From a2a31189ba847d8ec3049e4829002e016b8b3d81 Mon Sep 17 00:00:00 2001
From: yxxhero <aiopsclub@163.com>
Date: Tue, 4 Feb 2025 15:20:25 +0800
Subject: [PATCH] fix tests

Signed-off-by: yxxhero <aiopsclub@163.com>
---
 pkg/app/testdata/app_diff_test_1/bar          | 33 ---------------
 .../delete_bar_when_bar_needs_foo             | 31 --------------
 .../delete_bar_when_foo_needs_bar             | 31 --------------
 ..._bar_when_foo_needs_bar_with_include-needs | 31 --------------
 ...ete_bar_when_foo_needs_bar_with_skip-needs | 31 --------------
 .../delete_foo_and_bar_when_bar_needs_foo     | 33 ---------------
 .../delete_foo_and_bar_when_foo_needs_bar     | 33 ---------------
 .../delete_foo_when_bar_needs_foo             | 31 --------------
 ..._foo_when_bar_needs_foo_with_include-needs | 31 --------------
 ...ete_foo_when_bar_needs_foo_with_skip-needs | 31 --------------
 .../delete_foo_when_foo_needs_bar             | 31 --------------
 .../helm3_upgrade_when_ns2_bar_needs_ns1_foo  | 33 ---------------
 pkg/app/testdata/app_diff_test_1/install      | 33 ---------------
 pkg/app/testdata/app_diff_test_1/noop         | 31 --------------
 .../upgrade_when_bar_needs_foo                | 29 --------------
 ...grade_when_bar_needs_foo,_with_ns_override | 29 --------------
 .../upgrade_when_foo_needs_bar                | 29 --------------
 ...grade_when_foo_needs_bar,_with_ns_override | 29 --------------
 ...e_when_foo_needs_bar_with_context_override | 33 ---------------
 ...n_releaseb_needs_releasea_with_aws_context | 37 -----------------
 ...grade_when_tns1_ns1_foo_needs_tns2_ns2_bar | 33 ---------------
 ..._with_good_selector_with_--skip-needs=true | 40 ++-----------------
 22 files changed, 4 insertions(+), 699 deletions(-)

diff --git a/pkg/app/testdata/app_diff_test_1/bar b/pkg/app/testdata/app_diff_test_1/bar
index cf0a0bb0..26cad101 100644
--- a/pkg/app/testdata/app_diff_test_1/bar
+++ b/pkg/app/testdata/app_diff_test_1/bar
@@ -1,38 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: foo
- 3:   chart: mychart1
- 4:   namespace: ns1
- 5:   needs:
- 6:   - ns2/bar
- 7: - name: bar
- 8:   chart: mychart2
- 9:   namespace: ns2
-10: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: foo
- 3:   chart: mychart1
- 4:   namespace: ns1
- 5:   needs:
- 6:   - ns2/bar
- 7: - name: bar
- 8:   chart: mychart2
- 9:   namespace: ns2
-10: 
-
 merged environment: &{default  map[] map[]}
 2 release(s) found in helmfile.yaml
 
diff --git a/pkg/app/testdata/app_diff_test_1/delete_bar_when_bar_needs_foo b/pkg/app/testdata/app_diff_test_1/delete_bar_when_bar_needs_foo
index 993d71e8..96453206 100644
--- a/pkg/app/testdata/app_diff_test_1/delete_bar_when_bar_needs_foo
+++ b/pkg/app/testdata/app_diff_test_1/delete_bar_when_bar_needs_foo
@@ -1,36 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: foo
- 3:   chart: mychart1
- 4: - name: bar
- 5:   chart: mychart2
- 6:   installed: false
- 7:   needs:
- 8:   - foo
- 9: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: foo
- 3:   chart: mychart1
- 4: - name: bar
- 5:   chart: mychart2
- 6:   installed: false
- 7:   needs:
- 8:   - foo
- 9: 
-
 merged environment: &{default  map[] map[]}
 2 release(s) found in helmfile.yaml
 
diff --git a/pkg/app/testdata/app_diff_test_1/delete_bar_when_foo_needs_bar b/pkg/app/testdata/app_diff_test_1/delete_bar_when_foo_needs_bar
index febbbebd..9afd557d 100644
--- a/pkg/app/testdata/app_diff_test_1/delete_bar_when_foo_needs_bar
+++ b/pkg/app/testdata/app_diff_test_1/delete_bar_when_foo_needs_bar
@@ -1,36 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4:   installed: false
- 5: - name: foo
- 6:   chart: mychart1
- 7:   needs:
- 8:   - bar
- 9: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4:   installed: false
- 5: - name: foo
- 6:   chart: mychart1
- 7:   needs:
- 8:   - bar
- 9: 
-
 merged environment: &{default  map[] map[]}
 WARNING: release foo needs bar, but bar is not installed due to installed: false. Either mark bar as installed or remove bar from foo's needs
 2 release(s) found in helmfile.yaml
diff --git a/pkg/app/testdata/app_diff_test_1/delete_bar_when_foo_needs_bar_with_include-needs b/pkg/app/testdata/app_diff_test_1/delete_bar_when_foo_needs_bar_with_include-needs
index 1ac8c2d3..820af517 100644
--- a/pkg/app/testdata/app_diff_test_1/delete_bar_when_foo_needs_bar_with_include-needs
+++ b/pkg/app/testdata/app_diff_test_1/delete_bar_when_foo_needs_bar_with_include-needs
@@ -1,36 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4:   installed: false
- 5: - name: foo
- 6:   chart: mychart1
- 7:   needs:
- 8:   - bar
- 9: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4:   installed: false
- 5: - name: foo
- 6:   chart: mychart1
- 7:   needs:
- 8:   - bar
- 9: 
-
 merged environment: &{default  map[] map[]}
 WARNING: release foo needs bar, but bar is not installed due to installed: false. Either mark bar as installed or remove bar from foo's needs
 2 release(s) found in helmfile.yaml
diff --git a/pkg/app/testdata/app_diff_test_1/delete_bar_when_foo_needs_bar_with_skip-needs b/pkg/app/testdata/app_diff_test_1/delete_bar_when_foo_needs_bar_with_skip-needs
index 2cae2be4..b79babf5 100644
--- a/pkg/app/testdata/app_diff_test_1/delete_bar_when_foo_needs_bar_with_skip-needs
+++ b/pkg/app/testdata/app_diff_test_1/delete_bar_when_foo_needs_bar_with_skip-needs
@@ -1,36 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4:   installed: false
- 5: - name: foo
- 6:   chart: mychart1
- 7:   needs:
- 8:   - bar
- 9: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4:   installed: false
- 5: - name: foo
- 6:   chart: mychart1
- 7:   needs:
- 8:   - bar
- 9: 
-
 merged environment: &{default  map[] map[]}
 WARNING: release foo needs bar, but bar is not installed due to installed: false. Either mark bar as installed or remove bar from foo's needs
 2 release(s) found in helmfile.yaml
diff --git a/pkg/app/testdata/app_diff_test_1/delete_foo_and_bar_when_bar_needs_foo b/pkg/app/testdata/app_diff_test_1/delete_foo_and_bar_when_bar_needs_foo
index db62f332..ba652995 100644
--- a/pkg/app/testdata/app_diff_test_1/delete_foo_and_bar_when_bar_needs_foo
+++ b/pkg/app/testdata/app_diff_test_1/delete_foo_and_bar_when_bar_needs_foo
@@ -1,38 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4:   installed: false
- 5:   needs:
- 6:   - foo
- 7: - name: foo
- 8:   chart: mychart1
- 9:   installed: false
-10: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4:   installed: false
- 5:   needs:
- 6:   - foo
- 7: - name: foo
- 8:   chart: mychart1
- 9:   installed: false
-10: 
-
 merged environment: &{default  map[] map[]}
 WARNING: release bar needs foo, but foo is not installed due to installed: false. Either mark foo as installed or remove foo from bar's needs
 2 release(s) found in helmfile.yaml
diff --git a/pkg/app/testdata/app_diff_test_1/delete_foo_and_bar_when_foo_needs_bar b/pkg/app/testdata/app_diff_test_1/delete_foo_and_bar_when_foo_needs_bar
index 7268940e..a3469c08 100644
--- a/pkg/app/testdata/app_diff_test_1/delete_foo_and_bar_when_foo_needs_bar
+++ b/pkg/app/testdata/app_diff_test_1/delete_foo_and_bar_when_foo_needs_bar
@@ -1,38 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4:   installed: false
- 5: - name: foo
- 6:   chart: mychart1
- 7:   installed: false
- 8:   needs:
- 9:   - bar
-10: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4:   installed: false
- 5: - name: foo
- 6:   chart: mychart1
- 7:   installed: false
- 8:   needs:
- 9:   - bar
-10: 
-
 merged environment: &{default  map[] map[]}
 WARNING: release foo needs bar, but bar is not installed due to installed: false. Either mark bar as installed or remove bar from foo's needs
 2 release(s) found in helmfile.yaml
diff --git a/pkg/app/testdata/app_diff_test_1/delete_foo_when_bar_needs_foo b/pkg/app/testdata/app_diff_test_1/delete_foo_when_bar_needs_foo
index b10dd133..fb673733 100644
--- a/pkg/app/testdata/app_diff_test_1/delete_foo_when_bar_needs_foo
+++ b/pkg/app/testdata/app_diff_test_1/delete_foo_when_bar_needs_foo
@@ -1,36 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: foo
- 3:   chart: mychart1
- 4:   installed: false
- 5: - name: bar
- 6:   chart: mychart2
- 7:   needs:
- 8:   - foo
- 9: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: foo
- 3:   chart: mychart1
- 4:   installed: false
- 5: - name: bar
- 6:   chart: mychart2
- 7:   needs:
- 8:   - foo
- 9: 
-
 merged environment: &{default  map[] map[]}
 WARNING: release bar needs foo, but foo is not installed due to installed: false. Either mark foo as installed or remove foo from bar's needs
 2 release(s) found in helmfile.yaml
diff --git a/pkg/app/testdata/app_diff_test_1/delete_foo_when_bar_needs_foo_with_include-needs b/pkg/app/testdata/app_diff_test_1/delete_foo_when_bar_needs_foo_with_include-needs
index c34f7b46..3456f070 100644
--- a/pkg/app/testdata/app_diff_test_1/delete_foo_when_bar_needs_foo_with_include-needs
+++ b/pkg/app/testdata/app_diff_test_1/delete_foo_when_bar_needs_foo_with_include-needs
@@ -1,36 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: foo
- 3:   chart: mychart1
- 4:   installed: false
- 5: - name: bar
- 6:   chart: mychart2
- 7:   needs:
- 8:   - foo
- 9: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: foo
- 3:   chart: mychart1
- 4:   installed: false
- 5: - name: bar
- 6:   chart: mychart2
- 7:   needs:
- 8:   - foo
- 9: 
-
 merged environment: &{default  map[] map[]}
 WARNING: release bar needs foo, but foo is not installed due to installed: false. Either mark foo as installed or remove foo from bar's needs
 2 release(s) found in helmfile.yaml
diff --git a/pkg/app/testdata/app_diff_test_1/delete_foo_when_bar_needs_foo_with_skip-needs b/pkg/app/testdata/app_diff_test_1/delete_foo_when_bar_needs_foo_with_skip-needs
index 60002d0c..13f06734 100644
--- a/pkg/app/testdata/app_diff_test_1/delete_foo_when_bar_needs_foo_with_skip-needs
+++ b/pkg/app/testdata/app_diff_test_1/delete_foo_when_bar_needs_foo_with_skip-needs
@@ -1,36 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: foo
- 3:   chart: mychart1
- 4:   installed: false
- 5: - name: bar
- 6:   chart: mychart2
- 7:   needs:
- 8:   - foo
- 9: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: foo
- 3:   chart: mychart1
- 4:   installed: false
- 5: - name: bar
- 6:   chart: mychart2
- 7:   needs:
- 8:   - foo
- 9: 
-
 merged environment: &{default  map[] map[]}
 WARNING: release bar needs foo, but foo is not installed due to installed: false. Either mark foo as installed or remove foo from bar's needs
 2 release(s) found in helmfile.yaml
diff --git a/pkg/app/testdata/app_diff_test_1/delete_foo_when_foo_needs_bar b/pkg/app/testdata/app_diff_test_1/delete_foo_when_foo_needs_bar
index f2e49270..cb7b8fc7 100644
--- a/pkg/app/testdata/app_diff_test_1/delete_foo_when_foo_needs_bar
+++ b/pkg/app/testdata/app_diff_test_1/delete_foo_when_foo_needs_bar
@@ -1,36 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4: - name: foo
- 5:   chart: mychart1
- 6:   installed: false
- 7:   needs:
- 8:   - bar
- 9: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4: - name: foo
- 5:   chart: mychart1
- 6:   installed: false
- 7:   needs:
- 8:   - bar
- 9: 
-
 merged environment: &{default  map[] map[]}
 2 release(s) found in helmfile.yaml
 
diff --git a/pkg/app/testdata/app_diff_test_1/helm3_upgrade_when_ns2_bar_needs_ns1_foo b/pkg/app/testdata/app_diff_test_1/helm3_upgrade_when_ns2_bar_needs_ns1_foo
index 2c4a2fef..bb76a70e 100644
--- a/pkg/app/testdata/app_diff_test_1/helm3_upgrade_when_ns2_bar_needs_ns1_foo
+++ b/pkg/app/testdata/app_diff_test_1/helm3_upgrade_when_ns2_bar_needs_ns1_foo
@@ -1,38 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4:   namespace: ns2
- 5:   needs:
- 6:   - ns1/foo
- 7: - name: foo
- 8:   chart: mychart1
- 9:   namespace: ns1
-10: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4:   namespace: ns2
- 5:   needs:
- 6:   - ns1/foo
- 7: - name: foo
- 8:   chart: mychart1
- 9:   namespace: ns1
-10: 
-
 merged environment: &{default  map[] map[]}
 2 release(s) found in helmfile.yaml
 
diff --git a/pkg/app/testdata/app_diff_test_1/install b/pkg/app/testdata/app_diff_test_1/install
index bc8c2830..ba4ef00f 100644
--- a/pkg/app/testdata/app_diff_test_1/install
+++ b/pkg/app/testdata/app_diff_test_1/install
@@ -1,38 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: baz
- 3:   chart: mychart3
- 4: - name: foo
- 5:   chart: mychart1
- 6:   needs:
- 7:   - bar
- 8: - name: bar
- 9:   chart: mychart2
-10: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: baz
- 3:   chart: mychart3
- 4: - name: foo
- 5:   chart: mychart1
- 6:   needs:
- 7:   - bar
- 8: - name: bar
- 9:   chart: mychart2
-10: 
-
 merged environment: &{default  map[] map[]}
 3 release(s) found in helmfile.yaml
 
diff --git a/pkg/app/testdata/app_diff_test_1/noop b/pkg/app/testdata/app_diff_test_1/noop
index 5c2c5753..beea0d82 100644
--- a/pkg/app/testdata/app_diff_test_1/noop
+++ b/pkg/app/testdata/app_diff_test_1/noop
@@ -1,36 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4: - name: foo
- 5:   chart: mychart1
- 6:   installed: false
- 7:   needs:
- 8:   - bar
- 9: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4: - name: foo
- 5:   chart: mychart1
- 6:   installed: false
- 7:   needs:
- 8:   - bar
- 9: 
-
 merged environment: &{default  map[] map[]}
 2 release(s) found in helmfile.yaml
 
diff --git a/pkg/app/testdata/app_diff_test_1/upgrade_when_bar_needs_foo b/pkg/app/testdata/app_diff_test_1/upgrade_when_bar_needs_foo
index 20aae345..e1ade01c 100644
--- a/pkg/app/testdata/app_diff_test_1/upgrade_when_bar_needs_foo
+++ b/pkg/app/testdata/app_diff_test_1/upgrade_when_bar_needs_foo
@@ -1,34 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: foo
- 3:   chart: mychart1
- 4: - name: bar
- 5:   chart: mychart2
- 6:   needs:
- 7:   - foo
- 8: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: foo
- 3:   chart: mychart1
- 4: - name: bar
- 5:   chart: mychart2
- 6:   needs:
- 7:   - foo
- 8: 
-
 merged environment: &{default  map[] map[]}
 2 release(s) found in helmfile.yaml
 
diff --git a/pkg/app/testdata/app_diff_test_1/upgrade_when_bar_needs_foo,_with_ns_override b/pkg/app/testdata/app_diff_test_1/upgrade_when_bar_needs_foo,_with_ns_override
index f78c15ac..37ac4517 100644
--- a/pkg/app/testdata/app_diff_test_1/upgrade_when_bar_needs_foo,_with_ns_override
+++ b/pkg/app/testdata/app_diff_test_1/upgrade_when_bar_needs_foo,_with_ns_override
@@ -1,34 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: foo
- 3:   chart: mychart1
- 4: - name: bar
- 5:   chart: mychart2
- 6:   needs:
- 7:   - foo
- 8: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: foo
- 3:   chart: mychart1
- 4: - name: bar
- 5:   chart: mychart2
- 6:   needs:
- 7:   - foo
- 8: 
-
 merged environment: &{default  map[] map[]}
 2 release(s) found in helmfile.yaml
 
diff --git a/pkg/app/testdata/app_diff_test_1/upgrade_when_foo_needs_bar b/pkg/app/testdata/app_diff_test_1/upgrade_when_foo_needs_bar
index b87bccce..4add017f 100644
--- a/pkg/app/testdata/app_diff_test_1/upgrade_when_foo_needs_bar
+++ b/pkg/app/testdata/app_diff_test_1/upgrade_when_foo_needs_bar
@@ -1,34 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4: - name: foo
- 5:   chart: mychart1
- 6:   needs:
- 7:   - bar
- 8: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4: - name: foo
- 5:   chart: mychart1
- 6:   needs:
- 7:   - bar
- 8: 
-
 merged environment: &{default  map[] map[]}
 2 release(s) found in helmfile.yaml
 
diff --git a/pkg/app/testdata/app_diff_test_1/upgrade_when_foo_needs_bar,_with_ns_override b/pkg/app/testdata/app_diff_test_1/upgrade_when_foo_needs_bar,_with_ns_override
index e0d964ad..f54ab275 100644
--- a/pkg/app/testdata/app_diff_test_1/upgrade_when_foo_needs_bar,_with_ns_override
+++ b/pkg/app/testdata/app_diff_test_1/upgrade_when_foo_needs_bar,_with_ns_override
@@ -1,34 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4: - name: foo
- 5:   chart: mychart1
- 6:   needs:
- 7:   - bar
- 8: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: bar
- 3:   chart: mychart2
- 4: - name: foo
- 5:   chart: mychart1
- 6:   needs:
- 7:   - bar
- 8: 
-
 merged environment: &{default  map[] map[]}
 2 release(s) found in helmfile.yaml
 
diff --git a/pkg/app/testdata/app_diff_test_1/upgrade_when_foo_needs_bar_with_context_override b/pkg/app/testdata/app_diff_test_1/upgrade_when_foo_needs_bar_with_context_override
index bbdfc3d1..358aaaf6 100644
--- a/pkg/app/testdata/app_diff_test_1/upgrade_when_foo_needs_bar_with_context_override
+++ b/pkg/app/testdata/app_diff_test_1/upgrade_when_foo_needs_bar_with_context_override
@@ -1,38 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: helmDefaults:
- 2:   kubeContext: hello/world
- 3: releases:
- 4: - name: bar
- 5:   chart: mychart2
- 6: - name: foo
- 7:   chart: mychart1
- 8:   needs:
- 9:   - bar
-10: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: helmDefaults:
- 2:   kubeContext: hello/world
- 3: releases:
- 4: - name: bar
- 5:   chart: mychart2
- 6: - name: foo
- 7:   chart: mychart1
- 8:   needs:
- 9:   - bar
-10: 
-
 merged environment: &{default  map[] map[]}
 2 release(s) found in helmfile.yaml
 
diff --git a/pkg/app/testdata/app_diff_test_1/upgrade_when_releaseb_needs_releasea_with_aws_context b/pkg/app/testdata/app_diff_test_1/upgrade_when_releaseb_needs_releasea_with_aws_context
index e6383a6a..1ca95228 100644
--- a/pkg/app/testdata/app_diff_test_1/upgrade_when_releaseb_needs_releasea_with_aws_context
+++ b/pkg/app/testdata/app_diff_test_1/upgrade_when_releaseb_needs_releasea_with_aws_context
@@ -1,42 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: releaseA
- 3:   chart: mychart1
- 4:   namespace: namespaceA
- 5:   kubeContext: arn:aws:eks:us-east-1:1234567890:cluster/myekscluster
- 6: - name: releaseB
- 7:   chart: mychart2
- 8:   namespace: namespaceA
- 9:   kubeContext: arn:aws:eks:us-east-1:1234567890:cluster/myekscluster
-10:   needs:
-11:     - arn:aws:eks:us-east-1:1234567890:cluster/myekscluster/namespaceA/releaseA
-12: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: releaseA
- 3:   chart: mychart1
- 4:   namespace: namespaceA
- 5:   kubeContext: arn:aws:eks:us-east-1:1234567890:cluster/myekscluster
- 6: - name: releaseB
- 7:   chart: mychart2
- 8:   namespace: namespaceA
- 9:   kubeContext: arn:aws:eks:us-east-1:1234567890:cluster/myekscluster
-10:   needs:
-11:     - arn:aws:eks:us-east-1:1234567890:cluster/myekscluster/namespaceA/releaseA
-12: 
-
 merged environment: &{default  map[] map[]}
 2 release(s) found in helmfile.yaml
 
diff --git a/pkg/app/testdata/app_diff_test_1/upgrade_when_tns1_ns1_foo_needs_tns2_ns2_bar b/pkg/app/testdata/app_diff_test_1/upgrade_when_tns1_ns1_foo_needs_tns2_ns2_bar
index cf0a0bb0..26cad101 100644
--- a/pkg/app/testdata/app_diff_test_1/upgrade_when_tns1_ns1_foo_needs_tns2_ns2_bar
+++ b/pkg/app/testdata/app_diff_test_1/upgrade_when_tns1_ns1_foo_needs_tns2_ns2_bar
@@ -1,38 +1,5 @@
 processing file "helmfile.yaml" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: foo
- 3:   chart: mychart1
- 4:   namespace: ns1
- 5:   needs:
- 6:   - ns2/bar
- 7: - name: bar
- 8:   chart: mychart2
- 9:   namespace: ns2
-10: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
- 0: 
- 1: releases:
- 2: - name: foo
- 3:   chart: mychart1
- 4:   namespace: ns1
- 5:   needs:
- 6:   - ns2/bar
- 7: - name: bar
- 8:   chart: mychart2
- 9:   namespace: ns2
-10: 
-
 merged environment: &{default  map[] map[]}
 2 release(s) found in helmfile.yaml
 
diff --git a/pkg/app/testdata/app_diff_test_1/upgrades_with_good_selector_with_--skip-needs=true b/pkg/app/testdata/app_diff_test_1/upgrades_with_good_selector_with_--skip-needs=true
index 427f901f..6e264062 100644
--- a/pkg/app/testdata/app_diff_test_1/upgrades_with_good_selector_with_--skip-needs=true
+++ b/pkg/app/testdata/app_diff_test_1/upgrades_with_good_selector_with_--skip-needs=true
@@ -1,39 +1,7 @@
-processing file "helmfile.yaml" in directory "."
+processing file "helmfile.yaml.gotmpl" in directory "."
 changing working directory to "/path/to"
-first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
-first-pass uses: &{default  map[] map[]}
-first-pass rendering output of "helmfile.yaml.part.0":
- 0: 
- 1: 
- 2: 
- 3: releases:
- 4: - name: kubernetes-external-secrets
- 5:   chart: incubator/raw
- 6:   namespace: kube-system
- 7: 
- 8: - name: external-secrets
- 9:   chart: incubator/raw
-10:   namespace: default
-11:   labels:
-12:     app: test
-13:   needs:
-14:   - kube-system/kubernetes-external-secrets
-15: 
-16: - name: my-release
-17:   chart: incubator/raw
-18:   namespace: default
-19:   labels:
-20:     app: test
-21:   needs:
-22:   - default/external-secrets
-23: 
-
-first-pass produced: &{default  map[] map[]}
-first-pass rendering result of "helmfile.yaml.part.0": {default  map[] map[]}
-vals:
-map[]
-defaultVals:[]
-second-pass rendering result of "helmfile.yaml.part.0":
+rendering starting for "helmfile.yaml.gotmpl.part.0": inherited=&{default  map[] map[]}, overrode=<nil>
+rendering result of "helmfile.yaml.gotmpl.part.0":
  0: 
  1: 
  2: 
@@ -60,7 +28,7 @@ second-pass rendering result of "helmfile.yaml.part.0":
 23: 
 
 merged environment: &{default  map[] map[]}
-2 release(s) matching app=test found in helmfile.yaml
+2 release(s) matching app=test found in helmfile.yaml.gotmpl
 
 processing 2 groups of releases in this order:
 GROUP RELEASES