bump sdk, add new global var

Signed-off-by: Pavel Okhlopkov <[email protected]>
flant · Nov 15, 2024 · 69f5544 · 69f5544
1 parent 92e19d2
commit 69f5544
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -34,7 +34,7 @@ require (
 replace github.com/go-openapi/validate => github.com/flant/go-openapi-validate v0.19.12-flant.0
 
 require (
-	github.com/deckhouse/module-sdk v0.0.0-20241114101830-23c1625a3180
+	github.com/deckhouse/module-sdk v0.0.0-20241115114054-a4c8097d415a
 	github.com/gojuno/minimock/v3 v3.4.1
 )
 

diff --git a/go.sum b/go.sum
@@ -29,6 +29,8 @@ github.com/deckhouse/deckhouse/pkg/log v0.0.0-20241106140903-258b93b3334e h1:QUQ
 github.com/deckhouse/deckhouse/pkg/log v0.0.0-20241106140903-258b93b3334e/go.mod h1:Mk5HRzkc5pIcDIZ2JJ6DPuuqnwhXVkb3you8M8Mg+4w=
 github.com/deckhouse/module-sdk v0.0.0-20241114101830-23c1625a3180 h1:uZQFTYdEc/4ypHv+aO4ep5m41pVVUnWj+ZBknsmjR+M=
 github.com/deckhouse/module-sdk v0.0.0-20241114101830-23c1625a3180/go.mod h1:q9jIxjVSVhPRJLWC001c7ujYZIzoPKjiF4LV0Zm+XCE=
+github.com/deckhouse/module-sdk v0.0.0-20241115114054-a4c8097d415a h1:pEX95Y6y0zXcN5aHb+s+ToMgunsEf/Ky/4Xz1XPcBGY=
+github.com/deckhouse/module-sdk v0.0.0-20241115114054-a4c8097d415a/go.mod h1:q9jIxjVSVhPRJLWC001c7ujYZIzoPKjiF4LV0Zm+XCE=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
 github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=

diff --git a/pkg/app/debug.go b/pkg/app/debug.go
@@ -10,7 +10,10 @@ var DebugUnixSocket = "/var/run/shell-operator/debug.socket"
 
 var DebugHttpServerAddr = ""
 
-var DebugKeepTmpFiles = "no"
+var (
+	DebugKeepTmpFilesVar = "no"
+	DebugKeepTmpFiles    = false
+)
 
 var DebugKubernetesAPI = false
 
@@ -27,8 +30,12 @@ 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(DebugKeepTmpFiles).
-		StringVar(&DebugKeepTmpFiles)
+		Default(DebugKeepTmpFilesVar).Action(func(_ *kingpin.ParseContext) error {
+		DebugKeepTmpFiles = DebugKeepTmpFilesVar == "yes"
+
+		return nil
+	}).
+		StringVar(&DebugKeepTmpFilesVar)
 
 	cmd.Flag("debug-kubernetes-api", "enable client-go debug messages").
 		Envar("DEBUG_KUBERNETES_API").

diff --git a/pkg/hook/hook.go b/pkg/hook/hook.go
@@ -118,7 +118,7 @@ func (h *Hook) Run(_ BindingType, context []BindingContext, logLabels map[string
 
 	// remove tmp file on hook exit
 	defer func() {
-		if app.DebugKeepTmpFiles != "yes" {
+		if app.DebugKeepTmpFiles {
 			_ = os.Remove(contextPath)
 			_ = os.Remove(metricsPath)
 			_ = os.Remove(conversionPath)

diff --git a/pkg/shell-operator/kube_client.go b/pkg/shell-operator/kube_client.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/deckhouse/deckhouse/pkg/log"
 	metricstorage "github.com/deckhouse/module-sdk/pkg/metric-storage"
-
 	objectpatch "github.com/deckhouse/module-sdk/pkg/object-patch"
+
 	klient "github.com/flant/kube-client/client"
 	"github.com/flant/shell-operator/pkg/app"
 	utils "github.com/flant/shell-operator/pkg/utils/labels"

diff --git a/pkg/shell-operator/operator.go b/pkg/shell-operator/operator.go
@@ -11,12 +11,12 @@ import (
 	kubeeventsmanager "github.com/deckhouse/module-sdk/pkg/kube-events-manager"
 	kemTypes "github.com/deckhouse/module-sdk/pkg/kube-events-manager/types"
 	metricstorage "github.com/deckhouse/module-sdk/pkg/metric-storage"
+	objectpatch "github.com/deckhouse/module-sdk/pkg/object-patch"
 	"github.com/deckhouse/module-sdk/pkg/webhook/admission"
 	"github.com/deckhouse/module-sdk/pkg/webhook/conversion"
 	"github.com/gofrs/uuid/v5"
 	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 
-	objectpatch "github.com/deckhouse/module-sdk/pkg/object-patch"
 	klient "github.com/flant/kube-client/client"
 	"github.com/flant/shell-operator/pkg/hook"
 	"github.com/flant/shell-operator/pkg/hook/controller"

diff --git a/test/hook/context/generator.go b/test/hook/context/generator.go
@@ -14,6 +14,7 @@ import (
 	kubeeventsmanager "github.com/deckhouse/module-sdk/pkg/kube-events-manager"
 
 	"github.com/flant/kube-client/fake"
+	"github.com/flant/shell-operator/pkg/app"
 	schedulemanager "github.com/flant/shell-operator/pkg/schedule_manager"
 )
 
@@ -102,7 +103,7 @@ func (b *BindingContextController) Run(initialState string) (GeneratedBindingCon
 	}
 
 	if b.Hook == nil {
-		testHook := hook.NewHook("test", "test", b.logger.Named("hook"))
+		testHook := hook.NewHook("test", "test", app.DebugKeepTmpFiles, app.LogProxyHookJSON, app.ProxyJsonLogKey, b.logger.Named("hook"))
 		testHook, err = testHook.LoadConfig([]byte(b.HookConfig))
 		if err != nil {
 			return GeneratedBindingContexts{}, fmt.Errorf("couldn't load or validate hook configuration: %v", err)