From 67260764288eabdb1e9ac1dd7475f0ef66c288a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Scha=CC=88fer?= <101886095+PeterSchafer@users.noreply.github.com> Date: Fri, 20 Oct 2023 11:42:28 +0200 Subject: [PATCH 1/2] fix: use default HTTP headers consistently through GAF update --- cliv2/go.mod | 2 +- cliv2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cliv2/go.mod b/cliv2/go.mod index 6bbb9c611c..b56b3d28d7 100644 --- a/cliv2/go.mod +++ b/cliv2/go.mod @@ -13,7 +13,7 @@ require ( github.com/snyk/cli-extension-iac-rules v0.0.0-20230601153200-c572cfce46ce github.com/snyk/cli-extension-sbom v0.0.0-20230926124903-9705d7d47d8f github.com/snyk/container-cli v0.0.0-20230920093251-fe865879a91f - github.com/snyk/go-application-framework v0.0.0-20231010111039-f5b82b5eeb81 + github.com/snyk/go-application-framework v0.0.0-20231020092822-0fc994b2fd59 github.com/snyk/go-httpauth v0.0.0-20230925093100-dfb05155efc1 github.com/snyk/snyk-iac-capture v0.6.5 github.com/snyk/snyk-ls v0.0.0-20231018080541-3a486664f5ac diff --git a/cliv2/go.sum b/cliv2/go.sum index 5d78186220..34756a625e 100644 --- a/cliv2/go.sum +++ b/cliv2/go.sum @@ -661,8 +661,8 @@ github.com/snyk/cli-extension-sbom v0.0.0-20230926124903-9705d7d47d8f h1:U3DQ9wn github.com/snyk/cli-extension-sbom v0.0.0-20230926124903-9705d7d47d8f/go.mod h1:O/cjwCbKhJQWyXHPmNbZ7ToQKnhyw0VUp1Qhim3WEcw= github.com/snyk/container-cli v0.0.0-20230920093251-fe865879a91f h1:ghajT5PEiLP8XNFIdc7Yn4Th74RH/9Q++dDOp6Cb9eo= github.com/snyk/container-cli v0.0.0-20230920093251-fe865879a91f/go.mod h1:38w+dcAQp9eG3P5t2eNS9eG0reut10AeJjLv5lJ5lpM= -github.com/snyk/go-application-framework v0.0.0-20231010111039-f5b82b5eeb81 h1:a9P3ChzGgvmulkLsVORNEE9sBZVXapGzYxwxANG31oM= -github.com/snyk/go-application-framework v0.0.0-20231010111039-f5b82b5eeb81/go.mod h1:kuw/MMZ4rnQYMVGDTIkoJGyEEAl0DoHqEN6ZiYbNbSA= +github.com/snyk/go-application-framework v0.0.0-20231020092822-0fc994b2fd59 h1:RUulf7LAX6kEVQRIutcF7nuVFwwMOrCaBfoGaWFsprg= +github.com/snyk/go-application-framework v0.0.0-20231020092822-0fc994b2fd59/go.mod h1:kuw/MMZ4rnQYMVGDTIkoJGyEEAl0DoHqEN6ZiYbNbSA= github.com/snyk/go-httpauth v0.0.0-20230925093100-dfb05155efc1 h1:2HfjHQxOjWyD5jKJQtiZV9mptamqikAvE/H4gilFk30= github.com/snyk/go-httpauth v0.0.0-20230925093100-dfb05155efc1/go.mod h1:88KbbvGYlmLgee4OcQ19yr0bNpXpOr2kciOthaSzCAg= github.com/snyk/policy-engine v0.22.0 h1:od9pduGrXyfWO791X+8M1qmnvWUxaIXh0gBzGKqeseA= From f8728ab48c9feb1afc894b961d9057e501666016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Scha=CC=88fer?= <101886095+PeterSchafer@users.noreply.github.com> Date: Fri, 20 Oct 2023 17:30:24 +0200 Subject: [PATCH 2/2] feat: make log level configurable --- cliv2/cmd/cliv2/main.go | 23 ++++++++++++++++++++--- cliv2/go.mod | 2 +- cliv2/go.sum | 4 ++-- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/cliv2/cmd/cliv2/main.go b/cliv2/cmd/cliv2/main.go index 04f750478b..1f6e1502c3 100644 --- a/cliv2/cmd/cliv2/main.go +++ b/cliv2/cmd/cliv2/main.go @@ -77,12 +77,29 @@ const ( handleErrorUnhandled HandleError = iota ) -func getDebugLogger(config configuration.Configuration) *zerolog.Logger { +func getDebugLevel(config configuration.Configuration) zerolog.Level { + loglevel := zerolog.DebugLevel + if loglevelString := config.GetString("snyk_loglevel"); loglevelString != "" { + var err error + loglevel, err = zerolog.ParseLevel(loglevelString) + if err == nil { + debugLogger.Log().Msgf("Setting log level to %s", loglevelString) + } else { + debugLogger.Log().Msgf("%v", err) + loglevel = zerolog.DebugLevel + } + } + return loglevel +} + +func initDebugLogger(config configuration.Configuration) *zerolog.Logger { debug := config.GetBool(configuration.DEBUG) if !debug { debugLogger = debugLogger.Output(io.Discard) + } else { + loglevel := getDebugLevel(config) + debugLogger = debugLogger.Level(loglevel) } - return &debugLogger } @@ -366,7 +383,7 @@ func MainWithErrorCode() int { } debugEnabled := globalConfiguration.GetBool(configuration.DEBUG) - debugLogger := getDebugLogger(globalConfiguration) + debugLogger := initDebugLogger(globalConfiguration) initApplicationConfiguration(globalConfiguration) engine = app.CreateAppEngineWithOptions(app.WithZeroLogger(debugLogger), app.WithConfiguration(globalConfiguration)) diff --git a/cliv2/go.mod b/cliv2/go.mod index b56b3d28d7..8124f38616 100644 --- a/cliv2/go.mod +++ b/cliv2/go.mod @@ -13,7 +13,7 @@ require ( github.com/snyk/cli-extension-iac-rules v0.0.0-20230601153200-c572cfce46ce github.com/snyk/cli-extension-sbom v0.0.0-20230926124903-9705d7d47d8f github.com/snyk/container-cli v0.0.0-20230920093251-fe865879a91f - github.com/snyk/go-application-framework v0.0.0-20231020092822-0fc994b2fd59 + github.com/snyk/go-application-framework v0.0.0-20231020152829-1d64d967af62 github.com/snyk/go-httpauth v0.0.0-20230925093100-dfb05155efc1 github.com/snyk/snyk-iac-capture v0.6.5 github.com/snyk/snyk-ls v0.0.0-20231018080541-3a486664f5ac diff --git a/cliv2/go.sum b/cliv2/go.sum index 34756a625e..44daefcf3f 100644 --- a/cliv2/go.sum +++ b/cliv2/go.sum @@ -661,8 +661,8 @@ github.com/snyk/cli-extension-sbom v0.0.0-20230926124903-9705d7d47d8f h1:U3DQ9wn github.com/snyk/cli-extension-sbom v0.0.0-20230926124903-9705d7d47d8f/go.mod h1:O/cjwCbKhJQWyXHPmNbZ7ToQKnhyw0VUp1Qhim3WEcw= github.com/snyk/container-cli v0.0.0-20230920093251-fe865879a91f h1:ghajT5PEiLP8XNFIdc7Yn4Th74RH/9Q++dDOp6Cb9eo= github.com/snyk/container-cli v0.0.0-20230920093251-fe865879a91f/go.mod h1:38w+dcAQp9eG3P5t2eNS9eG0reut10AeJjLv5lJ5lpM= -github.com/snyk/go-application-framework v0.0.0-20231020092822-0fc994b2fd59 h1:RUulf7LAX6kEVQRIutcF7nuVFwwMOrCaBfoGaWFsprg= -github.com/snyk/go-application-framework v0.0.0-20231020092822-0fc994b2fd59/go.mod h1:kuw/MMZ4rnQYMVGDTIkoJGyEEAl0DoHqEN6ZiYbNbSA= +github.com/snyk/go-application-framework v0.0.0-20231020152829-1d64d967af62 h1:uUVWh8+Zzc6RWBnShqIFvLgbYp5UCoaexrWwJjhh0bI= +github.com/snyk/go-application-framework v0.0.0-20231020152829-1d64d967af62/go.mod h1:kuw/MMZ4rnQYMVGDTIkoJGyEEAl0DoHqEN6ZiYbNbSA= github.com/snyk/go-httpauth v0.0.0-20230925093100-dfb05155efc1 h1:2HfjHQxOjWyD5jKJQtiZV9mptamqikAvE/H4gilFk30= github.com/snyk/go-httpauth v0.0.0-20230925093100-dfb05155efc1/go.mod h1:88KbbvGYlmLgee4OcQ19yr0bNpXpOr2kciOthaSzCAg= github.com/snyk/policy-engine v0.22.0 h1:od9pduGrXyfWO791X+8M1qmnvWUxaIXh0gBzGKqeseA=