Merge pull request #29896 from hashicorp/b-cloudwatch-alarm-period

resource/aws_cloudwatch_metric_alarm: Add `period` to `metric_query` block

Author: gdavison

.changelog/29896.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_cloudwatch_metric_alarm: Add `period` parameter to `metric_query`
+```
+
+```release-note:enhancement
+resource/aws_cloudwatch_metric_alarm: Add validation to `period` parameter of `metric_query.metric`
+```

internal/service/cloudwatch/metric_alarm.go

@@ -113,6 +113,10 @@ func ResourceMetricAlarm() *schema.Resource {
 									"period": {
 										Type:     schema.TypeInt,
 										Required: true,
+										ValidateFunc: validation.Any(
+											validation.IntInSlice([]int{1, 5, 10, 30}),
+											validation.IntDivisibleBy(60),
+										),
 									},
 									"stat": {
 										Type:     schema.TypeString,
@@ -138,6 +142,14 @@ func ResourceMetricAlarm() *schema.Resource {
 							Type:     schema.TypeString,
 							Optional: true,
 						},
+						"period": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							ValidateFunc: validation.Any(
+								validation.IntInSlice([]int{1, 5, 10, 30}),
+								validation.IntDivisibleBy(60),
+							),
+						},
 						"return_data": {
 							Type:     schema.TypeBool,
 							Optional: true,
@@ -611,6 +623,9 @@ func flattenMetricAlarmMetrics(metrics []*cloudwatch.MetricDataQuery) []map[stri
 			metric := flattenMetricAlarmMetricsMetricStat(mq.MetricStat)
 			metricQuery["metric"] = []interface{}{metric}
 		}
+		if mq.Period != nil {
+			metricQuery["period"] = aws.Int64Value(mq.Period)
+		}
 		metricQueries = append(metricQueries, metricQuery)
 	}
 
@@ -655,6 +670,9 @@ func expandMetricAlarmMetrics(v *schema.Set) []*cloudwatch.MetricDataQuery {
 		if v := metricQueryResource["metric"]; v != nil && len(v.([]interface{})) > 0 {
 			metricQuery.MetricStat = expandMetricAlarmMetricsMetric(v.([]interface{}))
 		}
+		if v, ok := metricQueryResource["period"]; ok && v.(int) != 0 {
+			metricQuery.Period = aws.Int64(int64(v.(int)))
+		}
 		if v, ok := metricQueryResource["account_id"]; ok && v.(string) != "" {
 			metricQuery.AccountId = aws.String(v.(string))
 		}