update schema and fix test conflicts

src/test/bundles/07-helm-overrides/values-file/uds-bundle.yaml

@@ -32,6 +32,7 @@ packages:
               description: "Set the message for podinfo's UI"
             - name: SECRET_VAL
               path: "testSecret"
+              type: file
               description: "testing a secret value"
             - name: SECURITY_CTX
               path: "podinfo.securityContext"

src/test/e2e/variable_test.go

@@ -262,20 +262,20 @@ func TestBundleWithEnvVarHelmOverrides(t *testing.T) {
 	deployZarfInit(t)
 	e2e.HelmDepUpdate(t, "src/test/packages/helm/unicorn-podinfo")
 	e2e.CreateZarfPkg(t, "src/test/packages/helm", false)
+
+	// create and deploy bundle
+	bundleDir := "src/test/bundles/07-helm-overrides"
+	bundlePath := filepath.Join(bundleDir, fmt.Sprintf("uds-bundle-helm-overrides-%s-0.0.1.tar.zst", e2e.Arch))
+
 	color := "purple"
-	b64Secret := "dGhhdCBhaW50IG15IHRydWNr"
-	err := os.Setenv("UDS_CONFIG", filepath.Join("src/test/bundles/07-helm-overrides", "uds-config.yaml"))
+	err := os.Setenv("UDS_CONFIG", filepath.Join(bundleDir, "uds-config.yaml"))
 	require.NoError(t, err)
 	err = os.Setenv("UDS_UI_COLOR", color)
 	require.NoError(t, err)
 	err = os.Setenv("UDS_UI_MSG", "im set by an env var")
 	require.NoError(t, err)
-	err = os.Setenv("UDS_SECRET_VAL", b64Secret)
 	require.NoError(t, err)
 
-	// create and deploy bundle
-	bundleDir := "src/test/bundles/07-helm-overrides"
-	bundlePath := filepath.Join(bundleDir, fmt.Sprintf("uds-bundle-helm-overrides-%s-0.0.1.tar.zst", e2e.Arch))
 	createLocal(t, bundleDir, e2e.Arch)
 	deploy(t, bundlePath)
 
@@ -286,13 +286,6 @@ func TestBundleWithEnvVarHelmOverrides(t *testing.T) {
 		require.NoError(t, err)
 	})
 
-	t.Run("check override secret val", func(t *testing.T) {
-		cmd := strings.Split("z tools kubectl get secret test-secret -n podinfo -o jsonpath=\"{.data.test}\"", " ")
-		secretValue, _, err := e2e.UDS(cmd...)
-		require.Equal(t, fmt.Sprintf("\"%s\"", b64Secret), secretValue)
-		require.NoError(t, err)
-	})
-
 	t.Run("ensure --set overrides take precedence over env vars", func(t *testing.T) {
 		deployCmd := fmt.Sprintf("deploy %s --set UI_COLOR=orange --set helm-overrides.ui_msg=foo --confirm", bundlePath)
 		_, _, err := e2e.UDS(strings.Split(deployCmd, " ")...)

src/types/bundle.go

@@ -65,7 +65,7 @@ type BundleChartVariable struct {
 	Description string            `json:"description,omitempty" jsonschema:"name=Description of the variable"`
 	Default     interface{}       `json:"default,omitempty" jsonschema:"name=The default value to set"`
 	Type        ChartVariableType `json:"type,omitempty" jsonschema:"description=The type of value to be processed,enum=raw,enum=file"`
-	ValueSource string
+	ValueSource string            `json:"source,omitempty" jsonschema:"description=Where the value is set from"`
 }
 
 // BundleVariableImport represents variables in the bundle

uds.schema.json

@@ -76,6 +76,10 @@
           ],
           "type": "string",
           "description": "The type of value to be processed"
+        },
+        "source": {
+          "type": "string",
+          "description": "Where the value is set from"
         }
       },
       "additionalProperties": false,