Do not retry errors that are not recognized

hashicorp · Jun 3, 2016 · e1c79dd · e1c79dd
1 parent f4b90ef
commit e1c79dd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/builtin/providers/aws/resource_aws_internet_gateway.go b/builtin/providers/aws/resource_aws_internet_gateway.go
@@ -177,15 +177,12 @@ func resourceAwsInternetGatewayAttach(d *schema.ResourceData, meta interface{})
 		if err == nil {
 			return nil
 		}
-		ec2err, ok := err.(awserr.Error)
-		if !ok {
-			log.Printf("[INFO] RetryableError attaching InternetGateway ID: %s %s", d.Id(), err)
-			return resource.RetryableError(err)
-		}
-		switch ec2err.Code() {
-		case "InvalidInternetGatewayID.NotFound":
-			log.Printf("[INFO] RetryableError attaching InternetGateway ID: %s %s", d.Id(), err)
-			return resource.RetryableError(err) // retry
+		if ec2err, ok := err.(awserr.Error); ok {
+			switch ec2err.Code() {
+			case "InvalidInternetGatewayID.NotFound":
+				log.Printf("[INFO] RetryableError attaching InternetGateway ID: %s %s", d.Id(), err)
+				return resource.RetryableError(err) // retry
+			}
 		}
 		log.Printf("[INFO] NonRetryableError attaching InternetGateway ID: %s %s", d.Id(), err)
 		return resource.NonRetryableError(err)

diff --git a/builtin/providers/aws/resource_aws_route_table.go b/builtin/providers/aws/resource_aws_route_table.go
@@ -305,15 +305,12 @@ func resourceAwsRouteTableUpdate(d *schema.ResourceData, meta interface{}) error
 				if err == nil {
 					return nil
 				}
-				ec2err, ok := err.(awserr.Error)
-				if !ok {
-					log.Printf("[INFO] RetryableError creating route for RouteTable ID: %s %s", d.Id(), err)
-					return resource.RetryableError(err)
-				}
-				switch ec2err.Code() {
-				case "InvalidRouteTableID.NotFound":
-					log.Printf("[INFO] RetryableError creating route for RouteTable ID: %s %s", d.Id(), err)
-					return resource.RetryableError(err) // retry
+				if ec2err, ok := err.(awserr.Error); ok {
+					switch ec2err.Code() {
+					case "InvalidRouteTableID.NotFound":
+						log.Printf("[INFO] RetryableError creating route for RouteTable ID: %s %s", d.Id(), err)
+						return resource.RetryableError(err) // retry
+					}
 				}
 				log.Printf("[INFO] NonRetryableError creating route for RouteTable ID: %s %s", d.Id(), err)
 				return resource.NonRetryableError(err)