wip2: switch to resolver interface

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

Author: joelanford

cmd/manager/main.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"github.com/operator-framework/operator-controller/internal/resolve"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -230,16 +231,19 @@ func main() {
 	}
 
 	if err = (&controllers.ClusterExtensionReconciler{
-		Client:                 cl,
-		CatalogPackageProvider: catalogClient,
-		ActionClientGetter:     acg,
-		Unpacker:               unpacker,
-		Storage:                localStorage,
-		InstalledBundleGetter:  &controllers.DefaultInstalledBundleGetter{ActionClientGetter: acg},
-		Handler:                registryv1handler.HandlerFunc(registry.HandleBundleDeployment),
-		Finalizers:             clusterExtensionFinalizers,
-		CaCertDir:              caCertDir,
-		Preflights:             preflights,
+		Client: cl,
+		Resolver: &resolve.CatalogResolver{
+			Client:                 cl,
+			InstalledBundleGetter:  &controllers.DefaultInstalledBundleGetter{ActionClientGetter: acg},
+			CatalogPackageProvider: catalogClient,
+		},
+		ActionClientGetter: acg,
+		Unpacker:           unpacker,
+		Storage:            localStorage,
+		Handler:            registryv1handler.HandlerFunc(registry.HandleBundleDeployment),
+		Finalizers:         clusterExtensionFinalizers,
+		CaCertDir:          caCertDir,
+		Preflights:         preflights,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "ClusterExtension")
 		os.Exit(1)

go.mod

@@ -29,6 +29,8 @@ require (
 	sigs.k8s.io/controller-runtime v0.18.4
 )
 
+replace github.com/operator-framework/rukpak => ../rukpak
+
 require (
 	carvel.dev/kapp v0.62.1-0.20240508153820-7d8a03ed7ccf // indirect
 	cloud.google.com/go/compute/metadata v0.3.0 // indirect

go.sum

@@ -614,8 +614,6 @@ github.com/operator-framework/operator-lib v0.14.0 h1:er+BgZymZD1im2wytLJiPLZpGA
 github.com/operator-framework/operator-lib v0.14.0/go.mod h1:wUu4Xb9xzXnIpglvaZ3yucTMSlqGXHIoUEH9+5gWiu0=
 github.com/operator-framework/operator-registry v1.44.0 h1:NW5/xHYR77J2EUYm+6iBER1WNGLNS8gM+G5GBQWqTTs=
 github.com/operator-framework/operator-registry v1.44.0/go.mod h1:55I4XJ//Erir98Mm9OlD8UURWE0HQgL/zlvpGF+gkig=
-github.com/operator-framework/rukpak v0.24.0 h1:zxLyk931w4isFiTPox4soXxh/eQJr5sjq15gHcb6dlE=
-github.com/operator-framework/rukpak v0.24.0/go.mod h1:peTAGzf4gmU+in2RJen84ZQ8lkdB3m6qy+nfNiVv0RY=
 github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
 github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
 github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=

internal/bundleutil/bundle.go

@@ -3,8 +3,6 @@ package bundleutil
 import (
 	"encoding/json"
 	"fmt"
-	"sync"
-
 	bsemver "github.com/blang/semver/v4"
 
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
@@ -13,19 +11,7 @@ import (
 	ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
 )
 
-var VersionGetter = &versionGetter{cache: make(map[*declcfg.Bundle]*bsemver.Version)}
-
-type versionGetter struct {
-	mu    sync.Mutex
-	cache map[*declcfg.Bundle]*bsemver.Version
-}
-
-func (v *versionGetter) GetVersion(b *declcfg.Bundle) (*bsemver.Version, error) {
-	v.mu.Lock()
-	defer v.mu.Unlock()
-	if vers, ok := v.cache[b]; ok {
-		return &(*vers), nil
-	}
+func GetVersion(b declcfg.Bundle) (*bsemver.Version, error) {
 	for _, p := range b.Properties {
 		if p.Type == property.TypePackage {
 			var pkg property.Package
@@ -36,7 +22,6 @@ func (v *versionGetter) GetVersion(b *declcfg.Bundle) (*bsemver.Version, error)
 			if err != nil {
 				return nil, err
 			}
-			v.cache[b] = &vers
 			return &(*(&vers)), nil
 		}
 	}

internal/catalogmetadata/client/client.go

@@ -5,8 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"io/fs"
-	"testing/fstest"
-
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
@@ -43,8 +41,6 @@ func (c *Client) GetPackage(ctx context.Context, catalog *catalogd.ClusterCatalo
 		return nil, fmt.Errorf("catalog %q is not unpacked", catalog.Name)
 	}
 
-	var _ fs.SubFS = fstest.MapFS{}
-
 	catalogFsys, err := c.fetcher.FetchCatalogContents(ctx, catalog)
 	if err != nil {
 		return nil, fmt.Errorf("error fetching catalog contents: %v", err)

internal/catalogmetadata/filter/bundle_predicates.go

@@ -10,7 +10,7 @@ import (
 
 func InMastermindsSemverRange(semverRange *mmsemver.Constraints) Predicate[declcfg.Bundle] {
 	return func(b declcfg.Bundle) bool {
-		bVersion, err := bundleutil.VersionGetter.GetVersion(&b)
+		bVersion, err := bundleutil.GetVersion(b)
 		if err != nil {
 			return false
 		}

internal/catalogmetadata/filter/successors_test.go

@@ -1,7 +1,8 @@
 package filter
 
 import (
-	"sort"
+	"github.com/operator-framework/operator-controller/internal/catalogmetadata/sort"
+	"slices"
 	"testing"
 
 	bsemver "github.com/blang/semver/v4"
@@ -17,7 +18,6 @@ import (
 
 	ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
 	"github.com/operator-framework/operator-controller/internal/bundleutil"
-	catalogsort "github.com/operator-framework/operator-controller/internal/catalogmetadata/sort"
 	"github.com/operator-framework/operator-controller/pkg/features"
 )
 
@@ -181,9 +181,7 @@ func TestSuccessorsPredicateWithForceSemverUpgradeConstraintsEnabled(t *testing.
 			result := Filter(allBundles, successors)
 
 			// sort before comparison for stable order
-			sort.Slice(result, func(i, j int) bool {
-				return catalogsort.ByVersion(&result[i], &result[j]) < 0
-			})
+			slices.SortFunc(result, sort.ByVersion)
 
 			gocmpopts := []cmp.Option{
 				cmpopts.IgnoreUnexported(declcfg.Bundle{}),
@@ -340,9 +338,7 @@ func TestSuccessorsPredicateWithForceSemverUpgradeConstraintsDisabled(t *testing
 			result := Filter(allBundles, successors)
 
 			// sort before comparison for stable order
-			sort.Slice(result, func(i, j int) bool {
-				return catalogsort.ByVersion(&result[i], &result[j]) < 0
-			})
+			slices.SortFunc(result, sort.ByVersion)
 
 			gocmpopts := []cmp.Option{
 				cmpopts.IgnoreUnexported(declcfg.Bundle{}),

internal/catalogmetadata/sort/sort.go

@@ -1,6 +1,7 @@
 package sort
 
 import (
+	"fmt"
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
@@ -10,26 +11,28 @@ import (
 
 // ByVersion is a sort "less" function that orders bundles
 // in inverse version order (higher versions on top).
-func ByVersion(b1, b2 *declcfg.Bundle) int {
-	v1, err1 := bundleutil.VersionGetter.GetVersion(b1)
-	v2, err2 := bundleutil.VersionGetter.GetVersion(b2)
+func ByVersion(b1, b2 declcfg.Bundle) int {
+	v1, err1 := bundleutil.GetVersion(b1)
+	v2, err2 := bundleutil.GetVersion(b2)
 	if err1 != nil || err2 != nil {
 		return compareErrors(err1, err2)
 	}
 
+	fmt.Println(v1, v2, v2.Compare(*v1))
+
 	// Check for "greater than" because
 	// we want higher versions on top
 	return v2.Compare(*v1)
 }
 
-func ByDeprecationFunc(deprecation declcfg.Deprecation) func(a, b *declcfg.Bundle) int {
+func ByDeprecationFunc(deprecation declcfg.Deprecation) func(a, b declcfg.Bundle) int {
 	deprecatedBundles := sets.New[string]()
 	for _, entry := range deprecation.Entries {
 		if entry.Reference.Schema == declcfg.SchemaBundle {
 			deprecatedBundles.Insert(entry.Reference.Name)
 		}
 	}
-	return func(a, b *declcfg.Bundle) int {
+	return func(a, b declcfg.Bundle) int {
 		aDeprecated := deprecatedBundles.Has(a.Name)
 		bDeprecated := deprecatedBundles.Has(b.Name)
 		if aDeprecated && !bDeprecated {

internal/catalogmetadata/sort/sort_test.go

@@ -2,15 +2,14 @@ package sort_test
 
 import (
 	"encoding/json"
-	"sort"
+	"github.com/operator-framework/operator-controller/internal/catalogmetadata/sort"
+	"slices"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
 	"github.com/operator-framework/operator-registry/alpha/property"
-
-	catalogsort "github.com/operator-framework/operator-controller/internal/catalogmetadata/sort"
 )
 
 func TestByVersion(t *testing.T) {
@@ -56,27 +55,13 @@ func TestByVersion(t *testing.T) {
 
 	t.Run("all bundles valid", func(t *testing.T) {
 		toSort := []declcfg.Bundle{b3, b2, b1}
-		sort.Slice(toSort, func(i, j int) bool {
-			return catalogsort.ByVersion(&toSort[i], &toSort[j]) < 0
-		})
-
-		assert.Len(t, toSort, 3)
-		assert.Equal(t, b1, toSort[0])
-		assert.Equal(t, b3, toSort[1])
-		assert.Equal(t, b2, toSort[2])
+		slices.SortStableFunc(toSort, sort.ByVersion)
+		assert.Equal(t, []declcfg.Bundle{b1, b3, b2}, toSort)
 	})
 
 	t.Run("some bundles are missing version", func(t *testing.T) {
 		toSort := []declcfg.Bundle{b3, b4noVersion, b2, b5empty, b1}
-		sort.Slice(toSort, func(i, j int) bool {
-			return catalogsort.ByVersion(&toSort[i], &toSort[j]) < 0
-		})
-
-		assert.Len(t, toSort, 5)
-		assert.Equal(t, b1, toSort[0])
-		assert.Equal(t, b3, toSort[1])
-		assert.Equal(t, b2, toSort[2])
-		assert.Equal(t, b4noVersion, toSort[3])
-		assert.Equal(t, b5empty, toSort[4])
+		slices.SortStableFunc(toSort, sort.ByVersion)
+		assert.Equal(t, []declcfg.Bundle{b1, b3, b2, b4noVersion, b5empty}, toSort)
 	})
 }