Merge pull request #10609 from tompizmor/fix-package-with-oci-deps

fix: helm package with dependency update for charts with OCI dependencies

cmd/helm/package.go

@@ -48,7 +48,7 @@ If '--keyring' is not specified, Helm usually defaults to the public keyring
 unless your environment is otherwise configured.
 `
 
-func newPackageCmd(out io.Writer) *cobra.Command {
+func newPackageCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	client := action.NewPackage()
 	valueOpts := &values.Options{}
 
@@ -92,6 +92,7 @@ func newPackageCmd(out io.Writer) *cobra.Command {
 						Keyring:          client.Keyring,
 						Getters:          p,
 						Debug:            settings.Debug,
+						RegistryClient:   cfg.RegistryClient,
 						RepositoryConfig: settings.RepositoryConfig,
 						RepositoryCache:  settings.RepositoryCache,
 					}

cmd/helm/package_test.go

@@ -16,14 +16,13 @@ limitations under the License.
 package main
 
 import (
-	"bytes"
+	"fmt"
 	"os"
 	"path/filepath"
 	"regexp"
+	"strings"
 	"testing"
 
-	"github.com/spf13/cobra"
-
 	"helm.sh/helm/v3/internal/test/ensure"
 	"helm.sh/helm/v3/pkg/chart"
 	"helm.sh/helm/v3/pkg/chart/loader"
@@ -118,15 +117,12 @@ func TestPackage(t *testing.T) {
 			if err := os.MkdirAll("toot", 0777); err != nil {
 				t.Fatal(err)
 			}
-			var buf bytes.Buffer
-			c := newPackageCmd(&buf)
 
 			// This is an unfortunate byproduct of the tmpdir
 			if v, ok := tt.flags["keyring"]; ok && len(v) > 0 {
 				tt.flags["keyring"] = filepath.Join(origDir, v)
 			}
 
-			setFlags(c, tt.flags)
 			re := regexp.MustCompile(tt.expect)
 
 			adjustedArgs := make([]string, len(tt.args))
@@ -134,7 +130,16 @@ func TestPackage(t *testing.T) {
 				adjustedArgs[i] = filepath.Join(origDir, f)
 			}
 
-			err := c.RunE(c, adjustedArgs)
+			cmd := []string{"package"}
+			if len(adjustedArgs) > 0 {
+				cmd = append(cmd, adjustedArgs...)
+			}
+			for k, v := range tt.flags {
+				if v != "0" {
+					cmd = append(cmd, fmt.Sprintf("--%s=%s", k, v))
+				}
+			}
+			_, _, err = executeActionCommand(strings.Join(cmd, " "))
 			if err != nil {
 				if tt.err && re.MatchString(err.Error()) {
 					return
@@ -142,10 +147,6 @@ func TestPackage(t *testing.T) {
 				t.Fatalf("%q: expected error %q, got %q", tt.name, tt.expect, err)
 			}
 
-			if !re.Match(buf.Bytes()) {
-				t.Errorf("%q: expected output %q, got %q", tt.name, tt.expect, buf.String())
-			}
-
 			if len(tt.hasfile) > 0 {
 				if fi, err := os.Stat(tt.hasfile); err != nil {
 					t.Errorf("%q: expected file %q, got err %q", tt.name, tt.hasfile, err)
@@ -168,26 +169,21 @@ func TestPackage(t *testing.T) {
 func TestSetAppVersion(t *testing.T) {
 	var ch *chart.Chart
 	expectedAppVersion := "app-version-foo"
-
+	chartToPackage := "testdata/testcharts/alpine"
 	dir := ensure.TempDir(t)
-
+	cmd := fmt.Sprintf("package %s --destination=%s --app-version=%s", chartToPackage, dir, expectedAppVersion)
-	c := newPackageCmd(&bytes.Buffer{})
+	_, output, err := executeActionCommand(cmd)
-	flags := map[string]string{
+	if err != nil {
-		"destination": dir,
+		t.Logf("Output: %s", output)
-		"app-version": expectedAppVersion,
+		t.Fatal(err)
-	}
-	setFlags(c, flags)
-	if err := c.RunE(c, []string{"testdata/testcharts/alpine"}); err != nil {
-		t.Errorf("unexpected error %q", err)
 	}
-
 	chartPath := filepath.Join(dir, "alpine-0.1.0.tgz")
 	if fi, err := os.Stat(chartPath); err != nil {
 		t.Errorf("expected file %q, got err %q", chartPath, err)
 	} else if fi.Size() == 0 {
 		t.Errorf("file %q has zero bytes.", chartPath)
 	}
-	ch, err := loader.Load(chartPath)
+	ch, err = loader.Load(chartPath)
 	if err != nil {
 		t.Fatalf("unexpected error loading packaged chart: %v", err)
 	}
@@ -196,13 +192,6 @@ func TestSetAppVersion(t *testing.T) {
 	}
 }
 
-func setFlags(cmd *cobra.Command, flags map[string]string) {
-	dest := cmd.Flags()
-	for f, v := range flags {
-		dest.Set(f, v)
-	}
-}
-
 func TestPackageFileCompletion(t *testing.T) {
 	checkFileCompletion(t, "package", true)
 	checkFileCompletion(t, "package mypath", true) // Multiple paths can be given

cmd/helm/root.go

@@ -167,7 +167,7 @@ func newRootCmd(actionConfig *action.Configuration, out io.Writer, args []string
 		newPullCmd(actionConfig, out),
 		newShowCmd(actionConfig, out),
 		newLintCmd(out),
-		newPackageCmd(out),
+		newPackageCmd(actionConfig, out),
 		newRepoCmd(out),
 		newSearchCmd(out),
 		newVerifyCmd(out),