🌱 Moving version and util to internal/shared (operator-framework#1743)

* Moving version and util to internal/shared

This partially fixes operator-framework#1707. The intent is to consolidate internal code from operator-controller and catalogd within internal e.g.:

catalogd/ - code specific to catalogd
internal/ - holds internal code of catalogd and operator-controller. internal/catalogd - holds unexported code specific to catalogd internal/operator-controller - holds unexported code specific to operator-comntroller internal/shared - shared code between catalogd and operator-controller which can not be exported outside.

Signed-off-by: Lalatendu Mohanty <[email protected]>

* Adjusting Makefiles to the new version location

Signed-off-by: Lalatendu Mohanty <[email protected]>

---------

Signed-off-by: Lalatendu Mohanty <[email protected]>

Author: LalatenduMohanty

Diff for: Makefile

@@ -317,7 +317,7 @@ endif
 export CGO_ENABLED
 
 export GIT_REPO := $(shell go list -m)
-export VERSION_PATH := ${GIT_REPO}/internal/version
+export VERSION_PATH := ${GIT_REPO}/internal/shared/version
 export GO_BUILD_TAGS := containers_image_openpgp
 export GO_BUILD_ASMFLAGS := all=-trimpath=$(PWD)
 export GO_BUILD_GCFLAGS := all=-trimpath=$(PWD)

Diff for: catalogd/Makefile

@@ -74,7 +74,7 @@ VERSION := $(shell git describe --tags --always --dirty)
 endif
 export VERSION
 
-export VERSION_PKG     := $(shell go list -m)/internal/version
+export VERSION_PKG     := $(shell go list -m)/internal/shared/version
 
 export GIT_COMMIT      := $(shell git rev-parse HEAD)
 export GIT_VERSION     := $(shell git describe --tags --always --dirty)

Diff for: catalogd/cmd/catalogd/main.go

@@ -64,8 +64,8 @@ import (
 	"github.com/operator-framework/operator-controller/catalogd/internal/source"
 	"github.com/operator-framework/operator-controller/catalogd/internal/storage"
 	"github.com/operator-framework/operator-controller/catalogd/internal/webhook"
-	fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
-	"github.com/operator-framework/operator-controller/internal/version"
+	fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
+	"github.com/operator-framework/operator-controller/internal/shared/version"
 )
 
 var (

Diff for: catalogd/internal/source/containers_image.go

@@ -24,8 +24,8 @@ import (
 
 	catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	"github.com/operator-framework/operator-controller/internal/operator-controller/httputil"
-	fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
-	imageutil "github.com/operator-framework/operator-controller/internal/util/image"
+	fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
+	imageutil "github.com/operator-framework/operator-controller/internal/shared/util/image"
 )
 
 const ConfigDirLabel = "operators.operatorframework.io.index.configs.v1"

Diff for: cmd/operator-controller/main.go

@@ -70,8 +70,8 @@ import (
 	"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/preflights/crdupgradesafety"
 	"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/source"
 	"github.com/operator-framework/operator-controller/internal/operator-controller/scheme"
-	fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
-	"github.com/operator-framework/operator-controller/internal/version"
+	fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
+	"github.com/operator-framework/operator-controller/internal/shared/version"
 )
 
 var (

Diff for: internal/operator-controller/catalogmetadata/filter/bundle_predicates.go

@@ -6,7 +6,7 @@ import (
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
 
 	"github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil"
-	"github.com/operator-framework/operator-controller/internal/util/filter"
+	"github.com/operator-framework/operator-controller/internal/shared/util/filter"
 )
 
 func InMastermindsSemverRange(semverRange *mmsemver.Constraints) filter.Predicate[declcfg.Bundle] {

Diff for: internal/operator-controller/catalogmetadata/filter/successors.go

@@ -9,7 +9,7 @@ import (
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
-	"github.com/operator-framework/operator-controller/internal/util/filter"
+	"github.com/operator-framework/operator-controller/internal/shared/util/filter"
 )
 
 func SuccessorsOf(installedBundle ocv1.BundleMetadata, channels ...declcfg.Channel) (filter.Predicate[declcfg.Bundle], error) {

Diff for: internal/operator-controller/catalogmetadata/filter/successors_test.go

@@ -16,7 +16,7 @@ import (
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
 	"github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil"
 	"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/compare"
-	"github.com/operator-framework/operator-controller/internal/util/filter"
+	"github.com/operator-framework/operator-controller/internal/shared/util/filter"
 )
 
 func TestSuccessorsPredicate(t *testing.T) {

Diff for: internal/operator-controller/resolve/catalog.go

@@ -22,7 +22,7 @@ import (
 	"github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil"
 	"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/compare"
 	"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/filter"
-	filterutil "github.com/operator-framework/operator-controller/internal/util/filter"
+	filterutil "github.com/operator-framework/operator-controller/internal/shared/util/filter"
 )
 
 type ValidationFunc func(*declcfg.Bundle) error

Diff for: internal/operator-controller/rukpak/source/containers_image.go

@@ -21,8 +21,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	"github.com/operator-framework/operator-controller/internal/operator-controller/httputil"
-	fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
-	imageutil "github.com/operator-framework/operator-controller/internal/util/image"
+	fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
+	imageutil "github.com/operator-framework/operator-controller/internal/shared/util/image"
 )
 
 var insecurePolicy = []byte(`{"default":[{"type":"insecureAcceptAnything"}]}`)

Diff for: internal/operator-controller/rukpak/source/containers_image_test.go

@@ -23,7 +23,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/source"
-	fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
+	fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
 )
 
 const (

Diff for: internal/util/filter/filter.go renamed to internal/shared/util/filter/filter.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/operator-framework/operator-controller/internal/util/filter"
+	"github.com/operator-framework/operator-controller/internal/shared/util/filter"
 )
 
 func TestAnd(t *testing.T) {

Diff for: internal/util/filter/filter_test.go renamed to internal/shared/util/filter/filter_test.go

@@ -16,7 +16,7 @@ import (
 	"github.com/containers/image/v5/types"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	fsutil "github.com/operator-framework/operator-controller/internal/util/fs"
+	fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
 )
 
 // ForceOwnershipRWX is a passthrough archive.Filter that sets a tar header's