remove catalogmetadata types, introduce to resolver interface

Signed-off-by: Joe Lanford <[email protected]>

cmd/manager/main.go

@@ -47,7 +47,8 @@ import (
 	"github.com/operator-framework/operator-controller/internal/controllers"
 	"github.com/operator-framework/operator-controller/internal/httputil"
 	"github.com/operator-framework/operator-controller/internal/labels"
-	crdupgradesafety "github.com/operator-framework/operator-controller/internal/rukpak/preflights/crdupgradesafety"
+	"github.com/operator-framework/operator-controller/internal/resolve"
+	"github.com/operator-framework/operator-controller/internal/rukpak/preflights/crdupgradesafety"
 	"github.com/operator-framework/operator-controller/internal/rukpak/source"
 	"github.com/operator-framework/operator-controller/internal/version"
 	"github.com/operator-framework/operator-controller/pkg/features"
@@ -153,25 +154,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	certPool, err := httputil.NewCertPool(caCertDir)
-	if err != nil {
-		setupLog.Error(err, "unable to create CA certificate pool")
-		os.Exit(1)
-	}
-
-	httpClient, err := httputil.BuildHTTPClient(certPool)
-	if err != nil {
-		setupLog.Error(err, "unable to create catalogd http client")
-	}
-
-	cl := mgr.GetClient()
-	catalogsCachePath := filepath.Join(cachePath, "catalogs")
-	if err := os.MkdirAll(catalogsCachePath, 0700); err != nil {
-		setupLog.Error(err, "unable to create catalogs cache directory")
-		os.Exit(1)
-	}
-	catalogClient := catalogclient.New(cl, cache.NewFilesystemCache(catalogsCachePath, httpClient))
-
 	installNamespaceMapper := helmclient.ObjectToStringMapper(func(obj client.Object) (string, error) {
 		ext := obj.(*ocv1alpha1.ClusterExtension)
 		return ext.Spec.InstallNamespace, nil
@@ -194,14 +176,19 @@ func main() {
 		os.Exit(1)
 	}
 
-	clusterExtensionFinalizers := crfinalizer.NewFinalizers()
+	certPool, err := httputil.NewCertPool(caCertDir)
+	if err != nil {
+		setupLog.Error(err, "unable to create CA certificate pool")
+		os.Exit(1)
+	}
 	unpacker := &source.ImageRegistry{
 		BaseCachePath: filepath.Join(cachePath, "unpack"),
 		// TODO: This needs to be derived per extension via ext.Spec.InstallNamespace
 		AuthNamespace: systemNamespace,
 		CaCertPool:    certPool,
 	}
 
+	clusterExtensionFinalizers := crfinalizer.NewFinalizers()
 	domain := ocv1alpha1.GroupVersion.Group
 	cleanupUnpackCacheKey := fmt.Sprintf("%s/cleanup-unpack-cache", domain)
 	if err := clusterExtensionFinalizers.Register(cleanupUnpackCacheKey, finalizerFunc(func(ctx context.Context, obj client.Object) (crfinalizer.Result, error) {
@@ -222,9 +209,36 @@ func main() {
 		crdupgradesafety.NewPreflight(aeClient.CustomResourceDefinitions()),
 	}
 
+	cl := mgr.GetClient()
+	httpClient, err := httputil.BuildHTTPClient(certPool)
+	if err != nil {
+		setupLog.Error(err, "unable to create catalogd http client")
+		os.Exit(1)
+	}
+
+	catalogsCachePath := filepath.Join(cachePath, "catalogs")
+	if err := os.MkdirAll(catalogsCachePath, 0700); err != nil {
+		setupLog.Error(err, "unable to create catalogs cache directory")
+		os.Exit(1)
+	}
+	catalogClient := catalogclient.New(cache.NewFilesystemCache(catalogsCachePath, httpClient))
+
+	resolver := &resolve.CatalogResolver{
+		WalkCatalogsFunc: resolve.CatalogWalker(
+			func(ctx context.Context, option ...client.ListOption) ([]catalogd.ClusterCatalog, error) {
+				var catalogs catalogd.ClusterCatalogList
+				if err := cl.List(ctx, &catalogs, option...); err != nil {
+					return nil, err
+				}
+				return catalogs.Items, nil
+			},
+			catalogClient.GetPackage,
+		),
+	}
+
 	if err = (&controllers.ClusterExtensionReconciler{
 		Client:                cl,
-		BundleProvider:        catalogClient,
+		Resolver:              resolver,
 		ActionClientGetter:    acg,
 		Unpacker:              unpacker,
 		InstalledBundleGetter: &controllers.DefaultInstalledBundleGetter{ActionClientGetter: acg},

internal/bundleutil/bundle.go

@@ -0,0 +1,38 @@
+package bundleutil
+
+import (
+	"encoding/json"
+	"fmt"
+
+	bsemver "github.com/blang/semver/v4"
+
+	"github.com/operator-framework/operator-registry/alpha/declcfg"
+	"github.com/operator-framework/operator-registry/alpha/property"
+
+	ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
+)
+
+func GetVersion(b declcfg.Bundle) (*bsemver.Version, error) {
+	for _, p := range b.Properties {
+		if p.Type == property.TypePackage {
+			var pkg property.Package
+			if err := json.Unmarshal(p.Value, &pkg); err != nil {
+				return nil, fmt.Errorf("error unmarshalling package property: %w", err)
+			}
+			vers, err := bsemver.Parse(pkg.Version)
+			if err != nil {
+				return nil, err
+			}
+			return &vers, nil
+		}
+	}
+	return nil, fmt.Errorf("no package property found in bundle %q", b.Name)
+}
+
+// MetadataFor returns a BundleMetadata for the given bundle name and version.
+func MetadataFor(bundleName string, bundleVersion bsemver.Version) *ocv1alpha1.BundleMetadata {
+	return &ocv1alpha1.BundleMetadata{
+		Name:    bundleName,
+		Version: bundleVersion.String(),
+	}
+}

internal/catalogmetadata/cache/cache_test.go

@@ -68,7 +68,7 @@ func TestFilesystemCache(t *testing.T) {
 		catalog        *catalogd.ClusterCatalog
 		contents       fstest.MapFS
 		wantErr        bool
-		tripper        *MockTripper
+		tripper        *mockTripper
 		testCaching    bool
 		shouldHitCache bool
 	}
@@ -89,7 +89,7 @@ func TestFilesystemCache(t *testing.T) {
 				},
 			},
 			contents: defaultFS,
-			tripper:  &MockTripper{},
+			tripper:  &mockTripper{},
 		},
 		{
 			name: "valid cached fetch",
@@ -107,7 +107,7 @@ func TestFilesystemCache(t *testing.T) {
 				},
 			},
 			contents:       defaultFS,
-			tripper:        &MockTripper{},
+			tripper:        &mockTripper{},
 			testCaching:    true,
 			shouldHitCache: true,
 		},
@@ -127,7 +127,7 @@ func TestFilesystemCache(t *testing.T) {
 				},
 			},
 			contents:       defaultFS,
-			tripper:        &MockTripper{},
+			tripper:        &mockTripper{},
 			testCaching:    true,
 			shouldHitCache: false,
 		},
@@ -147,7 +147,7 @@ func TestFilesystemCache(t *testing.T) {
 				},
 			},
 			contents: defaultFS,
-			tripper:  &MockTripper{shouldError: true},
+			tripper:  &mockTripper{shouldError: true},
 			wantErr:  true,
 		},
 		{
@@ -166,14 +166,14 @@ func TestFilesystemCache(t *testing.T) {
 				},
 			},
 			contents: defaultFS,
-			tripper:  &MockTripper{serverError: true},
+			tripper:  &mockTripper{serverError: true},
 			wantErr:  true,
 		},
 		{
 			name:     "nil catalog",
 			catalog:  nil,
 			contents: defaultFS,
-			tripper:  &MockTripper{serverError: true},
+			tripper:  &mockTripper{serverError: true},
 			wantErr:  true,
 		},
 		{
@@ -187,7 +187,7 @@ func TestFilesystemCache(t *testing.T) {
 				},
 			},
 			contents: defaultFS,
-			tripper:  &MockTripper{serverError: true},
+			tripper:  &mockTripper{serverError: true},
 			wantErr:  true,
 		},
 		{
@@ -203,7 +203,7 @@ func TestFilesystemCache(t *testing.T) {
 				},
 			},
 			contents: defaultFS,
-			tripper:  &MockTripper{serverError: true},
+			tripper:  &mockTripper{serverError: true},
 			wantErr:  true,
 		},
 	} {
@@ -242,15 +242,15 @@ func TestFilesystemCache(t *testing.T) {
 	}
 }
 
-var _ http.RoundTripper = &MockTripper{}
+var _ http.RoundTripper = &mockTripper{}
 
-type MockTripper struct {
+type mockTripper struct {
 	content     fstest.MapFS
 	shouldError bool
 	serverError bool
 }
 
-func (mt *MockTripper) RoundTrip(_ *http.Request) (*http.Response, error) {
+func (mt *mockTripper) RoundTrip(_ *http.Request) (*http.Response, error) {
 	if mt.shouldError {
 		return nil, errors.New("mock tripper error")
 	}