Merge pull request #416 from QuentinPerez/rename-delete-method

rename deleteServerSafe

Author: moul

README.md

@@ -1203,6 +1203,7 @@ $ scw inspect myserver | jq '.[0].public_ip.address'
 
 ### master (unreleased)
 
+* API rename `deleteServerSafe` -> `deleteServerForce`
 * API support paginate
 * API more verbose with `-V`
 * Better handling of secondary volumes size ([361](https://github.com/scaleway/scaleway-cli/issues/361))

pkg/api/helpers.go

@@ -637,8 +637,8 @@ func StartServerOnce(api *ScalewayAPI, needle string, wait bool, successChan cha
 	successChan <- needle
 }
 
-// DeleteServerSafe tries to delete a server using multiple ways
-func (a *ScalewayAPI) DeleteServerSafe(serverID string) error {
+// DeleteServerForce tries to delete a server using multiple ways
+func (a *ScalewayAPI) DeleteServerForce(serverID string) error {
 	// FIXME: also delete attached volumes and ip address
 	// FIXME: call delete and stop -t in parallel to speed up process
 	err := a.DeleteServer(serverID)

pkg/commands/rm.go

@@ -25,7 +25,7 @@ func RunRm(ctx CommandContext, args RmArgs) error {
 			return err
 		}
 		if args.Force {
-			err = ctx.API.DeleteServerSafe(server)
+			err = ctx.API.DeleteServerForce(server)
 		} else {
 			err = ctx.API.DeleteServer(server)
 		}

pkg/commands/run.go

@@ -186,7 +186,7 @@ func Run(ctx CommandContext, args RunArgs) error {
 	logrus.Debugf("PrivateDNS %s", serverID+api.URLPrivateDNS)
 
 	if args.AutoRemove {
-		defer ctx.API.DeleteServerSafe(serverID)
+		defer ctx.API.DeleteServerForce(serverID)
 	}
 
 	// start SERVER