Skip to content
Snippets Groups Projects
Unverified Commit 9d8e8098 authored by Manuel Hutter's avatar Manuel Hutter
Browse files

Don't try to remove server if it does not exist

When a server does not exist anymore (eg if it has been removed manually
before removing it from docker-machine), gracefully handle the situation
and ensure the accompanying SSH-Key is removed aswell.

Fixes: #18
parent ce6fd6f9
Branches
Tags
No related merge requests found
...@@ -341,12 +341,16 @@ func (d *Driver) Remove() error { ...@@ -341,12 +341,16 @@ func (d *Driver) Remove() error {
return errors.Wrap(err, "could not get server handle") return errors.Wrap(err, "could not get server handle")
} }
if srv == nil {
log.Infof(" -> Server does not exist anymore")
} else {
log.Infof(" -> Destroying server %s[%d] in...", srv.Name, srv.ID) log.Infof(" -> Destroying server %s[%d] in...", srv.Name, srv.ID)
if _, err := d.getClient().Server.Delete(context.Background(), srv); err != nil { if _, err := d.getClient().Server.Delete(context.Background(), srv); err != nil {
return errors.Wrap(err, "could not delete server") return errors.Wrap(err, "could not delete server")
} }
} }
}
if !d.IsExistingKey && d.KeyID != 0 { if !d.IsExistingKey && d.KeyID != 0 {
key, err := d.getKey() key, err := d.getKey()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment