updated comment and made defer of shutdown function return errors as before and not the possible shutdown error

mfbieber · benoittgt · commit 10714772bedf · 2025-11-26T17:01:54.000+01:00
Signed-off-by: Michelle Fernandez Bieber &lt;mfbieber@gmail.com&gt;
diff --git a/pkg/action/hooks.go b/pkg/action/hooks.go
@@ -49,7 +49,7 @@ func ShutdownNoOp() error {
 	return nil
 }
 
-// execHook executes all of the hooks for the given hook event and return a shutdownHook function to trigger deletions after doing other things like e.g. retrieving logs.
+// execHook executes all of the hooks for the given hook event and returns a shutdownHook function to trigger deletions after doing other things like e.g. retrieving logs.
 func (cfg *Configuration) execHookWithDelayedShutdown(rl *release.Release, hook release.HookEvent, waitStrategy kube.WaitStrategy, timeout time.Duration, serverSideApply bool) (ExecuteShutdownHooks, error) {
 	executingHooks := []*release.Hook{}
 
diff --git a/pkg/cmd/release_testing.go b/pkg/cmd/release_testing.go
@@ -55,7 +55,7 @@ func newReleaseTestCmd(cfg *action.Configuration, out io.Writer) *cobra.Command
 			}
 			return compListReleases(toComplete, args, cfg)
 		},
-		RunE: func(_ *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, args []string) (returnError error) {
 			client.Namespace = settings.Namespace()
 			notName := regexp.MustCompile(`^!\s?name=`)
 			for _, f := range filter {
@@ -65,8 +65,17 @@ func newReleaseTestCmd(cfg *action.Configuration, out io.Writer) *cobra.Command
 					client.Filters[action.ExcludeNameFilter] = append(client.Filters[action.ExcludeNameFilter], notName.ReplaceAllLiteralString(f, ""))
 				}
 			}
+
 			reli, shutdown, runErr := client.Run(args[0])
-			defer shutdown()
+			defer func() {
+				if shutdownErr := shutdown(); shutdownErr != nil {
+					if returnError == nil {
+						returnError = shutdownErr
+					}
+				}
+			}()
+
+
 			// We only return an error if we weren't even able to get the
 			// release, otherwise we keep going so we can print status and logs
 			// if requested

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func ShutdownNoOp() error {`
`49`	`49`	`return nil`
`50`	`50`	`}`
`51`	`51`
`52`		`-// execHook executes all of the hooks for the given hook event and return a shutdownHook function to trigger deletions after doing other things like e.g. retrieving logs.`
	`52`	`+// execHook executes all of the hooks for the given hook event and returns a shutdownHook function to trigger deletions after doing other things like e.g. retrieving logs.`
`53`	`53`	`func (cfg Configuration) execHookWithDelayedShutdown(rl release.Release, hook release.HookEvent, waitStrategy kube.WaitStrategy, timeout time.Duration, serverSideApply bool) (ExecuteShutdownHooks, error) {`
`54`	`54`	`executingHooks := []*release.Hook{}`
`55`	`55`