Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

provider/google: Fix VPN Region bug #5125

Merged
merged 1 commit into from
Feb 17, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions builtin/providers/google/resource_compute_vpn_gateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func resourceComputeVpnGatewayRead(d *schema.ResourceData, meta interface{}) err
config := meta.(*Config)

name := d.Get("name").(string)
region := d.Get("region").(string)
region := getOptionalRegion(d, config)
project := config.Project

vpnGatewaysService := compute.NewTargetVpnGatewaysService(config.clientCompute)
Expand Down Expand Up @@ -111,7 +111,7 @@ func resourceComputeVpnGatewayDelete(d *schema.ResourceData, meta interface{}) e
config := meta.(*Config)

name := d.Get("name").(string)
region := d.Get("region").(string)
region := getOptionalRegion(d, config)
project := config.Project

vpnGatewaysService := compute.NewTargetVpnGatewaysService(config.clientCompute)
Expand Down
4 changes: 2 additions & 2 deletions builtin/providers/google/resource_compute_vpn_tunnel.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func resourceComputeVpnTunnelRead(d *schema.ResourceData, meta interface{}) erro
config := meta.(*Config)

name := d.Get("name").(string)
region := d.Get("region").(string)
region := getOptionalRegion(d, config)
project := config.Project

vpnTunnelsService := compute.NewVpnTunnelsService(config.clientCompute)
Expand Down Expand Up @@ -143,7 +143,7 @@ func resourceComputeVpnTunnelDelete(d *schema.ResourceData, meta interface{}) er
config := meta.(*Config)

name := d.Get("name").(string)
region := d.Get("region").(string)
region := getOptionalRegion(d, config)
project := config.Project

vpnTunnelsService := compute.NewVpnTunnelsService(config.clientCompute)
Expand Down