fix(cdn) review fixes

- test Min
- test JoinStringMap
- rm superfluous var for constant
- rm file committed by accident
- add nil checks when dereferencing pointers

Author: cgoetz-inovex

internal/cmd/beta/cdn/distribution/create/create_test.go

@@ -20,8 +20,6 @@ import (
 	"k8s.io/utils/ptr"
 )
 
-var projectIdFlag = globalflags.ProjectIdFlag
-
 type testCtxKey struct{}
 
 var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -32,8 +30,8 @@ const testRegions = cdn.REGION_EU
 
 func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
 	flagValues := map[string]string{
-		projectIdFlag: testProjectId,
-		flagRegion:    string(testRegions),
+		globalflags.ProjectIdFlag: testProjectId,
+		flagRegion:                string(testRegions),
 	}
 	flagsHTTPBackend()(flagValues)
 	for _, mod := range mods {
@@ -202,21 +200,21 @@ func TestParseInput(t *testing.T) {
 		{
 			description: "project id missing",
 			flagValues: fixtureFlagValues(func(m map[string]string) {
-				delete(m, projectIdFlag)
+				delete(m, globalflags.ProjectIdFlag)
 			}),
 			isValid: false,
 		},
 		{
 			description: "project id invalid 1",
 			flagValues: fixtureFlagValues(func(m map[string]string) {
-				m[projectIdFlag] = ""
+				m[globalflags.ProjectIdFlag] = ""
 			}),
 			isValid: false,
 		},
 		{
 			description: "project id invalid 2",
 			flagValues: fixtureFlagValues(func(m map[string]string) {
-				m[projectIdFlag] = "invalid-uuid"
+				m[globalflags.ProjectIdFlag] = "invalid-uuid"
 			}),
 			isValid: false,
 		},

internal/cmd/beta/cdn/distribution/describe/describe.go

@@ -167,15 +167,19 @@ func buildDistributionTable(d *cdn.Distribution) tables.Table {
 	} else if d.Config.Backend.HttpBackend != nil {
 		h := d.Config.Backend.HttpBackend
 		var geofencing []string
-		for k, v := range *h.Geofencing {
-			geofencing = append(geofencing, fmt.Sprintf("%s: %s", k, strings.Join(v, ", ")))
+		if h.Geofencing != nil {
+			for k, v := range *h.Geofencing {
+				geofencing = append(geofencing, fmt.Sprintf("%s: %s", k, strings.Join(v, ", ")))
+			}
 		}
 		table.AddRow("BACKEND TYPE", "HTTP")
 		table.AddSeparator()
 		table.AddRow("HTTP ORIGIN URL", utils.PtrString(h.OriginUrl))
 		table.AddSeparator()
-		table.AddRow("HTTP ORIGIN REQUEST HEADERS", utils.JoinStringMap(*h.OriginRequestHeaders, ": ", ", "))
-		table.AddSeparator()
+		if h.OriginRequestHeaders != nil {
+			table.AddRow("HTTP ORIGIN REQUEST HEADERS", utils.JoinStringMap(*h.OriginRequestHeaders, ": ", ", "))
+			table.AddSeparator()
+		}
 		table.AddRow("HTTP GEOFENCING PROPERTIES", strings.Join(geofencing, "\n"))
 		table.AddSeparator()
 	}

internal/cmd/beta/cdn/domain/describe/describe.go

@@ -30,3 +30,39 @@ func TestTruncate(t *testing.T) {
 		})
 	}
 }
+
+func TestJoinStringMap(t *testing.T) {
+	tests := []struct {
+		name string
+		m    map[string]string
+		want string
+	}{
+		{
+			name: "nil map",
+			m:    nil,
+			want: "",
+		},
+		{
+			name: "empty map",
+			m:    map[string]string{},
+			want: "",
+		},
+		{
+			name: "single element",
+			m:    map[string]string{"key1": "value1"},
+			want: "key1=value1",
+		},
+		{
+			name: "multiple elements",
+			m:    map[string]string{"key1": "value1", "key2": "value2"},
+			want: "key1=value1, key2=value2",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := JoinStringMap(tt.m, "=", ", "); got != tt.want {
+				t.Errorf("JoinStringMap() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

internal/pkg/utils/strings_test.go

@@ -590,3 +590,44 @@ func TestGetSliceFromPointer(t *testing.T) {
 		})
 	}
 }
+
+func TestMin(t *testing.T) {
+	tests := []struct {
+		name string
+		a, b int
+		want int
+	}{
+		{
+			name: "min(0, 0) = 0",
+			a:    0,
+			b:    0,
+			want: 0,
+		},
+		{
+			name: "min(1, 2) = 1",
+			a:    1,
+			b:    2,
+			want: 1,
+		},
+		{
+			name: "min(2, 1) = 1",
+			a:    2,
+			b:    1,
+			want: 1,
+		},
+		{
+			name: "min(-1, 1) = -1",
+			a:    -1,
+			b:    1,
+			want: -1,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := Min(tt.a, tt.b); got != tt.want {
+				t.Errorf("Min() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+
+}