Skip to content

Commit 10fe5a5

Browse files
committed
chore: write legacycli stderr in debuglogger when debug enabled
1 parent 5c985bb commit 10fe5a5

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

cliv2/pkg/basic_workflows/legacycli.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package basic_workflows
33
import (
44
"bufio"
55
"bytes"
6+
"io"
67
"os"
78

89
"github.com/snyk/cli/cliv2/internal/proxy/interceptor"
910

1011
"github.com/pkg/errors"
1112
"github.com/rs/zerolog"
1213
"github.com/snyk/go-application-framework/pkg/configuration"
13-
"github.com/snyk/go-application-framework/pkg/logging"
1414
pkg_utils "github.com/snyk/go-application-framework/pkg/utils"
1515
"github.com/snyk/go-application-framework/pkg/workflow"
1616
"github.com/spf13/pflag"
@@ -66,7 +66,6 @@ func legacycliWorkflow(
6666
output = []workflow.Data{}
6767
var outBuffer bytes.Buffer
6868
var outWriter *bufio.Writer
69-
var errWriter *bufio.Writer
7069

7170
config := invocation.GetConfiguration()
7271
debugLogger := invocation.GetEnhancedLogger() // uses zerolog
@@ -103,23 +102,25 @@ func legacycliWorkflow(
103102
if len(apiToken) == 0 {
104103
apiToken = "random"
105104
}
106-
cli.AppendEnvironmentVariables([]string{constants.SNYK_API_TOKEN_ENV + "=" + apiToken})
105+
cli.AppendEnvironmentVariables([]string{constants.SNYK_API_TOKEN_ENV + "=" + apiToken, "DEBUG_HIDE_DATE=true"})
107106

108107
err = cli.Init()
109108
if err != nil {
110109
return output, err
111110
}
112111

113-
scrubDict := logging.GetScrubDictFromConfig(config)
114-
scrubbedStderr := logging.NewScrubbingIoWriter(os.Stderr, scrubDict)
112+
// if debug is enabled, stderr will be directly using the debuglogger otherwise, stderr will be stderr
113+
var stderr io.Writer = os.Stderr
114+
if config.GetBool(configuration.DEBUG) {
115+
stderr = debugLogger
116+
}
115117

116118
if !useStdIo {
117119
in := bytes.NewReader([]byte{})
118120
outWriter = bufio.NewWriter(&outBuffer)
119-
errWriter = bufio.NewWriter(scrubbedStderr)
120-
cli.SetIoStreams(in, outWriter, errWriter)
121+
cli.SetIoStreams(in, outWriter, stderr)
121122
} else {
122-
cli.SetIoStreams(os.Stdin, os.Stdout, scrubbedStderr)
123+
cli.SetIoStreams(os.Stdin, os.Stdout, stderr)
123124
}
124125

125126
wrapperProxy, err := createInternalProxy(
@@ -137,7 +138,6 @@ func legacycliWorkflow(
137138

138139
if !useStdIo {
139140
outWriter.Flush()
140-
errWriter.Flush()
141141

142142
contentType := "text/plain"
143143
if pkg_utils.Contains(args, "--json") || pkg_utils.Contains(args, "--sarif") {

0 commit comments

Comments
 (0)