rollback keep-tmp-files flag(#693)

Signed-off-by: Pavel Okhlopkov <[email protected]> Co-authored-by: Pavel Okhlopkov <[email protected]>
flant · Dec 2, 2024 · fc7a47f · fc7a47f
1 parent 0b4a0ef
commit fc7a47f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/pkg/app/debug.go b/pkg/app/debug.go
@@ -30,11 +30,7 @@ func DefineDebugFlags(kpApp *kingpin.Application, cmd *kingpin.CmdClause) {
 	cmd.Flag("debug-keep-tmp-files", "set to yes to disable cleanup of temporary files").
 		Envar("DEBUG_KEEP_TMP_FILES").
 		Hidden().
-		Default(DebugKeepTmpFilesVar).Action(func(_ *kingpin.ParseContext) error {
-		DebugKeepTmpFiles = DebugKeepTmpFilesVar == "yes"
-
-		return nil
-	}).
+		Default(DebugKeepTmpFilesVar).
 		StringVar(&DebugKeepTmpFilesVar)
 
 	cmd.Flag("debug-kubernetes-api", "enable client-go debug messages").

diff --git a/pkg/hook/hook.go b/pkg/hook/hook.go
@@ -13,6 +13,7 @@ import (
 	"github.com/kennygrant/sanitize"
 	"golang.org/x/time/rate"
 
+	"github.com/flant/shell-operator/pkg/app"
 	"github.com/flant/shell-operator/pkg/executor"
 	bctx "github.com/flant/shell-operator/pkg/hook/binding_context"
 	"github.com/flant/shell-operator/pkg/hook/config"
@@ -124,7 +125,7 @@ func (h *Hook) Run(_ htypes.BindingType, context []bctx.BindingContext, logLabel
 
 	// remove tmp file on hook exit
 	defer func() {
-		if h.KeepTemporaryHookFiles {
+		if app.DebugKeepTmpFilesVar != "yes" {
 			_ = os.Remove(contextPath)
 			_ = os.Remove(metricsPath)
 			_ = os.Remove(conversionPath)