Update milestone 7 proposal and improve some tests (#2748)

* Update milestone 7 proposal and improve some tests

* fix namespace in test

* fix release name in tests

Author: sgalsaleh

api/internal/managers/app/release/template_test.go

@@ -1812,7 +1812,6 @@ func TestAppReleaseManager_ExtractInstallableHelmCharts(t *testing.T) {
 		expectError      bool
 		errorContains    string
 		expected         []types.InstallableHelmChart
-		validateCharts   func(t *testing.T, charts []types.InstallableHelmChart, testHelmChartCRs [][]byte, testChartArchives [][]byte)
 	}{
 		{
 			name:          "no helm charts returns empty slice",
@@ -1823,14 +1822,15 @@ func TestAppReleaseManager_ExtractInstallableHelmCharts(t *testing.T) {
 			expected:      nil,
 		},
 		{
-			name: "single chart with basic values",
+			name: "single chart with basic configuration",
 			helmChartCRs: [][]byte{
 				[]byte(`apiVersion: kots.io/v1beta2
 kind: HelmChart
 metadata:
   name: nginx-chart
-  namespace: default
 spec:
+  namespace: repl{{ConfigOption "namespace"}}
+  releaseName: repl{{ConfigOption "release_name"}}
   chart:
     name: nginx
     chartVersion: "1.0.0"
@@ -1853,6 +1853,8 @@ spec:
 				createTestChartArchive(t, "nginx", "1.0.0"),
 			},
 			configValues: types.AppConfigValues{
+				"namespace":      {Value: "custom-namespace"},
+				"release_name":   {Value: "custom-release-name"},
 				"image_tag":      {Value: "1.20.0"},
 				"enable_ingress": {Value: "true"},
 				"ingress_host":   {Value: "nginx.example.com"},
@@ -1880,8 +1882,9 @@ spec:
 kind: HelmChart
 metadata:
   name: nginx-chart
-  namespace: default
 spec:
+  namespace: custom-namespace
+  releaseName: custom-release-name
   chart:
     name: nginx
     chartVersion: "1.0.0"
@@ -1937,22 +1940,27 @@ spec:
 				"skip_nginx": {Value: "true"},
 			},
 			expectError: false,
-			validateCharts: func(t *testing.T, charts []types.InstallableHelmChart, testHelmChartCRs [][]byte, testChartArchives [][]byte) {
-				expectedValues := map[string]any{
-					"persistence": map[string]any{
-						"enabled": true,
-					},
-				}
-
-				expectedCharts := []types.InstallableHelmChart{
-					{
-						Archive: testChartArchives[1], // redis chart (index 1)
-						Values:  expectedValues,
-						CR:      createHelmChartCRFromYAML(string(testHelmChartCRs[1])), // redis CR (index 1)
+			expected: []types.InstallableHelmChart{
+				{
+					Archive: createTestChartArchive(t, "redis", "2.0.0"),
+					Values: map[string]any{
+						"persistence": map[string]any{
+							"enabled": true,
+						},
 					},
-				}
-
-				assert.Equal(t, expectedCharts, charts)
+					CR: createHelmChartCRFromYAML(`apiVersion: kots.io/v1beta2
+kind: HelmChart
+metadata:
+  name: included-chart
+spec:
+  chart:
+    name: redis
+    chartVersion: "2.0.0"
+  exclude: false
+  values:
+    persistence:
+      enabled: true`),
+				},
 			},
 		},
 		{
@@ -2262,9 +2270,7 @@ spec:
 			chartArchives: [][]byte{},
 			configValues:  types.AppConfigValues{},
 			expectError:   false,
-			validateCharts: func(t *testing.T, charts []types.InstallableHelmChart, testHelmChartCRs [][]byte, testChartArchives [][]byte) {
-				assert.Empty(t, charts)
-			},
+			expected:      nil,
 		},
 		{
 			name: "skip nil helm chart CR in collection",
@@ -2286,20 +2292,23 @@ spec:
 			},
 			configValues: types.AppConfigValues{},
 			expectError:  false,
-			validateCharts: func(t *testing.T, charts []types.InstallableHelmChart, testHelmChartCRs [][]byte, testChartArchives [][]byte) {
-				expectedValues := map[string]any{
-					"replicaCount": "2",
-				}
-
-				expectedCharts := []types.InstallableHelmChart{
-					{
-						Archive: testChartArchives[0],
-						Values:  expectedValues,
-						CR:      createHelmChartCRFromYAML(string(testHelmChartCRs[1])), // Skip the nil CR at index 0
+			expected: []types.InstallableHelmChart{
+				{
+					Archive: createTestChartArchive(t, "nginx", "1.0.0"),
+					Values: map[string]any{
+						"replicaCount": "2",
 					},
-				}
-
-				assert.Equal(t, expectedCharts, charts)
+					CR: createHelmChartCRFromYAML(`apiVersion: kots.io/v1beta2
+kind: HelmChart
+metadata:
+  name: valid-chart
+spec:
+  chart:
+    name: nginx
+    chartVersion: "1.0.0"
+  values:
+    replicaCount: "2"`),
+				},
 			},
 		},
 		{
@@ -2420,12 +2429,8 @@ spec:
 
 			require.NoError(t, err)
 
-			// Use expectedInstallableCharts if provided, otherwise use validateCharts
-			if tt.expected != nil {
-				assert.Equal(t, tt.expected, result)
-			} else if tt.validateCharts != nil {
-				tt.validateCharts(t, result, tt.helmChartCRs, tt.chartArchives)
-			}
+			// Validate expected results
+			assert.Equal(t, tt.expected, result)
 		})
 	}
 }
@@ -2557,6 +2562,8 @@ func createTestConfig() kotsv1beta1.Config {
 					Name: "test_group",
 					Items: []kotsv1beta1.ConfigItem{
 						{Name: "chart_name", Type: "text", Value: multitype.FromString("nginx")},
+						{Name: "namespace", Type: "text", Value: multitype.FromString("default-namespace")},
+						{Name: "release_name", Type: "text", Value: multitype.FromString("default-release-name")},
 						{Name: "image_tag", Type: "text", Value: multitype.FromString("1.20.0")},
 						{Name: "app_name", Type: "text", Value: multitype.FromString("myapp")},
 						{Name: "chart1_name", Type: "text", Value: multitype.FromString("nginx")},