Bundle image references and versions are passed in as a map for creat…

…ing FBC

Signed-off-by: jubittajohn <jujohn@redhat.com>

test/operator-framework-e2e/create_fbc_helper.go

@@ -21,10 +21,15 @@ const (
 )
 
 // Forms the FBC declartive config and creates the FBC by calling functions for forming the package, channel and bundles.
-func CreateFBC(operatorName, defaultChannel string, bundleRef, bundleVersions []string) *declcfg.DeclarativeConfig {
+func CreateFBC(operatorName, defaultChannel string, bundleRefsVersions map[string]string) *declcfg.DeclarativeConfig {
 	dPackage := formPackage(operatorName)
+	bundleVersions := make([]string, 0)
+	for _, bundleVersion := range bundleRefsVersions {
+		bundleVersions = append(bundleVersions, bundleVersion)
+	}
 	dChannel := formChannel(operatorName, defaultChannel, bundleVersions)
-	dBundle := formBundle(operatorName, bundleVersions, bundleRef)
+
+	dBundle := formBundle(operatorName, bundleRefsVersions)
 
 	fbc := declcfg.DeclarativeConfig{
 		Packages: []declcfg.Package{dPackage},
@@ -73,9 +78,9 @@ func formChannelEntries(pkgName string, bundleVersions []string) []declcfg.Chann
 }
 
 // Forms bundle schema for the FBC
-func formBundle(pkgName string, versions, imageRefs []string) []declcfg.Bundle {
-	bundleFormed := make([]declcfg.Bundle, 0, len(imageRefs))
-	for i, version := range versions {
+func formBundle(pkgName string, imgRefsVersions map[string]string) []declcfg.Bundle {
+	bundleFormed := make([]declcfg.Bundle, 0, len(imgRefsVersions))
+	for imgRef, version := range imgRefsVersions {
 		var properties []property.Property
 		properties = append(properties, property.Property{
 			Type:  SchemaPackage,
@@ -90,7 +95,7 @@ func formBundle(pkgName string, versions, imageRefs []string) []declcfg.Bundle {
 			Schema:     SchemaBundle,
 			Name:       pkgName + ".v" + version,
 			Package:    pkgName,
-			Image:      imageRefs[i],
+			Image:      imgRef,
 			Properties: properties,
 		})
 	}

test/operator-framework-e2e/operator_framework_test.go

@@ -159,13 +159,11 @@ var _ = Describe("Operator Framework E2E for plain bundles", func() {
 	When("Create the FBC", func() {
 		It("Create a FBC", func() {
 			By("Creating FBC for plain bundle using custom routine")
-			var imageRefs []string
-			var bundleVersions []string
+			imageRefsBundleVersions := make(map[string]string)
 			for _, b := range bundleInfo.bundles {
-				imageRefs = append(imageRefs, b.imageRef)
-				bundleVersions = append(bundleVersions, b.bundleVersion)
+				imageRefsBundleVersions[b.imageRef] = b.bundleVersion
 			}
-			fbc := CreateFBC(catalogDInfo.operatorName, catalogDInfo.desiredChannelName, imageRefs, bundleVersions)
+			fbc := CreateFBC(catalogDInfo.operatorName, catalogDInfo.desiredChannelName, imageRefsBundleVersions)
 			err = WriteFBC(*fbc, filepath.Join(catalogDInfo.baseFolderPath, catalogDInfo.catalogDir), catalogDInfo.fbcFileName)
 			Expect(err).ToNot(HaveOccurred())
 		})