Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

providers/digitalocean: wait for droplet to be unlocked before destroy #1057

Merged
merged 1 commit into from
Feb 26, 2015
Merged

providers/digitalocean: wait for droplet to be unlocked before destroy #1057

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion builtin/providers/digitalocean/resource_digitalocean_droplet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,10 +326,18 @@ func resourceDigitalOceanDropletUpdate(d *schema.ResourceData, meta interface{})
func resourceDigitalOceanDropletDelete(d *schema.ResourceData, meta interface{}) error {
client := meta.(*digitalocean.Client)

_, err := WaitForDropletAttribute(
d, "false", []string{"", "true"}, "locked", meta)

if err != nil {
return fmt.Errorf(
"Error waiting for droplet to be unlocked for destroy (%s): %s", d.Id(), err)
}

log.Printf("[INFO] Deleting droplet: %s", d.Id())

// Destroy the droplet
err := client.DestroyDroplet(d.Id())
err = client.DestroyDroplet(d.Id())

// Handle remotely destroyed droplets
if err != nil && strings.Contains(err.Error(), "404 Not Found") {
Expand Down