Move all the remainder module out of experimental.

All the experimental modules were moved to pkg/action Signed-off-by: David Peraza <dperaza@redhat.com>
monostream · Jan 13, 2022 · 7cab1a0 · 7cab1a0
1 parent 9f869c6
commit 7cab1a0
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 19 deletions.
diff --git a/cmd/helm/push.go b/cmd/helm/push.go
@@ -23,7 +23,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"helm.sh/helm/v3/cmd/helm/require"
-	experimental "helm.sh/helm/v3/internal/experimental/action"
 	"helm.sh/helm/v3/pkg/action"
 )
 
@@ -35,7 +34,7 @@ it will also be uploaded.
 `
 
 func newPushCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
-	client := experimental.NewPushWithOpts(experimental.WithPushConfig(cfg))
+	client := action.NewPushWithOpts(action.WithPushConfig(cfg))
 
 	cmd := &cobra.Command{
 		Use:   "push [chart] [remote]",

diff --git a/cmd/helm/registry_login.go b/cmd/helm/registry_login.go
@@ -29,7 +29,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"helm.sh/helm/v3/cmd/helm/require"
-	experimental "helm.sh/helm/v3/internal/experimental/action"
 	"helm.sh/helm/v3/pkg/action"
 )
 
@@ -54,7 +53,7 @@ func newRegistryLoginCmd(cfg *action.Configuration, out io.Writer) *cobra.Comman
 				return err
 			}
 
-			return experimental.NewRegistryLogin(cfg).Run(out, hostname, username, password, insecureOpt)
+			return action.NewRegistryLogin(cfg).Run(out, hostname, username, password, insecureOpt)
 		},
 	}
 

diff --git a/cmd/helm/registry_logout.go b/cmd/helm/registry_logout.go
@@ -22,7 +22,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"helm.sh/helm/v3/cmd/helm/require"
-	experimental "helm.sh/helm/v3/internal/experimental/action"
 	"helm.sh/helm/v3/pkg/action"
 )
 
@@ -38,7 +37,7 @@ func newRegistryLogoutCmd(cfg *action.Configuration, out io.Writer) *cobra.Comma
 		Args:  require.MinimumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			hostname := args[0]
-			return experimental.NewRegistryLogout(cfg).Run(out, hostname)
+			return action.NewRegistryLogout(cfg).Run(out, hostname)
 		},
 	}
 }
diff --git a/internal/experimental/action/push.go → pkg/action/push.go b/internal/experimental/action/push.go → pkg/action/push.go
@@ -19,9 +19,8 @@ package action
 import (
 	"strings"
 
-	"helm.sh/helm/v3/internal/experimental/pusher"
-	"helm.sh/helm/v3/internal/experimental/uploader"
-	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/action/pusher"
+	"helm.sh/helm/v3/pkg/action/uploader"
 	"helm.sh/helm/v3/pkg/cli"
 	"helm.sh/helm/v3/pkg/registry"
 )
@@ -31,14 +30,14 @@ import (
 // It provides the implementation of 'helm push'.
 type Push struct {
 	Settings *cli.EnvSettings
-	cfg      *action.Configuration
+	cfg      *Configuration
 }
 
 // PushOpt is a type of function that sets options for a push action.
 type PushOpt func(*Push)
 
 // WithPushConfig sets the cfg field on the push configuration object.
-func WithPushConfig(cfg *action.Configuration) PushOpt {
+func WithPushConfig(cfg *Configuration) PushOpt {
 	return func(p *Push) {
 		p.cfg = cfg
 	}

diff --git a/internal/experimental/pusher/doc.go → pkg/action/pusher/doc.go b/internal/experimental/pusher/doc.go → pkg/action/pusher/doc.go
diff --git a/internal/experimental/pusher/ocipusher.go → pkg/action/pusher/ocipusher.go b/internal/experimental/pusher/ocipusher.go → pkg/action/pusher/ocipusher.go
diff --git a/...nal/experimental/pusher/ocipusher_test.go → pkg/action/pusher/ocipusher_test.go b/...nal/experimental/pusher/ocipusher_test.go → pkg/action/pusher/ocipusher_test.go
diff --git a/internal/experimental/pusher/pusher.go → pkg/action/pusher/pusher.go b/internal/experimental/pusher/pusher.go → pkg/action/pusher/pusher.go
diff --git a/internal/experimental/pusher/pusher_test.go → pkg/action/pusher/pusher_test.go b/internal/experimental/pusher/pusher_test.go → pkg/action/pusher/pusher_test.go
diff --git a/...nal/experimental/action/registry_login.go → pkg/action/registry_login.go b/...nal/experimental/action/registry_login.go → pkg/action/registry_login.go
@@ -19,17 +19,16 @@ package action
 import (
 	"io"
 
-	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/registry"
 )
 
 // RegistryLogin performs a registry login operation.
 type RegistryLogin struct {
-	cfg *action.Configuration
+	cfg *Configuration
 }
 
 // NewRegistryLogin creates a new RegistryLogin object with the given configuration.
-func NewRegistryLogin(cfg *action.Configuration) *RegistryLogin {
+func NewRegistryLogin(cfg *Configuration) *RegistryLogin {
 	return &RegistryLogin{
 		cfg: cfg,
 	}

diff --git a/...al/experimental/action/registry_logout.go → pkg/action/registry_logout.go b/...al/experimental/action/registry_logout.go → pkg/action/registry_logout.go
@@ -18,17 +18,15 @@ package action
 
 import (
 	"io"
-
-	"helm.sh/helm/v3/pkg/action"
 )
 
 // RegistryLogout performs a registry login operation.
 type RegistryLogout struct {
-	cfg *action.Configuration
+	cfg *Configuration
 }
 
 // NewRegistryLogout creates a new RegistryLogout object with the given configuration.
-func NewRegistryLogout(cfg *action.Configuration) *RegistryLogout {
+func NewRegistryLogout(cfg *Configuration) *RegistryLogout {
 	return &RegistryLogout{
 		cfg: cfg,
 	}

diff --git a/...l/experimental/uploader/chart_uploader.go → pkg/action/uploader/chart_uploader.go b/...l/experimental/uploader/chart_uploader.go → pkg/action/uploader/chart_uploader.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/v3/internal/experimental/pusher"
+	"helm.sh/helm/v3/pkg/action/pusher"
 	"helm.sh/helm/v3/pkg/registry"
 )
 

diff --git a/internal/experimental/uploader/doc.go → pkg/action/uploader/doc.go b/internal/experimental/uploader/doc.go → pkg/action/uploader/doc.go