vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #302 from ncdc/check-backup-before-creating-restore 

Error if backup missing when creating a restore
pull/296/head
Nolan Brubaker 2018-02-26 12:05:38 -05:00 committed by GitHub
parent 530e22939d cc4d2916fa
commit fcbc7bd570
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/cmd/cli/restore/create.go
View File

@ -31,6 +31,7 @@ import (
"github.com/heptio/ark/pkg/cmd"
"github.com/heptio/ark/pkg/cmd/util/flag"
"github.com/heptio/ark/pkg/cmd/util/output"
arkclient "github.com/heptio/ark/pkg/generated/clientset/versioned"
)
func NewCreateCommand(f client.Factory, use string) *cobra.Command {
@ -40,7 +41,7 @@ func NewCreateCommand(f client.Factory, use string) *cobra.Command {
Use: use + " BACKUP",
Short: "Create a restore",
Run: func(c *cobra.Command, args []string) {
cmd.CheckError(o.Validate(c, args))
cmd.CheckError(o.Validate(c, args, f))
cmd.CheckError(o.Complete(args))
cmd.CheckError(o.Run(c, f))
},
@ -64,6 +65,8 @@ type CreateOptions struct {
NamespaceMappings flag.Map
Selector flag.LabelSelector
IncludeClusterResources flag.OptionalBool
client arkclient.Interface
}
func NewCreateOptions() *CreateOptions {
@ -93,7 +96,7 @@ func (o *CreateOptions) BindFlags(flags *pflag.FlagSet) {
f.NoOptDefVal = "true"
}
func (o *CreateOptions) Validate(c *cobra.Command, args []string) error {
func (o *CreateOptions) Validate(c *cobra.Command, args []string, f client.Factory) error {
if len(args) != 1 {
return errors.New("you must specify only one argument, the backup's name")
}
@ -102,6 +105,17 @@ func (o *CreateOptions) Validate(c *cobra.Command, args []string) error {
return err
}
client, err := f.Client()
if err != nil {
return err
}
o.client = client
_, err = o.client.ArkV1().Backups(f.Namespace()).Get(args[0], metav1.GetOptions{})
if err != nil {
return err
}
return nil
}
@ -111,9 +125,9 @@ func (o *CreateOptions) Complete(args []string) error {
}
func (o *CreateOptions) Run(c *cobra.Command, f client.Factory) error {
arkClient, err := f.Client()
if err != nil {
return err
if o.client == nil {
// This should never happen
return errors.New("Ark client is not set; unable to proceed")
}
restore := &api.Restore{
@ -139,7 +153,7 @@ func (o *CreateOptions) Run(c *cobra.Command, f client.Factory) error {
return err
}
restore, err = arkClient.ArkV1().Restores(restore.Namespace).Create(restore)
restore, err := o.client.ArkV1().Restores(restore.Namespace).Create(restore)
if err != nil {
return err
}