Revert "Externalize storage package"

This reverts commit 19f2876.
operator-framework · Sep 19, 2023 · aadd856 · aadd856
1 parent 426a902
commit aadd856
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -6,7 +6,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/finalizer"
 
-	"github.com/operator-framework/rukpak/pkg/storage"
+	"github.com/operator-framework/rukpak/internal/storage"
 )
 
 var _ finalizer.Finalizer = &DeleteCachedBundle{}

diff --git a/pkg/storage/http.go → internal/storage/http.go b/pkg/storage/http.go → internal/storage/http.go
diff --git a/pkg/storage/http_test.go → internal/storage/http_test.go b/pkg/storage/http_test.go → internal/storage/http_test.go
diff --git a/pkg/storage/localdir.go → internal/storage/localdir.go b/pkg/storage/localdir.go → internal/storage/localdir.go
diff --git a/pkg/storage/localdir_test.go → internal/storage/localdir_test.go b/pkg/storage/localdir_test.go → internal/storage/localdir_test.go
diff --git a/pkg/storage/storage.go → internal/storage/storage.go b/pkg/storage/storage.go → internal/storage/storage.go
diff --git a/pkg/storage/storage_suite_test.go → internal/storage/storage_suite_test.go b/pkg/storage/storage_suite_test.go → internal/storage/storage_suite_test.go
diff --git a/pkg/storage/storage_test.go → internal/storage/storage_test.go b/pkg/storage/storage_test.go → internal/storage/storage_test.go
diff --git 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 (