fixing unit tests

Author: ankitathomas

controllers/catalogsource_controller_test.go

@@ -141,6 +141,7 @@ var _ = Describe("CatalogSource Controller Test", func() {
 			By("running re-reconcile")
 			res, err = reconciler.Reconcile(ctx, ctrl.Request{NamespacedName: opKey})
 			Expect(res).To(Equal(ctrl.Result{}))
+			Expect(err).ToNot(HaveOccurred())
 
 			By("checking the cache is empty again")
 			entities = nil
@@ -151,5 +152,63 @@ var _ = Describe("CatalogSource Controller Test", func() {
 			Expect(err).ToNot(HaveOccurred())
 			Expect(entities).To(BeEmpty())
 		})
+
+		Describe("querying CatalogSource EntitySource", func() {
+			BeforeEach(func() {
+				registryEntities := []*input.Entity{
+					input.NewEntity(deppy.Identifier(fmt.Sprintf("%s/%s/pkg1/chan1/0.1.0", catalogSourceName, namespace)), map[string]string{}),
+					input.NewEntity(deppy.Identifier(fmt.Sprintf("%s/%s/pkg1/chan1/0.2.0", catalogSourceName, namespace)), map[string]string{"k": "v"}),
+				}
+				fakeRegistry.setEntitiesForSource(opKey.String(), registryEntities...)
+
+				res, err := reconciler.Reconcile(ctx, ctrl.Request{NamespacedName: opKey})
+				Expect(err).ToNot(HaveOccurred())
+				Expect(res).To(Equal(ctrl.Result{}))
+			})
+			Describe("Get", func() {
+				It("should fetch an entity by ID", func() {
+					Expect(reconciler.Get(ctx, deppy.Identifier(fmt.Sprintf("%s/%s/pkg1/chan1/0.1.0", catalogSourceName, namespace)))).To(
+						Equal(input.NewEntity(deppy.Identifier(fmt.Sprintf("%s/%s/pkg1/chan1/0.1.0", catalogSourceName, namespace)), map[string]string{})),
+					)
+				})
+				It("should not fetch anything for nonexistent entity ID", func() {
+					Expect(reconciler.Get(ctx, "non-existent")).To(BeNil())
+				})
+			})
+			Describe("Filter", func() {
+				It("should return entities that meet filter predicates", func() {
+					actual, err := reconciler.Filter(ctx, func(e *input.Entity) bool {
+						_, ok := e.Properties["k"]
+						return ok
+					})
+					Expect(err).ToNot(HaveOccurred())
+					Expect(actual).To(ConsistOf(input.EntityList{*input.NewEntity(deppy.Identifier(fmt.Sprintf("%s/%s/pkg1/chan1/0.2.0", catalogSourceName, namespace)), map[string]string{"k": "v"})}))
+				})
+			})
+			Describe("GroupBy", func() {
+				It("should group entities by the keys provided by the groupBy function", func() {
+					actual, err := reconciler.GroupBy(ctx, func(e *input.Entity) []string {
+						var keys []string
+						for k := range e.Properties {
+							keys = append(keys, k)
+						}
+						return keys
+					})
+					Expect(err).ToNot(HaveOccurred())
+					Expect(actual).To(Equal(input.EntityListMap{"k": input.EntityList{*input.NewEntity(deppy.Identifier(fmt.Sprintf("%s/%s/pkg1/chan1/0.2.0", catalogSourceName, namespace)), map[string]string{"k": "v"})}}))
+				})
+			})
+			Describe("Iterate", func() {
+				It("should go through all entities", func() {
+					var ids []string
+					Expect(reconciler.Iterate(ctx, func(e *input.Entity) error {
+						ids = append(ids, e.Identifier().String())
+						return nil
+					})).To(BeNil())
+					Expect(ids).To(ConsistOf([]string{fmt.Sprintf("%s/%s/pkg1/chan1/0.1.0", catalogSourceName, namespace),
+						fmt.Sprintf("%s/%s/pkg1/chan1/0.2.0", catalogSourceName, namespace)}))
+				})
+			})
+		})
 	})
 })

controllers/operator_controller_test.go

@@ -570,7 +570,7 @@ var testEntitySource = input.NewCacheQuerier(map[deppy.Identifier]input.Entity{
 		"olm.gvk":         `[]`,
 	}),
 	"operatorhub/badimage/0.1.0": *input.NewEntity("operatorhub/badimage/0.1.0", map[string]string{
-		"olm.bundle.path": `{"name": "quay.io/operatorhubio/badimage:v0.1.0"}`,
+		"olm.bundle.path": ``,
 		"olm.package":     `{"packageName":"badimage","version":"0.1.0"}`,
 		"olm.gvk":         `[]`,
 	}),

go.mod

@@ -4,6 +4,7 @@ go 1.19
 
 require (
 	github.com/blang/semver/v4 v4.0.0
+	github.com/containerd/containerd v1.6.3
 	github.com/onsi/ginkgo/v2 v2.3.1
 	github.com/onsi/gomega v1.22.1
 	github.com/operator-framework/api v0.15.0

go.sum

@@ -98,6 +98,8 @@ github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/containerd/containerd v1.6.3 h1:JfgUEIAH07xDWk6kqz0P3ArZt+KJ9YeihSC9uyFtSKg=
+github.com/containerd/containerd v1.6.3/go.mod h1:gCVGrYRYFm2E8GmuUIbj/NGD7DLZQLzSJQazjVKDOig=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

internal/resolution/variable_sources/olm/olm.go

@@ -5,10 +5,10 @@ import (
 
 	"github.com/operator-framework/deppy/pkg/deppy"
 	"github.com/operator-framework/deppy/pkg/deppy/input"
-	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/required_package"
 
 	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/bundles_and_dependencies"
 	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/crd_constraints"
+	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/required_package"
 )
 
 var _ input.VariableSource = &OLMVariableSource{}

internal/resolution/variable_sources/required_package/required_package_test.go

@@ -9,10 +9,10 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/operator-framework/deppy/pkg/deppy"
 	"github.com/operator-framework/deppy/pkg/deppy/input"
-	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/required_package"
 	"github.com/operator-framework/operator-registry/alpha/property"
 
 	olmentity "github.com/operator-framework/operator-controller/internal/resolution/variable_sources/entity"
+	"github.com/operator-framework/operator-controller/internal/resolution/variable_sources/required_package"
 )
 
 func TestRequiredPackage(t *testing.T) {