luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Updated go-hclog to v1.4.0 to allow access to GetLevel. Refactored TranslateLoggerLevel (#18260)

This commit is contained in:
Peter Wilson 2022-12-07 14:25:54 +00:00 committed by GitHub
parent 1801f09c6a
commit 21a8bcaa7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -67,7 +67,7 @@ require (
github.com/hashicorp/go-cleanhttp v0.5.2
github.com/hashicorp/go-discover v0.0.0-20210818145131-c573d69da192
github.com/hashicorp/go-gcp-common v0.8.0
github.com/hashicorp/go-hclog v1.3.1
github.com/hashicorp/go-hclog v1.4.0
github.com/hashicorp/go-kms-wrapping/v2 v2.0.5
github.com/hashicorp/go-kms-wrapping/wrappers/aead/v2 v2.0.4
github.com/hashicorp/go-kms-wrapping/wrappers/alicloudkms/v2 v2.0.1

3
go.sum
View File

@ -981,8 +981,9 @@ github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39
github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
github.com/hashicorp/go-hclog v1.3.1 h1:vDwF1DFNZhntP4DAjuTpOw3uEgMUpXh1pB5fW9DqHpo=
github.com/hashicorp/go-hclog v1.3.1/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
github.com/hashicorp/go-hclog v1.4.0 h1:ctuWFGrhFha8BnnzxqeRGidlEcQkDyL5u8J8t5eA11I=
github.com/hashicorp/go-hclog v1.4.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=

19
helper/logging/logger.go
View File

@ -189,21 +189,12 @@ func ParseLogLevel(logLevel string) (log.Level, error) {
// TranslateLoggerLevel returns the string that corresponds with logging level of the hclog.Logger.
func TranslateLoggerLevel(logger log.Logger) (string, error) {
var result string
logLevel := logger.GetLevel()
if logger.IsTrace() {
result = "trace"
} else if logger.IsDebug() {
result = "debug"
} else if logger.IsInfo() {
result = "info"
} else if logger.IsWarn() {
result = "warn"
} else if logger.IsError() {
result = "error"
} else {
switch logLevel {
case log.Trace, log.Debug, log.Info, log.Warn, log.Error:
return logLevel.String(), nil
default:
return "", fmt.Errorf("unknown log level")
}
return result, nil
}

8
helper/logging/logger_test.go
View File

@ -206,7 +206,7 @@ func TestLogger_ChangeLogLevels(t *testing.T) {
require.NoError(t, err)
require.NotNil(t, logger)
assert.True(t, logger.IsDebug())
assert.Equal(t, log.Debug, logger.GetLevel())
// Create new named loggers from the base logger and change the levels
logger2 := logger.Named("test2")
@ -215,7 +215,7 @@ func TestLogger_ChangeLogLevels(t *testing.T) {
logger2.SetLevel(log.Info)
logger3.SetLevel(log.Error)
assert.True(t, logger.IsDebug())
assert.True(t, logger2.IsInfo())
assert.True(t, logger3.IsError())
assert.Equal(t, log.Debug, logger.GetLevel())
assert.Equal(t, log.Info, logger2.GetLevel())
assert.Equal(t, log.Error, logger3.GetLevel())
}