Change to preprocess catalogs for enabled...

And delete unneeded test for mixed case priority+disablement

Signed-off-by: Brett Tofel <[email protected]>

Author: bentito

internal/resolve/catalog.go

@@ -243,15 +243,19 @@ func CatalogWalker(
 			return fmt.Errorf("error listing catalogs: %w", err)
 		}
 
+		// Remove disabled catalogs from consideration
+		catalogs = slices.DeleteFunc(catalogs, func(c catalogd.ClusterCatalog) bool {
+			if c.Spec.Availability == "Disabled" {
+				l.Info("excluding ClusterCatalog from resolution process since it is disabled", "catalog", c.Name)
+				return true
+			}
+			return false
+		})
+
 		for i := range catalogs {
 			cat := &catalogs[i]
 
-			// skip catalogs with Availability set to "Disabled"
-			if cat.Spec.Availability == "Disabled" {
-				l.Info("excluding ClusterCatalog from resolution process since it is disabled", "catalog", cat.Name)
-				continue
-			}
-
+			// process enabled catalogs
 			fbc, fbcErr := getPackage(ctx, cat, packageName)
 
 			if walkErr := f(ctx, cat, fbc, fbcErr); walkErr != nil {

internal/resolve/catalog_test.go

@@ -1027,65 +1027,6 @@ func TestSomeCatalogsDisabled(t *testing.T) {
 	require.Equal(t, bsemver.MustParse("3.0.0"), *gotVersion)
 }
 
-func TestPriorityRespectedWithDisabledCatalogs(t *testing.T) {
-	pkgName := randPkg()
-	listCatalogs := func(ctx context.Context, options ...client.ListOption) ([]catalogd.ClusterCatalog, error) {
-		return []catalogd.ClusterCatalog{
-			{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: "enabledCatalog",
-				},
-				Spec: catalogd.ClusterCatalogSpec{
-					Priority:     0, // Lower priority
-					Availability: "Enabled",
-				},
-			},
-			{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: "disabledCatalog",
-				},
-				Spec: catalogd.ClusterCatalogSpec{
-					Priority:     1, // Higher priority
-					Availability: "Disabled",
-				},
-			},
-		}, nil
-	}
-
-	getPackage := func(ctx context.Context, cat *catalogd.ClusterCatalog, packageName string) (*declcfg.DeclarativeConfig, error) {
-		if cat.Spec.Availability == "Disabled" {
-			panic("getPackage should not be called for disabled catalogs")
-		}
-		// Enabled catalog returns a lower version
-		return &declcfg.DeclarativeConfig{
-			Packages: []declcfg.Package{{Name: pkgName}},
-			Channels: []declcfg.Channel{
-				{
-					Package: pkgName,
-					Name:    "alpha",
-					Entries: []declcfg.ChannelEntry{
-						{Name: bundleName(pkgName, "1.0.0")},
-					},
-				},
-			},
-			Bundles: []declcfg.Bundle{
-				genBundle(pkgName, "1.0.0"),
-			},
-		}, nil
-	}
-
-	r := CatalogResolver{
-		WalkCatalogsFunc: CatalogWalker(listCatalogs, getPackage),
-	}
-
-	ce := buildFooClusterExtension(pkgName, []string{}, "", ocv1alpha1.UpgradeConstraintPolicyCatalogProvided)
-	gotBundle, gotVersion, _, err := r.Resolve(context.Background(), ce, nil)
-	require.NoError(t, err)
-	require.NotNil(t, gotBundle)
-	require.Equal(t, genBundle(pkgName, "1.0.0"), *gotBundle)
-	require.Equal(t, bsemver.MustParse("1.0.0"), *gotVersion)
-}
-
 func TestCatalogWithoutAvailabilityIsEnabled(t *testing.T) {
 	pkgName := randPkg()
 	listCatalogs := func(ctx context.Context, options ...client.ListOption) ([]catalogd.ClusterCatalog, error) {