providers/aws: gateway detach is idempotent

2014-07-08 16:02:01 -07:00 · 2014-07-08 16:02:01 -07:00 · 5bec1ac383
parent c9bb814917
commit 5bec1ac383
1 changed files with 8 additions and 1 deletions
--- a/builtin/providers/aws/resource_aws_internet_gateway.go
+++ b/builtin/providers/aws/resource_aws_internet_gateway.go
@ -180,9 +180,16 @@ func resource_aws_internet_gateway_detach(
 		s.ID,
 		s.Attributes["vpc_id"])
 	_, err := ec2conn.DetachInternetGateway(s.ID, s.Attributes["vpc_id"])
+	if err != nil {
+		ec2err, ok := err.(*ec2.Error)
+		if ok && ec2err.Code == "Gateway.NotAttached" {
+			err = nil
+		}
+
 		if err != nil {
 			return err
 		}
+	}

 	delete(s.Attributes, "vpc_id")