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

Merge pull request #617 from josephholsten/simplify-do-droplet-image-loading 

simplify digitalocean_droplet.image loading
This commit is contained in:
Armon Dadgar 2014-12-03 11:59:52 -08:00
parent cd50d71538 5b0894b5cd
commit f7a0b7ac1d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,10 +170,10 @@ func resourceDigitalOceanDropletRead(d *schema.ResourceData, meta interface{}) e
return fmt.Errorf("Error retrieving droplet: %s", err)
}
if droplet.ImageSlug() == "" && droplet.ImageId() != "" {
d.Set("image", droplet.ImageId())
} else {
if droplet.ImageSlug() != "" {
d.Set("image", droplet.ImageSlug())
} else {
d.Set("image", droplet.ImageId())
}
d.Set("name", droplet.Name)