Moving version and util to internal/shared

LalatenduMohanty · LalatenduMohanty · commit 097bf9b722bd · 2025-02-11T13:25:57.000-05:00
This partially fixes #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 <lmohanty@redhat.com>
diff --git a/catalogd/cmd/catalogd/main.go b/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 --git a/catalogd/internal/source/containers_image.go b/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 --git a/cmd/operator-controller/main.go b/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 --git a/internal/operator-controller/catalogmetadata/filter/bundle_predicates.go b/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 --git a/internal/operator-controller/catalogmetadata/filter/successors.go b/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 --git a/internal/operator-controller/catalogmetadata/filter/successors_test.go b/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 --git a/internal/operator-controller/resolve/catalog.go b/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 --git a/internal/operator-controller/rukpak/source/containers_image.go b/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 --git a/internal/operator-controller/rukpak/source/containers_image_test.go b/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 --git a/internal/shared/util/filter/filter.go b/internal/shared/util/filter/filter.go
diff --git a/internal/shared/util/filter/filter_test.go b/internal/shared/util/filter/filter_test.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 --git a/internal/shared/util/fs/fs.go b/internal/shared/util/fs/fs.go
diff --git a/internal/shared/util/fs/fs_test.go b/internal/shared/util/fs/fs_test.go
diff --git a/internal/shared/util/image/layers.go b/internal/shared/util/image/layers.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
diff --git a/internal/shared/util/image/layers_test.go b/internal/shared/util/image/layers_test.go
diff --git a/internal/shared/version/version.go b/internal/shared/version/version.go

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ import (`
`24`	`24`
`25`	`25`	`catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"`
`26`	`26`	`"github.com/operator-framework/operator-controller/internal/operator-controller/httputil"`
`27`		`- fsutil "github.com/operator-framework/operator-controller/internal/util/fs"`
`28`		`- imageutil "github.com/operator-framework/operator-controller/internal/util/image"`
	`27`	`+ fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"`
	`28`	`+ imageutil "github.com/operator-framework/operator-controller/internal/shared/util/image"`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`const ConfigDirLabel = "operators.operatorframework.io.index.configs.v1"`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"github.com/operator-framework/operator-registry/alpha/declcfg"`
`7`	`7`
`8`	`8`	`"github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil"`
`9`		`- "github.com/operator-framework/operator-controller/internal/util/filter"`
	`9`	`+ "github.com/operator-framework/operator-controller/internal/shared/util/filter"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func InMastermindsSemverRange(semverRange *mmsemver.Constraints) filter.Predicate[declcfg.Bundle] {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"github.com/operator-framework/operator-registry/alpha/declcfg"`
`10`	`10`
`11`	`11`	`ocv1 "github.com/operator-framework/operator-controller/api/v1"`
`12`		`- "github.com/operator-framework/operator-controller/internal/util/filter"`
	`12`	`+ "github.com/operator-framework/operator-controller/internal/shared/util/filter"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func SuccessorsOf(installedBundle ocv1.BundleMetadata, channels ...declcfg.Channel) (filter.Predicate[declcfg.Bundle], error) {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`ocv1 "github.com/operator-framework/operator-controller/api/v1"`
`17`	`17`	`"github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil"`
`18`	`18`	`"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/compare"`
`19`		`- "github.com/operator-framework/operator-controller/internal/util/filter"`
	`19`	`+ "github.com/operator-framework/operator-controller/internal/shared/util/filter"`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`func TestSuccessorsPredicate(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"github.com/operator-framework/operator-controller/internal/operator-controller/bundleutil"`
`23`	`23`	`"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/compare"`
`24`	`24`	`"github.com/operator-framework/operator-controller/internal/operator-controller/catalogmetadata/filter"`
`25`		`- filterutil "github.com/operator-framework/operator-controller/internal/util/filter"`
	`25`	`+ filterutil "github.com/operator-framework/operator-controller/internal/shared/util/filter"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`type ValidationFunc func(*declcfg.Bundle) error`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ import (`
`21`	`21`	`"sigs.k8s.io/controller-runtime/pkg/reconcile"`
`22`	`22`
`23`	`23`	`"github.com/operator-framework/operator-controller/internal/operator-controller/httputil"`
`24`		`- fsutil "github.com/operator-framework/operator-controller/internal/util/fs"`
`25`		`- imageutil "github.com/operator-framework/operator-controller/internal/util/image"`
	`24`	`+ fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"`
	`25`	`+ imageutil "github.com/operator-framework/operator-controller/internal/shared/util/image"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	var insecurePolicy = []byte(`{"default":[{"type":"insecureAcceptAnything"}]}`)
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`	`"sigs.k8s.io/controller-runtime/pkg/reconcile"`
`24`	`24`
`25`	`25`	`"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/source"`
`26`		`- fsutil "github.com/operator-framework/operator-controller/internal/util/fs"`
	`26`	`+ fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`
`6`	`6`	`"github.com/stretchr/testify/require"`
`7`	`7`
`8`		`- "github.com/operator-framework/operator-controller/internal/util/filter"`
	`8`	`+ "github.com/operator-framework/operator-controller/internal/shared/util/filter"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func TestAnd(t *testing.T) {`