Merge pull request #459 from dinhxuanvu/defaulchan-val

openshift-merge-robot · web-flow · commit 5f55ec29ef79 · 2020-09-29T11:51:10.000Z
Bug 1883329: Bundle validation shouldn't fail if default channel is not provided
diff --git a/pkg/lib/bundle/testdata/validate/invalid_annotations_bundle/metadata/annotations.yaml b/pkg/lib/bundle/testdata/validate/invalid_annotations_bundle/metadata/annotations.yaml
@@ -1,5 +1,4 @@
 annotations:
-  operators.operatorframework.io.bundle.channel.default.v1: stable
   operators.operatorframework.io.bundle.channels.v1: stable,beta
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.mediatype.v1: registry+v2
diff --git a/pkg/lib/bundle/validate.go b/pkg/lib/bundle/validate.go
@@ -207,7 +207,7 @@ func validateAnnotations(mediaType string, fileAnnotations *AnnotationMetadata)
 				validationErrors = append(validationErrors, aErr)
 			}
 		case ChannelDefaultLabel:
-			if val == "" {
+			if ok && val == "" {
 				aErr := fmt.Errorf("Expecting annotation %q to have non-empty value", label)
 				validationErrors = append(validationErrors, aErr)
 			}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`annotations:`
`2`		`- operators.operatorframework.io.bundle.channel.default.v1: stable`
`3`	`2`	`operators.operatorframework.io.bundle.channels.v1: stable,beta`
`4`	`3`	`operators.operatorframework.io.bundle.manifests.v1: manifests/`
`5`	`4`	`operators.operatorframework.io.bundle.mediatype.v1: registry+v2`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ func validateAnnotations(mediaType string, fileAnnotations *AnnotationMetadata)`
`207`	`207`	`validationErrors = append(validationErrors, aErr)`
`208`	`208`	`}`
`209`	`209`	`case ChannelDefaultLabel:`
`210`		`- if val == "" {`
	`210`	`+ if ok && val == "" {`
`211`	`211`	`aErr := fmt.Errorf("Expecting annotation %q to have non-empty value", label)`
`212`	`212`	`validationErrors = append(validationErrors, aErr)`
`213`	`213`	`}`