Merge pull request #19668 from hashicorp/b-aws_cloudwatch_metric_alar…

…m-stat-regression r/aws_cloudwatch_metric_alarm: Allow extended statistics in `metric.stat` argument
hashicorp · Jun 8, 2021 · 5fdecce · 5fdecce
2 parents 69611c1 + d1ce0c7
commit 5fdecce
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.changelog/19668.txt b/.changelog/19668.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_cloudwatch_metric_alarm: Allow extended statistics in the `stat` argument of the `metric` configuration block
+```
diff --git a/aws/resource_aws_cloudwatch_metric_alarm.go b/aws/resource_aws_cloudwatch_metric_alarm.go
@@ -99,9 +99,12 @@ func resourceAwsCloudWatchMetricAlarm() *schema.Resource {
 										Required: true,
 									},
 									"stat": {
-										Type:         schema.TypeString,
-										Required:     true,
-										ValidateFunc: validation.StringInSlice(cloudwatch.Statistic_Values(), false),
+										Type:     schema.TypeString,
+										Required: true,
+										ValidateFunc: validation.Any(
+											validation.StringInSlice(cloudwatch.Statistic_Values(), false),
+											validation.StringMatch(regexp.MustCompile(`p(\d{1,2}(\.\d{0,2})?|100)`), "must specify a value between p0.0 and p100"),
+										),
 									},
 									"unit": {
 										Type:         schema.TypeString,

diff --git a/aws/resource_aws_cloudwatch_metric_alarm_test.go b/aws/resource_aws_cloudwatch_metric_alarm_test.go
@@ -716,7 +716,7 @@ resource "aws_cloudwatch_metric_alarm" "test" {
       metric_name = "CPUUtilization"
       namespace   = "AWS/EC2"
       period      = "120"
-      stat        = "Average"
+      stat        = "p95.45"
       unit        = "Count"
 
       dimensions = {