diff --git a/go.mod b/go.mod index f65aae02..8ac97ed3 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.11.1 github.com/tidwall/gjson v1.18.0 - github.com/werf/nelm v1.16.2-0.20251106110659-fb3b42bd8fba + github.com/werf/nelm v1.17.2-0.20251113141246-0e0ea9049efe google.golang.org/protobuf v1.36.5 gopkg.in/alecthomas/kingpin.v2 v2.2.6 gopkg.in/yaml.v3 v3.0.1 @@ -201,9 +201,9 @@ require ( github.com/tidwall/pretty v1.2.1 // indirect github.com/tidwall/sjson v1.2.5 // indirect github.com/wI2L/jsondiff v0.5.0 // indirect - github.com/werf/3p-helm v0.0.0-20251021224308-a90f195bd29a // indirect - github.com/werf/common-go v0.0.0-20251017004901-cb6247f72f1a // indirect - github.com/werf/kubedog v0.13.1-0.20251105104917-8615bb20d8c0 // indirect + github.com/werf/3p-helm v0.0.0-20251113141050-17dd24e6c20b // indirect + github.com/werf/common-go v0.0.0-20251113140850-a1a98e909e9b // indirect + github.com/werf/kubedog v0.13.1-0.20251110132552-6ffc5a117ada // indirect github.com/werf/lockgate v0.1.1 // indirect github.com/werf/logboek v0.6.1 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect diff --git a/go.sum b/go.sum index 32db7aae..ef1ba89c 100644 --- a/go.sum +++ b/go.sum @@ -522,18 +522,18 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY= github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= github.com/wI2L/jsondiff v0.5.0 h1:RRMTi/mH+R2aXcPe1VYyvGINJqQfC3R+KSEakuU1Ikw= github.com/wI2L/jsondiff v0.5.0/go.mod h1:qqG6hnK0Lsrz2BpIVCxWiK9ItsBCpIZQiv0izJjOZ9s= -github.com/werf/3p-helm v0.0.0-20251021224308-a90f195bd29a h1:2MQLbG3bB3wx1PaHSKftVIZNmBUNHKjDdD2K+4kHFbE= -github.com/werf/3p-helm v0.0.0-20251021224308-a90f195bd29a/go.mod h1:cJqEbzc97X0/gYYi5pU4RyXDD8o1spkZh7bOxV2+NQ0= -github.com/werf/common-go v0.0.0-20251017004901-cb6247f72f1a h1:merq7OD3hQmgUQBZDQ3cJdirvGBZS9qUB6U+Emdh63I= -github.com/werf/common-go v0.0.0-20251017004901-cb6247f72f1a/go.mod h1:MXS0JR9zut+oR9oEM8PEkdXXoEbKDILTmWopt0z1eZs= -github.com/werf/kubedog v0.13.1-0.20251105104917-8615bb20d8c0 h1:7owKaBiK78CpIBr6tCzhSgcXDD25X6ZH0O4B+koBt+M= -github.com/werf/kubedog v0.13.1-0.20251105104917-8615bb20d8c0/go.mod h1:gu4EY4hxtiYVDy5o6WE2lRZS0YWqrOV0HS//GTYyrUE= +github.com/werf/3p-helm v0.0.0-20251113141050-17dd24e6c20b h1:O6CamSLgJSG70OLoNettCHqiJYV7/prRXHJSq4sqB3I= +github.com/werf/3p-helm v0.0.0-20251113141050-17dd24e6c20b/go.mod h1:UAmQvGZhiUULXQpigm1yqcp57s097kpAHz2EvFtKCSk= +github.com/werf/common-go v0.0.0-20251113140850-a1a98e909e9b h1:58850oFrnw5Jy5YaB8QifXz75qpGotfx6qqZ9Q2my1A= +github.com/werf/common-go v0.0.0-20251113140850-a1a98e909e9b/go.mod h1:MXS0JR9zut+oR9oEM8PEkdXXoEbKDILTmWopt0z1eZs= +github.com/werf/kubedog v0.13.1-0.20251110132552-6ffc5a117ada h1:QABud6hPXaKnl7sMpvAtu9Rxi/fY2+QzGKtw+7itYo4= +github.com/werf/kubedog v0.13.1-0.20251110132552-6ffc5a117ada/go.mod h1:gu4EY4hxtiYVDy5o6WE2lRZS0YWqrOV0HS//GTYyrUE= github.com/werf/lockgate v0.1.1 h1:S400JFYjtWfE4i4LY9FA8zx0fMdfui9DPrBiTciCrx4= github.com/werf/lockgate v0.1.1/go.mod h1:0yIFSLq9ausy6ejNxF5uUBf/Ib6daMAfXuCaTMZJzIE= github.com/werf/logboek v0.6.1 h1:oEe6FkmlKg0z0n80oZjLplj6sXcBeLleCkjfOOZEL2g= github.com/werf/logboek v0.6.1/go.mod h1:Gez5J4bxekyr6MxTmIJyId1F61rpO+0/V4vjCIEIZmk= -github.com/werf/nelm v1.16.2-0.20251106110659-fb3b42bd8fba h1:1afKGS7rHV14veK0uGFKL62fpBlOYik4bFpRSjvMTII= -github.com/werf/nelm v1.16.2-0.20251106110659-fb3b42bd8fba/go.mod h1:xagTj6aWTBe+EmzWBIhTydrXeiq47uVX8WISjxo9yIE= +github.com/werf/nelm v1.17.2-0.20251113141246-0e0ea9049efe h1:buWARaRTc8Xlq9rlTsHUrLsrFGstC7nupSCkophOxv4= +github.com/werf/nelm v1.17.2-0.20251113141246-0e0ea9049efe/go.mod h1:nMH3ZVono+IUvun+RaSCvZCWkGUOfAMhPNkOI+UPeJA= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= diff --git a/pkg/helm/nelm/logger.go b/pkg/helm/nelm/logger.go index 4698c172..6d8fbff3 100644 --- a/pkg/helm/nelm/logger.go +++ b/pkg/helm/nelm/logger.go @@ -23,18 +23,15 @@ type NelmLogger struct { } func (n *NelmLogger) Trace(ctx context.Context, format string, a ...interface{}) { - // n.logger.Log(ctx, log.LevelTrace.Level(), fmt.Sprintf(format, a...)) - n.logger.With(slog.Bool("trace", true)).Log(ctx, log.LevelDebug.Level(), fmt.Sprintf(format, a...)) + n.logger.Log(ctx, log.LevelTrace.Level(), fmt.Sprintf(format, a...)) } func (n *NelmLogger) TraceStruct(ctx context.Context, obj interface{}, format string, a ...interface{}) { - // n.logger.Log(ctx, log.LevelTrace.Level(), fmt.Sprintf(format, a...), slog.Any("obj", obj)) - n.logger.With(slog.Bool("trace", true)).Log(ctx, log.LevelDebug.Level(), fmt.Sprintf(format, a...), slog.Any("obj", obj)) + n.logger.Log(ctx, log.LevelTrace.Level(), fmt.Sprintf(format, a...), slog.Any("obj", obj)) } func (n *NelmLogger) TracePush(ctx context.Context, _, format string, a ...interface{}) { - // n.logger.Log(ctx, log.LevelTrace.Level(), fmt.Sprintf(format, a...)) - n.logger.With(slog.Bool("trace", true)).Log(ctx, log.LevelDebug.Level(), fmt.Sprintf(format, a...)) + n.logger.Log(ctx, log.LevelTrace.Level(), fmt.Sprintf(format, a...)) } func (n *NelmLogger) TracePop(_ context.Context, _ string) {