fix: adding tests for new functionality in helm release

Testing OCI without specifying credentials
Testing exclusion and inclusion of specific helm charts

Author: msvticket

pkg/cmd/helm/release/release_test.go

@@ -70,7 +70,7 @@ func TestStepHelmRelease(t *testing.T) {
 		t.Logf("ran: %s\n", c.CLI())
 	}
 
-	assert.Equal(t, o.ReleasedCharts, 1, "should have released 1 chart")
+	assert.Equal(t, 2, o.ReleasedCharts, "should have released 2 charts")
 }
 
 func TestStepHelmReleaseWithArtifactory(t *testing.T) {
@@ -112,7 +112,7 @@ func TestStepHelmReleaseWithArtifactory(t *testing.T) {
 		},
 	)
 
-	err = o.Run()
+	err = o.Run("anotherchart")
 	require.NoError(t, err, "failed to run the command")
 
 	for _, c := range runner.OrderedCommands {
@@ -160,16 +160,13 @@ func TestStepHelmReleaseWithChartPages(t *testing.T) {
 		t.Logf("ran: %s\n", c.CLI())
 	}
 
-	assert.Equal(t, o.ReleasedCharts, 1, "should have released 1 chart")
+	assert.Equal(t, 2, o.ReleasedCharts, "should have released 2 charts")
 
 	runner.ExpectResults(t,
 		fakerunner.FakeResult{
 			// workaround for dynamically generated git clone destination folder
 			CLI: runner.OrderedCommands[0].Name + " " + strings.Join(runner.OrderedCommands[0].Args, " "),
 		},
-		fakerunner.FakeResult{
-			CLI: "helm repo add 0 file://myapp-common",
-		},
 		fakerunner.FakeResult{
 			CLI: "git sparse-checkout set --no-cone jx-requirements.yml .jx/gitops/source-config.yaml",
 		},
@@ -194,6 +191,33 @@ func TestStepHelmReleaseWithChartPages(t *testing.T) {
 		fakerunner.FakeResult{
 			CLI: "git status -s",
 		},
+		fakerunner.FakeResult{
+			CLI: "git commit -m chore: add helm chart for anotherchart v1.2.3",
+		},
+		fakerunner.FakeResult{
+			CLI: "git push --set-upstream origin gh-pages",
+		},
+		fakerunner.FakeResult{
+			CLI: "helm repo add 0 file://myapp-common",
+		},
+		fakerunner.FakeResult{
+			CLI: helmDependencyBuild + o.RegistryConfigFile,
+		},
+		fakerunner.FakeResult{
+			CLI: helmLint,
+		},
+		fakerunner.FakeResult{
+			CLI: helmPackage,
+		},
+		fakerunner.FakeResult{
+			CLI: "helm repo index .",
+		},
+		fakerunner.FakeResult{
+			CLI: "git add *",
+		},
+		fakerunner.FakeResult{
+			CLI: "git status -s",
+		},
 		fakerunner.FakeResult{
 			CLI: "git commit -m chore: add helm chart for myapp v1.2.3",
 		},
@@ -213,7 +237,7 @@ func TestStepHelmReleaseWithOCIUsingUserName(t *testing.T) {
 	o.RepositoryPassword = reposvearword
 	o.Dir = "testdata"
 
-	err = o.Run()
+	err = o.Run("myapp")
 	require.NoError(t, err, "failed to run the command")
 
 	for _, c := range runner.OrderedCommands {
@@ -262,7 +286,7 @@ func TestStepHelmReleaseWithOCIUsingRegistryConfig(t *testing.T) {
 	require.NoError(t, err, "failed to setup commands")
 	o.NoOCILogin = true
 	o.RegistryConfigFile = "testdata/helmregistry/config.json"
-	err = o.Run()
+	err = o.Run("anotherchart")
 	require.NoError(t, err, "failed to run the command")
 
 	for _, c := range runner.OrderedCommands {
@@ -276,9 +300,6 @@ func TestStepHelmReleaseWithOCIUsingRegistryConfig(t *testing.T) {
 			// workaround for dynamically generated git clone destination folder
 			CLI: runner.OrderedCommands[0].Name + " " + strings.Join(runner.OrderedCommands[0].Args, " "),
 		},
-		fakerunner.FakeResult{
-			CLI: "helm repo add 0 file://myapp-common",
-		},
 		fakerunner.FakeResult{
 			CLI: "git sparse-checkout set --no-cone jx-requirements.yml .jx/gitops/source-config.yaml",
 		},
@@ -296,7 +317,7 @@ func TestStepHelmReleaseWithOCIUsingRegistryConfig(t *testing.T) {
 		},
 
 		fakerunner.FakeResult{
-			CLI: "helm push myapp-" + chartVersion + ".tgz " + "oci://" + OCIRegistry + " --registry-config " + o.RegistryConfigFile,
+			CLI: "helm push anotherchart-" + chartVersion + ".tgz " + "oci://" + OCIRegistry + " --registry-config " + o.RegistryConfigFile,
 		},
 	)
 }
@@ -306,6 +327,50 @@ func TestStepHelmReleaseWithOCINoOCILogin(t *testing.T) {
 	runner, OCIRegistry, chartVersion, o, err := setupReleaseOCI(t)
 	require.NoError(t, err, "failed to run the command")
 	o.NoOCILogin = true
+	err = o.Run("myapp")
+	require.NoError(t, err, "failed to run the command")
+
+	for _, c := range runner.OrderedCommands {
+		t.Logf("ran: %s\n", c.CLI())
+	}
+
+	assert.Equal(t, o.ReleasedCharts, 1, "should have released 1 chart")
+
+	runner.ExpectResults(t,
+		fakerunner.FakeResult{
+			// workaround for dynamically generated git clone destination folder
+			CLI: runner.OrderedCommands[0].Name + " " + strings.Join(runner.OrderedCommands[0].Args, " "),
+		},
+		fakerunner.FakeResult{
+			CLI: "helm repo add 0 file://myapp-common",
+		},
+		fakerunner.FakeResult{
+			CLI: "git sparse-checkout set --no-cone jx-requirements.yml .jx/gitops/source-config.yaml",
+		},
+		fakerunner.FakeResult{
+			CLI: "git checkout",
+		},
+		fakerunner.FakeResult{
+			CLI: helmDependencyBuild + o.RegistryConfigFile,
+		},
+		fakerunner.FakeResult{
+			CLI: helmLint,
+		},
+		fakerunner.FakeResult{
+			CLI: helmPackage,
+		},
+
+		fakerunner.FakeResult{
+			CLI: "helm push myapp-" + chartVersion + ".tgz " + "oci://" + OCIRegistry + " --registry-config " + o.RegistryConfigFile,
+		})
+
+}
+
+//nolint:dupl
+func TestStepHelmReleaseWithOCINoOCILoginImplicit(t *testing.T) {
+	runner, OCIRegistry, chartVersion, o, err := setupReleaseOCI(t)
+	require.NoError(t, err, "failed to run the command")
+	o.IgnoreChartNames = []string{"anotherchart", "preview"}
 	err = o.Run()
 	require.NoError(t, err, "failed to run the command")
 

pkg/cmd/helm/release/testdata/charts/anotherchart/Chart.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+description: Another test chart
+icon: https://raw.githubusercontent.com/jenkins-x/jenkins-x-platform/d273e09/images/nodejs.png
+name:  anotherchart
+version: 0.1.0-SNAPSHOT

pkg/cmd/helm/release/testdata/charts/anotherchart/templates/NOTES.txt

@@ -0,0 +1,2 @@
+
+Another test chart