Merge pull request #7227 from dtolnay/alarm

Stop swallowing errors from DescribeAlarms
2016-06-20 09:42:06 +02:00 · 2016-06-20 09:42:06 +02:00 · a0df0bd7df
parent b8d15ec147 0b9fb1d8f8
commit a0df0bd7df
1 changed files with 1 additions and 1 deletions
--- a/builtin/providers/aws/resource_aws_cloudwatch_metric_alarm.go
+++ b/builtin/providers/aws/resource_aws_cloudwatch_metric_alarm.go
@ -259,7 +259,7 @@ func getAwsCloudWatchMetricAlarm(d *schema.ResourceData, meta interface{}) (*clo

 	resp, err := conn.DescribeAlarms(&params)
 	if err != nil {
-		return nil, nil
+		return nil, err
 	}

 	// Find it and return it