Prefix new server's root-volume with server hostname (#63)

Author: moul

api/api.go

@@ -150,6 +150,22 @@ type ScalewayVolumeDefinition struct {
 	Organization string `json:"organization"`
 }
 
+// ScalewayVolumePutDefinition represents a Scaleway C1 volume with nullable fields (for PUT)
+type ScalewayVolumePutDefinition struct {
+	Identifier       *string `json:"id,omitempty"`
+	Size             *uint64 `json:"size,omitempty"`
+	CreationDate     *string `json:"creation_date,omitempty"`
+	ModificationDate *string `json:"modification_date,omitempty"`
+	Organization     *string `json:"organization,omitempty"`
+	Name             *string `json:"name,omitempty"`
+	Server           struct {
+		Identifier *string `json:"id,omitempty"`
+		Name       *string `json:"name,omitempty"`
+	} `json:"server,omitempty"`
+	VolumeType *string `json:"volume_type,omitempty"`
+	ExportURI  *string `json:"export_uri,omitempty"`
+}
+
 // ScalewayImage represents a Scaleway Image
 type ScalewayImage struct {
 	// Identifier is a unique identifier for the image
@@ -544,6 +560,25 @@ func (s *ScalewayAPI) PatchResponse(resource string, data interface{}) (*http.Re
 	return client.Do(req)
 }
 
+// PutResponse returns an http.Response object for the updated resource
+func (s *ScalewayAPI) PutResponse(resource string, data interface{}) (*http.Response, error) {
+	uri := fmt.Sprintf("%s/%s", strings.TrimRight(s.APIEndPoint, "/"), resource)
+	client := &http.Client{}
+	payload := new(bytes.Buffer)
+	encoder := json.NewEncoder(payload)
+	if err := encoder.Encode(data); err != nil {
+		return nil, err
+	}
+	log.Debugf("PUT %s payload=%s", uri, strings.TrimSpace(fmt.Sprintf("%s", payload)))
+	req, err := http.NewRequest("PUT", uri, payload)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Set("X-Auth-Token", s.Token)
+	req.Header.Set("Content-Type", "application/json")
+	return client.Do(req)
+}
+
 // DeleteResponse returns an http.Response object for the deleted resource
 func (s *ScalewayAPI) DeleteResponse(resource string) (*http.Response, error) {
 	uri := fmt.Sprintf("%s/%s", strings.TrimRight(s.APIEndPoint, "/"), resource)
@@ -851,6 +886,32 @@ func (s *ScalewayAPI) PostVolume(definition ScalewayVolumeDefinition) (string, e
 	return "", error
 }
 
+// PutVolume updates a volume
+func (s *ScalewayAPI) PutVolume(volumeID string, definition ScalewayVolumePutDefinition) error {
+	resp, err := s.PutResponse(fmt.Sprintf("volumes/%s", volumeID), definition)
+	if err != nil {
+		return err
+	}
+
+	defer resp.Body.Close()
+	decoder := json.NewDecoder(resp.Body)
+
+	// Succeed PUT 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
+}
+
 // ResolveServer attempts the find a matching Identifier for the input string
 func (s *ScalewayAPI) ResolveServer(needle string) ([]string, error) {
 	servers := s.Cache.LookUpServers(needle, true)

api/helpers.go

@@ -234,6 +234,7 @@ func CreateServer(api *ScalewayAPI, imageName string, name string, bootscript st
 		server.Bootscript = &bootscript
 	}
 
+	inheritingVolume := false
 	_, err := humanize.ParseBytes(imageName)
 	if err == nil {
 		// Create a new root volume
@@ -245,6 +246,7 @@ func CreateServer(api *ScalewayAPI, imageName string, name string, bootscript st
 	} else {
 		// Use an existing image
 		// FIXME: handle snapshots
+		inheritingVolume = true
 		image := api.GetImageID(imageName, false)
 		if image != "" {
 			server.Image = &image
@@ -263,6 +265,36 @@ func CreateServer(api *ScalewayAPI, imageName string, name string, bootscript st
 		return "", nil
 	}
 
+	// For inherited volumes, we prefix the name with server hostname
+	if inheritingVolume {
+		createdServer, err := api.GetServer(serverID)
+		if err != nil {
+			return "", err
+		}
+		currentVolume := createdServer.Volumes["0"]
+
+		var volumePayload ScalewayVolumePutDefinition
+		newName := fmt.Sprintf("%s-%s", createdServer.Hostname, currentVolume.Name)
+		volumePayload.Name = &newName
+		volumePayload.CreationDate = &currentVolume.CreationDate
+		volumePayload.Organization = &currentVolume.Organization
+		volumePayload.Server.Identifier = &currentVolume.Server.Identifier
+		volumePayload.Server.Name = &currentVolume.Server.Name
+		volumePayload.Identifier = &currentVolume.Identifier
+		volumePayload.Size = &currentVolume.Size
+		volumePayload.ModificationDate = &currentVolume.ModificationDate
+		volumePayload.ExportURI = &currentVolume.ExportURI
+
+		// FIXME: temporary workaround for API bug
+		newType := "l_hdd"
+		volumePayload.VolumeType = &newType
+
+		err = api.PutVolume(currentVolume.Identifier, volumePayload)
+		if err != nil {
+			return "", err
+		}
+	}
+
 	return serverID, nil
 }