simplify digitalocean_droplet.image loading

If a droplet's image slug is empty and its image id is empty, then the
image attribute should be empty, so we may assign from either. So it is
unnecessary to check if the image id is empty.

* remove unnecessary check for emptiness of image id
* reverse order of the conditions for assigning the image attribute,
  with the default case (using the slug) first, and the fallback case
  (using the id) second
This commit is contained in:
Joseph Anthony Pasquale Holsten 2014-12-01 11:36:05 -08:00
parent f929d076b4
commit ea7e35e385
1 changed files with 3 additions and 3 deletions

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)