Add support tags attribute for aws_appmesh_virtual_service resource

aws/resource_aws_appmesh_test.go

@@ -28,6 +28,7 @@ func TestAccAWSAppmesh(t *testing.T) {
 		"VirtualService": {
 			"virtualNode":   testAccAwsAppmeshVirtualService_virtualNode,
 			"virtualRouter": testAccAwsAppmeshVirtualService_virtualRouter,
+			"tags":          testAccAwsAppmeshVirtualService_tags,
 		},
 	}
 

aws/resource_aws_appmesh_virtual_service.go

@@ -105,6 +105,8 @@ func resourceAwsAppmeshVirtualService() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
+			"tags": tagsSchema(),
 		},
 	}
 }
@@ -116,6 +118,7 @@ func resourceAwsAppmeshVirtualServiceCreate(d *schema.ResourceData, meta interfa
 		MeshName:           aws.String(d.Get("mesh_name").(string)),
 		VirtualServiceName: aws.String(d.Get("name").(string)),
 		Spec:               expandAppmeshVirtualServiceSpec(d.Get("spec").([]interface{})),
+		Tags:               tagsFromMapAppmesh(d.Get("tags").(map[string]interface{})),
 	}
 
 	log.Printf("[DEBUG] Creating App Mesh virtual service: %#v", req)
@@ -160,6 +163,16 @@ func resourceAwsAppmeshVirtualServiceRead(d *schema.ResourceData, meta interface
 		return fmt.Errorf("error setting spec: %s", err)
 	}
 
+	err = saveTagsAppmesh(conn, d, aws.StringValue(resp.VirtualService.Metadata.Arn))
+	if isAWSErr(err, appmesh.ErrCodeNotFoundException, "") {
+		log.Printf("[WARN] App Mesh virtual service (%s) not found, removing from state", d.Id())
+		d.SetId("")
+		return nil
+	}
+	if err != nil {
+		return fmt.Errorf("error saving tags: %s", err)
+	}
+
 	return nil
 }
 
@@ -181,6 +194,16 @@ func resourceAwsAppmeshVirtualServiceUpdate(d *schema.ResourceData, meta interfa
 		}
 	}
 
+	err := setTagsAppmesh(conn, d, d.Get("arn").(string))
+	if isAWSErr(err, appmesh.ErrCodeNotFoundException, "") {
+		log.Printf("[WARN] App Mesh virtual service (%s) not found, removing from state", d.Id())
+		d.SetId("")
+		return nil
+	}
+	if err != nil {
+		return fmt.Errorf("error setting tags: %s", err)
+	}
+
 	return resourceAwsAppmeshVirtualServiceRead(d, meta)
 }
 

aws/resource_aws_appmesh_virtual_service_test.go

@@ -108,6 +108,61 @@ func testAccAwsAppmeshVirtualService_virtualRouter(t *testing.T) {
 	})
 }
 
+func testAccAwsAppmeshVirtualService_tags(t *testing.T) {
+	var vs appmesh.VirtualServiceData
+	resourceName := "aws_appmesh_virtual_service.foo"
+	meshName := fmt.Sprintf("tf-test-mesh-%d", acctest.RandInt())
+	vnName1 := fmt.Sprintf("tf-test-node-%d", acctest.RandInt())
+	vnName2 := fmt.Sprintf("tf-test-node-%d", acctest.RandInt())
+	vsName := fmt.Sprintf("tf-test-%d.mesh.local", acctest.RandInt())
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAppmeshVirtualServiceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAppmeshVirtualServiceConfig_tags(meshName, vnName1, vnName2, vsName, "aws_appmesh_virtual_node.foo", "foo", "bar", "good", "bad"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAppmeshVirtualServiceExists(resourceName, &vs),
+					resource.TestCheckResourceAttr(
+						resourceName, "tags.%", "2"),
+					resource.TestCheckResourceAttr(
+						resourceName, "tags.foo", "bar"),
+					resource.TestCheckResourceAttr(
+						resourceName, "tags.good", "bad"),
+				),
+			},
+			{
+				Config: testAccAppmeshVirtualServiceConfig_tags(meshName, vnName1, vnName2, vsName, "aws_appmesh_virtual_node.foo", "foo2", "bar", "good", "bad2"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAppmeshVirtualServiceExists(resourceName, &vs),
+					resource.TestCheckResourceAttr(
+						resourceName, "tags.%", "2"),
+					resource.TestCheckResourceAttr(
+						resourceName, "tags.foo2", "bar"),
+					resource.TestCheckResourceAttr(
+						resourceName, "tags.good", "bad2"),
+				),
+			},
+			{
+				Config: testAccAppmeshVirtualServiceConfig_virtualNode(meshName, vnName1, vnName2, vsName, "aws_appmesh_virtual_node.foo"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAppmeshVirtualServiceExists(resourceName, &vs),
+					resource.TestCheckResourceAttr(
+						resourceName, "tags.%", "0"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportStateId:     fmt.Sprintf("%s/%s", meshName, vsName),
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func testAccCheckAppmeshVirtualServiceDestroy(s *terraform.State) error {
 	conn := testAccProvider.Meta().(*AWSClient).appmeshconn
 
@@ -241,3 +296,43 @@ resource "aws_appmesh_virtual_service" "foo" {
 }
 `, meshName, vrName1, vrName2, vsName, rName)
 }
+
+func testAccAppmeshVirtualServiceConfig_tags(meshName, vnName1, vnName2, vsName, rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string {
+	return fmt.Sprintf(`
+resource "aws_appmesh_mesh" "foo" {
+  name = "%[1]s"
+}
+
+resource "aws_appmesh_virtual_node" "foo" {
+  name      = "%[2]s"
+  mesh_name = "${aws_appmesh_mesh.foo.id}"
+
+  spec {}
+}
+
+resource "aws_appmesh_virtual_node" "bar" {
+  name      = "%[3]s"
+  mesh_name = "${aws_appmesh_mesh.foo.id}"
+
+  spec {}
+}
+
+resource "aws_appmesh_virtual_service" "foo" {
+  name      = "%[4]s"
+  mesh_name = "${aws_appmesh_mesh.foo.id}"
+
+  spec {
+    provider {
+      virtual_node {
+        virtual_node_name = "${%s.name}"
+      }
+    }
+  }
+
+  tags = {
+	%[6]s = %[7]q
+	%[8]s = %[9]q
+  }
+}
+`, meshName, vnName1, vnName2, vsName, rName, tagKey1, tagValue1, tagKey2, tagValue2)
+}

website/docs/r/appmesh_virtual_service.html.markdown

@@ -53,6 +53,7 @@ The following arguments are supported:
 * `name` - (Required) The name to use for the virtual service.
 * `mesh_name` - (Required) The name of the service mesh in which to create the virtual service.
 * `spec` - (Required) The virtual service specification to apply.
+* `tags` - (Optional) A mapping of tags to assign to the resource.
 
 The `spec` object supports the following: