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

Merge pull request #4214 from stack72/f-do-floatingip_panic 

provider/digitalocean: Fixing panic condition on FloatingIP droplet
This commit is contained in:
James Nugent 2015-12-08 11:37:59 -05:00
parent 2652fa7f97 4b5cb07475
commit 53609c89c5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/providers/digitalocean/resource_digitalocean_floating_ip.go
View File

@ -83,8 +83,10 @@ func resourceDigitalOceanFloatingIpRead(d *schema.ResourceData, meta interface{}
}
if _, ok := d.GetOk("droplet_id"); ok {
log.Printf("[INFO] The region of the Droplet is %s", floatingIp.Droplet.Region)
d.Set("region", floatingIp.Droplet.Region.Slug)
if floatingIp.Droplet != nil {
log.Printf("[INFO] The region of the Droplet is %s", floatingIp.Droplet.Region)
d.Set("region", floatingIp.Droplet.Region.Slug)
}
} else {
d.Set("region", floatingIp.Region.Slug)
}