Export rukpak functionality

In anticipation of using rukpak as a library, export some of the functionality. This primarilly meant moving files from `internal` to `pkg`. Signed-off-by: Todd Short <[email protected]>
operator-framework · May 2, 2024 · 72cffe6 · 72cffe6
1 parent f9cee1a
commit 72cffe6
Show file tree

Hide file tree

Showing 32 changed files with 23 additions and 23 deletions.
diff --git a/cmd/core/main.go b/cmd/core/main.go
@@ -49,11 +49,11 @@ import (
 	"github.com/operator-framework/rukpak/internal/finalizer"
 	"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/util"
 	"github.com/operator-framework/rukpak/internal/version"
 	"github.com/operator-framework/rukpak/pkg/features"
+	"github.com/operator-framework/rukpak/pkg/source"
+	"github.com/operator-framework/rukpak/pkg/storage"
+	"github.com/operator-framework/rukpak/pkg/util"
 )
 
 var (

diff --git a/cmd/helm/main.go b/cmd/helm/main.go
@@ -44,10 +44,10 @@ import (
 	"github.com/operator-framework/rukpak/internal/controllers/bundledeployment"
 	"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/source"
+	"github.com/operator-framework/rukpak/pkg/storage"
+	"github.com/operator-framework/rukpak/pkg/util"
 )
 
 var (

diff --git a/cmd/webhooks/main.go b/cmd/webhooks/main.go
@@ -33,9 +33,9 @@ import (
 	crwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2"
-	"github.com/operator-framework/rukpak/internal/util"
 	"github.com/operator-framework/rukpak/internal/version"
 	"github.com/operator-framework/rukpak/internal/webhook"
+	"github.com/operator-framework/rukpak/pkg/util"
 )
 
 var (

diff --git a/internal/controllers/bundledeployment/bundledeployment.go b/internal/controllers/bundledeployment/bundledeployment.go
@@ -41,10 +41,10 @@ import (
 	rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2"
 	"github.com/operator-framework/rukpak/internal/healthchecks"
 	helmpredicate "github.com/operator-framework/rukpak/internal/helm-operator-plugins/predicate"
-	unpackersource "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/features"
+	unpackersource "github.com/operator-framework/rukpak/pkg/source"
+	"github.com/operator-framework/rukpak/pkg/storage"
+	"github.com/operator-framework/rukpak/pkg/util"
 )
 
 /*

diff --git a/internal/controllers/bundledeployment/bundledeployment_test.go b/internal/controllers/bundledeployment/bundledeployment_test.go
@@ -14,7 +14,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2"
-	"github.com/operator-framework/rukpak/internal/util"
+	"github.com/operator-framework/rukpak/pkg/util"
 )
 
 func TestBundleDeploymentController(t *testing.T) {

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/internal/storage"
+	"github.com/operator-framework/rukpak/pkg/storage"
 )
 
 var _ finalizer.Finalizer = &DeleteCachedBundle{}

diff --git a/internal/provisioner/helm/helm.go b/internal/provisioner/helm/helm.go
@@ -13,7 +13,7 @@ import (
 	"helm.sh/helm/v3/pkg/chartutil"
 
 	rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2"
-	"github.com/operator-framework/rukpak/internal/util"
+	"github.com/operator-framework/rukpak/pkg/util"
 )
 
 const (

diff --git a/internal/provisioner/plain/plain.go b/internal/provisioner/plain/plain.go
@@ -14,7 +14,7 @@ import (
 	"sigs.k8s.io/yaml"
 
 	rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2"
-	"github.com/operator-framework/rukpak/internal/util"
+	"github.com/operator-framework/rukpak/pkg/util"
 )
 
 const (

diff --git a/internal/provisioner/registry/registry.go b/internal/provisioner/registry/registry.go
@@ -10,8 +10,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2"
-	"github.com/operator-framework/rukpak/internal/convert"
 	"github.com/operator-framework/rukpak/internal/provisioner/plain"
+	"github.com/operator-framework/rukpak/pkg/convert"
 )
 
 const (

diff --git a/internal/convert/registryv1.go → pkg/convert/registryv1.go b/internal/convert/registryv1.go → pkg/convert/registryv1.go
@@ -27,7 +27,7 @@ import (
 	registrybundle "github.com/operator-framework/operator-registry/pkg/lib/bundle"
 
 	registry "github.com/operator-framework/rukpak/internal/operator-registry"
-	"github.com/operator-framework/rukpak/internal/util"
+	"github.com/operator-framework/rukpak/pkg/util"
 )
 
 type RegistryV1 struct {

diff --git a/internal/convert/registryv1_test.go → pkg/convert/registryv1_test.go b/internal/convert/registryv1_test.go → pkg/convert/registryv1_test.go
diff --git a/internal/source/common.go → pkg/source/common.go b/internal/source/common.go → pkg/source/common.go
diff --git a/internal/source/configmaps.go → pkg/source/configmaps.go b/internal/source/configmaps.go → pkg/source/configmaps.go
diff --git a/internal/source/git.go → pkg/source/git.go b/internal/source/git.go → pkg/source/git.go
diff --git a/internal/source/http.go → pkg/source/http.go b/internal/source/http.go → pkg/source/http.go
diff --git a/internal/source/image.go → pkg/source/image.go b/internal/source/image.go → pkg/source/image.go
@@ -22,7 +22,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
 	rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2"
-	"github.com/operator-framework/rukpak/internal/util"
+	"github.com/operator-framework/rukpak/pkg/util"
 )
 
 type Image struct {

diff --git a/internal/source/unpacker.go → pkg/source/unpacker.go b/internal/source/unpacker.go → pkg/source/unpacker.go
diff --git a/internal/storage/http.go → pkg/storage/http.go b/internal/storage/http.go → pkg/storage/http.go
diff --git a/internal/storage/http_test.go → pkg/storage/http_test.go b/internal/storage/http_test.go → pkg/storage/http_test.go
@@ -19,7 +19,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/rand"
 
 	rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2"
-	"github.com/operator-framework/rukpak/internal/util"
+	"github.com/operator-framework/rukpak/pkg/util"
 )
 
 var _ = Describe("HTTP", func() {

diff --git a/internal/storage/localdir.go → pkg/storage/localdir.go b/internal/storage/localdir.go → pkg/storage/localdir.go
@@ -16,7 +16,7 @@ import (
 	"github.com/nlepage/go-tarfs"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/operator-framework/rukpak/internal/util"
+	"github.com/operator-framework/rukpak/pkg/util"
 )
 
 var _ Storage = &LocalDirectory{}

diff --git a/internal/storage/localdir_test.go → pkg/storage/localdir_test.go b/internal/storage/localdir_test.go → pkg/storage/localdir_test.go
diff --git a/internal/storage/storage.go → pkg/storage/storage.go b/internal/storage/storage.go → pkg/storage/storage.go
diff --git a/internal/storage/storage_suite_test.go → pkg/storage/storage_suite_test.go b/internal/storage/storage_suite_test.go → pkg/storage/storage_suite_test.go
diff --git a/internal/storage/storage_test.go → pkg/storage/storage_test.go b/internal/storage/storage_test.go → pkg/storage/storage_test.go
@@ -15,7 +15,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/rand"
 
 	rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2"
-	"github.com/operator-framework/rukpak/internal/util"
+	"github.com/operator-framework/rukpak/pkg/util"
 )
 
 var _ = Describe("WithFallbackLoader", func() {

diff --git a/internal/util/defaults.go → pkg/util/defaults.go b/internal/util/defaults.go → pkg/util/defaults.go
diff --git a/internal/util/fs.go → pkg/util/fs.go b/internal/util/fs.go → pkg/util/fs.go
diff --git a/internal/util/hash.go → pkg/util/hash.go b/internal/util/hash.go → pkg/util/hash.go
diff --git a/internal/util/labels.go → pkg/util/labels.go b/internal/util/labels.go → pkg/util/labels.go
diff --git a/internal/util/tar.go → pkg/util/tar.go b/internal/util/tar.go → pkg/util/tar.go
diff --git a/internal/util/util.go → pkg/util/util.go b/internal/util/util.go → pkg/util/util.go
diff --git a/test/e2e/crdvalidator_test.go b/test/e2e/crdvalidator_test.go
@@ -11,7 +11,7 @@ import (
 
 	rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2"
 	"github.com/operator-framework/rukpak/cmd/crdvalidator/annotation"
-	"github.com/operator-framework/rukpak/internal/util"
+	"github.com/operator-framework/rukpak/pkg/util"
 	"github.com/operator-framework/rukpak/test/testutil"
 )
 

diff --git a/test/e2e/plain_provisioner_test.go b/test/e2e/plain_provisioner_test.go
@@ -30,8 +30,8 @@ import (
 
 	rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2"
 	"github.com/operator-framework/rukpak/internal/provisioner/plain"
-	"github.com/operator-framework/rukpak/internal/storage"
-	"github.com/operator-framework/rukpak/internal/util"
+	"github.com/operator-framework/rukpak/pkg/storage"
+	"github.com/operator-framework/rukpak/pkg/util"
 )
 
 const (