Skip to content

Commit 959fbba

Browse files
committed
address comment on mgmt config map test and add warning test
1 parent 8cabdf1 commit 959fbba

File tree

1 file changed

+33
-20
lines changed

1 file changed

+33
-20
lines changed

internal/configs/configmaps_test.go

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ func TestParseMGMTConfigMapNil(t *testing.T) {
289289
t.Parallel()
290290
tests := []struct {
291291
configMap *v1.ConfigMap
292-
want *MGMTConfigParams
293292
msg string
294293
}{
295294
{
@@ -298,37 +297,51 @@ func TestParseMGMTConfigMapNil(t *testing.T) {
298297
"license-token-secret-name": "",
299298
},
300299
},
301-
want: nil,
302-
msg: "Must have license-token-secret-name",
300+
msg: "Must have license-token-secret-name",
303301
},
304302
{
305303
configMap: &v1.ConfigMap{
306304
Data: map[string]string{},
307305
},
308-
want: nil,
309-
msg: "Must have license-token-secret-name key",
306+
msg: "Must have license-token-secret-name key",
310307
},
311308
}
312309

313310
for _, test := range tests {
314311
t.Run(test.msg, func(t *testing.T) {
315-
result, _, err := ParseMGMTConfigMap(context.Background(), test.configMap, makeEventLogger())
312+
_, _, err := ParseMGMTConfigMap(context.Background(), test.configMap, makeEventLogger())
316313

317-
if test.want == nil {
318-
if err == nil {
319-
t.Fatalf("Expected error but got none")
320-
}
321-
if result != nil {
322-
t.Errorf("Expected result to be nil, but got: %+v", result)
323-
}
324-
} else {
325-
if err != nil {
326-
t.Fatalf("Did not expect error, but got: %v", err)
327-
}
314+
if err == nil {
315+
t.Errorf("Expected error, got nil")
316+
}
317+
})
318+
}
319+
}
328320

329-
if result.Secrets.License != test.want.Secrets.License {
330-
t.Errorf("Secrets.License: want %q, got %q", test.want.Secrets.License, result.Secrets.License)
331-
}
321+
func TestParseMGMTConfigMapWarnings(t *testing.T) {
322+
t.Parallel()
323+
tests := []struct {
324+
configMap *v1.ConfigMap
325+
want *MGMTConfigParams
326+
msg string
327+
}{
328+
{
329+
configMap: &v1.ConfigMap{
330+
Data: map[string]string{
331+
"license-token-secret-name": "license-token",
332+
"enforce-initial-report": "7",
333+
},
334+
},
335+
msg: "enforce-initial-report is invalid",
336+
},
337+
}
338+
339+
for _, test := range tests {
340+
t.Run(test.msg, func(t *testing.T) {
341+
_, configWarnings, _ := ParseMGMTConfigMap(context.Background(), test.configMap, makeEventLogger())
342+
343+
if !configWarnings {
344+
t.Fatal("Expected warnings, got none")
332345
}
333346
})
334347
}

0 commit comments

Comments
 (0)