Skip to content

Commit 9d8e809

Browse files
committed
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
1 parent ce6fd6f commit 9d8e809

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

driver.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,10 +341,14 @@ func (d *Driver) Remove() error {
341341
return errors.Wrap(err, "could not get server handle")
342342
}
343343

344-
log.Infof(" -> Destroying server %s[%d] in...", srv.Name, srv.ID)
345-
346-
if _, err := d.getClient().Server.Delete(context.Background(), srv); err != nil {
347-
return errors.Wrap(err, "could not delete server")
344+
if srv == nil {
345+
log.Infof(" -> Server does not exist anymore")
346+
} else {
347+
log.Infof(" -> Destroying server %s[%d] in...", srv.Name, srv.ID)
348+
349+
if _, err := d.getClient().Server.Delete(context.Background(), srv); err != nil {
350+
return errors.Wrap(err, "could not delete server")
351+
}
348352
}
349353
}
350354

0 commit comments

Comments
 (0)