From 9661e39dce46785089fb93a647f95c7526ec28c8 Mon Sep 17 00:00:00 2001
From: David Peraza <dperaza@redhat.com>
Date: Thu, 13 Jan 2022 08:02:32 -0500
Subject: [PATCH] Moving uploader and pusher out of action into pkg

Signed-off-by: David Peraza <dperaza@redhat.com>
---
 cmd/helm/root.go                            | 1 -
 pkg/action/push.go                          | 4 ++--
 pkg/{action => }/pusher/doc.go              | 0
 pkg/{action => }/pusher/ocipusher.go        | 0
 pkg/{action => }/pusher/ocipusher_test.go   | 0
 pkg/{action => }/pusher/pusher.go           | 0
 pkg/{action => }/pusher/pusher_test.go      | 0
 pkg/{action => }/uploader/chart_uploader.go | 2 +-
 pkg/{action => }/uploader/doc.go            | 0
 9 files changed, 3 insertions(+), 4 deletions(-)
 rename pkg/{action => }/pusher/doc.go (100%)
 rename pkg/{action => }/pusher/ocipusher.go (100%)
 rename pkg/{action => }/pusher/ocipusher_test.go (100%)
 rename pkg/{action => }/pusher/pusher.go (100%)
 rename pkg/{action => }/pusher/pusher_test.go (100%)
 rename pkg/{action => }/uploader/chart_uploader.go (97%)
 rename pkg/{action => }/uploader/doc.go (100%)

diff --git a/cmd/helm/root.go b/cmd/helm/root.go
index 4ce7022ff..05af89d13 100644
--- a/cmd/helm/root.go
+++ b/cmd/helm/root.go
@@ -193,7 +193,6 @@ func newRootCmd(actionConfig *action.Configuration, out io.Writer, args []string
 		newDocsCmd(out),
 	)
 
-	// Add *experimental* subcommands
 	cmd.AddCommand(
 		newRegistryCmd(actionConfig, out),
 		newPushCmd(actionConfig, out),
diff --git a/pkg/action/push.go b/pkg/action/push.go
index 134abe99a..99d1beadc 100644
--- a/pkg/action/push.go
+++ b/pkg/action/push.go
@@ -19,10 +19,10 @@ package action
 import (
 	"strings"
 
-	"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/pusher"
 	"helm.sh/helm/v3/pkg/registry"
+	"helm.sh/helm/v3/pkg/uploader"
 )
 
 // Push is the action for uploading a chart.
diff --git a/pkg/action/pusher/doc.go b/pkg/pusher/doc.go
similarity index 100%
rename from pkg/action/pusher/doc.go
rename to pkg/pusher/doc.go
diff --git a/pkg/action/pusher/ocipusher.go b/pkg/pusher/ocipusher.go
similarity index 100%
rename from pkg/action/pusher/ocipusher.go
rename to pkg/pusher/ocipusher.go
diff --git a/pkg/action/pusher/ocipusher_test.go b/pkg/pusher/ocipusher_test.go
similarity index 100%
rename from pkg/action/pusher/ocipusher_test.go
rename to pkg/pusher/ocipusher_test.go
diff --git a/pkg/action/pusher/pusher.go b/pkg/pusher/pusher.go
similarity index 100%
rename from pkg/action/pusher/pusher.go
rename to pkg/pusher/pusher.go
diff --git a/pkg/action/pusher/pusher_test.go b/pkg/pusher/pusher_test.go
similarity index 100%
rename from pkg/action/pusher/pusher_test.go
rename to pkg/pusher/pusher_test.go
diff --git a/pkg/action/uploader/chart_uploader.go b/pkg/uploader/chart_uploader.go
similarity index 97%
rename from pkg/action/uploader/chart_uploader.go
rename to pkg/uploader/chart_uploader.go
index 8152b263b..2aa04937a 100644
--- a/pkg/action/uploader/chart_uploader.go
+++ b/pkg/uploader/chart_uploader.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/v3/pkg/action/pusher"
+	"helm.sh/helm/v3/pkg/pusher"
 	"helm.sh/helm/v3/pkg/registry"
 )
 
diff --git a/pkg/action/uploader/doc.go b/pkg/uploader/doc.go
similarity index 100%
rename from pkg/action/uploader/doc.go
rename to pkg/uploader/doc.go