From 0b9fb1d8f839d4685259f4ec9cb040decbbebff2 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 18 Jun 2016 15:57:01 -0700
Subject: [PATCH] Stop swallowing errors from DescribeAlarms

This caused alarms to be created repeatedly if Terraform is running without
DescribeAlarms permission.
---
 builtin/providers/aws/resource_aws_cloudwatch_metric_alarm.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/providers/aws/resource_aws_cloudwatch_metric_alarm.go b/builtin/providers/aws/resource_aws_cloudwatch_metric_alarm.go
index cf44fb155..d5b03b8a9 100644
--- 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