feat(values): dev inspect

examples/values-templating/zarf.yaml

@@ -93,7 +93,11 @@ x-mdx: |
   Deploy this example to see values and templates in action:
 
     ```bash
-    # Create and deploy the package (features="values=true" flag required until general release of values)
+    # Optional: Inspect the manifests and chart values-files (features="values=true" flag required until general release of values)
+    zarf dev inspect manifests --features="values=true"
+    zarf dev inspect values-files --features="values=true"
+
+    # Create and deploy the package
     zarf package create . --confirm --features="values=true"
     zarf package deploy zarf-package-values-templating-*.tar.zst --confirm --features="values=true"
 

site/src/content/docs/commands/zarf_dev_inspect_manifests.md

@@ -22,6 +22,8 @@ zarf dev inspect manifests [ DIRECTORY ] [flags]
   -f, --flavor string               The flavor of components to include in the resulting package (i.e. have a matching or empty "only.flavor" key)
   -h, --help                        help for manifests
       --kube-version string         Override the default helm template KubeVersion when performing a package chart template
+      --set-values stringToString   Set specific values via command line (format: key.path=value) (default [])
+      --values strings              Path to values file(s) for templating
 ```
 
 ### Options inherited from parent commands

site/src/content/docs/commands/zarf_dev_inspect_values-files.md

@@ -26,6 +26,8 @@ zarf dev inspect values-files [ DIRECTORY ] [flags]
   -f, --flavor string               The flavor of components to include in the resulting package (i.e. have a matching or empty "only.flavor" key)
   -h, --help                        help for values-files
       --kube-version string         Override the default helm template KubeVersion when performing a package chart template
+      --set-values stringToString   Set specific values via command line (format: key.path=value) (default [])
+      --values strings              Path to values file(s) for templating
 ```
 
 ### Options inherited from parent commands

src/cmd/dev.go

@@ -25,6 +25,7 @@ import (
 	"github.com/zarf-dev/zarf/src/api/v1alpha1"
 	"github.com/zarf-dev/zarf/src/config"
 	"github.com/zarf-dev/zarf/src/config/lang"
+	"github.com/zarf-dev/zarf/src/internal/value"
 	"github.com/zarf-dev/zarf/src/pkg/archive"
 	"github.com/zarf-dev/zarf/src/pkg/lint"
 	"github.com/zarf-dev/zarf/src/pkg/logger"
@@ -124,6 +125,8 @@ type devInspectManifestsOptions struct {
 	flavor             string
 	createSetVariables map[string]string
 	deploySetVariables map[string]string
+	valuesFiles        []string
+	setValues          map[string]string
 	kubeVersion        string
 	outputWriter       io.Writer
 }
@@ -149,6 +152,8 @@ func newDevInspectManifestsCommand(v *viper.Viper) *cobra.Command {
 	cmd.Flags().StringVarP(&o.flavor, "flavor", "f", "", lang.CmdPackageCreateFlagFlavor)
 	cmd.Flags().StringToStringVar(&o.createSetVariables, "create-set", v.GetStringMapString(VPkgCreateSet), lang.CmdPackageCreateFlagSet)
 	cmd.Flags().StringToStringVar(&o.deploySetVariables, "deploy-set", v.GetStringMapString(VPkgDeploySet), lang.CmdPackageDeployFlagSet)
+	cmd.Flags().StringSliceVar(&o.valuesFiles, "values", []string{}, "Path to values file(s) for templating")
+	cmd.Flags().StringToStringVar(&o.setValues, "set-values", map[string]string{}, "Set specific values via command line (format: key.path=value)")
 	cmd.Flags().StringVar(&o.kubeVersion, "kube-version", "", lang.CmdDevFlagKubeVersion)
 
 	return cmd
@@ -164,9 +169,29 @@ func (o *devInspectManifestsOptions) run(ctx context.Context, args []string) err
 	if err != nil {
 		return err
 	}
+
+	// Parse values from files
+	values, err := value.ParseFiles(ctx, o.valuesFiles, value.ParseFilesOptions{})
+	if err != nil {
+		return fmt.Errorf("unable to parse values files: %w", err)
+	}
+
+	// Apply CLI --set-values overrides
+	for key, val := range o.setValues {
+		// Convert key to path format (ensure it starts with .)
+		path := value.Path(key)
+		if !strings.HasPrefix(key, ".") {
+			path = value.Path("." + key)
+		}
+		if err := values.Set(path, val); err != nil {
+			return fmt.Errorf("unable to set value at path %s: %w", key, err)
+		}
+	}
+
 	opts := packager.InspectDefinitionResourcesOptions{
 		CreateSetVariables: o.createSetVariables,
 		DeploySetVariables: o.deploySetVariables,
+		Values:             values,
 		Flavor:             o.flavor,
 		KubeVersion:        o.kubeVersion,
 		CachePath:          cachePath,
@@ -201,6 +226,8 @@ type devInspectValuesFilesOptions struct {
 	flavor             string
 	createSetVariables map[string]string
 	deploySetVariables map[string]string
+	valuesFiles        []string
+	setValues          map[string]string
 	kubeVersion        string
 	outputWriter       io.Writer
 }
@@ -227,6 +254,8 @@ func newDevInspectValuesFilesCommand(v *viper.Viper) *cobra.Command {
 	cmd.Flags().StringVarP(&o.flavor, "flavor", "f", "", lang.CmdPackageCreateFlagFlavor)
 	cmd.Flags().StringToStringVar(&o.createSetVariables, "create-set", v.GetStringMapString(VPkgCreateSet), lang.CmdPackageCreateFlagSet)
 	cmd.Flags().StringToStringVar(&o.deploySetVariables, "deploy-set", v.GetStringMapString(VPkgDeploySet), lang.CmdPackageDeployFlagSet)
+	cmd.Flags().StringSliceVar(&o.valuesFiles, "values", []string{}, "Path to values file(s) for templating")
+	cmd.Flags().StringToStringVar(&o.setValues, "set-values", map[string]string{}, "Set specific values via command line (format: key.path=value)")
 	cmd.Flags().StringVar(&o.kubeVersion, "kube-version", "", lang.CmdDevFlagKubeVersion)
 
 	return cmd
@@ -242,9 +271,29 @@ func (o *devInspectValuesFilesOptions) run(ctx context.Context, args []string) e
 	if err != nil {
 		return err
 	}
+
+	// Parse values from files
+	values, err := value.ParseFiles(ctx, o.valuesFiles, value.ParseFilesOptions{})
+	if err != nil {
+		return fmt.Errorf("unable to parse values files: %w", err)
+	}
+
+	// Apply CLI --set-values overrides
+	for key, val := range o.setValues {
+		// Convert key to path format (ensure it starts with .)
+		path := value.Path(key)
+		if !strings.HasPrefix(key, ".") {
+			path = value.Path("." + key)
+		}
+		if err := values.Set(path, val); err != nil {
+			return fmt.Errorf("unable to set value at path %s: %w", key, err)
+		}
+	}
+
 	opts := packager.InspectDefinitionResourcesOptions{
 		CreateSetVariables: o.createSetVariables,
 		DeploySetVariables: o.deploySetVariables,
+		Values:             values,
 		Flavor:             o.flavor,
 		KubeVersion:        o.kubeVersion,
 		CachePath:          cachePath,

src/cmd/dev_test.go

@@ -12,6 +12,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"github.com/zarf-dev/zarf/src/internal/feature"
 	"github.com/zarf-dev/zarf/src/pkg/lint"
 	"github.com/zarf-dev/zarf/src/pkg/utils"
 	"github.com/zarf-dev/zarf/src/test/testutil"
@@ -21,13 +22,19 @@ func TestDevInspectManifests(t *testing.T) {
 	t.Parallel()
 	lint.ZarfSchema = testutil.LoadSchema(t, "../../zarf.schema.json")
 
+	// Enable values feature for tests
+	err := feature.Set([]feature.Feature{{Name: feature.Values, Enabled: true}})
+	require.NoError(t, err)
+
 	tests := []struct {
 		name               string
 		definitionDir      string
 		expectedOutput     string
 		packageName        string
 		deploySetVariables map[string]string
 		createSetVariables map[string]string
+		valuesFiles        []string
+		setValues          map[string]string
 		kubeVersion        string
 		flavor             string
 		expectedErr        string
@@ -79,6 +86,38 @@ func TestDevInspectManifests(t *testing.T) {
 			definitionDir: filepath.Join("testdata", "inspect-manifests", "empty"),
 			expectedErr:   "0 manifests found",
 		},
+		{
+			name:           "manifest with CLI values only",
+			packageName:    "manifest-with-values",
+			definitionDir:  filepath.Join("testdata", "inspect-manifests", "manifest-with-values"),
+			expectedOutput: filepath.Join("testdata", "inspect-manifests", "manifest-with-values", "expected.yaml"),
+			valuesFiles: []string{
+				filepath.Join("testdata", "inspect-manifests", "manifest-with-values", "user-values.yaml"),
+			},
+			setValues: map[string]string{
+				"replicas": "5",
+				"imageTag": "latest",
+			},
+		},
+		{
+			name:           "manifest with package default values",
+			packageName:    "manifest-with-package-values",
+			definitionDir:  filepath.Join("testdata", "inspect-manifests", "manifest-with-package-values"),
+			expectedOutput: filepath.Join("testdata", "inspect-manifests", "manifest-with-package-values", "expected-default.yaml"),
+		},
+		{
+			name:           "manifest with package values overridden by CLI",
+			packageName:    "manifest-with-package-values",
+			definitionDir:  filepath.Join("testdata", "inspect-manifests", "manifest-with-package-values"),
+			expectedOutput: filepath.Join("testdata", "inspect-manifests", "manifest-with-package-values", "expected-override.yaml"),
+			setValues: map[string]string{
+				"app.name":             "overridden-app",
+				"app.replicas":         "5",
+				"app.image.repository": "nginx",
+				"app.image.tag":        "latest",
+				"app.port":             "8080",
+			},
+		},
 	}
 
 	for _, tc := range tests {
@@ -92,6 +131,8 @@ func TestDevInspectManifests(t *testing.T) {
 				kubeVersion:        tc.kubeVersion,
 				deploySetVariables: tc.deploySetVariables,
 				createSetVariables: tc.createSetVariables,
+				valuesFiles:        tc.valuesFiles,
+				setValues:          tc.setValues,
 				flavor:             tc.flavor,
 			}
 			err := opts.run(context.Background(), []string{tc.definitionDir})
@@ -124,6 +165,8 @@ func TestDevInspectValuesFiles(t *testing.T) {
 		expectedOutput string
 		packageName    string
 		setVariables   map[string]string
+		valuesFiles    []string
+		setValues      map[string]string
 		expectedErr    string
 		components     string
 	}{
@@ -145,6 +188,21 @@ func TestDevInspectValuesFiles(t *testing.T) {
 			definitionDir: filepath.Join("testdata", "inspect-manifests", "manifest"),
 			expectedErr:   "0 values files found",
 		},
+		{
+			name:           "chart with values from file and CLI",
+			packageName:    "chart-with-values",
+			definitionDir:  filepath.Join("testdata", "inspect-values-files", "chart-with-values"),
+			expectedOutput: filepath.Join("testdata", "inspect-values-files", "chart-with-values", "expected.yaml"),
+			setVariables: map[string]string{
+				"REPLICAS": "3",
+			},
+			valuesFiles: []string{
+				filepath.Join("testdata", "inspect-values-files", "chart-with-values", "user-values.yaml"),
+			},
+			setValues: map[string]string{
+				"customField": "fromCLI",
+			},
+		},
 	}
 
 	for _, tc := range tests {
@@ -156,6 +214,8 @@ func TestDevInspectValuesFiles(t *testing.T) {
 			opts := devInspectValuesFilesOptions{
 				outputWriter:       buf,
 				deploySetVariables: tc.setVariables,
+				valuesFiles:        tc.valuesFiles,
+				setValues:          tc.setValues,
 			}
 			err := opts.run(context.Background(), []string{tc.definitionDir})
 			if tc.expectedErr != "" {

src/cmd/testdata/inspect-manifests/manifest-with-package-values/deployment.yaml

@@ -0,0 +1,19 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Values.app.name }}
+spec:
+  replicas: {{ .Values.app.replicas }}
+  selector:
+    matchLabels:
+      app: {{ .Values.app.name }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.app.name }}
+    spec:
+      containers:
+        - name: httpd
+          image: {{ .Values.app.image.repository }}:{{ .Values.app.image.tag }}
+          ports:
+            - containerPort: {{ .Values.app.port }}

src/cmd/testdata/inspect-manifests/manifest-with-package-values/expected-default.yaml

@@ -0,0 +1,22 @@
+#type: manifest
+#source: /var/folders/2s/03x_k4gj0g30dv1qs_p39z3h0000gn/T/zarf-1945337041/httpd/manifests/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: my-httpd-app
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      app: my-httpd-app
+  template:
+    metadata:
+      labels:
+        app: my-httpd-app
+    spec:
+      containers:
+        - name: httpd
+          image: httpd:2.4
+          ports:
+            - containerPort: 80
+---

src/cmd/testdata/inspect-manifests/manifest-with-package-values/expected-override.yaml

@@ -0,0 +1,22 @@
+#type: manifest
+#source: /var/folders/2s/03x_k4gj0g30dv1qs_p39z3h0000gn/T/zarf-1945337041/httpd/manifests/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: overridden-app
+spec:
+  replicas: 5
+  selector:
+    matchLabels:
+      app: overridden-app
+  template:
+    metadata:
+      labels:
+        app: overridden-app
+    spec:
+      containers:
+        - name: httpd
+          image: nginx:latest
+          ports:
+            - containerPort: 8080
+---

src/cmd/testdata/inspect-manifests/manifest-with-package-values/values/default-values.yaml

@@ -0,0 +1,7 @@
+app:
+  name: my-httpd-app
+  replicas: 3
+  image:
+    repository: httpd
+    tag: "2.4"
+  port: 80

src/cmd/testdata/inspect-manifests/manifest-with-package-values/zarf.yaml

@@ -0,0 +1,15 @@
+kind: ZarfPackageConfig
+metadata:
+  name: manifest-with-package-values
+
+values:
+  files:
+    - default-values.yaml
+
+components:
+  - name: httpd
+    manifests:
+      - name: httpd-manifest
+        files:
+          - deployment.yaml
+        template: true

src/cmd/testdata/inspect-manifests/manifest-with-values/deployment.yaml

@@ -0,0 +1,19 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: httpd
+spec:
+  replicas: {{ .Values.replicas }}
+  selector:
+    matchLabels:
+      app: httpd
+  template:
+    metadata:
+      labels:
+        app: httpd
+    spec:
+      containers:
+        - name: httpd
+          image: httpd:{{ .Values.imageTag }}
+          ports:
+            - containerPort: {{ .Values.port }}

src/cmd/testdata/inspect-manifests/manifest-with-values/expected.yaml

@@ -0,0 +1,22 @@
+#type: manifest
+#source: /var/folders/2s/03x_k4gj0g30dv1qs_p39z3h0000gn/T/zarf-1945337041/httpd/manifests/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: httpd
+spec:
+  replicas: 5
+  selector:
+    matchLabels:
+      app: httpd
+  template:
+    metadata:
+      labels:
+        app: httpd
+    spec:
+      containers:
+        - name: httpd
+          image: httpd:latest
+          ports:
+            - containerPort: 8080
+---

src/cmd/testdata/inspect-manifests/manifest-with-values/user-values.yaml

@@ -0,0 +1,3 @@
+replicas: 2
+imageTag: 2.4
+port: 8080