Fix state detection for the VPN Gateway.

Related to hashicorp#7859. Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
kwilczynski · Aug 1, 2016 · 6d927a4 · 6d927a4
1 parent 03590ca
commit 6d927a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/builtin/providers/aws/resource_aws_vpn_gateway.go b/builtin/providers/aws/resource_aws_vpn_gateway.go
@@ -81,7 +81,7 @@ func resourceAwsVpnGatewayRead(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	vpnGateway := resp.VpnGateways[0]
-	if vpnGateway == nil {
+	if vpnGateway == nil || *vpnGateway.State == "deleted" {
 		// Seems we have lost our VPN gateway
 		d.SetId("")
 		return nil

diff --git a/builtin/providers/aws/resource_aws_vpn_gateway_attachment.go b/builtin/providers/aws/resource_aws_vpn_gateway_attachment.go
@@ -100,12 +100,7 @@ func resourceAwsVpnGatewayAttachmentRead(d *schema.ResourceData, meta interface{
 		return nil
 	}
 
-	if len(vgw.VpcAttachments) == 0 {
-		d.Set("vpc_id", "")
-		return nil
-	}
-
-	if *vgw.VpcAttachments[0].State == "detached" || *vgw.VpcAttachments[0].State == "deleted" {
+	if len(vgw.VpcAttachments) == 0 || *vgw.VpcAttachments[0].State == "detached" {
 		d.Set("vpc_id", "")
 		return nil
 	}