Issue #790 - Fix application controller panic

argoproj · Nov 16, 2018 · fd4f27f · fd4f27f
1 parent 361931f
commit fd4f27f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/util/diff/diff.go b/util/diff/diff.go
@@ -137,8 +137,16 @@ func removeNamespaceAnnotation(orig *unstructured.Unstructured) *unstructured.Un
 		metadata := metadataIf.(map[string]interface{})
 		delete(metadata, "namespace")
 		if annotationsIf, ok := metadata["annotations"]; ok {
-			annotation := annotationsIf.(map[string]interface{})
-			if len(annotation) == 0 {
+			shouldDelete := false
+			if annotationsIf == nil {
+				shouldDelete = true
+			} else {
+				annotation := annotationsIf.(map[string]interface{})
+				if len(annotation) == 0 {
+					shouldDelete = true
+				}
+			}
+			if shouldDelete {
 				delete(metadata, "annotations")
 			}
 		}

diff --git a/util/diff/diff_test.go b/util/diff/diff_test.go
@@ -297,3 +297,23 @@ func TestThreeWayDiffExplicitNamespace(t *testing.T) {
 	assert.Nil(t, err)
 	log.Println(ascii)
 }
+
+func TestRemoveNamespaceAnnotation(t *testing.T) {
+	obj := removeNamespaceAnnotation(&unstructured.Unstructured{Object: map[string]interface{}{
+		"metadata": map[string]interface{}{
+			"name":      "test",
+			"namespace": "default",
+		},
+	}})
+	assert.Equal(t, "", obj.GetNamespace())
+
+	obj = removeNamespaceAnnotation(&unstructured.Unstructured{Object: map[string]interface{}{
+		"metadata": map[string]interface{}{
+			"name":        "test",
+			"namespace":   "default",
+			"annotations": make(map[string]interface{}),
+		},
+	}})
+	assert.Equal(t, "", obj.GetNamespace())
+	assert.Nil(t, obj.GetAnnotations())
+}