Add e2e test case to test multiple dependencies with same package

Signed-off-by: Vu Dinh <[email protected]>

Author: dinhxuanvu

pkg/controller/registry/registry_client.go

@@ -11,8 +11,6 @@ import (
 	opregistry "github.com/operator-framework/operator-registry/pkg/registry"
 )
 
-var _ RegistryClientInterface = &OLMRegistryClient{}
-
 type ChannelEntryStream interface {
 	Recv() (*registryapi.ChannelEntry, error)
 }
@@ -57,6 +55,8 @@ func NewRegistryClient(client *client.Client) *OLMRegistryClient {
 	return &OLMRegistryClient{Client: client}
 }
 
+var _ RegistryClientInterface = &OLMRegistryClient{}
+
 // GetLatestChannelEntriesThatProvide uses registry client to get a list of
 // latest channel entries that provide the requested API (via an iterator)
 func (rc *OLMRegistryClient) GetLatestChannelEntriesThatProvide(ctx context.Context, group, version, kind string) (*ChannelEntryIterator, error) {
@@ -74,9 +74,8 @@ func (rc *OLMRegistryClient) FindBundleThatProvides(ctx context.Context, group,
 	if err != nil {
 		return nil, err
 	}
-
-	entry := FilterChannelEntries(it, pkgName)
-	if entry != nil {
+	entry := rc.filterChannelEntries(it, pkgName)
+	if entry == nil {
 		return nil, fmt.Errorf("Unable to find a channel entry which doesn't belong to package %s", pkgName)
 	}
 	bundle, err := rc.Client.Registry.GetBundle(ctx, &registryapi.GetBundleRequest{PkgName: entry.PackageName, ChannelName: entry.ChannelName, CsvName: entry.BundleName})
@@ -89,7 +88,7 @@ func (rc *OLMRegistryClient) FindBundleThatProvides(ctx context.Context, group,
 // FilterChannelEntries filters out a channel entries that provide the requested
 // API and come from the same package with original operator and returns the
 // first entry on the list
-func FilterChannelEntries(it *ChannelEntryIterator, pkgName string) *opregistry.ChannelEntry {
+func (rc *OLMRegistryClient) filterChannelEntries(it *ChannelEntryIterator, pkgName string) *opregistry.ChannelEntry {
 	var entry *opregistry.ChannelEntry
 	for e := it.Next(); e != nil; e = it.Next() {
 		if e.PackageName != pkgName {

test/e2e/subscription_e2e_test.go

@@ -1265,6 +1265,141 @@ var _ = Describe("Subscription", func() {
 		require.NoError(GinkgoT(), err)
 		require.Len(GinkgoT(), installPlan.Status.CatalogSources, 1)
 	})
+
+	FIt("creation with multiple dependencies", func() {
+
+		defer cleaner.NotifyTestComplete(GinkgoT(), true)
+
+		kubeClient := newKubeClient(GinkgoT())
+		crClient := newCRClient(GinkgoT())
+
+		permissions := deploymentPermissions()
+
+		crdPlural := genName("ins")
+		crdName := crdPlural + ".cluster.com"
+		crdPlural2 := genName("ins")
+		crdName2 := crdPlural2 + ".cluster.com"
+
+		crd := apiextensions.CustomResourceDefinition{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: crdName,
+			},
+			Spec: apiextensions.CustomResourceDefinitionSpec{
+				Group:   "cluster.com",
+				Version: "v1alpha1",
+				Names: apiextensions.CustomResourceDefinitionNames{
+					Plural:   crdPlural,
+					Singular: crdPlural,
+					Kind:     crdPlural,
+					ListKind: "list" + crdPlural,
+				},
+				Scope: "Namespaced",
+			},
+		}
+
+		crd2 := apiextensions.CustomResourceDefinition{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: crdName2,
+			},
+			Spec: apiextensions.CustomResourceDefinitionSpec{
+				Group:   "cluster.com",
+				Version: "v1alpha1",
+				Names: apiextensions.CustomResourceDefinitionNames{
+					Plural:   crdPlural2,
+					Singular: crdPlural2,
+					Kind:     crdPlural2,
+					ListKind: "list" + crdPlural2,
+				},
+				Scope: "Namespaced",
+			},
+		}
+
+		// Create CSV
+		packageName1 := genName("apackage")
+		packageName2 := genName("bpackage")
+
+		namedStrategy := newNginxInstallStrategy((genName("dep")), permissions, nil)
+		depNamedStrategy := newNginxInstallStrategy((genName("dep")), permissions, nil)
+		depNamedStrategy2 := newNginxInstallStrategy((genName("dep")), permissions, nil)
+		csvA := newCSV("nginx-a", testNamespace, "", semver.MustParse("0.1.0"), nil, []apiextensions.CustomResourceDefinition{crd, crd2}, namedStrategy)
+		csvAB := newCSV("nginx-a-b", testNamespace, "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{crd}, nil, namedStrategy)
+		csvB := newCSV("nginx-b-dep", testNamespace, "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{crd}, nil, depNamedStrategy)
+		csvC := newCSV("nginx-c-dep", testNamespace, "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{crd2}, nil, depNamedStrategy2)
+
+		// Create PackageManifests
+		manifests := []registry.PackageManifest{
+			{
+				PackageName: packageName1,
+				Channels: []registry.PackageChannel{
+					{Name: stableChannel, CurrentCSVName: csvA.GetName()},
+					{Name: alphaChannel, CurrentCSVName: csvAB.GetName()},
+				},
+				DefaultChannelName: stableChannel,
+			},
+			{
+				PackageName: packageName2,
+				Channels: []registry.PackageChannel{
+					{Name: stableChannel, CurrentCSVName: csvB.GetName()},
+				},
+				DefaultChannelName: stableChannel,
+			},
+		}
+
+		manifests2 := []registry.PackageManifest{
+			{
+				PackageName: packageName2,
+				Channels: []registry.PackageChannel{
+					{Name: stableChannel, CurrentCSVName: csvC.GetName()},
+				},
+				DefaultChannelName: stableChannel,
+			},
+		}
+
+		catalogSourceName := genName("catsrc")
+		catsrc, cleanup := createInternalCatalogSource(GinkgoT(), kubeClient, crClient, catalogSourceName, testNamespace, manifests, []apiextensions.CustomResourceDefinition{crd, crd2}, []v1alpha1.ClusterServiceVersion{csvA, csvAB, csvB})
+		defer cleanup()
+
+		// Ensure that the catalog source is resolved before we create a subscription.
+		_, err := fetchCatalogSource(GinkgoT(), crClient, catsrc.GetName(), testNamespace, catalogSourceRegistryPodSynced)
+		require.NoError(GinkgoT(), err)
+
+		subscriptionSpec := &v1alpha1.SubscriptionSpec{
+			CatalogSource:          catsrc.GetName(),
+			CatalogSourceNamespace: catsrc.GetNamespace(),
+			Package:                packageName1,
+			Channel:                stableChannel,
+			StartingCSV:            csvA.GetName(),
+			InstallPlanApproval:    v1alpha1.ApprovalAutomatic,
+		}
+
+		catalogSourceName2 := genName("catsrc")
+		catsrc2, cleanup2 := createInternalCatalogSource(GinkgoT(), kubeClient, crClient, catalogSourceName2, testNamespace, manifests2, []apiextensions.CustomResourceDefinition{crd2}, []v1alpha1.ClusterServiceVersion{csvC})
+		defer cleanup2()
+
+		// Ensure that the catalog source is resolved before we create a subscription.
+		_, err = fetchCatalogSource(GinkgoT(), crClient, catsrc2.GetName(), testNamespace, catalogSourceRegistryPodSynced)
+		require.NoError(GinkgoT(), err)
+
+		// Create a subscription that has a dependency
+		subscriptionName := genName("sub-")
+		cleanupSubscription := createSubscriptionForCatalogWithSpec(GinkgoT(), crClient, testNamespace, subscriptionName, subscriptionSpec)
+		defer cleanupSubscription()
+
+		subscription, err := fetchSubscription(GinkgoT(), crClient, testNamespace, subscriptionName, subscriptionStateAtLatestChecker)
+		require.NoError(GinkgoT(), err)
+		require.NotNil(GinkgoT(), subscription)
+
+		// Check that a single catalog source was used to resolve the InstallPlan
+		_, err = fetchInstallPlan(GinkgoT(), crClient, subscription.Status.InstallPlanRef.Name, buildInstallPlanPhaseCheckFunc(v1alpha1.InstallPlanPhaseComplete))
+		require.NoError(GinkgoT(), err)
+		// Fetch CSVs
+		_, err = fetchCSV(GinkgoT(), crClient, csvB.Name, testNamespace, csvSucceededChecker)
+		require.NoError(GinkgoT(), err)
+		_, err = fetchCSV(GinkgoT(), crClient, csvC.Name, testNamespace, csvSucceededChecker)
+		require.NoError(GinkgoT(), err)
+		_, err = fetchCSV(GinkgoT(), crClient, csvA.Name, testNamespace, csvSucceededChecker)
+		require.NoError(GinkgoT(), err)
+	})
 })
 
 const (