Changing the DigitalOcean FloatingIP Read func to check for Droplet Region and then fallback to FloatingIP Region

This commit is contained in:
stack72 2015-12-08 16:52:41 +00:00
parent 6460f23593
commit 22388139a3
1 changed files with 4 additions and 5 deletions

View File

@ -82,11 +82,10 @@ func resourceDigitalOceanFloatingIpRead(d *schema.ResourceData, meta interface{}
return fmt.Errorf("Error retrieving FloatingIP: %s", err) return fmt.Errorf("Error retrieving FloatingIP: %s", err)
} }
if _, ok := d.GetOk("droplet_id"); ok { if floatingIp.Droplet != nil {
if floatingIp.Droplet != nil { log.Printf("[INFO] A droplet was detected on the FloatingIP so setting the Region based on the Droplet")
log.Printf("[INFO] The region of the Droplet is %s", floatingIp.Droplet.Region) log.Printf("[INFO] The region of the Droplet is %s", floatingIp.Droplet.Region.Slug)
d.Set("region", floatingIp.Droplet.Region.Slug) d.Set("region", floatingIp.Droplet.Region.Slug)
}
} else { } else {
d.Set("region", floatingIp.Region.Slug) d.Set("region", floatingIp.Region.Slug)
} }