Skip to content

Commit b3dbb66

Browse files
committed
Update log level range check for lint pass
1 parent 981fcf3 commit b3dbb66

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

internal/logging/logger.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,15 @@ func NewLogger() Logger {
9292
fmt.Println(err)
9393
level = 7
9494
}
95+
if level > 7 {
96+
level = 7
97+
}
98+
if level < 0 {
99+
level = 0
100+
}
95101
return &logger{
96102
output: os.Stderr,
97-
level: uint(level),
103+
level: uint(level), // #nosec G115 - level is constrained to 0-7
98104
}
99105
}
100106

internal/logging/logger_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package logging
22

33
import (
44
"bufio"
5+
"fmt"
56
"io"
67
"io/ioutil"
78
"log"
89
"os"
9-
"strconv"
1010
"strings"
1111
"testing"
1212
)
@@ -32,7 +32,8 @@ var settingList []LogSetting = []LogSetting{
3232
}
3333

3434
func testLoggerLevel(t *testing.T, targetLevel uint) {
35-
tempFile := newFile("testing level "+strconv.Itoa(int(targetLevel)), t)
35+
testName := fmt.Sprintf("testing level %v", targetLevel)
36+
tempFile := newFile(testName, t)
3637
testLogger := &logger{
3738
output: tempFile,
3839
level: targetLevel,

main.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ func main() {
2525
flag.Parse()
2626

2727
if _, ok := os.LookupEnv("LOG_LEVEL"); !ok {
28+
if *logLevel > 7 {
29+
*logLevel = 7
30+
}
2831
os.Setenv("LOG_LEVEL", strconv.Itoa(int(*logLevel)))
2932
}
3033

0 commit comments

Comments
 (0)