Merge branch '550-fix-unknown-log-level-message' into 'main'

Default to info level for an empty log-level

Closes #550

See merge request gitlab-org/gitlab-shell!579

2 files changed, 13 insertions, 3 deletions

diff --git a/internal/logger/logger.go b/internal/logger/logger.go
index 748fce0..b3eb936 100644
--- a/internal/logger/logger.go
+++ b/internal/logger/logger.go
@@ -22,6 +22,14 @@ func logFmt(inFmt string) string {
 	return inFmt
 }
 
+func logLevel(inLevel string) string {
+	if inLevel == "" {
+		return "info"
+	}
+
+	return inLevel
+}
+
 func logFile(inFile string) string {
 	if inFile == "" {
 		return "stderr"
@@ -35,7 +43,7 @@ func buildOpts(cfg *config.Config) []log.LoggerOption {
 		log.WithFormatter(logFmt(cfg.LogFormat)),
 		log.WithOutputName(logFile(cfg.LogFile)),
 		log.WithTimezone(time.UTC),
-		log.WithLogLevel(cfg.LogLevel),
+		log.WithLogLevel(logLevel(cfg.LogLevel)),
 	}
 }
 
diff --git a/internal/logger/logger_test.go b/internal/logger/logger_test.go
index 4ea8c1f..b3881ba 100644
--- a/internal/logger/logger_test.go
+++ b/internal/logger/logger_test.go
@@ -30,9 +30,11 @@ func TestConfigure(t *testing.T) {
 	tmpFile.Close()
 
 	data, err := os.ReadFile(tmpFile.Name())
+	dataStr := string(data)
 	require.NoError(t, err)
-	require.Contains(t, string(data), `msg":"this is a test"`)
-	require.NotContains(t, string(data), `msg:":"debug log message"`)
+	require.Contains(t, dataStr, `"msg":"this is a test"`)
+	require.NotContains(t, dataStr, `"msg":"debug log message"`)
+	require.NotContains(t, dataStr, `"msg":"unknown log level`)
 }
 
 func TestConfigureWithDebugLogLevel(t *testing.T) {