manage id from regional or not

Author: Laure-di

docs/resources/inference_custom_model.md

@@ -16,7 +16,7 @@ For more information, see the [API documentation](https://www.scaleway.com/en/de
 resource "scaleway_inference_deployment" "deployment" {
   name = "tf-inference-deployment"
   node_type = "L4"
-  model_name = "meta/llama-3.1-8b-instruct:fp8"
+  model_id = "d33fb5fd-75ca-4dfb-8952-8af8b8b28be5"
   public_endpoint {
     is_enabled = true
   }
@@ -26,7 +26,7 @@ resource "scaleway_inference_deployment" "deployment" {
 
 ## Argument Reference
 
-- `model_name` - (Required) The model name to use for the deployment. Model names can be found in Console or using Scaleway's CLI (`scw inference model list`)
+- `model_id` - The model id used for the deployment.
 - `node_type` - (Required) The node type to use for the deployment. Node types can be found using Scaleway's CLI (`scw inference node-type list`)
 - `name` - (Optional) The deployment name.
 - `accept_eula` - (Optional) Some models (e.g Meta Llama) require end-user license agreements. Set `true` to accept.
@@ -48,7 +48,7 @@ resource "scaleway_inference_deployment" "deployment" {
 In addition to all arguments above, the following attributes are exported:
 
 - `id` - The ID of the deployment.
-- `model_id` - The model id used for the deployment.
+- `model_name` - (Required) The model name to use for the deployment. Model names can be found in Console or using Scaleway's CLI (`scw inference model list`)
 - `size` - The size of the pool.
 - `status` - The status of the deployment.
 - `created_at` - The date and time of the creation of the deployment.

docs/resources/inference_deployment.md

@@ -181,6 +181,7 @@ 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())
+
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -195,7 +196,7 @@ func ResourceCustomModelRead(ctx context.Context, d *schema.ResourceData, m inte
 
 		return diag.FromErr(err)
 	}
-	
+
 	_ = d.Set("parameter_size_bits", model.ParameterSizeBits)
 	_ = d.Set("size_bits", model.SizeBytes)
 	_ = d.Set("name", model.Name)

internal/services/inference/custom_model.go

@@ -15,6 +15,7 @@ import (
 const (
 	modelURLCompatible    = "https://huggingface.co/agentica-org/DeepCoder-14B-Preview"
 	modelURLNotCompatible = "https://huggingface.co/google/gemma-3-4b-it"
+	nodeTypeH100          = "H100"
 )
 
 func TestAccCustomModel_Basic(t *testing.T) {
@@ -66,6 +67,43 @@ func TestAccCustomModel_NotCompatible(t *testing.T) {
 	})
 }
 
+func TestAccCustomModel_DeployModelOnServer(t *testing.T) {
+	tt := acctest.NewTestTools(t)
+	defer tt.Cleanup()
+
+	modelName := "TestAccCustomModel_DeployModelOnServer"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { acctest.PreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      inferencetestfuncs.IsCustomModelDestroyed(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_inference_custom_model" "test" {
+						name = "%s"
+						url = "%s"
+					}
+					resource "scaleway_inference_deployment" "main" {
+						name = "%s"
+						node_type = "%s"
+						model_id = scaleway_inference_custom_model.test.id
+  						public_endpoint {
+    						is_enabled = true
+ 		 				}
+						accept_eula = true
+					}
+				`, modelName, modelURLCompatible, modelName, nodeTypeH100),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckDeploymentExists(tt, "scaleway_inference_deployment.main"),
+					resource.TestCheckResourceAttr("scaleway_inference_deployment.main", "model_name", modelName),
+					resource.TestCheckTypeSetElemAttrPair("scaleway_inference_deployment.main", "model_id", "scaleway_inference_custom_model.test", "id"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckCustomModelExists(tt *acctest.TestTools, n string) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		rs, ok := state.RootModule().Resources[n]

internal/services/inference/custom_model_test.go

@@ -8,6 +8,7 @@ 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"
@@ -182,12 +183,18 @@ 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:      d.Get("model_id").(string),
+		ModelID:      modelID.(string),
 		Tags:         types.ExpandStrings(d.Get("tags")),
 		Endpoints:    buildEndpoints(d),
 	}

internal/services/inference/deployment.go

@@ -0,0 +1 @@
+package inference