Skip to content

Commit d08fed8

Browse files
committed
Drop From field validation check
Currently if From.Name is zero the validation wrongly reports that the From field is required. Drop the From field validation check as it's not so useful.
1 parent 1f5063f commit d08fed8

File tree

2 files changed

+63
-2
lines changed

2 files changed

+63
-2
lines changed

pkg/build/api/validation/validation.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,6 @@ func validateImageChange(imageChange *buildapi.ImageChangeTrigger) errs.Validati
240240
allErrs = append(allErrs, errs.NewFieldRequired("image"))
241241
}
242242
if len(imageChange.From.Name) == 0 {
243-
allErrs = append(allErrs, errs.NewFieldRequired("from"))
244-
} else if len(imageChange.From.Name) == 0 {
245243
allErrs = append(allErrs, errs.ValidationErrorList{errs.NewFieldRequired("name")}.Prefix("from")...)
246244
}
247245
return allErrs

pkg/build/api/validation/validation_test.go

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -505,3 +505,66 @@ func TestValidateTrigger(t *testing.T) {
505505
}
506506
}
507507
}
508+
509+
func TestValidateImageChange(t *testing.T) {
510+
tests := []struct {
511+
name string
512+
ict *buildapi.ImageChangeTrigger
513+
expectedErrNum int
514+
}{
515+
{
516+
name: "Pass",
517+
ict: &buildapi.ImageChangeTrigger{
518+
Image: "openshift",
519+
From: kapi.ObjectReference{
520+
Name: "default/repo",
521+
},
522+
},
523+
expectedErrNum: 0,
524+
},
525+
{
526+
name: "Missing image ref",
527+
ict: &buildapi.ImageChangeTrigger{
528+
Image: "",
529+
From: kapi.ObjectReference{
530+
Name: "default/repo",
531+
},
532+
},
533+
expectedErrNum: 1,
534+
},
535+
{
536+
name: "Missing From ref",
537+
ict: &buildapi.ImageChangeTrigger{
538+
Image: "openshift",
539+
From: kapi.ObjectReference{
540+
Name: "",
541+
},
542+
},
543+
expectedErrNum: 1,
544+
},
545+
{
546+
name: "Both missing refs",
547+
ict: &buildapi.ImageChangeTrigger{
548+
Image: "",
549+
From: kapi.ObjectReference{
550+
Name: "",
551+
},
552+
},
553+
expectedErrNum: 2,
554+
},
555+
{
556+
name: "Undefined from field",
557+
ict: &buildapi.ImageChangeTrigger{
558+
Image: "openshift",
559+
},
560+
expectedErrNum: 1,
561+
},
562+
}
563+
564+
for _, test := range tests {
565+
got := len(validateImageChange(test.ict))
566+
if test.expectedErrNum != got {
567+
t.Errorf("%s: Expected %d error(s), got %d", test.name, test.expectedErrNum, got)
568+
}
569+
}
570+
}

0 commit comments

Comments
 (0)