Avoid assignments to nil maps when coalescing metadata (#210)

Initialize the maps when they're nil. --------- Co-authored-by: Mariano Uvalle <[email protected]>
Azure · Oct 2, 2024 · 1529fc2 · 1529fc2
1 parent 2731edd
commit 1529fc2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/internal/controllers/replication/symphony.go b/internal/controllers/replication/symphony.go
@@ -264,14 +264,22 @@ func sortSynthesizerRefs(refs []apiv1.SynthesizerRef) {
 
 func coalesceMetadata(variation *apiv1.Variation, existing *apiv1.Composition) bool {
 	var metaChanged bool
+
+	if existing.Labels == nil {
+		existing.Labels = map[string]string{}
+	}
 	for key, val := range variation.Labels {
-		if existing.Labels == nil || existing.Labels[key] != val {
+		if existing.Labels[key] != val {
 			metaChanged = true
 		}
 		existing.Labels[key] = val
 	}
+
+	if existing.Annotations == nil {
+		existing.Annotations = map[string]string{}
+	}
 	for key, val := range variation.Annotations {
-		if existing.Annotations == nil || existing.Annotations[key] != val {
+		if existing.Annotations[key] != val {
 			metaChanged = true
 		}
 		existing.Annotations[key] = val

diff --git a/internal/controllers/replication/symphony_test.go b/internal/controllers/replication/symphony_test.go
@@ -314,10 +314,7 @@ func TestCoalesceMetadata(t *testing.T) {
 				Annotations: map[string]string{},
 			},
 			existing: &apiv1.Composition{
-				ObjectMeta: metav1.ObjectMeta{
-					Labels:      map[string]string{},
-					Annotations: map[string]string{},
-				},
+				ObjectMeta: metav1.ObjectMeta{},
 			},
 			expectedLabels: map[string]string{
 				"label1": "value1",
@@ -356,10 +353,7 @@ func TestCoalesceMetadata(t *testing.T) {
 				},
 			},
 			existing: &apiv1.Composition{
-				ObjectMeta: metav1.ObjectMeta{
-					Labels:      map[string]string{},
-					Annotations: map[string]string{},
-				},
+				ObjectMeta: metav1.ObjectMeta{},
 			},
 			expectedLabels: map[string]string{},
 			expectedAnnos: map[string]string{