Merge pull request operator-framework#358 from estroz/bugfix/annotation-compare-validation

pkg/lib/bundle/generate.go: do not compare number of annotations

Author: openshift-merge-robot

pkg/lib/bundle/generate.go

@@ -11,6 +11,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	k8syaml "k8s.io/apimachinery/pkg/util/yaml"
 )
 
@@ -274,24 +275,22 @@ func ValidateAnnotations(existing, expected []byte) error {
 		return err
 	}
 
-	if len(fileAnnotations.Annotations) != len(expectedAnnotations.Annotations) {
-		return fmt.Errorf("Unmatched number of fields. Expected (%d) vs existing (%d)",
-			len(expectedAnnotations.Annotations), len(fileAnnotations.Annotations))
-	}
-
+	// Ensure each expected annotation key and value exist in existing.
+	var errs []error
 	for label, item := range expectedAnnotations.Annotations {
-		value, ok := fileAnnotations.Annotations[label]
-		if ok == false {
-			return fmt.Errorf("Missing field: %s", label)
+		value, hasAnnotation := fileAnnotations.Annotations[label]
+		if !hasAnnotation {
+			errs = append(errs, fmt.Errorf("Missing field: %s", label))
+			continue
 		}
 
 		if item != value {
-			return fmt.Errorf(`Expect field "%s" to have value "%s" instead of "%s"`,
-				label, item, value)
+			errs = append(errs, fmt.Errorf("Expect field %q to have value %q instead of %q",
+				label, item, value))
 		}
 	}
 
-	return nil
+	return utilerrors.NewAggregate(errs)
 }
 
 // ValidateChannelDefault validates provided default channel to ensure it exists in

pkg/lib/bundle/generate_test.go

@@ -117,7 +117,7 @@ func TestValidateAnnotations(t *testing.T) {
 					"test1": "stable",
 					"test2": "stable,beta",
 				}),
-			fmt.Errorf("Unmatched number of fields. Expected (2) vs existing (3)"),
+			nil,
 		},
 		{
 			buildTestAnnotations("annotations",