From 101535ebc3d912e6bfe41b2720afee12c1900db3 Mon Sep 17 00:00:00 2001 From: Lalatendu Mohanty Date: Tue, 11 Feb 2025 14:28:12 -0500 Subject: [PATCH] Moving code from catalogd/internal to internal/catalogd This partially fixes #1707. The intent is to consolidate internal code from operator-controller and catalogd within internal. This PR does not move catalogd/internal/controllers and catalogd/internal/webhook as it need explict changes in both op-con and catalogd Makefile. Which we will do in a followup PR. 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 --- catalogd/cmd/catalogd/main.go | 12 ++++++------ .../controllers/core/clustercatalog_controller.go | 4 ++-- .../core/clustercatalog_controller_test.go | 4 ++-- .../catalogd}/features/features.go | 0 .../catalogd}/garbagecollection/garbage_collector.go | 0 .../garbagecollection/garbage_collector_test.go | 0 .../catalogd}/metrics/metrics.go | 0 .../catalogd}/serverutil/serverutil.go | 4 ++-- .../catalogd}/serverutil/serverutil_test.go | 0 .../catalogd}/source/containers_image.go | 0 .../catalogd}/source/containers_image_test.go | 4 ++-- .../catalogd}/source/unpacker.go | 0 .../catalogd}/storage/http_preconditions_check.go | 0 .../internal => internal/catalogd}/storage/index.go | 0 .../catalogd}/storage/index_test.go | 0 .../catalogd}/storage/localdir.go | 0 .../catalogd}/storage/localdir_test.go | 0 .../catalogd}/storage/storage.go | 0 18 files changed, 14 insertions(+), 14 deletions(-) rename {catalogd/internal => internal/catalogd}/features/features.go (100%) rename {catalogd/internal => internal/catalogd}/garbagecollection/garbage_collector.go (100%) rename {catalogd/internal => internal/catalogd}/garbagecollection/garbage_collector_test.go (100%) rename {catalogd/internal => internal/catalogd}/metrics/metrics.go (100%) rename {catalogd/internal => internal/catalogd}/serverutil/serverutil.go (96%) rename {catalogd/internal => internal/catalogd}/serverutil/serverutil_test.go (100%) rename {catalogd/internal => internal/catalogd}/source/containers_image.go (100%) rename {catalogd/internal => internal/catalogd}/source/containers_image_test.go (99%) rename {catalogd/internal => internal/catalogd}/source/unpacker.go (100%) rename {catalogd/internal => internal/catalogd}/storage/http_preconditions_check.go (100%) rename {catalogd/internal => internal/catalogd}/storage/index.go (100%) rename {catalogd/internal => internal/catalogd}/storage/index_test.go (100%) rename {catalogd/internal => internal/catalogd}/storage/localdir.go (100%) rename {catalogd/internal => internal/catalogd}/storage/localdir_test.go (100%) rename {catalogd/internal => internal/catalogd}/storage/storage.go (100%) diff --git a/catalogd/cmd/catalogd/main.go b/catalogd/cmd/catalogd/main.go index 8d547a131..7e973cfc3 100644 --- a/catalogd/cmd/catalogd/main.go +++ b/catalogd/cmd/catalogd/main.go @@ -57,13 +57,13 @@ import ( catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1" corecontrollers "github.com/operator-framework/operator-controller/catalogd/internal/controllers/core" - "github.com/operator-framework/operator-controller/catalogd/internal/features" - "github.com/operator-framework/operator-controller/catalogd/internal/garbagecollection" - catalogdmetrics "github.com/operator-framework/operator-controller/catalogd/internal/metrics" - "github.com/operator-framework/operator-controller/catalogd/internal/serverutil" - "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" + "github.com/operator-framework/operator-controller/internal/catalogd/features" + "github.com/operator-framework/operator-controller/internal/catalogd/garbagecollection" + catalogdmetrics "github.com/operator-framework/operator-controller/internal/catalogd/metrics" + "github.com/operator-framework/operator-controller/internal/catalogd/serverutil" + "github.com/operator-framework/operator-controller/internal/catalogd/source" + "github.com/operator-framework/operator-controller/internal/catalogd/storage" fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs" "github.com/operator-framework/operator-controller/internal/shared/version" ) diff --git a/catalogd/internal/controllers/core/clustercatalog_controller.go b/catalogd/internal/controllers/core/clustercatalog_controller.go index 4eedd52df..7dd1de79e 100644 --- a/catalogd/internal/controllers/core/clustercatalog_controller.go +++ b/catalogd/internal/controllers/core/clustercatalog_controller.go @@ -38,8 +38,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1" - "github.com/operator-framework/operator-controller/catalogd/internal/source" - "github.com/operator-framework/operator-controller/catalogd/internal/storage" + "github.com/operator-framework/operator-controller/internal/catalogd/source" + "github.com/operator-framework/operator-controller/internal/catalogd/storage" ) const ( diff --git a/catalogd/internal/controllers/core/clustercatalog_controller_test.go b/catalogd/internal/controllers/core/clustercatalog_controller_test.go index 7b6463e36..84db330ac 100644 --- a/catalogd/internal/controllers/core/clustercatalog_controller_test.go +++ b/catalogd/internal/controllers/core/clustercatalog_controller_test.go @@ -21,8 +21,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1" - "github.com/operator-framework/operator-controller/catalogd/internal/source" - "github.com/operator-framework/operator-controller/catalogd/internal/storage" + "github.com/operator-framework/operator-controller/internal/catalogd/source" + "github.com/operator-framework/operator-controller/internal/catalogd/storage" ) var _ source.Unpacker = &MockSource{} diff --git a/catalogd/internal/features/features.go b/internal/catalogd/features/features.go similarity index 100% rename from catalogd/internal/features/features.go rename to internal/catalogd/features/features.go diff --git a/catalogd/internal/garbagecollection/garbage_collector.go b/internal/catalogd/garbagecollection/garbage_collector.go similarity index 100% rename from catalogd/internal/garbagecollection/garbage_collector.go rename to internal/catalogd/garbagecollection/garbage_collector.go diff --git a/catalogd/internal/garbagecollection/garbage_collector_test.go b/internal/catalogd/garbagecollection/garbage_collector_test.go similarity index 100% rename from catalogd/internal/garbagecollection/garbage_collector_test.go rename to internal/catalogd/garbagecollection/garbage_collector_test.go diff --git a/catalogd/internal/metrics/metrics.go b/internal/catalogd/metrics/metrics.go similarity index 100% rename from catalogd/internal/metrics/metrics.go rename to internal/catalogd/metrics/metrics.go diff --git a/catalogd/internal/serverutil/serverutil.go b/internal/catalogd/serverutil/serverutil.go similarity index 96% rename from catalogd/internal/serverutil/serverutil.go rename to internal/catalogd/serverutil/serverutil.go index 2d84b46d1..143d4c876 100644 --- a/catalogd/internal/serverutil/serverutil.go +++ b/internal/catalogd/serverutil/serverutil.go @@ -15,8 +15,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/certwatcher" "sigs.k8s.io/controller-runtime/pkg/manager" - catalogdmetrics "github.com/operator-framework/operator-controller/catalogd/internal/metrics" - "github.com/operator-framework/operator-controller/catalogd/internal/storage" + catalogdmetrics "github.com/operator-framework/operator-controller/internal/catalogd/metrics" + "github.com/operator-framework/operator-controller/internal/catalogd/storage" ) type CatalogServerConfig struct { diff --git a/catalogd/internal/serverutil/serverutil_test.go b/internal/catalogd/serverutil/serverutil_test.go similarity index 100% rename from catalogd/internal/serverutil/serverutil_test.go rename to internal/catalogd/serverutil/serverutil_test.go diff --git a/catalogd/internal/source/containers_image.go b/internal/catalogd/source/containers_image.go similarity index 100% rename from catalogd/internal/source/containers_image.go rename to internal/catalogd/source/containers_image.go diff --git a/catalogd/internal/source/containers_image_test.go b/internal/catalogd/source/containers_image_test.go similarity index 99% rename from catalogd/internal/source/containers_image_test.go rename to internal/catalogd/source/containers_image_test.go index 138464cbe..59e8523b6 100644 --- a/catalogd/internal/source/containers_image_test.go +++ b/internal/catalogd/source/containers_image_test.go @@ -17,7 +17,7 @@ import ( "github.com/go-logr/logr/funcr" "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/registry" - "github.com/google/go-containerregistry/pkg/v1" + v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/mutate" "github.com/google/go-containerregistry/pkg/v1/random" "github.com/google/go-containerregistry/pkg/v1/remote" @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1" - "github.com/operator-framework/operator-controller/catalogd/internal/source" + "github.com/operator-framework/operator-controller/internal/catalogd/source" ) func TestImageRegistry(t *testing.T) { diff --git a/catalogd/internal/source/unpacker.go b/internal/catalogd/source/unpacker.go similarity index 100% rename from catalogd/internal/source/unpacker.go rename to internal/catalogd/source/unpacker.go diff --git a/catalogd/internal/storage/http_preconditions_check.go b/internal/catalogd/storage/http_preconditions_check.go similarity index 100% rename from catalogd/internal/storage/http_preconditions_check.go rename to internal/catalogd/storage/http_preconditions_check.go diff --git a/catalogd/internal/storage/index.go b/internal/catalogd/storage/index.go similarity index 100% rename from catalogd/internal/storage/index.go rename to internal/catalogd/storage/index.go diff --git a/catalogd/internal/storage/index_test.go b/internal/catalogd/storage/index_test.go similarity index 100% rename from catalogd/internal/storage/index_test.go rename to internal/catalogd/storage/index_test.go diff --git a/catalogd/internal/storage/localdir.go b/internal/catalogd/storage/localdir.go similarity index 100% rename from catalogd/internal/storage/localdir.go rename to internal/catalogd/storage/localdir.go diff --git a/catalogd/internal/storage/localdir_test.go b/internal/catalogd/storage/localdir_test.go similarity index 100% rename from catalogd/internal/storage/localdir_test.go rename to internal/catalogd/storage/localdir_test.go diff --git a/catalogd/internal/storage/storage.go b/internal/catalogd/storage/storage.go similarity index 100% rename from catalogd/internal/storage/storage.go rename to internal/catalogd/storage/storage.go