From 7aadc816a11077fbcdcc6ab0e1bf4927fb218f4a Mon Sep 17 00:00:00 2001 From: Catherine Chan-Tse Date: Mon, 31 Jul 2023 16:23:39 -0400 Subject: [PATCH] Externalize storage package Signed-off-by: Catherine Chan-Tse --- cmd/core/main.go | 2 +- cmd/helm/main.go | 2 +- internal/controllers/bundle/bundle.go | 2 +- internal/controllers/bundledeployment/bundledeployment.go | 2 +- internal/finalizer/deletecachedbundle.go | 2 +- {internal => pkg}/storage/http.go | 0 {internal => pkg}/storage/http_test.go | 0 {internal => pkg}/storage/localdir.go | 0 {internal => pkg}/storage/localdir_test.go | 0 {internal => pkg}/storage/storage.go | 0 {internal => pkg}/storage/storage_suite_test.go | 0 {internal => pkg}/storage/storage_test.go | 0 test/e2e/plain_provisioner_test.go | 2 +- 13 files changed, 6 insertions(+), 6 deletions(-) rename {internal => pkg}/storage/http.go (100%) rename {internal => pkg}/storage/http_test.go (100%) rename {internal => pkg}/storage/localdir.go (100%) rename {internal => pkg}/storage/localdir_test.go (100%) rename {internal => pkg}/storage/storage.go (100%) rename {internal => pkg}/storage/storage_suite_test.go (100%) rename {internal => pkg}/storage/storage_test.go (100%) diff --git a/cmd/core/main.go b/cmd/core/main.go index 5b6cf91d..676e2103 100644 --- a/cmd/core/main.go +++ b/cmd/core/main.go @@ -48,10 +48,10 @@ import ( "github.com/operator-framework/rukpak/internal/provisioner/plain" "github.com/operator-framework/rukpak/internal/provisioner/registry" "github.com/operator-framework/rukpak/internal/source" - "github.com/operator-framework/rukpak/internal/storage" "github.com/operator-framework/rukpak/internal/uploadmgr" "github.com/operator-framework/rukpak/internal/util" "github.com/operator-framework/rukpak/internal/version" + "github.com/operator-framework/rukpak/pkg/storage" ) var ( diff --git a/cmd/helm/main.go b/cmd/helm/main.go index 95acf2f4..706620a7 100644 --- a/cmd/helm/main.go +++ b/cmd/helm/main.go @@ -43,9 +43,9 @@ import ( "github.com/operator-framework/rukpak/internal/finalizer" "github.com/operator-framework/rukpak/internal/provisioner/helm" "github.com/operator-framework/rukpak/internal/source" - "github.com/operator-framework/rukpak/internal/storage" "github.com/operator-framework/rukpak/internal/util" "github.com/operator-framework/rukpak/internal/version" + "github.com/operator-framework/rukpak/pkg/storage" ) var ( diff --git a/internal/controllers/bundle/bundle.go b/internal/controllers/bundle/bundle.go index acbaa218..bd85e487 100644 --- a/internal/controllers/bundle/bundle.go +++ b/internal/controllers/bundle/bundle.go @@ -22,8 +22,8 @@ import ( rukpakv1alpha1 "github.com/operator-framework/rukpak/api/v1alpha1" "github.com/operator-framework/rukpak/internal/source" - "github.com/operator-framework/rukpak/internal/storage" "github.com/operator-framework/rukpak/internal/util" + "github.com/operator-framework/rukpak/pkg/storage" ) type Option func(*controller) diff --git a/internal/controllers/bundledeployment/bundledeployment.go b/internal/controllers/bundledeployment/bundledeployment.go index 75a9b0ca..178cc6c4 100644 --- a/internal/controllers/bundledeployment/bundledeployment.go +++ b/internal/controllers/bundledeployment/bundledeployment.go @@ -36,8 +36,8 @@ import ( rukpakv1alpha1 "github.com/operator-framework/rukpak/api/v1alpha1" helmpredicate "github.com/operator-framework/rukpak/internal/helm-operator-plugins/predicate" - "github.com/operator-framework/rukpak/internal/storage" "github.com/operator-framework/rukpak/internal/util" + "github.com/operator-framework/rukpak/pkg/storage" ) /* diff --git a/internal/finalizer/deletecachedbundle.go b/internal/finalizer/deletecachedbundle.go index 7dec9d67..b8a0d775 100644 --- a/internal/finalizer/deletecachedbundle.go +++ b/internal/finalizer/deletecachedbundle.go @@ -6,7 +6,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/finalizer" - "github.com/operator-framework/rukpak/internal/storage" + "github.com/operator-framework/rukpak/pkg/storage" ) var _ finalizer.Finalizer = &DeleteCachedBundle{} diff --git a/internal/storage/http.go b/pkg/storage/http.go similarity index 100% rename from internal/storage/http.go rename to pkg/storage/http.go diff --git a/internal/storage/http_test.go b/pkg/storage/http_test.go similarity index 100% rename from internal/storage/http_test.go rename to pkg/storage/http_test.go diff --git a/internal/storage/localdir.go b/pkg/storage/localdir.go similarity index 100% rename from internal/storage/localdir.go rename to pkg/storage/localdir.go diff --git a/internal/storage/localdir_test.go b/pkg/storage/localdir_test.go similarity index 100% rename from internal/storage/localdir_test.go rename to pkg/storage/localdir_test.go diff --git a/internal/storage/storage.go b/pkg/storage/storage.go similarity index 100% rename from internal/storage/storage.go rename to pkg/storage/storage.go diff --git a/internal/storage/storage_suite_test.go b/pkg/storage/storage_suite_test.go similarity index 100% rename from internal/storage/storage_suite_test.go rename to pkg/storage/storage_suite_test.go diff --git a/internal/storage/storage_test.go b/pkg/storage/storage_test.go similarity index 100% rename from internal/storage/storage_test.go rename to pkg/storage/storage_test.go diff --git a/test/e2e/plain_provisioner_test.go b/test/e2e/plain_provisioner_test.go index bb16a110..2d6b466c 100644 --- a/test/e2e/plain_provisioner_test.go +++ b/test/e2e/plain_provisioner_test.go @@ -32,8 +32,8 @@ import ( rukpakv1alpha1 "github.com/operator-framework/rukpak/api/v1alpha1" "github.com/operator-framework/rukpak/internal/provisioner/plain" "github.com/operator-framework/rukpak/internal/rukpakctl" - "github.com/operator-framework/rukpak/internal/storage" "github.com/operator-framework/rukpak/internal/util" + "github.com/operator-framework/rukpak/pkg/storage" ) const (