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

Merge pull request #5564 from lwander/b-gcp-route-network 

provider/google: Mark next_hop_network as read only.
This commit is contained in:
Lars Wander 2016-03-10 14:38:08 -05:00
parent 914fd487c8 f8784df82b
commit 0254f95cc9
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/providers/google/resource_compute_route.go
View File

@ -60,8 +60,7 @@ func resourceComputeRoute() *schema.Resource {
"next_hop_network": &schema.Schema{ "next_hop_network": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Computed: true,
ForceNew: true,
}, },
"next_hop_vpn_tunnel": &schema.Schema{ "next_hop_vpn_tunnel": &schema.Schema{
@ -103,7 +102,7 @@ func resourceComputeRouteCreate(d *schema.ResourceData, meta interface{}) error
} }
// Next hop data // Next hop data
var nextHopInstance, nextHopIp, nextHopNetwork, nextHopGateway, var nextHopInstance, nextHopIp, nextHopGateway,
nextHopVpnTunnel string nextHopVpnTunnel string
if v, ok := d.GetOk("next_hop_ip"); ok { if v, ok := d.GetOk("next_hop_ip"); ok {
nextHopIp = v.(string) nextHopIp = v.(string)
@ -125,15 +124,6 @@ func resourceComputeRouteCreate(d *schema.ResourceData, meta interface{}) error
nextHopInstance = nextInstance.SelfLink nextHopInstance = nextInstance.SelfLink
} }
if v, ok := d.GetOk("next_hop_network"); ok {
nextNetwork, err := config.clientCompute.Networks.Get(
config.Project, v.(string)).Do()
if err != nil {
return fmt.Errorf("Error reading network: %s", err)
}
nextHopNetwork = nextNetwork.SelfLink
}
// Tags // Tags
var tags []string var tags []string
@ -152,7 +142,6 @@ func resourceComputeRouteCreate(d *schema.ResourceData, meta interface{}) error
NextHopInstance: nextHopInstance, NextHopInstance: nextHopInstance,
NextHopVpnTunnel: nextHopVpnTunnel, NextHopVpnTunnel: nextHopVpnTunnel,
NextHopIp: nextHopIp, NextHopIp: nextHopIp,
NextHopNetwork: nextHopNetwork,
NextHopGateway: nextHopGateway, NextHopGateway: nextHopGateway,
Priority: int64(d.Get("priority").(int)), Priority: int64(d.Get("priority").(int)),
Tags: tags, Tags: tags,
@ -192,6 +181,7 @@ func resourceComputeRouteRead(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("Error reading route: %#v", err) return fmt.Errorf("Error reading route: %#v", err)
} }
d.Set("next_hop_network", route.NextHopNetwork)
d.Set("self_link", route.SelfLink) d.Set("self_link", route.SelfLink)
return nil return nil

3
website/source/docs/providers/google/r/compute_route.html.markdown
View File

@ -51,9 +51,6 @@ The following arguments are supported:
* `next_hop_gateway` - (Optional) The name of the internet gateway to route * `next_hop_gateway` - (Optional) The name of the internet gateway to route
to if this route is matched. to if this route is matched.
* `next_hop_network` - (Optional) The name of the network to route to if this
route is matched.
* `next_hop_vpn_gateway` - (Optional) The name of the VPN to route to if this * `next_hop_vpn_gateway` - (Optional) The name of the VPN to route to if this
route is matched. route is matched.