Merge pull request #2533 from hashicorp/b-vpn-connection-protection

provider/aws: nil protection against VPN connections [GH-2144]
hashicorp · Jun 30, 2015 · 97ee426 · 97ee426
2 parents 13dd7f8 + 1cc5068
commit 97ee426
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/builtin/providers/aws/resource_vpn_connection_route.go b/builtin/providers/aws/resource_vpn_connection_route.go
@@ -91,6 +91,12 @@ func resourceAwsVpnConnectionRouteRead(d *schema.ResourceData, meta interface{})
 			return err
 		}
 	}
+	if resp == nil || len(resp.VPNConnections) == 0 {
+		// This is kind of a weird edge case. I'd rather return an error
+		// instead of just blindly setting the ID to ""... since I don't know
+		// what might cause this.
+		return fmt.Errorf("No VPN connections returned")
+	}
 
 	vpnConnection := resp.VPNConnections[0]