ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5125 from lwander/b-gcp-vpn-gateway-region 

provider/google: Fix VPN Region bug
This commit is contained in:
James Nugent 2016-02-17 13:45:32 -08:00
parent 84d9b757d1 14d133f574
commit 815cde7fd2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/providers/google/resource_compute_vpn_gateway.go
View File

@ -83,7 +83,7 @@ func resourceComputeVpnGatewayRead(d *schema.ResourceData, meta interface{}) err
config := meta.(*Config) config := meta.(*Config)
name := d.Get("name").(string) name := d.Get("name").(string)
region := d.Get("region").(string) region := getOptionalRegion(d, config)
project := config.Project project := config.Project
vpnGatewaysService := compute.NewTargetVpnGatewaysService(config.clientCompute) vpnGatewaysService := compute.NewTargetVpnGatewaysService(config.clientCompute)
@ -111,7 +111,7 @@ func resourceComputeVpnGatewayDelete(d *schema.ResourceData, meta interface{}) e
config := meta.(*Config) config := meta.(*Config)
name := d.Get("name").(string) name := d.Get("name").(string)
region := d.Get("region").(string) region := getOptionalRegion(d, config)
project := config.Project project := config.Project
vpnGatewaysService := compute.NewTargetVpnGatewaysService(config.clientCompute) vpnGatewaysService := compute.NewTargetVpnGatewaysService(config.clientCompute)

4
builtin/providers/google/resource_compute_vpn_tunnel.go
View File

@ -113,7 +113,7 @@ func resourceComputeVpnTunnelRead(d *schema.ResourceData, meta interface{}) erro
config := meta.(*Config) config := meta.(*Config)
name := d.Get("name").(string) name := d.Get("name").(string)
region := d.Get("region").(string) region := getOptionalRegion(d, config)
project := config.Project project := config.Project
vpnTunnelsService := compute.NewVpnTunnelsService(config.clientCompute) vpnTunnelsService := compute.NewVpnTunnelsService(config.clientCompute)
@ -143,7 +143,7 @@ func resourceComputeVpnTunnelDelete(d *schema.ResourceData, meta interface{}) er
config := meta.(*Config) config := meta.(*Config)
name := d.Get("name").(string) name := d.Get("name").(string)
region := d.Get("region").(string) region := getOptionalRegion(d, config)
project := config.Project project := config.Project
vpnTunnelsService := compute.NewVpnTunnelsService(config.clientCompute) vpnTunnelsService := compute.NewVpnTunnelsService(config.clientCompute)