resolve image label after root volume preparation

Author: Codelax

internal/services/instance/helpers_instance_block.go

@@ -193,16 +193,14 @@ func instanceAndBlockAPIWithZoneAndID(m interface{}, zonedID string) (*BlockAndI
 	}, zone, ID, nil
 }
 
-func volumeTypeToMarketplaceFilter(volumeType any) marketplace.LocalImageType {
-	if volumeType != nil {
-		switch instance.VolumeVolumeType(volumeType.(string)) {
-		case instance.VolumeVolumeTypeSbsVolume:
-			return marketplace.LocalImageTypeInstanceSbs
-		case instance.VolumeVolumeTypeBSSD:
-			return marketplace.LocalImageTypeInstanceLocal
-		case instance.VolumeVolumeTypeLSSD:
-			return marketplace.LocalImageTypeInstanceLocal
-		}
+func volumeTypeToMarketplaceFilter(volumeType instance.VolumeVolumeType) marketplace.LocalImageType {
+	switch volumeType {
+	case instance.VolumeVolumeTypeSbsVolume:
+		return marketplace.LocalImageTypeInstanceSbs
+	case instance.VolumeVolumeTypeBSSD:
+		return marketplace.LocalImageTypeInstanceLocal
+	case instance.VolumeVolumeTypeLSSD:
+		return marketplace.LocalImageTypeInstanceLocal
 	}
 
 	return marketplace.LocalImageTypeInstanceSbs

internal/services/instance/server.go

@@ -389,22 +389,6 @@ func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m
 	commercialType := d.Get("type").(string)
 
 	imageUUID := locality.ExpandID(d.Get("image"))
-	if imageUUID != "" && !scwvalidation.IsUUID(imageUUID) {
-		// Replace dashes with underscores ubuntu-focal -> ubuntu_focal
-		imageLabel := formatImageLabel(imageUUID)
-
-		marketPlaceAPI := marketplace.NewAPI(meta.ExtractScwClient(m))
-		image, err := marketPlaceAPI.GetLocalImageByLabel(&marketplace.GetLocalImageByLabelRequest{
-			CommercialType: commercialType,
-			Zone:           zone,
-			ImageLabel:     imageLabel,
-			Type:           volumeTypeToMarketplaceFilter(d.Get("root_volume.0.volume_type")),
-		})
-		if err != nil {
-			return diag.FromErr(fmt.Errorf("could not get image '%s': %s", zonal.NewID(zone, imageLabel), err))
-		}
-		imageUUID = image.ID
-	}
 
 	req := &instanceSDK.CreateServerRequest{
 		Zone:              zone,
@@ -473,6 +457,23 @@ func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m
 		return diag.FromErr(err)
 	}
 
+	if imageUUID != "" && !scwvalidation.IsUUID(imageUUID) {
+		// Replace dashes with underscores ubuntu-focal -> ubuntu_focal
+		imageLabel := formatImageLabel(imageUUID)
+
+		marketPlaceAPI := marketplace.NewAPI(meta.ExtractScwClient(m))
+		image, err := marketPlaceAPI.GetLocalImageByLabel(&marketplace.GetLocalImageByLabelRequest{
+			CommercialType: commercialType,
+			Zone:           zone,
+			ImageLabel:     imageLabel,
+			Type:           volumeTypeToMarketplaceFilter(req.Volumes["0"].VolumeType),
+		})
+		if err != nil {
+			return diag.FromErr(fmt.Errorf("could not get image '%s': %s", zonal.NewID(zone, imageLabel), err))
+		}
+		imageUUID = image.ID
+	}
+
 	res, err := api.CreateServer(req, scw.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)