Merge pull request #20409 from gordonbondon/launch-tamplate-tag-spec-…

…values r/aws_launch_tamplate: Allow more resource values for tag specification
hashicorp · Aug 4, 2021 · bd0c046 · bd0c046
2 parents 32fe8c9 + 2b1413b
commit bd0c046
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/.changelog/20409.txt b/.changelog/20409.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_launch_template: Allow all supported resource types `tag_specifications.resource_type`
+```
diff --git a/aws/resource_aws_launch_template.go b/aws/resource_aws_launch_template.go
@@ -595,14 +595,9 @@ func resourceAwsLaunchTemplate() *schema.Resource {
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"resource_type": {
-							Type:     schema.TypeString,
-							Optional: true,
-							ValidateFunc: validation.StringInSlice([]string{
-								ec2.ResourceTypeInstance,
-								ec2.ResourceTypeVolume,
-								ec2.ResourceTypeSpotInstancesRequest,
-								ec2.ResourceTypeElasticGpu,
-							}, false),
+							Type:         schema.TypeString,
+							Optional:     true,
+							ValidateFunc: validation.StringInSlice(ec2.ResourceType_Values(), false),
 						},
 						"tags": tagsSchema(),
 					},

diff --git a/aws/resource_aws_launch_template_test.go b/aws/resource_aws_launch_template_test.go
@@ -471,7 +471,7 @@ func TestAccAWSLaunchTemplate_data(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "placement.#", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "ram_disk_id"),
 					resource.TestCheckResourceAttr(resourceName, "vpc_security_group_ids.#", "1"),
-					resource.TestCheckResourceAttr(resourceName, "tag_specifications.#", "4"),
+					resource.TestCheckResourceAttr(resourceName, "tag_specifications.#", "5"),
 				),
 			},
 			{
@@ -1709,6 +1709,14 @@ resource "aws_launch_template" "test" {
       Name = "test"
     }
   }
+
+  tag_specifications {
+    resource_type = "network-interface"
+
+    tags = {
+      Name = "test"
+    }
+  }
 }
 `, rName)) //lintignore:AWSAT002
 }

diff --git a/website/docs/r/launch_template.html.markdown b/website/docs/r/launch_template.html.markdown
@@ -341,7 +341,7 @@ The tags to apply to the resources during launch. You can tag instances, volumes
 
 Each `tag_specifications` block supports the following:
 
-* `resource_type` - The type of resource to tag. Valid values are `instance`, `volume`, `elastic-gpu` and `spot-instances-request`.
+* `resource_type` - The type of resource to tag.
 * `tags` - A map of tags to assign to the resource.