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

Merge pull request #1458 from sparkprime/fix-network-source 

Avoid 'source' being undefined in legacy network Read
This commit is contained in:
Paul Hinze 2015-04-10 09:34:56 -05:00
parent d90b3aa332 d149db41d6
commit 8f5ac1d06f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/providers/google/resource_compute_instance.go
View File

@ -522,7 +522,7 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error
networks := make([]map[string]interface{}, 0, 1) networks := make([]map[string]interface{}, 0, 1)
if networksCount > 0 { if networksCount > 0 {
// TODO: Remove this when realizing deprecation of .network // TODO: Remove this when realizing deprecation of .network
for _, iface := range instance.NetworkInterfaces { for i, iface := range instance.NetworkInterfaces {
var natIP string var natIP string
for _, config := range iface.AccessConfigs { for _, config := range iface.AccessConfigs {
if config.Type == "ONE_TO_ONE_NAT" { if config.Type == "ONE_TO_ONE_NAT" {
@ -539,6 +539,7 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error
network["name"] = iface.Name network["name"] = iface.Name
network["external_address"] = natIP network["external_address"] = natIP
network["internal_address"] = iface.NetworkIP network["internal_address"] = iface.NetworkIP
network["source"] = d.Get(fmt.Sprintf("network.%d.source", i))
networks = append(networks, network) networks = append(networks, network)
} }
} }