fixup! Adjust config structure according to feedback from code review

Signed-off-by: Christian Haudum <[email protected]>
grafana · Dec 19, 2024 · f84fa29 · f84fa29
1 parent 43ed574
commit f84fa29
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pkg/validation/limits.go b/pkg/validation/limits.go
@@ -248,7 +248,7 @@ type Limits struct {
 }
 
 type FieldDetectorConfig struct {
-	Fields map[string][]string `yaml:"fields" json:"fields"`
+	Fields map[string][]string `yaml:"fields,omitempty" json:"fields,omitempty"`
 }
 
 type StreamRetention struct {

diff --git a/pkg/validation/limits_test.go b/pkg/validation/limits_test.go
@@ -214,7 +214,7 @@ ruler_remote_write_headers:
   foo: "bar"
 `,
 			exp: Limits{
-				DiscoverGenericFields:   map[string][]string{},
+				DiscoverGenericFields:   FieldDetectorConfig{},
 				RulerRemoteWriteHeaders: OverwriteMarshalingStringMap{map[string]string{"foo": "bar"}},
 				DiscoverServiceName:     []string{},
 				LogLevelFields:          []string{},
@@ -235,7 +235,7 @@ ruler_remote_write_headers:
 ruler_remote_write_headers:
 `,
 			exp: Limits{
-				DiscoverGenericFields: map[string][]string{},
+				DiscoverGenericFields: FieldDetectorConfig{},
 				DiscoverServiceName:   []string{},
 				LogLevelFields:        []string{},
 				// Rest from new defaults
@@ -256,7 +256,7 @@ retention_stream:
     selector: '{foo="bar"}'
 `,
 			exp: Limits{
-				DiscoverGenericFields: map[string][]string{},
+				DiscoverGenericFields: FieldDetectorConfig{},
 				DiscoverServiceName:   []string{},
 				LogLevelFields:        []string{},
 				StreamRetention: []StreamRetention{
@@ -278,7 +278,7 @@ reject_old_samples: true
 `,
 			exp: Limits{
 				RejectOldSamples:      true,
-				DiscoverGenericFields: map[string][]string{},
+				DiscoverGenericFields: FieldDetectorConfig{},
 				DiscoverServiceName:   []string{},
 				LogLevelFields:        []string{},
 
@@ -299,7 +299,7 @@ reject_old_samples: true
 query_timeout: 5m
 `,
 			exp: Limits{
-				DiscoverGenericFields: map[string][]string{},
+				DiscoverGenericFields: FieldDetectorConfig{},
 				DiscoverServiceName:   []string{},
 				LogLevelFields:        []string{},