test: address Helm lifecycle review feedback

shirkevich · shirkevich · commit 64112b1c4caf · 2026-08-06T04:32:11.000+04:00
diff --git a/examples/helm/atmos.yaml b/examples/helm/atmos.yaml
@@ -42,14 +42,16 @@ commands:
       - atmos validate stacks
       # Dependency acquisition is explicit: the opt-in flag fetches the missing
       # file:// library and updates the local chart before the first render.
-      - atmos helm template demo -s dev --dependency-update --output=/tmp/atmos-helm-template.yaml
       # Template output includes weighted hooks and leaves Helm `tpl` expressions
       # in values for the chart to evaluate with its native .Values context.
       - command: >-
-          test "$(grep -c '^  name: demo-hook-order$' /tmp/atmos-helm-template.yaml)" -eq 2 &&
-          grep -q 'helm.sh/hook-weight: "-2"' /tmp/atmos-helm-template.yaml &&
-          grep -q 'helm.sh/hook-weight: "-1"' /tmp/atmos-helm-template.yaml &&
-          grep -q 'rendered: from-stack' /tmp/atmos-helm-template.yaml
+          artifact=$(mktemp ./atmos-helm-template.XXXXXX.yaml);
+          trap 'rm -f "$artifact"' EXIT;
+          atmos helm template demo -s dev --dependency-update --output="$artifact" &&
+          test "$(grep -c '^  name: demo-hook-order$' "$artifact")" -eq 2 &&
+          grep -q 'helm.sh/hook-weight: "-2"' "$artifact" &&
+          grep -q 'helm.sh/hook-weight: "-1"' "$artifact" &&
+          grep -q 'rendered: from-stack' "$artifact"
       - command: atmos emulator up kubernetes -s dev
         retry:
           max_attempts: 2
diff --git a/internal/exec/describe_affected_components_test.go b/internal/exec/describe_affected_components_test.go
@@ -645,6 +645,34 @@ func TestProcessHelmComponentsIndexed_ValuesFileChangedOutsideComponentBasePath(
 	assert.Contains(t, affected[0].AffectedAll, affectedReasonStackValuesFile)
 }
 
+func TestProcessHelmComponentsIndexed_AbsoluteValuesFileChanged(t *testing.T) {
+	tempDir := t.TempDir()
+	atmosConfig := helmAtmosConfig()
+	atmosConfig.BasePath = tempDir
+
+	valuesFile := filepath.Join(tempDir, "config", "helm", "app-values.yaml")
+	identical := map[string]any{
+		cfg.ComponentSectionName: "shared-chart",
+		sectionNameChart:         ".",
+		sectionNameValuesF:       []any{valuesFile},
+	}
+	helmSection := map[string]any{helmTestComponent: identical}
+	remoteStacks := helmRemoteStacksWith(identical)
+	filesIndex := newChangedFilesIndex(atmosConfig, []string{valuesFile}, tempDir)
+
+	affected, err := processHelmComponentsIndexed(
+		helmTestStack, helmSection, &remoteStacks, &remoteStacks,
+		atmosConfig, filesIndex, newComponentPathPatternCache(),
+		false, false, false,
+	)
+	require.NoError(t, err)
+
+	require.Len(t, affected, 1)
+	assert.Equal(t, helmTestComponent, affected[0].Component)
+	assert.Equal(t, cfg.HelmComponentType, affected[0].ComponentType)
+	assert.Contains(t, affected[0].AffectedAll, affectedReasonStackValuesFile)
+}
+
 func TestProcessHelmComponentsIndexed_UnrelatedFileDoesNotAffectValuesFile(t *testing.T) {
 	tempDir := t.TempDir()
 	atmosConfig := helmAtmosConfig()
diff --git a/pkg/ci/plugins/helm/plugin_test.go b/pkg/ci/plugins/helm/plugin_test.go
@@ -264,8 +264,9 @@ func TestTemplateRendering(t *testing.T) {
 				"history":            map[string]any{"max": 10},
 			},
 			contains: []string{
-				"Helm Apply Summary", "bitnami/nginx", "Deployment", "Release lifecycle",
-				"| Wait strategy | `watcher` |",
+				"Helm Apply Summary", "bitnami/nginx", "Deployment", "\n### Release lifecycle\n",
+				"\n| Operation | `upgrade` |\n",
+				"\n| Wait strategy | `watcher` |\n",
 				"| Timeout | `30m0s` |",
 				"| Chart hooks enabled | `true` |",
 				"| Wait for Jobs | `true` |",
@@ -286,8 +287,8 @@ func TestTemplateRendering(t *testing.T) {
 				"crds":        "create",
 			},
 			contains: []string{
-				"Helm Apply Summary", "Release lifecycle",
-				"| Operation | `install` |",
+				"Helm Apply Summary", "\n### Release lifecycle\n",
+				"\n| Operation | `install` |\n",
 				"| Wait strategy | `hookOnly` |",
 				"| Timeout | `5m0s` |",
 				"| Chart hooks enabled | `true` |",
@@ -305,7 +306,8 @@ func TestTemplateRendering(t *testing.T) {
 			},
 			contains: []string{
 				"Helm Apply Summary",
-				"| Applied | `false` |",
+				"\n### Release lifecycle\n",
+				"\n| Applied | `false` |\n",
 				"| Target kind | `git` |",
 				"| Reason | `external_target` |",
 			},
@@ -321,8 +323,8 @@ func TestTemplateRendering(t *testing.T) {
 				"chart_hooks": false,
 			},
 			contains: []string{
-				"Helm Delete Summary", "Release lifecycle",
-				"| Operation | `delete` |",
+				"Helm Delete Summary", "\n### Release lifecycle\n",
+				"\n| Operation | `delete` |\n",
 				"| Wait strategy | `legacy` |",
 				"| Timeout | `10m0s` |",
 				"| Chart hooks enabled | `false` |",
@@ -336,7 +338,8 @@ func TestTemplateRendering(t *testing.T) {
 			},
 			contains: []string{
 				"Helm Delete Summary",
-				"| Deleted | `false` |",
+				"\n### Release lifecycle\n",
+				"\n| Deleted | `false` |\n",
 				"| Target kind | `git` |",
 				"| Reason | `external_target` |",
 			},
diff --git a/pkg/ci/plugins/helm/templates/apply.md b/pkg/ci/plugins/helm/templates/apply.md
@@ -14,19 +14,19 @@
 | Objects | `{{ .ObjectCount }}` |
 | Manifest bytes | `{{ .ManifestBytes }}` |
 
-{{- with .Lifecycle }}
+{{ with .Lifecycle }}
 
 ### Release lifecycle
 
-{{- if eq (index . "reason") "external_target" }}
+{{ if eq (index . "reason") "external_target" }}
 
 | Field | Value |
 | --- | --- |
 | Applied | `false` |
 | Target kind | `{{ index . "target_kind" }}` |
 | Reason | `external_target` |
 
-{{- else }}
+{{ else }}
 
 | Field | Value |
 | --- | --- |
@@ -37,20 +37,20 @@
 | Wait for Jobs | `{{ index (index . "wait") "jobs" }}` |
 | On failure | `{{ index . "on_failure" }}` |
 
-{{- if eq (index . "operation") "install" }}
+{{ if eq (index . "operation") "install" }}
 | Install CRDs | `{{ index . "crds" }}` |
 
-{{- end }}
+{{ end }}
 
-{{- if eq (index . "operation") "upgrade" }}
+{{ if eq (index . "operation") "upgrade" }}
 | Cleanup on failure | `{{ index . "cleanup_on_failure" }}` |
 | Maximum history | `{{ index (index . "history") "max" }}` |
 
-{{- end }}
+{{ end }}
 
-{{- end }}
+{{ end }}
 
-{{- end }}
+{{ end }}
 
 To reproduce locally:
 
diff --git a/pkg/ci/plugins/helm/templates/delete.md b/pkg/ci/plugins/helm/templates/delete.md
@@ -10,19 +10,19 @@
 | Release | `{{ .ReleaseName }}` |
 | Namespace | `{{ .Namespace }}` |
 
-{{- with .Lifecycle }}
+{{ with .Lifecycle }}
 
 ### Release lifecycle
 
-{{- if eq (index . "reason") "external_target" }}
+{{ if eq (index . "reason") "external_target" }}
 
 | Field | Value |
 | --- | --- |
 | Deleted | `false` |
 | Target kind | `{{ index . "target_kind" }}` |
 | Reason | `external_target` |
 
-{{- else }}
+{{ else }}
 
 | Field | Value |
 | --- | --- |
@@ -31,9 +31,9 @@
 | Timeout | `{{ index . "timeout" }}` |
 | Chart hooks enabled | `{{ index . "chart_hooks" }}` |
 
-{{- end }}
+{{ end }}
 
-{{- end }}
+{{ end }}
 
 To reproduce locally:
 
diff --git a/pkg/component/helm/lifecycle_test.go b/pkg/component/helm/lifecycle_test.go
@@ -111,46 +111,37 @@ func TestResolveReleaseLifecycleDerivedWaitStrategy(t *testing.T) {
 	}
 }
 
-func TestResolveReleaseLifecycleWithFlagsReportsDerivedWaitStrategy(t *testing.T) {
-	input, err := decodeReleasePolicy(map[string]any{
-		cfg.HelmReleaseSectionName: map[string]any{
-			cfg.HelmWaitSectionName: map[string]any{
-				cfg.HelmWaitStrategySectionName: "hookOnly",
-			},
-			cfg.HelmUpgradeSectionName: map[string]any{
-				cfg.HelmOnFailureSectionName: "rollback",
-				cfg.HelmWaitSectionName: map[string]any{
-					cfg.HelmWaitJobsSectionName: true,
+func TestResolveReleaseLifecycleWithFlagsDerivesWaitStrategyAfterFlagOverlay(t *testing.T) {
+	for _, tt := range []struct {
+		name              string
+		configuredFailure string
+		flags             map[string]any
+		wantStrategy      kube.WaitStrategy
+		wantDerived       bool
+	}{
+		{name: "configured rollback", configuredFailure: "rollback", wantStrategy: kube.StatusWatcherStrategy, wantDerived: true},
+		{name: "flag rollback", flags: map[string]any{cfg.HelmOnFailureSectionName: "rollback"}, wantStrategy: kube.StatusWatcherStrategy, wantDerived: true},
+		{name: "flag keep disables configured rollback", configuredFailure: "rollback", flags: map[string]any{cfg.HelmOnFailureSectionName: "keep"}, wantStrategy: kube.HookOnlyStrategy},
+	} {
+		t.Run(tt.name, func(t *testing.T) {
+			upgrade := map[string]any{}
+			if tt.configuredFailure != "" {
+				upgrade[cfg.HelmOnFailureSectionName] = tt.configuredFailure
+			}
+			input, err := decodeReleasePolicy(map[string]any{
+				cfg.HelmReleaseSectionName: map[string]any{
+					cfg.HelmWaitSectionName:    map[string]any{cfg.HelmWaitStrategySectionName: "hookOnly"},
+					cfg.HelmUpgradeSectionName: upgrade,
 				},
-			},
-		},
-	})
-	require.NoError(t, err)
-
-	resolution, err := resolveReleaseLifecycleWithFlags(input, releaseOperationUpgrade, nil)
-	require.NoError(t, err)
-	assert.Equal(t, kube.StatusWatcherStrategy, resolution.Policy.WaitStrategy)
-	assert.True(t, resolution.Policy.WaitForJobs)
-	assert.True(t, hasLifecycleWarning(resolution.Warnings, warningWaitDerived))
-}
-
-func TestResolveReleaseLifecycleWithFlagsCanDisableDerivedWaitStrategy(t *testing.T) {
-	input, err := decodeReleasePolicy(map[string]any{
-		cfg.HelmReleaseSectionName: map[string]any{
-			cfg.HelmWaitSectionName: map[string]any{cfg.HelmWaitStrategySectionName: "hookOnly"},
-			cfg.HelmUpgradeSectionName: map[string]any{
-				cfg.HelmOnFailureSectionName: "rollback",
-			},
-		},
-	})
-	require.NoError(t, err)
+			})
+			require.NoError(t, err)
 
-	resolution, err := resolveReleaseLifecycleWithFlags(input, releaseOperationUpgrade, map[string]any{
-		cfg.HelmOnFailureSectionName: "keep",
-	})
-	require.NoError(t, err)
-	assert.Equal(t, kube.HookOnlyStrategy, resolution.Policy.WaitStrategy)
-	assert.False(t, hasLifecycleWarning(resolution.Warnings, warningWaitDerived))
+			resolution, err := resolveReleaseLifecycleWithFlags(input, releaseOperationUpgrade, tt.flags)
+			require.NoError(t, err)
+			assert.Equal(t, tt.wantStrategy, resolution.Policy.WaitStrategy)
+			assert.Equal(t, tt.wantDerived, hasLifecycleWarning(resolution.Warnings, warningWaitDerived))
+		})
+	}
 }
 
 func TestResolveReleaseLifecycleWithFlagsHighestPrecedence(t *testing.T) {
diff --git a/website/docs/cli/commands/helm/helm-apply.mdx b/website/docs/cli/commands/helm/helm-apply.mdx
@@ -26,7 +26,7 @@ Install or upgrade the release in the cluster:
 atmos helm apply monitoring -s plat-ue2-dev
 ```
 
-Apply an explicit production readiness and recovery policy:
+Upgrade an existing release with an explicit production readiness and recovery policy:
 
 ```shell
 atmos helm apply monitoring -s plat-ue2-dev \
