Merge pull request #5747 from hashicorp/b-5647

provider/aws: Fix panic in VPN connection resource
hashicorp · Mar 21, 2016 · b920371 · b920371
2 parents 3bb9903 + 6732659
commit b920371
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/builtin/providers/aws/resource_aws_vpn_connection.go b/builtin/providers/aws/resource_aws_vpn_connection.go
@@ -305,11 +305,13 @@ func resourceAwsVpnConnectionRead(d *schema.ResourceData, meta interface{}) erro
 	// Set read only attributes.
 	d.Set("customer_gateway_configuration", vpnConnection.CustomerGatewayConfiguration)
 
-	tunnelInfo := xmlConfigToTunnelInfo(*vpnConnection.CustomerGatewayConfiguration)
-	d.Set("tunnel1_address", tunnelInfo.Tunnel1Address)
-	d.Set("tunnel1_preshared_key", tunnelInfo.Tunnel1PreSharedKey)
-	d.Set("tunnel2_address", tunnelInfo.Tunnel2Address)
-	d.Set("tunnel2_preshared_key", tunnelInfo.Tunnel2PreSharedKey)
+	if vpnConnection.CustomerGatewayConfiguration != nil {
+		tunnelInfo := xmlConfigToTunnelInfo(*vpnConnection.CustomerGatewayConfiguration)
+		d.Set("tunnel1_address", tunnelInfo.Tunnel1Address)
+		d.Set("tunnel1_preshared_key", tunnelInfo.Tunnel1PreSharedKey)
+		d.Set("tunnel2_address", tunnelInfo.Tunnel2Address)
+		d.Set("tunnel2_preshared_key", tunnelInfo.Tunnel2PreSharedKey)
+	}
 
 	if err := d.Set("vgw_telemetry", telemetryToMapList(vpnConnection.VgwTelemetry)); err != nil {
 		return err