From 14066a07e162b457a21b173d1779ddf7701e2bc6 Mon Sep 17 00:00:00 2001 From: Thomas Runyon Date: Wed, 8 Dec 2021 06:23:04 -0500 Subject: [PATCH] refactor internal/experimental/registry to pkg/registry Signed-off-by: Thomas Runyon --- cmd/helm/root.go | 2 +- internal/experimental/action/push.go | 2 +- internal/experimental/action/registry_login.go | 2 +- internal/experimental/pusher/ocipusher.go | 2 +- internal/experimental/pusher/pusher.go | 2 +- internal/experimental/pusher/pusher_test.go | 2 +- internal/experimental/uploader/chart_uploader.go | 2 +- internal/resolver/resolver.go | 2 +- pkg/action/action.go | 2 +- pkg/action/action_test.go | 2 +- pkg/action/install.go | 2 +- pkg/action/pull.go | 2 +- pkg/downloader/chart_downloader.go | 2 +- pkg/downloader/manager.go | 2 +- pkg/getter/getter.go | 2 +- pkg/getter/ocigetter.go | 2 +- {internal/experimental => pkg}/registry/client.go | 2 +- {internal/experimental => pkg}/registry/client_test.go | 0 {internal/experimental => pkg}/registry/constants.go | 2 +- {internal/experimental => pkg}/registry/util.go | 2 +- pkg/repo/repotest/server.go | 2 +- 21 files changed, 20 insertions(+), 20 deletions(-) rename {internal/experimental => pkg}/registry/client.go (99%) rename {internal/experimental => pkg}/registry/client_test.go (100%) rename {internal/experimental => pkg}/registry/constants.go (94%) rename {internal/experimental => pkg}/registry/util.go (95%) diff --git a/cmd/helm/root.go b/cmd/helm/root.go index 0de4a738a..6f41cf3ed 100644 --- a/cmd/helm/root.go +++ b/cmd/helm/root.go @@ -29,8 +29,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/clientcmd" - "helm.sh/helm/v3/internal/experimental/registry" "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/registry" "helm.sh/helm/v3/pkg/repo" ) diff --git a/internal/experimental/action/push.go b/internal/experimental/action/push.go index b125ae1f4..9a7fbedd5 100644 --- a/internal/experimental/action/push.go +++ b/internal/experimental/action/push.go @@ -20,10 +20,10 @@ import ( "strings" "helm.sh/helm/v3/internal/experimental/pusher" - "helm.sh/helm/v3/internal/experimental/registry" "helm.sh/helm/v3/internal/experimental/uploader" "helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/cli" + "helm.sh/helm/v3/pkg/registry" ) // Push is the action for uploading a chart. diff --git a/internal/experimental/action/registry_login.go b/internal/experimental/action/registry_login.go index 8312f3c57..966c03380 100644 --- a/internal/experimental/action/registry_login.go +++ b/internal/experimental/action/registry_login.go @@ -19,8 +19,8 @@ package action import ( "io" - "helm.sh/helm/v3/internal/experimental/registry" "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/registry" ) // RegistryLogin performs a registry login operation. diff --git a/internal/experimental/pusher/ocipusher.go b/internal/experimental/pusher/ocipusher.go index a1df0da85..24cfd8cad 100644 --- a/internal/experimental/pusher/ocipusher.go +++ b/internal/experimental/pusher/ocipusher.go @@ -24,8 +24,8 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/v3/internal/experimental/registry" "helm.sh/helm/v3/pkg/chart/loader" + "helm.sh/helm/v3/pkg/registry" ) // OCIPusher is the default OCI backend handler diff --git a/internal/experimental/pusher/pusher.go b/internal/experimental/pusher/pusher.go index 32c1351e9..30c6af97c 100644 --- a/internal/experimental/pusher/pusher.go +++ b/internal/experimental/pusher/pusher.go @@ -19,8 +19,8 @@ package pusher import ( "github.com/pkg/errors" - "helm.sh/helm/v3/internal/experimental/registry" "helm.sh/helm/v3/pkg/cli" + "helm.sh/helm/v3/pkg/registry" ) // options are generic parameters to be provided to the pusher during instantiation. diff --git a/internal/experimental/pusher/pusher_test.go b/internal/experimental/pusher/pusher_test.go index a99b1a5db..d43e6c9ec 100644 --- a/internal/experimental/pusher/pusher_test.go +++ b/internal/experimental/pusher/pusher_test.go @@ -18,8 +18,8 @@ package pusher import ( "testing" - "helm.sh/helm/v3/internal/experimental/registry" "helm.sh/helm/v3/pkg/cli" + "helm.sh/helm/v3/pkg/registry" ) func TestProvider(t *testing.T) { diff --git a/internal/experimental/uploader/chart_uploader.go b/internal/experimental/uploader/chart_uploader.go index 87a9d5772..e8edd94a9 100644 --- a/internal/experimental/uploader/chart_uploader.go +++ b/internal/experimental/uploader/chart_uploader.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" "helm.sh/helm/v3/internal/experimental/pusher" - "helm.sh/helm/v3/internal/experimental/registry" + "helm.sh/helm/v3/pkg/registry" ) // ChartUploader handles uploading a chart. diff --git a/internal/resolver/resolver.go b/internal/resolver/resolver.go index 70ce6a55b..d32e74290 100644 --- a/internal/resolver/resolver.go +++ b/internal/resolver/resolver.go @@ -26,12 +26,12 @@ import ( "github.com/Masterminds/semver/v3" "github.com/pkg/errors" - "helm.sh/helm/v3/internal/experimental/registry" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chart/loader" "helm.sh/helm/v3/pkg/gates" "helm.sh/helm/v3/pkg/helmpath" "helm.sh/helm/v3/pkg/provenance" + "helm.sh/helm/v3/pkg/registry" "helm.sh/helm/v3/pkg/repo" ) diff --git a/pkg/action/action.go b/pkg/action/action.go index f093ed7f8..deb3f65df 100644 --- a/pkg/action/action.go +++ b/pkg/action/action.go @@ -32,12 +32,12 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" - "helm.sh/helm/v3/internal/experimental/registry" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chartutil" "helm.sh/helm/v3/pkg/engine" "helm.sh/helm/v3/pkg/kube" "helm.sh/helm/v3/pkg/postrender" + "helm.sh/helm/v3/pkg/registry" "helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/releaseutil" "helm.sh/helm/v3/pkg/storage" diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go index f8bdff3b7..190d00cae 100644 --- a/pkg/action/action_test.go +++ b/pkg/action/action_test.go @@ -23,10 +23,10 @@ import ( fakeclientset "k8s.io/client-go/kubernetes/fake" - "helm.sh/helm/v3/internal/experimental/registry" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chartutil" kubefake "helm.sh/helm/v3/pkg/kube/fake" + "helm.sh/helm/v3/pkg/registry" "helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/storage" "helm.sh/helm/v3/pkg/storage/driver" diff --git a/pkg/action/install.go b/pkg/action/install.go index e91154515..91f09c3ba 100644 --- a/pkg/action/install.go +++ b/pkg/action/install.go @@ -38,7 +38,6 @@ import ( "k8s.io/cli-runtime/pkg/resource" "sigs.k8s.io/yaml" - "helm.sh/helm/v3/internal/experimental/registry" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chartutil" "helm.sh/helm/v3/pkg/cli" @@ -47,6 +46,7 @@ import ( "helm.sh/helm/v3/pkg/kube" kubefake "helm.sh/helm/v3/pkg/kube/fake" "helm.sh/helm/v3/pkg/postrender" + "helm.sh/helm/v3/pkg/registry" "helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/releaseutil" "helm.sh/helm/v3/pkg/repo" diff --git a/pkg/action/pull.go b/pkg/action/pull.go index 2f5127ea9..effb632dc 100644 --- a/pkg/action/pull.go +++ b/pkg/action/pull.go @@ -25,11 +25,11 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/v3/internal/experimental/registry" "helm.sh/helm/v3/pkg/chartutil" "helm.sh/helm/v3/pkg/cli" "helm.sh/helm/v3/pkg/downloader" "helm.sh/helm/v3/pkg/getter" + "helm.sh/helm/v3/pkg/registry" "helm.sh/helm/v3/pkg/repo" ) diff --git a/pkg/downloader/chart_downloader.go b/pkg/downloader/chart_downloader.go index 93afb1461..bfc557998 100644 --- a/pkg/downloader/chart_downloader.go +++ b/pkg/downloader/chart_downloader.go @@ -25,12 +25,12 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/v3/internal/experimental/registry" "helm.sh/helm/v3/internal/fileutil" "helm.sh/helm/v3/internal/urlutil" "helm.sh/helm/v3/pkg/getter" "helm.sh/helm/v3/pkg/helmpath" "helm.sh/helm/v3/pkg/provenance" + "helm.sh/helm/v3/pkg/registry" "helm.sh/helm/v3/pkg/repo" ) diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go index 52f1a1312..f55cab172 100644 --- a/pkg/downloader/manager.go +++ b/pkg/downloader/manager.go @@ -34,7 +34,6 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" - "helm.sh/helm/v3/internal/experimental/registry" "helm.sh/helm/v3/internal/resolver" "helm.sh/helm/v3/internal/third_party/dep/fs" "helm.sh/helm/v3/internal/urlutil" @@ -43,6 +42,7 @@ import ( "helm.sh/helm/v3/pkg/chartutil" "helm.sh/helm/v3/pkg/getter" "helm.sh/helm/v3/pkg/helmpath" + "helm.sh/helm/v3/pkg/registry" "helm.sh/helm/v3/pkg/repo" ) diff --git a/pkg/getter/getter.go b/pkg/getter/getter.go index 3a0567a87..7f830bac7 100644 --- a/pkg/getter/getter.go +++ b/pkg/getter/getter.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/v3/internal/experimental/registry" "helm.sh/helm/v3/pkg/cli" + "helm.sh/helm/v3/pkg/registry" ) // options are generic parameters to be provided to the getter during instantiation. diff --git a/pkg/getter/ocigetter.go b/pkg/getter/ocigetter.go index 45c92749c..bcc599ead 100644 --- a/pkg/getter/ocigetter.go +++ b/pkg/getter/ocigetter.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "helm.sh/helm/v3/internal/experimental/registry" + "helm.sh/helm/v3/pkg/registry" ) // OCIGetter is the default HTTP(/S) backend handler diff --git a/internal/experimental/registry/client.go b/pkg/registry/client.go similarity index 99% rename from internal/experimental/registry/client.go rename to pkg/registry/client.go index 495671059..bf19f7e0f 100644 --- a/internal/experimental/registry/client.go +++ b/pkg/registry/client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package registry // import "helm.sh/helm/v3/internal/experimental/registry" +package registry // import "helm.sh/helm/v3/pkg/registry" import ( "encoding/json" diff --git a/internal/experimental/registry/client_test.go b/pkg/registry/client_test.go similarity index 100% rename from internal/experimental/registry/client_test.go rename to pkg/registry/client_test.go diff --git a/internal/experimental/registry/constants.go b/pkg/registry/constants.go similarity index 94% rename from internal/experimental/registry/constants.go rename to pkg/registry/constants.go index 876e4dc13..66b02f91c 100644 --- a/internal/experimental/registry/constants.go +++ b/pkg/registry/constants.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package registry // import "helm.sh/helm/v3/internal/experimental/registry" +package registry // import "helm.sh/helm/v3/pkg/registry" const ( // OCIScheme is the URL scheme for OCI-based requests diff --git a/internal/experimental/registry/util.go b/pkg/registry/util.go similarity index 95% rename from internal/experimental/registry/util.go rename to pkg/registry/util.go index 257e7af87..c60aad10f 100644 --- a/internal/experimental/registry/util.go +++ b/pkg/registry/util.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package registry // import "helm.sh/helm/v3/internal/experimental/registry" +package registry // import "helm.sh/helm/v3/pkg/registry" import ( "bytes" diff --git a/pkg/repo/repotest/server.go b/pkg/repo/repotest/server.go index 0a5c3ae69..e1ddb1d9a 100644 --- a/pkg/repo/repotest/server.go +++ b/pkg/repo/repotest/server.go @@ -34,11 +34,11 @@ import ( "golang.org/x/crypto/bcrypt" "sigs.k8s.io/yaml" - ociRegistry "helm.sh/helm/v3/internal/experimental/registry" "helm.sh/helm/v3/internal/tlsutil" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chart/loader" "helm.sh/helm/v3/pkg/chartutil" + ociRegistry "helm.sh/helm/v3/pkg/registry" "helm.sh/helm/v3/pkg/repo" )