Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: make gosec linter happy #367

Merged
merged 3 commits into from
Sep 3, 2024
Merged

chore: make gosec linter happy #367

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a86581c
chore: make gosec linter happy
erikgb Sep 3, 2024
123b2f9
less change
erikgb Sep 3, 2024
77caf0e
better errors
erikgb Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 11 additions & 19 deletions pkg/zap/zap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"io"
"reflect"
"strconv"
"strings"

"github.com/go-logr/logr"
"github.com/go-logr/zapr"
Expand Down Expand Up @@ -116,13 +115,6 @@ func newJSONEncoder(opts ...crzap.EncoderConfigOption) zapcore.Encoder {
return zapcore.NewJSONEncoder(encoderConfig)
}

var levelStrings = map[string]zapcore.Level{
"debug": zap.DebugLevel,
"info": zap.InfoLevel,
"error": zap.ErrorLevel,
"panic": zap.PanicLevel,
}

func zapHook() mapstructure.DecodeHookFunc {
return mapstructure.ComposeDecodeHookFunc(
stringToLevelEnablerHookFunc(),
Expand All @@ -144,23 +136,23 @@ func stringToLevelEnablerHookFunc() mapstructure.DecodeHookFuncType {
return &v, nil
}

// level supports setting of integer value > 0 in addition to `info`, `error` or `debug`
level, validLevel := levelStrings[strings.ToLower(sVal)]
if !validLevel {
logLevel, err := strconv.Atoi(sVal)
var logLevel zap.AtomicLevel
if err := logLevel.UnmarshalText([]byte(sVal)); err != nil {
// Level string not successfully parsed as a valid zap level string. Trying to parse int level.
iVal, err := strconv.Atoi(sVal)
if err != nil {
return nil, fmt.Errorf("invalid log level \"%s\"", val)
return nil, fmt.Errorf("invalid level value \"%s\"", val)
}

if logLevel > 0 {
intLevel := -1 * logLevel
return zap.NewAtomicLevelAt(zapcore.Level(int8(intLevel))), nil
} else {
return nil, fmt.Errorf("invalid log level \"%s\"", val)
if iVal < int(zap.DebugLevel) || iVal > int(zap.FatalLevel) {
return nil, fmt.Errorf("invalid level value \"%s\"", val)
}

// #nosec G115
logLevel = zap.NewAtomicLevelAt(zapcore.Level(int8(-iVal)))
}

return zap.NewAtomicLevelAt(level), nil
return logLevel, nil
}
}

Expand Down