fix(instance_server): update volume fields (#2006)

Author: Codelax

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/nats-io/jwt/v2 v2.4.1
 	github.com/nats-io/nats.go v1.26.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230526161530-cf508019231d
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230619154501-6a12f2ddaa47
 	github.com/stretchr/testify v1.8.4
 )
 

go.sum

@@ -253,8 +253,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230526161530-cf508019231d h1:qeI25+qrQ5MQaMFS2RgmAeAwUSWZSeYy5eYHnmW8vpk=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230526161530-cf508019231d/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230619154501-6a12f2ddaa47 h1:eGARFgFhRDgxFF6QwimHe+MV21xhuPKLPNhJyML3JkA=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230619154501-6a12f2ddaa47/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=

scaleway/helpers_instance.go

@@ -214,8 +214,8 @@ func validateLocalVolumeSizes(volumes map[string]*instance.VolumeServerTemplate,
 	// Calculate local volume total size.
 	var localVolumeTotalSize scw.Size
 	for _, volume := range volumes {
-		if volume.VolumeType == instance.VolumeVolumeTypeLSSD {
-			localVolumeTotalSize += volume.Size
+		if volume.VolumeType == instance.VolumeVolumeTypeLSSD && volume.Size != nil {
+			localVolumeTotalSize += *volume.Size
 		}
 	}
 
@@ -252,15 +252,15 @@ func sanitizeVolumeMap(volumes map[string]*instance.VolumeServerTemplate) map[st
 		switch {
 		// If a volume already got an ID it is passed as it to the API without specifying the volume type.
 		// TODO: Fix once instance accept volume type in the schema validation
-		case v.ID != "":
+		case v.ID != nil:
 			v = &instance.VolumeServerTemplate{
 				ID:   v.ID,
 				Name: v.Name,
 				Boot: v.Boot,
 			}
 		// For the root volume (index 0) if the size is 0, it is considered as a volume created from an image.
 		// The size is not passed to the API, so it's computed by the API
-		case index == "0" && v.Size == 0:
+		case index == "0" && v.Size == nil:
 			v = &instance.VolumeServerTemplate{
 				VolumeType: v.VolumeType,
 				Boot:       v.Boot,

scaleway/resource_instance_server.go

@@ -367,24 +367,23 @@ func resourceScalewayInstanceServerCreate(ctx context.Context, d *schema.Resourc
 		rootVolumeName = newRandomName("vol")
 	}
 
-	var rootVolumeSize scw.Size
+	var rootVolumeSize *scw.Size
 	if sizeInput == 0 && rootVolumeType == instance.VolumeVolumeTypeLSSD.String() {
 		// Compute the rootVolumeSize so it will be valid against the local volume constraints
 		// It wouldn't be valid if another local volume is added, but in this case
 		// the user would be informed that it does not fulfill the local volume constraints
-		rootVolumeSize = serverType.VolumesConstraint.MaxSize
-	} else {
-		rootVolumeSize = scw.Size(uint64(sizeInput) * gb)
+		rootVolumeSize = scw.SizePtr(serverType.VolumesConstraint.MaxSize)
+	} else if sizeInput > 0 {
+		rootVolumeSize = scw.SizePtr(scw.Size(uint64(sizeInput) * gb))
 	}
 
 	req.Volumes["0"] = &instance.VolumeServerTemplate{
-		Name:       rootVolumeName,
-		ID:         rootVolumeID,
+		Name:       expandStringPtr(rootVolumeName),
+		ID:         expandStringPtr(rootVolumeID),
 		VolumeType: instance.VolumeVolumeType(rootVolumeType),
 		Size:       rootVolumeSize,
-		Boot:       *rootVolumeIsBootVolume,
+		Boot:       rootVolumeIsBootVolume,
 	}
-
 	if raw, ok := d.GetOk("additional_volume_ids"); ok {
 		for i, volumeID := range raw.([]interface{}) {
 			// We have to get the volume to know whether it is a local or a block volume
@@ -396,10 +395,10 @@ func resourceScalewayInstanceServerCreate(ctx context.Context, d *schema.Resourc
 				return diag.FromErr(err)
 			}
 			req.Volumes[strconv.Itoa(i+1)] = &instance.VolumeServerTemplate{
-				ID:         vol.Volume.ID,
-				Name:       vol.Volume.Name,
+				ID:         &vol.Volume.ID,
+				Name:       &vol.Volume.Name,
 				VolumeType: vol.Volume.VolumeType,
-				Size:       vol.Volume.Size,
+				Size:       &vol.Volume.Size,
 			}
 		}
 	}
@@ -713,9 +712,9 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
 
 	if raw, hasAdditionalVolumes := d.GetOk("additional_volume_ids"); d.HasChanges("additional_volume_ids", "root_volume") {
 		volumes["0"] = &instance.VolumeServerTemplate{
-			ID:   expandZonedID(d.Get("root_volume.0.volume_id")).ID,
-			Name: newRandomName("vol"), // name is ignored by the API, any name will work here
-			Boot: d.Get("root_volume.0.boot").(bool),
+			ID:   scw.StringPtr(expandZonedID(d.Get("root_volume.0.volume_id")).ID),
+			Name: scw.StringPtr(newRandomName("vol")), // name is ignored by the API, any name will work here
+			Boot: expandBoolPtr(d.Get("root_volume.0.boot")),
 		}
 
 		if !hasAdditionalVolumes {
@@ -742,8 +741,8 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
 				}
 			}
 			volumes[strconv.Itoa(i+1)] = &instance.VolumeServerTemplate{
-				ID:   expandZonedID(volumeID).ID,
-				Name: newRandomName("vol"), // name is ignored by the API, any name will work here
+				ID:   scw.StringPtr(expandZonedID(volumeID).ID),
+				Name: scw.StringPtr(newRandomName("vol")), // name is ignored by the API, any name will work here
 			}
 		}