diff --git a/go.mod b/go.mod index 1a837e5f..cb6aa149 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dominikbraun/graph v0.23.0 github.com/ettle/strcase v0.2.0 github.com/flant/kube-client v1.6.0 - github.com/flant/shell-operator v1.14.2 + github.com/flant/shell-operator v1.14.3 github.com/go-chi/chi/v5 v5.2.3 github.com/go-openapi/loads v0.23.1 github.com/go-openapi/spec v0.22.0 diff --git a/go.sum b/go.sum index 201b9ba1..31f25616 100644 --- a/go.sum +++ b/go.sum @@ -161,8 +161,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/flant/kube-client v1.6.0 h1:g6ksfIgTlrvLgp/Iu1a9c5aC4yPClLplq3w9e/qtYbk= github.com/flant/kube-client v1.6.0/go.mod h1:dYJyx7aMldXR/F8hlhRxlcEhSkxKcMZV2Oz8d+o/Up4= -github.com/flant/shell-operator v1.14.2 h1:HPmKqO/fUs8n35m9z63CClO1DCePG3Zu4yw9AIBEX4Y= -github.com/flant/shell-operator v1.14.2/go.mod h1:9tUfaWsJ8lzT04L/nUEvpqjOtOrzFgK4RPylSkZPMmo= +github.com/flant/shell-operator v1.14.3 h1:P88uPvWZsWYAt6gUS14C1brYpCKvYIHYahgdo/UQKRo= +github.com/flant/shell-operator v1.14.3/go.mod h1:9tUfaWsJ8lzT04L/nUEvpqjOtOrzFgK4RPylSkZPMmo= github.com/flopp/go-findfont v0.1.0 h1:lPn0BymDUtJo+ZkV01VS3661HL6F4qFlkhcJN55u6mU= github.com/flopp/go-findfont v0.1.0/go.mod h1:wKKxRDjD024Rh7VMwoU90i6ikQRCr+JTHB5n4Ejkqvw= github.com/fluxcd/flagger v1.36.1 h1:X2PumtNwZz9YSGaOtZLFm2zAKLgHhFkbNv8beg7ifyc= diff --git a/pkg/module_manager/models/hooks/kind/check.go b/pkg/module_manager/models/hooks/kind/check.go index 1b3e270d..872c97c7 100644 --- a/pkg/module_manager/models/hooks/kind/check.go +++ b/pkg/module_manager/models/hooks/kind/check.go @@ -15,14 +15,11 @@ package kind import ( - "bytes" "context" - "encoding/json" "fmt" "log/slog" "os" "path/filepath" - "strings" "github.com/deckhouse/deckhouse/pkg/log" "github.com/deckhouse/module-sdk/pkg/settingscheck" @@ -70,11 +67,7 @@ func (c *SettingsCheck) Check(ctx context.Context, settings utils.Values) (setti cmd := executor.NewExecutor("", c.path, []string{"hook", "check"}, envs).WithLogger(c.logger.Named("executor")) if _, err = cmd.RunAndLogLines(ctx, make(map[string]string)); err != nil { - trimmed := bytes.NewBufferString(strings.TrimPrefix(err.Error(), "stderr:")) - - if err = json.NewDecoder(trimmed).Decode(&result); err != nil { - return settingscheck.Result{}, fmt.Errorf("parse output: %s", err) - } + return settingscheck.Result{}, fmt.Errorf("run and log lines: %w", err) } return result, nil