fixup! Fix preapply hook behavior

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

pkg/app/testdata/testapply/delete_bar_when_bar_needs_foo/log

@@ -38,6 +38,13 @@ Affected releases are:
   bar (stable/mychart2) DELETED
   foo (stable/mychart1) UPDATED
 
+invoking preapply hooks for 2 groups of releases in this order:
+GROUP RELEASES
+1     default//bar
+2     default//foo
+
+invoking preapply hooks for releases in group 1/2: default//bar
+invoking preapply hooks for releases in group 2/2: default//foo
 processing 1 groups of releases in this order:
 GROUP RELEASES
 1     default//bar

pkg/app/testdata/testapply/delete_bar_when_foo_needs_bar/log

@@ -38,6 +38,13 @@ Affected releases are:
   bar (stable/mychart2) DELETED
   foo (stable/mychart1) UPDATED
 
+invoking preapply hooks for 2 groups of releases in this order:
+GROUP RELEASES
+1     default//foo
+2     default//bar
+
+invoking preapply hooks for releases in group 1/2: default//foo
+invoking preapply hooks for releases in group 2/2: default//bar
 processing 1 groups of releases in this order:
 GROUP RELEASES
 1     default//bar

pkg/app/testdata/testapply/delete_foo_and_bar_when_bar_needs_foo/log

@@ -40,6 +40,13 @@ Affected releases are:
   bar (stable/mychart2) DELETED
   foo (stable/mychart1) DELETED
 
+invoking preapply hooks for 2 groups of releases in this order:
+GROUP RELEASES
+1     default//bar
+2     default//foo
+
+invoking preapply hooks for releases in group 1/2: default//bar
+invoking preapply hooks for releases in group 2/2: default//foo
 processing 2 groups of releases in this order:
 GROUP RELEASES
 1     default//bar

pkg/app/testdata/testapply/delete_foo_and_bar_when_foo_needs_bar/log

@@ -40,6 +40,13 @@ Affected releases are:
   bar (stable/mychart2) DELETED
   foo (stable/mychart1) DELETED
 
+invoking preapply hooks for 2 groups of releases in this order:
+GROUP RELEASES
+1     default//foo
+2     default//bar
+
+invoking preapply hooks for releases in group 1/2: default//foo
+invoking preapply hooks for releases in group 2/2: default//bar
 processing 2 groups of releases in this order:
 GROUP RELEASES
 1     default//foo

pkg/app/testdata/testapply/delete_foo_when_bar_needs_foo/log

@@ -38,6 +38,13 @@ Affected releases are:
   bar (stable/mychart2) UPDATED
   foo (stable/mychart1) DELETED
 
+invoking preapply hooks for 2 groups of releases in this order:
+GROUP RELEASES
+1     default//bar
+2     default//foo
+
+invoking preapply hooks for releases in group 1/2: default//bar
+invoking preapply hooks for releases in group 2/2: default//foo
 processing 1 groups of releases in this order:
 GROUP RELEASES
 1     default//foo

pkg/app/testdata/testapply/delete_foo_when_foo_needs_bar/log

@@ -38,6 +38,13 @@ Affected releases are:
   bar (stable/mychart2) UPDATED
   foo (stable/mychart1) DELETED
 
+invoking preapply hooks for 2 groups of releases in this order:
+GROUP RELEASES
+1     default//foo
+2     default//bar
+
+invoking preapply hooks for releases in group 1/2: default//foo
+invoking preapply hooks for releases in group 2/2: default//bar
 processing 1 groups of releases in this order:
 GROUP RELEASES
 1     default//foo

pkg/app/testdata/testapply/helm2_upgrade_when_tns1/foo_needs_tns2/bar/log

@@ -44,6 +44,13 @@ Affected releases are:
   bar (stable/mychart2) UPDATED
   foo (stable/mychart1) UPDATED
 
+invoking preapply hooks for 2 groups of releases in this order:
+GROUP RELEASES
+1     default/tns1/foo
+2     default/tns2/bar
+
+invoking preapply hooks for releases in group 1/2: default/tns1/foo
+invoking preapply hooks for releases in group 2/2: default/tns2/bar
 processing 2 groups of releases in this order:
 GROUP RELEASES
 1     default/tns2/bar

pkg/app/testdata/testapply/install/log

@@ -41,6 +41,13 @@ Affected releases are:
   baz (stable/mychart3) UPDATED
   foo (stable/mychart1) UPDATED
 
+invoking preapply hooks for 2 groups of releases in this order:
+GROUP RELEASES
+1     default//foo
+2     default//baz, default//bar
+
+invoking preapply hooks for releases in group 1/2: default//foo
+invoking preapply hooks for releases in group 2/2: default//baz, default//bar
 processing 2 groups of releases in this order:
 GROUP RELEASES
 1     default//baz, default//bar

pkg/app/testdata/testapply/smoke/log

@@ -135,6 +135,19 @@ Affected releases are:
   logging (charts/fluent-bit) UPDATED
   servicemesh (charts/istio) UPDATED
 
+invoking preapply hooks for 5 groups of releases in this order:
+GROUP RELEASES
+1     default//frontend-v1, default//frontend-v2, default//frontend-v3
+2     default//backend-v1, default//backend-v2
+3     default//anotherbackend
+4     default//database, default//servicemesh
+5     default//logging, default//front-proxy
+
+invoking preapply hooks for releases in group 1/5: default//frontend-v1, default//frontend-v2, default//frontend-v3
+invoking preapply hooks for releases in group 2/5: default//backend-v1, default//backend-v2
+invoking preapply hooks for releases in group 3/5: default//anotherbackend
+invoking preapply hooks for releases in group 4/5: default//database, default//servicemesh
+invoking preapply hooks for releases in group 5/5: default//logging, default//front-proxy
 processing 2 groups of releases in this order:
 GROUP RELEASES
 1     default//frontend-v1

pkg/app/testdata/testapply/upgrade_when_bar_needs_foo,_with_ns_override/log

@@ -36,6 +36,13 @@ Affected releases are:
   bar (stable/mychart2) UPDATED
   foo (stable/mychart1) UPDATED
 
+invoking preapply hooks for 2 groups of releases in this order:
+GROUP RELEASES
+1     default/testNamespace/bar
+2     default/testNamespace/foo
+
+invoking preapply hooks for releases in group 1/2: default/testNamespace/bar
+invoking preapply hooks for releases in group 2/2: default/testNamespace/foo
 processing 2 groups of releases in this order:
 GROUP RELEASES
 1     default/testNamespace/foo

pkg/app/testdata/testapply/upgrade_when_bar_needs_foo/log

@@ -36,6 +36,13 @@ Affected releases are:
   bar (stable/mychart2) UPDATED
   foo (stable/mychart1) UPDATED
 
+invoking preapply hooks for 2 groups of releases in this order:
+GROUP RELEASES
+1     default//bar
+2     default//foo
+
+invoking preapply hooks for releases in group 1/2: default//bar
+invoking preapply hooks for releases in group 2/2: default//foo
 processing 2 groups of releases in this order:
 GROUP RELEASES
 1     default//foo

pkg/app/testdata/testapply/upgrade_when_foo_needs_bar,_with_ns_override/log

@@ -36,6 +36,13 @@ Affected releases are:
   bar (stable/mychart2) UPDATED
   foo (stable/mychart1) UPDATED
 
+invoking preapply hooks for 2 groups of releases in this order:
+GROUP RELEASES
+1     default/testNamespace/foo
+2     default/testNamespace/bar
+
+invoking preapply hooks for releases in group 1/2: default/testNamespace/foo
+invoking preapply hooks for releases in group 2/2: default/testNamespace/bar
 processing 2 groups of releases in this order:
 GROUP RELEASES
 1     default/testNamespace/bar

pkg/app/testdata/testapply/upgrade_when_foo_needs_bar/log

@@ -36,6 +36,13 @@ Affected releases are:
   bar (stable/mychart2) UPDATED
   foo (stable/mychart1) UPDATED
 
+invoking preapply hooks for 2 groups of releases in this order:
+GROUP RELEASES
+1     default//foo
+2     default//bar
+
+invoking preapply hooks for releases in group 1/2: default//foo
+invoking preapply hooks for releases in group 2/2: default//bar
 processing 2 groups of releases in this order:
 GROUP RELEASES
 1     default//bar

pkg/app/testdata/testapply/upgrade_when_ns1/foo_needs_ns2/bar/log

@@ -40,6 +40,13 @@ Affected releases are:
   bar (stable/mychart2) UPDATED
   foo (stable/mychart1) UPDATED
 
+invoking preapply hooks for 2 groups of releases in this order:
+GROUP RELEASES
+1     default/ns1/foo
+2     default/ns2/bar
+
+invoking preapply hooks for releases in group 1/2: default/ns1/foo
+invoking preapply hooks for releases in group 2/2: default/ns2/bar
 processing 2 groups of releases in this order:
 GROUP RELEASES
 1     default/ns2/bar

pkg/app/testdata/testapply/upgrade_when_ns2/bar_needs_ns1/foo/log

@@ -40,6 +40,13 @@ Affected releases are:
   bar (stable/mychart2) UPDATED
   foo (stable/mychart1) UPDATED
 
+invoking preapply hooks for 2 groups of releases in this order:
+GROUP RELEASES
+1     default/ns2/bar
+2     default/ns1/foo
+
+invoking preapply hooks for releases in group 1/2: default/ns2/bar
+invoking preapply hooks for releases in group 2/2: default/ns1/foo
 processing 2 groups of releases in this order:
 GROUP RELEASES
 1     default/ns1/foo

pkg/app/testdata/testapply_2/deduplicate_by_--selector/log

@@ -53,6 +53,11 @@ merged environment: &{default map[] map[]}
 Affected releases are:
   foo (incubator/raw) UPDATED
 
+invoking preapply hooks for 1 groups of releases in this order:
+GROUP RELEASES
+1     default/default/foo
+
+invoking preapply hooks for releases in group 1/1: default/default/foo
 processing 1 groups of releases in this order:
 GROUP RELEASES
 1     default/default/foo

pkg/app/testdata/testapply_2/select_single_release_from_helmfile_with_two_duplicates/log

@@ -57,6 +57,11 @@ merged environment: &{default map[] map[]}
 Affected releases are:
   foo (incubator/raw) UPDATED
 
+invoking preapply hooks for 1 groups of releases in this order:
+GROUP RELEASES
+1     default/default/foo
+
+invoking preapply hooks for releases in group 1/1: default/default/foo
 processing 1 groups of releases in this order:
 GROUP RELEASES
 1     default/default/foo

pkg/app/testdata/testapply_hooks/hooks_are_not_run_on_alreadyd_uninstalled_release/log

@@ -5,6 +5,9 @@ hook[prepare] logs |
 hook[preapply] logs | foo
 hook[preapply] logs | 
 
+hook[preapply] logs | bar
+hook[preapply] logs | 
+
 hook[presync] logs | foo
 hook[presync] logs | 
 

pkg/app/testdata/testapply_hooks/hooks_are_run_on_to-be-uninstalled_release/log

@@ -2,15 +2,15 @@
 hook[prepare] logs | foo
 hook[prepare] logs | 
 
+hook[preapply] logs | foo
+hook[preapply] logs | 
+
 hook[preapply] logs | bar
 hook[preapply] logs | 
 
 hook[presync] logs | bar
 hook[presync] logs | 
 
-hook[preapply] logs | foo
-hook[preapply] logs | 
-
 hook[presync] logs | foo
 hook[presync] logs |