Skip to content

Commit cba3688

Browse files
committed
add validation and test case
1 parent a83f102 commit cba3688

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

kustomize/commands/edit/add/addmetadata.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ func (o *addMetadataOptions) validateAndParse(args []string) error {
116116
if len(args) < 1 {
117117
return fmt.Errorf("must specify %s", o.kind)
118118
}
119+
if !o.labelsWithoutSelector && o.includeTemplates {
120+
return fmt.Errorf("--without-selector flag must be specified for --include-templates to work")
121+
}
119122
m, err := util.ConvertSliceToMap(args, o.kind.String())
120123
if err != nil {
121124
return err

kustomize/commands/edit/add/addmetadata_test.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,19 @@ func TestAddLabelWithoutSelectorIncludeTemplates(t *testing.T) {
294294
assert.Equal(t, m.Labels[0], types.Label{Pairs: map[string]string{"new": "label"}, IncludeTemplates: true})
295295
}
296296

297+
func TestAddLabelIncludeTemplatesWithoutRequiredFlag(t *testing.T) {
298+
fSys := filesys.MakeFsInMemory()
299+
v := valtest_test.MakeHappyMapValidator(t)
300+
cmd := newCmdAddLabel(fSys, v.Validator)
301+
args := []string{"new:label"}
302+
_ = cmd.Flag("include-templates").Value.Set("true")
303+
_ = cmd.Flag("without-selector").Value.Set("false")
304+
err := cmd.RunE(cmd, args)
305+
v.VerifyNoCall()
306+
require.Error(t, err)
307+
require.Containsf(t, err.Error(), "--without-selector flag must be specified for --include-templates to work", "incorrect error: %s", err.Error())
308+
}
309+
297310
func TestAddLabelWithoutSelectorAddLabel(t *testing.T) {
298311
var o addMetadataOptions
299312
o.metadata = map[string]string{"owls": "cute", "otters": "adorable"}

0 commit comments

Comments
 (0)