Rename now uses generic PatchServer

Author: moul

api.go

@@ -399,12 +399,6 @@ type ScalewayServerPatchDefinition struct {
 	//Tags            *[]string                  `json:"tags",omitempty`
 }
 
-// ScalewayServerPatchNameDefinition represents a Scaleway C1 server with only its name as field
-type ScalewayServerPatchNameDefinition struct {
-	// Name is the user-defined name of the server
-	Name string `json:"name"`
-}
-
 // ScalewayServerDefinition represents a Scaleway C1 server with image definition
 type ScalewayServerDefinition struct {
 	// Name is the user-defined name of the server
@@ -701,32 +695,6 @@ func (s *ScalewayAPI) PostServer(definition ScalewayServerDefinition) (string, e
 	return "", error
 }
 
-// PatchServerName changes the name of the server
-func (s *ScalewayAPI) PatchServerName(serverID string, definition ScalewayServerPatchNameDefinition) error {
-	resp, err := s.PatchResponse(fmt.Sprintf("servers/%s", serverID), definition)
-	if err != nil {
-		return err
-	}
-
-	defer resp.Body.Close()
-	decoder := json.NewDecoder(resp.Body)
-
-	// Succeed PATCH code
-	if resp.StatusCode == 200 {
-		return nil
-	}
-
-	var error ScalewayAPIError
-	err = decoder.Decode(&error)
-	if err != nil {
-		return err
-	}
-
-	error.StatusCode = resp.StatusCode
-	error.Debug()
-	return error
-}
-
 // PatchServer updates a server
 func (s *ScalewayAPI) PatchServer(serverID string, definition ScalewayServerPatchDefinition) error {
 	resp, err := s.PatchResponse(fmt.Sprintf("servers/%s", serverID), definition)

rename.go

@@ -26,13 +26,13 @@ func runRename(cmd *Command, args []string) {
 
 	serverID := cmd.API.GetServerID(args[0])
 
-	var server ScalewayServerPatchNameDefinition
-	server.Name = args[1]
+	var server ScalewayServerPatchDefinition
+	server.Name = &args[1]
 
-	err := cmd.API.PatchServerName(serverID, server)
+	err := cmd.API.PatchServer(serverID, server)
 	if err != nil {
 		log.Fatalf("Cannot rename server: %v", err)
 	} else {
-		cmd.API.Cache.InsertServer(serverID, server.Name)
+		cmd.API.Cache.InsertServer(serverID, *server.Name)
 	}
 }