Adds ARN output to ECS capacity provider

hashicorp · Dec 11, 2019 · 96ff71a · 96ff71a
1 parent 22cae57
commit 96ff71a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/aws/resource_aws_ecs_capacity_provider.go b/aws/resource_aws_ecs_capacity_provider.go
@@ -27,6 +27,10 @@ func resourceAwsEcsCapacityProvider() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"arn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"auto_scaling_group_provider": {
 				Type:     schema.TypeList,
 				MaxItems: 1,

diff --git a/aws/resource_aws_ecs_capacity_provider_test.go b/aws/resource_aws_ecs_capacity_provider_test.go
@@ -29,6 +29,7 @@ func TestAccAWSEcsCapacityProvider_basic(t *testing.T) {
 					testAccCheckAWSEcsCapacityProviderExists(resourceName, &provider),
 					resource.TestCheckResourceAttr(resourceName, "name", rName),
 					testAccCheckResourceAttrRegionalARN(resourceName, "id", "ecs", fmt.Sprintf("capacity-provider/%s", rName)),
+					resource.TestCheckResourceAttrPair(resourceName, "id", resourceName, "arn"),
 					resource.TestCheckResourceAttr(resourceName, "tags.%", "0"),
 					resource.TestCheckResourceAttrPair(resourceName, "auto_scaling_group_provider.0.auto_scaling_group_arn", "aws_autoscaling_group.bar", "arn"),
 					resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_termination_protection", "DISABLED"),
@@ -197,8 +198,6 @@ func testAccCheckAWSEcsCapacityProviderExists(resourceName string, provider *ecs
 	}
 }
 
-// TODO pull managed scaling out of _basic and make it a separate test
-
 func testAccAWSEcsCapacityProviderConfig(rName string) string {
 	return testAccAWSAutoScalingGroupConfig(rName) + fmt.Sprintf(`
 resource "aws_ecs_capacity_provider" "test" {

diff --git a/website/docs/r/ecs_capacity_provider.html.markdown b/website/docs/r/ecs_capacity_provider.html.markdown
@@ -58,6 +58,7 @@ The `managed_scaling` block supports the following:
 In addition to all arguments above, the following attributes are exported:
 
 * `id` - The Amazon Resource Name (ARN) that identifies the capacity provider.
+* `arn` - The Amazon Resource Name (ARN) that identifies the capacity provider.
 
 ## Import