diff --git a/changelogs/unreleased/8665-aj-2000 b/changelogs/unreleased/8665-aj-2000 new file mode 100644 index 000000000..2c37bc7fe --- /dev/null +++ b/changelogs/unreleased/8665-aj-2000 @@ -0,0 +1 @@ +Fixes issue #8214, validate `--from-schedule` flag in create backup command to prevent empty or whitespace-only values. diff --git a/pkg/cmd/cli/backup/create.go b/pkg/cmd/cli/backup/create.go index 03fb74938..31564aae8 100644 --- a/pkg/cmd/cli/backup/create.go +++ b/pkg/cmd/cli/backup/create.go @@ -179,6 +179,11 @@ func (o *CreateOptions) Validate(c *cobra.Command, args []string, f client.Facto return fmt.Errorf("either a 'selector' or an 'or-selector' can be specified, but not both") } + // Ensure if FromSchedule is set, it has a non-empty value + if err := o.validateFromScheduleFlag(c); err != nil { + return err + } + // Ensure that unless FromSchedule is set, args contains a backup name if o.FromSchedule == "" && len(args) != 1 { return fmt.Errorf("a backup name is required, unless you are creating based on a schedule") @@ -215,6 +220,17 @@ func (o *CreateOptions) Validate(c *cobra.Command, args []string, f client.Facto return nil } +func (o *CreateOptions) validateFromScheduleFlag(c *cobra.Command) error { + trimmed := strings.TrimSpace(o.FromSchedule) + if c.Flags().Changed("from-schedule") && trimmed == "" { + return fmt.Errorf("flag must have a non-empty value: --from-schedule") + } + + // Assign the trimmed value back + o.FromSchedule = trimmed + return nil +} + func (o *CreateOptions) Complete(args []string, f client.Factory) error { // If an explicit name is specified, use that name if len(args) > 0 { diff --git a/pkg/cmd/cli/backup/create_test.go b/pkg/cmd/cli/backup/create_test.go index b9be38e1e..1615c6eef 100644 --- a/pkg/cmd/cli/backup/create_test.go +++ b/pkg/cmd/cli/backup/create_test.go @@ -24,6 +24,7 @@ import ( "testing" "time" + "github.com/spf13/cobra" flag "github.com/spf13/pflag" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" @@ -86,6 +87,42 @@ func TestCreateOptions_BuildBackup(t *testing.T) { }, backup.Spec.OrderedResources) } +func TestCreateOptions_ValidateFromScheduleFlag(t *testing.T) { + cmd := &cobra.Command{} + o := NewCreateOptions() + o.BindFromSchedule(cmd.Flags()) + + t.Run("from-schedule with empty or no value", func(t *testing.T) { + cmd.Flags().Set("from-schedule", "") + err := o.validateFromScheduleFlag(cmd) + require.True(t, cmd.Flags().Changed("from-schedule")) + require.Error(t, err) + require.Equal(t, "flag must have a non-empty value: --from-schedule", err.Error()) + }) + + t.Run("from-schedule with spaces only", func(t *testing.T) { + cmd.Flags().Set("from-schedule", " ") + err := o.validateFromScheduleFlag(cmd) + require.True(t, cmd.Flags().Changed("from-schedule")) + require.Error(t, err) + require.Equal(t, "flag must have a non-empty value: --from-schedule", err.Error()) + }) + + t.Run("from-schedule with valid value", func(t *testing.T) { + cmd.Flags().Set("from-schedule", "daily") + err := o.validateFromScheduleFlag(cmd) + require.NoError(t, err) + require.Equal(t, "daily", o.FromSchedule) + }) + + t.Run("from-schedule with leading and trailing spaces", func(t *testing.T) { + cmd.Flags().Set("from-schedule", " daily ") + err := o.validateFromScheduleFlag(cmd) + require.NoError(t, err) + require.Equal(t, "daily", o.FromSchedule) + }) +} + func TestCreateOptions_BuildBackupFromSchedule(t *testing.T) { o := NewCreateOptions() o.FromSchedule = "test"