Refactor to use constant default error log level

bjee19 · bjee19 · commit e1c96c5bf271 · 2024-10-04T07:46:24.000-07:00
diff --git a/internal/mode/static/state/dataplane/configuration.go b/internal/mode/static/state/dataplane/configuration.go
@@ -910,6 +910,6 @@ func buildLogging(g *graph.Graph) Logging {
 func GetDefaultConfiguration(configVersion int) Configuration {
 	return Configuration{
 		Version: configVersion,
-		Logging: Logging{ErrorLevel: "info"},
+		Logging: Logging{ErrorLevel: defaultErrorLogLevel},
 	}
 }
diff --git a/internal/mode/static/state/dataplane/configuration_test.go b/internal/mode/static/state/dataplane/configuration_test.go
@@ -62,7 +62,7 @@ func getExpectedConfiguration() Configuration {
 		},
 		CertBundles: map[CertBundleID]CertBundle{},
 		Logging: Logging{
-			ErrorLevel: "info",
+			ErrorLevel: defaultErrorLogLevel,
 		},
 	}
 }
@@ -1496,7 +1496,7 @@ func TestBuildConfiguration(t *testing.T) {
 				}
 				return g
 			}),
-			expConf: Configuration{Logging: Logging{ErrorLevel: "info"}},
+			expConf: Configuration{Logging: Logging{ErrorLevel: defaultErrorLogLevel}},
 			msg:     "invalid gatewayclass",
 		},
 		{
@@ -1515,15 +1515,15 @@ func TestBuildConfiguration(t *testing.T) {
 				}
 				return g
 			}),
-			expConf: Configuration{Logging: Logging{ErrorLevel: "info"}},
+			expConf: Configuration{Logging: Logging{ErrorLevel: defaultErrorLogLevel}},
 			msg:     "missing gatewayclass",
 		},
 		{
 			graph: getModifiedGraph(func(g *graph.Graph) *graph.Graph {
 				g.Gateway = nil
 				return g
 			}),
-			expConf: Configuration{Logging: Logging{ErrorLevel: "info"}},
+			expConf: Configuration{Logging: Logging{ErrorLevel: defaultErrorLogLevel}},
 			msg:     "missing gateway",
 		},
 		{
@@ -3831,7 +3831,7 @@ func TestBuildLogging(t *testing.T) {
 					},
 				},
 			},
-			expLoggingSettings: Logging{ErrorLevel: "info"},
+			expLoggingSettings: Logging{ErrorLevel: defaultErrorLogLevel},
 		},
 		{
 			msg: "NginxProxy log level set to notice",

Original file line number	Diff line number	Diff line change
`@@ -910,6 +910,6 @@ func buildLogging(g *graph.Graph) Logging {`
`910`	`910`	`func GetDefaultConfiguration(configVersion int) Configuration {`
`911`	`911`	`return Configuration{`
`912`	`912`	`Version: configVersion,`
`913`		`- Logging: Logging{ErrorLevel: "info"},`
	`913`	`+ Logging: Logging{ErrorLevel: defaultErrorLogLevel},`
`914`	`914`	`}`
`915`	`915`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func getExpectedConfiguration() Configuration {`
`62`	`62`	`},`
`63`	`63`	`CertBundles: map[CertBundleID]CertBundle{},`
`64`	`64`	`Logging: Logging{`
`65`		`- ErrorLevel: "info",`
	`65`	`+ ErrorLevel: defaultErrorLogLevel,`
`66`	`66`	`},`
`67`	`67`	`}`
`68`	`68`	`}`
`@@ -1496,7 +1496,7 @@ func TestBuildConfiguration(t *testing.T) {`
`1496`	`1496`	`}`
`1497`	`1497`	`return g`
`1498`	`1498`	`}),`
`1499`		`- expConf: Configuration{Logging: Logging{ErrorLevel: "info"}},`
	`1499`	`+ expConf: Configuration{Logging: Logging{ErrorLevel: defaultErrorLogLevel}},`
`1500`	`1500`	`msg: "invalid gatewayclass",`
`1501`	`1501`	`},`
`1502`	`1502`	`{`
`@@ -1515,15 +1515,15 @@ func TestBuildConfiguration(t *testing.T) {`
`1515`	`1515`	`}`
`1516`	`1516`	`return g`
`1517`	`1517`	`}),`
`1518`		`- expConf: Configuration{Logging: Logging{ErrorLevel: "info"}},`
	`1518`	`+ expConf: Configuration{Logging: Logging{ErrorLevel: defaultErrorLogLevel}},`
`1519`	`1519`	`msg: "missing gatewayclass",`
`1520`	`1520`	`},`
`1521`	`1521`	`{`
`1522`	`1522`	`graph: getModifiedGraph(func(g graph.Graph) graph.Graph {`
`1523`	`1523`	`g.Gateway = nil`
`1524`	`1524`	`return g`
`1525`	`1525`	`}),`
`1526`		`- expConf: Configuration{Logging: Logging{ErrorLevel: "info"}},`
	`1526`	`+ expConf: Configuration{Logging: Logging{ErrorLevel: defaultErrorLogLevel}},`
`1527`	`1527`	`msg: "missing gateway",`
`1528`	`1528`	`},`
`1529`	`1529`	`{`
`@@ -3831,7 +3831,7 @@ func TestBuildLogging(t *testing.T) {`
`3831`	`3831`	`},`
`3832`	`3832`	`},`
`3833`	`3833`	`},`
`3834`		`- expLoggingSettings: Logging{ErrorLevel: "info"},`
	`3834`	`+ expLoggingSettings: Logging{ErrorLevel: defaultErrorLogLevel},`
`3835`	`3835`	`},`
`3836`	`3836`	`{`
`3837`	`3837`	`msg: "NginxProxy log level set to notice",`