Merge pull request #27011 from jochenboesmans/main

resource/aws_appautoscalingpolicy: add computed attribute `alarmARNs`

Author: ewbankkit

.changelog/27011.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_appautoscaling_policy: Add `alarm_arns` attribute
+```

internal/service/appautoscaling/policy.go

@@ -34,17 +34,24 @@ func ResourcePolicy() *schema.Resource {
 		},
 
 		Schema: map[string]*schema.Schema{
+			"alarm_arns": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+			"arn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"name": {
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 				// https://github.com/boto/botocore/blob/9f322b1/botocore/data/autoscaling/2011-01-01/service-2.json#L1862-L1873
 				ValidateFunc: validation.StringLenBetween(0, 255),
 			},
-			"arn": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"policy_type": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -148,15 +155,9 @@ func ResourcePolicy() *schema.Resource {
 										Required: true,
 									},
 									"statistic": {
-										Type:     schema.TypeString,
-										Required: true,
-										ValidateFunc: validation.StringInSlice([]string{
-											applicationautoscaling.MetricStatisticAverage,
-											applicationautoscaling.MetricStatisticMinimum,
-											applicationautoscaling.MetricStatisticMaximum,
-											applicationautoscaling.MetricStatisticSampleCount,
-											applicationautoscaling.MetricStatisticSum,
-										}, false),
+										Type:         schema.TypeString,
+										Required:     true,
+										ValidateFunc: validation.StringInSlice(applicationautoscaling.MetricStatistic_Values(), false),
 									},
 									"unit": {
 										Type:     schema.TypeString,
@@ -165,6 +166,11 @@ func ResourcePolicy() *schema.Resource {
 								},
 							},
 						},
+						"disable_scale_in": {
+							Type:     schema.TypeBool,
+							Default:  false,
+							Optional: true,
+						},
 						"predefined_metric_specification": {
 							Type:          schema.TypeList,
 							MaxItems:      1,
@@ -184,11 +190,6 @@ func ResourcePolicy() *schema.Resource {
 								},
 							},
 						},
-						"disable_scale_in": {
-							Type:     schema.TypeBool,
-							Default:  false,
-							Optional: true,
-						},
 						"scale_in_cooldown": {
 							Type:     schema.TypeInt,
 							Optional: true,
@@ -284,6 +285,11 @@ func resourcePolicyRead(d *schema.ResourceData, meta interface{}) error {
 
 	log.Printf("[DEBUG] Read ApplicationAutoScaling policy: %s, SP: %s, Obj: %s", d.Get("name"), d.Get("name"), p)
 
+	var alarmARNs = make([]string, 0, len(p.Alarms))
+	for _, alarm := range p.Alarms {
+		alarmARNs = append(alarmARNs, aws.StringValue(alarm.AlarmARN))
+	}
+	d.Set("alarm_arns", alarmARNs)
 	d.Set("arn", p.PolicyARN)
 	d.Set("name", p.PolicyName)
 	d.Set("policy_type", p.PolicyType)

internal/service/appautoscaling/policy_test.go

@@ -96,6 +96,7 @@ func TestAccAppAutoScalingPolicy_basic(t *testing.T) {
 				Config: testAccPolicyConfig_basic(rName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckPolicyExists(resourceName, &policy),
+					resource.TestCheckResourceAttr(resourceName, "alarm_arns.#", "0"),
 					resource.TestCheckResourceAttr(resourceName, "name", rName),
 					resource.TestCheckResourceAttr(resourceName, "policy_type", "StepScaling"),
 					resource.TestCheckResourceAttrPair(resourceName, "resource_id", appAutoscalingTargetResourceName, "resource_id"),
@@ -136,7 +137,7 @@ func TestAccAppAutoScalingPolicy_disappears(t *testing.T) {
 				Config: testAccPolicyConfig_basic(rName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckPolicyExists(resourceName, &policy),
-					testAccCheckPolicyDisappears(&policy),
+					acctest.CheckResourceDisappears(acctest.Provider, tfappautoscaling.ResourcePolicy(), resourceName),
 				),
 				ExpectNonEmptyPlan: true,
 			},
@@ -485,23 +486,6 @@ func testAccCheckPolicyDestroy(s *terraform.State) error {
 	return nil
 }
 
-func testAccCheckPolicyDisappears(policy *applicationautoscaling.ScalingPolicy) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		conn := acctest.Provider.Meta().(*conns.AWSClient).AppAutoScalingConn
-
-		input := &applicationautoscaling.DeleteScalingPolicyInput{
-			PolicyName:        policy.PolicyName,
-			ResourceId:        policy.ResourceId,
-			ScalableDimension: policy.ScalableDimension,
-			ServiceNamespace:  policy.ServiceNamespace,
-		}
-
-		_, err := conn.DeleteScalingPolicy(input)
-
-		return err
-	}
-}
-
 func testAccPolicyConfig_basic(rName string) string {
 	return fmt.Sprintf(`
 resource "aws_ecs_cluster" "test" {

website/docs/r/appautoscaling_policy.html.markdown

@@ -231,6 +231,7 @@ The `target_tracking_scaling_policy_configuration` `predefined_metric_specificat
 
 In addition to all arguments above, the following attributes are exported:
 
+* `alarm_arns` - List of CloudWatch alarm ARNs associated with the scaling policy.
 * `arn` - ARN assigned by AWS to the scaling policy.
 * `name` - Scaling policy's name.
 * `policy_type` - Scaling policy's type.