fixup! fixup! fixup! fixup! fixup! Fix preapply hook behavior

Signed-off-by: Yusuke Kuoka <ykuoka@gmail.com>

pkg/app/app_apply_test.go

@@ -804,85 +804,6 @@ serviceC 	4       	Fri Nov  1 08:40:07 2019	DEPLOYED	chart-3.1.0	3.1.0      	def
 			},
 			// as we check for log output, set concurrency to 1 to avoid non-deterministic test result
 			concurrency: 1,
-			log: `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: 
- 2: 
- 3: releases:
- 4: - name: serviceA
- 5:   chart: my/chart
- 6:   needs:
- 7:   - serviceB
- 8: 
- 9: - name: serviceB
-10:   chart: my/chart
-11:   needs:
-12:   - serviceC
-13: 
-14: - name: serviceC
-15:   chart: my/chart
-16: 
-17: - name: serviceD
-18:   chart: my/chart
-19: 
-
-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: 
- 2: 
- 3: releases:
- 4: - name: serviceA
- 5:   chart: my/chart
- 6:   needs:
- 7:   - serviceB
- 8: 
- 9: - name: serviceB
-10:   chart: my/chart
-11:   needs:
-12:   - serviceC
-13: 
-14: - name: serviceC
-15:   chart: my/chart
-16: 
-17: - name: serviceD
-18:   chart: my/chart
-19: 
-
-merged environment: &{default map[] map[]}
-3 release(s) matching name=serviceA found in helmfile.yaml
-
-Affected releases are:
-  serviceA (my/chart) UPDATED
-  serviceB (my/chart) UPDATED
-  serviceC (my/chart) UPDATED
-
-processing 3 groups of releases in this order:
-GROUP RELEASES
-1     default//serviceC
-2     default//serviceB
-3     default//serviceA
-
-processing releases in group 1/3: default//serviceC
-processing releases in group 2/3: default//serviceB
-processing releases in group 3/3: default//serviceA
-
-UPDATED RELEASES:
-NAME       CHART      VERSION
-serviceC   my/chart     3.1.0
-serviceB   my/chart     3.1.0
-serviceA   my/chart     3.1.0
-
-changing working directory back to "/path/to"
-`,
 		})
 	})
 

pkg/app/testdata/testapply_2/include-transitive-needs=true/log

@@ -0,0 +1,87 @@
+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: 
+ 2: 
+ 3: releases:
+ 4: - name: serviceA
+ 5:   chart: my/chart
+ 6:   needs:
+ 7:   - serviceB
+ 8: 
+ 9: - name: serviceB
+10:   chart: my/chart
+11:   needs:
+12:   - serviceC
+13: 
+14: - name: serviceC
+15:   chart: my/chart
+16: 
+17: - name: serviceD
+18:   chart: my/chart
+19: 
+
+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: 
+ 2: 
+ 3: releases:
+ 4: - name: serviceA
+ 5:   chart: my/chart
+ 6:   needs:
+ 7:   - serviceB
+ 8: 
+ 9: - name: serviceB
+10:   chart: my/chart
+11:   needs:
+12:   - serviceC
+13: 
+14: - name: serviceC
+15:   chart: my/chart
+16: 
+17: - name: serviceD
+18:   chart: my/chart
+19: 
+
+merged environment: &{default map[] map[]}
+3 release(s) matching name=serviceA found in helmfile.yaml
+
+Affected releases are:
+  serviceA (my/chart) UPDATED
+  serviceB (my/chart) UPDATED
+  serviceC (my/chart) UPDATED
+
+invoking preapply hooks for 3 groups of releases in this order:
+GROUP RELEASES
+1     default//serviceA
+2     default//serviceB
+3     default//serviceC
+
+invoking preapply hooks for releases in group 1/3: default//serviceA
+invoking preapply hooks for releases in group 2/3: default//serviceB
+invoking preapply hooks for releases in group 3/3: default//serviceC
+processing 3 groups of releases in this order:
+GROUP RELEASES
+1     default//serviceC
+2     default//serviceB
+3     default//serviceA
+
+processing releases in group 1/3: default//serviceC
+processing releases in group 2/3: default//serviceB
+processing releases in group 3/3: default//serviceA
+
+UPDATED RELEASES:
+NAME       CHART      VERSION
+serviceC   my/chart     3.1.0
+serviceB   my/chart     3.1.0
+serviceA   my/chart     3.1.0
+
+changing working directory back to "/path/to"