Skip to content

Commit 5599f14

Browse files
ctrlokQuentin Perez
authored and
Quentin Perez
committed
Remove IP adress if machine didn't exist (#64)
* Remove IP adress if machine didn't exist * fix error returning
1 parent 64645e7 commit 5599f14

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

driver/scaleway.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,7 @@ func (d *Driver) Remove() (err error) {
347347
if err != nil {
348348
return
349349
}
350-
err = cl.PostServerAction(d.ServerID, "terminate")
351-
if err != nil {
352-
return
353-
}
350+
errRemove := cl.PostServerAction(d.ServerID, "terminate")
354351
for {
355352
_, err = cl.GetServer(d.ServerID)
356353
if err != nil {
@@ -360,6 +357,10 @@ func (d *Driver) Remove() (err error) {
360357
if !d.IPPersistant {
361358
err = cl.DeleteIP(d.IPID)
362359
}
360+
if errRemove != nil {
361+
err = errRemove
362+
return
363+
}
363364
return
364365
}
365366

0 commit comments

Comments
 (0)