change model_id format

Author: Laure-di

docs/resources/inference_custom_model.md

@@ -59,7 +59,7 @@ In addition to all arguments above, the following attributes are exported:
 - `description` - A textual description of the model (if available).
 - `has_eula` - Whether the model requires end-user license agreement acceptance before use.
 - `parameter_size_bits` - Size, in bits, of the model parameters.
-- `size_bits` - Total size, in bytes, of the model archive.
+- `size_bytes` - Total size, in bytes, of the model archive.
 - `nodes_support` - List of supported node types and their quantization options. Each entry contains:
         - `node_type_name` - The type of node supported.
         - `quantization` - A list of supported quantization options, including:

internal/services/inference/custom_model.go

@@ -124,7 +124,7 @@ func ResourceCustomModel() *schema.Resource {
 				Computed:    true,
 				Description: "Size, in bits, of the model parameters",
 			},
-			"size_bits": {
+			"size_bytes": {
 				Type:        schema.TypeInt,
 				Computed:    true,
 				Description: "Total size, in bytes, of the model files",
@@ -161,7 +161,7 @@ func ResourceCustomModelCreate(ctx context.Context, d *schema.ResourceData, m in
 		return diag.FromErr(err)
 	}
 
-	d.SetId(regional.NewIDString(region, model.ID))
+	d.SetId(model.ID)
 
 	model, err = waitForModel(ctx, api, region, model.ID, d.Timeout(schema.TimeoutCreate))
 	if err != nil {
@@ -178,12 +178,12 @@ func ResourceCustomModelCreate(ctx context.Context, d *schema.ResourceData, m in
 }
 
 func ResourceCustomModelRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	api, region, id, err := NewAPIWithRegionAndID(m, d.Id())
+	api, region, err := NewAPIWithRegion(d, m)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	model, err := waitForModel(ctx, api, region, id, d.Timeout(schema.TimeoutRead))
+	model, err := waitForModel(ctx, api, region, d.Id(), d.Timeout(schema.TimeoutRead))
 	if err != nil {
 		if httperrors.Is404(err) {
 			d.SetId("")
@@ -195,7 +195,7 @@ func ResourceCustomModelRead(ctx context.Context, d *schema.ResourceData, m inte
 	}
 
 	_ = d.Set("parameter_size_bits", int32(model.ParameterSizeBits))
-	_ = d.Set("size_bits", int64(model.SizeBytes))
+	_ = d.Set("size_bytes", int64(model.SizeBytes))
 	_ = d.Set("name", model.Name)
 	_ = d.Set("status", model.Status)
 	_ = d.Set("description", model.Description)
@@ -209,23 +209,18 @@ func ResourceCustomModelRead(ctx context.Context, d *schema.ResourceData, m inte
 }
 
 func ResourceCustomModelDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	api, region, id, err := NewAPIWithRegionAndID(m, d.Id())
+	api, region, err := NewAPIWithRegion(d, m)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	_, err = waitForModel(ctx, api, region, id, d.Timeout(schema.TimeoutDelete))
+	_, err = waitForModel(ctx, api, region, d.Id(), d.Timeout(schema.TimeoutDelete))
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	err = api.DeleteModel(&inference.DeleteModelRequest{
+	return diag.FromErr(api.DeleteModel(&inference.DeleteModelRequest{
 		Region:  region,
-		ModelID: id,
-	}, scw.WithContext(ctx))
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	return nil
+		ModelID: d.Id(),
+	}, scw.WithContext(ctx)))
 }

internal/services/inference/deployment.go

@@ -8,7 +8,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/scaleway/scaleway-sdk-go/api/inference/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
-	scwvalidation "github.com/scaleway/scaleway-sdk-go/validation"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
@@ -56,18 +55,6 @@ func ResourceDeployment() *schema.Resource {
 				Required:    true,
 				Description: "The model id used for the deployment",
 				ForceNew:    true,
-				DiffSuppressFunc: func(k, old, newValue string, d *schema.ResourceData) bool {
-					if old == "" || newValue == "" {
-						return false
-					}
-					if !scwvalidation.IsUUID(newValue) {
-						newID := regional.ExpandID(newValue).ID
-
-						return old == newID
-					}
-
-					return old == newValue
-				},
 			},
 			"accept_eula": {
 				Type:        schema.TypeBool,
@@ -196,18 +183,12 @@ func ResourceDeploymentCreate(ctx context.Context, d *schema.ResourceData, m int
 		return diag.FromErr(err)
 	}
 
-	modelID := d.Get("model_id")
-
-	if !scwvalidation.IsUUID(modelID.(string)) {
-		modelID = regional.ExpandID(modelID).ID
-	}
-
 	req := &inference.CreateDeploymentRequest{
 		Region:       region,
 		ProjectID:    d.Get("project_id").(string),
 		Name:         d.Get("name").(string),
 		NodeTypeName: d.Get("node_type").(string),
-		ModelID:      modelID.(string),
+		ModelID:      d.Get("model_id").(string),
 		Tags:         types.ExpandStrings(d.Get("tags")),
 		Endpoints:    buildEndpoints(d),
 	}