refactor resource tag for appmesh

hashicorp · Jun 27, 2019 · 0aa99f7 · 0aa99f7
1 parent 0aa114d
commit 0aa99f7
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 13 deletions.
diff --git a/aws/tagsAppmesh.go b/aws/tagsAppmesh.go
@@ -53,15 +53,18 @@ func diffTagsAppmesh(oldTags, newTags []*appmesh.TagRef) ([]*appmesh.TagRef, []*
 	// First, we're creating everything we have
 	create := make(map[string]interface{})
 	for _, t := range newTags {
-		create[*t.Key] = *t.Value
+		create[aws.StringValue(t.Key)] = aws.StringValue(t.Value)
 	}
 
 	// Build the list of what to remove
 	var remove []*string
 	for _, t := range oldTags {
-		if _, ok := create[*t.Key]; !ok {
-			// Delete it!
+		old, ok := create[aws.StringValue(t.Key)]
+		if !ok || old != aws.StringValue(t.Value) {
 			remove = append(remove, t.Key)
+		} else if ok {
+			// already present so remove from new
+			delete(create, aws.StringValue(t.Key))
 		}
 	}
 
@@ -89,7 +92,7 @@ func tagsToMapAppmesh(ts []*appmesh.TagRef) map[string]string {
 	result := make(map[string]string)
 	for _, t := range ts {
 		if !tagIgnoredAppmesh(t) {
-			result[*t.Key] = *t.Value
+			result[aws.StringValue(t.Key)] = aws.StringValue(t.Value)
 		}
 	}
 
@@ -115,12 +118,12 @@ func saveTagsAppmesh(conn *appmesh.AppMesh, d *schema.ResourceData, arn string)
 // compare a tag against a list of strings and checks if it should
 // be ignored or not
 func tagIgnoredAppmesh(t *appmesh.TagRef) bool {
-	filter := []string{"^aws:", "^appmesh:", "Name"}
+	filter := []string{"^aws:"}
 	for _, v := range filter {
-		log.Printf("[DEBUG] Matching %v with %v\n", v, *t.Key)
-		r, _ := regexp.MatchString(v, *t.Key)
+		log.Printf("[DEBUG] Matching %v with %v\n", v, aws.StringValue(t.Key))
+		r, _ := regexp.MatchString(v, aws.StringValue(t.Key))
 		if r {
-			log.Printf("[DEBUG] Found AWS specific tag %s (val: %s), ignoring.\n", *t.Key, *t.Value)
+			log.Printf("[DEBUG] Found AWS specific tag %s (val: %s), ignoring.\n", aws.StringValue(t.Key), aws.StringValue(t.Value))
 			return true
 		}
 	}

diff --git a/aws/tagsAppmesh_test.go b/aws/tagsAppmesh_test.go
@@ -14,20 +14,19 @@ func TestDiffAppmeshTags(t *testing.T) {
 		Create   map[string]string
 		Remove   []string
 	}{
-		// Basic add/remove
+		// Add
 		{
 			Old: map[string]interface{}{
 				"foo": "bar",
 			},
 			New: map[string]interface{}{
+				"foo": "bar",
 				"bar": "baz",
 			},
 			Create: map[string]string{
 				"bar": "baz",
 			},
-			Remove: []string{
-				"foo",
-			},
+			Remove: map[string]string{},
 		},
 
 		// Modify
@@ -41,7 +40,42 @@ func TestDiffAppmeshTags(t *testing.T) {
 			Create: map[string]string{
 				"foo": "baz",
 			},
-			Remove: []string{},
+			Remove: map[string]string{
+				"foo": "bar",
+			},
+		},
+
+		// Overlap
+		{
+			Old: map[string]interface{}{
+				"foo":   "bar",
+				"hello": "world",
+			},
+			New: map[string]interface{}{
+				"foo":   "baz",
+				"hello": "world",
+			},
+			Create: map[string]string{
+				"foo": "baz",
+			},
+			Remove: map[string]string{
+				"foo": "bar",
+			},
+		},
+
+		// Remove
+		{
+			Old: map[string]interface{}{
+				"foo": "bar",
+				"bar": "baz",
+			},
+			New: map[string]interface{}{
+				"foo": "bar",
+			},
+			Create: map[string]string{},
+			Remove: map[string]string{
+				"bar": "baz",
+			},
 		},
 	}