fix(inference): rename resource from custom_model to model

Author: Laure-di

docs/resources/inference_custom_model.md renamed to docs/resources/inference_model.md

@@ -1,18 +1,18 @@
 ---
 subcategory: "Inference"
-page_title: "Scaleway: scaleway_inference_custom_model"
+page_title: "Scaleway: scaleway_inference_model"
 ---
 
-# Resource: scaleway_inference_custom_model
+# Resource: scaleway_inference_model
 
-The scaleway_inference_custom_model resource allows you to upload and manage custom inference models in the Scaleway Inference ecosystem. Once registered, a custom model can be used in any scaleway_inference_deployment resource.
+The scaleway_inference_model resource allows you to upload and manage custom inference models in the Scaleway Inference ecosystem. Once registered, a custom model can be used in any scaleway_inference_deployment resource.
 
 ## Example Usage
 
 ### Basic
 
 ```terraform
-resource "scaleway_inference_custom_model" "test" {
+resource "scaleway_inference_model" "test" {
   name = "my-awesome-model"
   url = "https://huggingface.co/my-awsome-model"
   secret = "my-secret-token"
@@ -22,7 +22,7 @@ resource "scaleway_inference_custom_model" "test" {
 ### Deploy your own model on your managed inference
 
 ```terraform
-resource "scaleway_inference_custom_model" "my_model" {
+resource "scaleway_inference_model" "my_model" {
   name = "my-awesome-model"
   url = "https://huggingface.co/my-awsome-model"
   secret = "my-secret-token"
@@ -31,7 +31,7 @@ resource "scaleway_inference_custom_model" "my_model" {
 resource "scaleway_inference_deployment" "my_deployment" {
   name      = "test-inference-deployment-basic"
   node_type = "A100-80GB" # replace with your node type
-  model_id  = scaleway_inference_custom_model.my_model.id
+  model_id  = scaleway_inference_model.my_model.id
 
   public_endpoint {
     is_enabled = true
@@ -72,5 +72,5 @@ In addition to all arguments above, the following attributes are exported:
 Custom models can be imported using, `{region}/{id}`, as shown below:
 
 ```bash
-terraform import scaleway_inference_custom_model.my_model fr-par/11111111-1111-1111-1111-111111111111
+terraform import scaleway_inference_model.my_model fr-par/11111111-1111-1111-1111-111111111111
 ```

internal/provider/provider.go

@@ -167,7 +167,7 @@ func Provider(config *Config) plugin.ProviderFunc {
 				"scaleway_iam_ssh_key":                         iam.ResourceSSKKey(),
 				"scaleway_iam_user":                            iam.ResourceUser(),
 				"scaleway_inference_deployment":                inference.ResourceDeployment(),
-				"scaleway_inference_custom_model":              inference.ResourceCustomModel(),
+				"scaleway_inference_model":                     inference.ResourceModel(),
 				"scaleway_instance_image":                      instance.ResourceImage(),
 				"scaleway_instance_ip":                         instance.ResourceIP(),
 				"scaleway_instance_ip_reverse_dns":             instance.ResourceIPReverseDNS(),

internal/services/inference/helpers_inference.go

@@ -13,7 +13,7 @@ import (
 const (
 	defaultInferenceDeploymentTimeout = 80 * time.Minute
 	defaultDeploymentRetryInterval    = 1 * time.Minute
-	defaultCustomModelTimeout         = 180 * time.Minute
+	defaultModelTimeout               = 180 * time.Minute
 	defaultCustomModelRetryInterval   = 1 * time.Minute
 )
 

internal/services/inference/custom_model.go renamed to internal/services/inference/model.go

@@ -14,19 +14,19 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
 )
 
-func ResourceCustomModel() *schema.Resource {
+func ResourceModel() *schema.Resource {
 	return &schema.Resource{
-		CreateContext: ResourceCustomModelCreate,
-		ReadContext:   ResourceCustomModelRead,
-		DeleteContext: ResourceCustomModelDelete,
+		CreateContext: ResourceModelCreate,
+		ReadContext:   ResourceModelRead,
+		DeleteContext: ResourceModelDelete,
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Timeouts: &schema.ResourceTimeout{
-			Default: schema.DefaultTimeout(defaultCustomModelTimeout),
-			Create:  schema.DefaultTimeout(defaultCustomModelTimeout),
-			Update:  schema.DefaultTimeout(defaultCustomModelTimeout),
-			Delete:  schema.DefaultTimeout(defaultCustomModelTimeout),
+			Default: schema.DefaultTimeout(defaultModelTimeout),
+			Create:  schema.DefaultTimeout(defaultModelTimeout),
+			Update:  schema.DefaultTimeout(defaultModelTimeout),
+			Delete:  schema.DefaultTimeout(defaultModelTimeout),
 		},
 		SchemaVersion: 0,
 		Schema: map[string]*schema.Schema{
@@ -134,7 +134,7 @@ func ResourceCustomModel() *schema.Resource {
 	}
 }
 
-func ResourceCustomModelCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func ResourceModelCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	api, region, err := NewAPIWithRegion(d, m)
 	if err != nil {
 		return diag.FromErr(err)
@@ -173,10 +173,10 @@ func ResourceCustomModelCreate(ctx context.Context, d *schema.ResourceData, m in
 		return diag.FromErr(fmt.Errorf("model '%s' is in status '%s'", model.ID, errMsg))
 	}
 
-	return ResourceCustomModelRead(ctx, d, m)
+	return ResourceModelRead(ctx, d, m)
 }
 
-func ResourceCustomModelRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func ResourceModelRead(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)
@@ -207,7 +207,7 @@ func ResourceCustomModelRead(ctx context.Context, d *schema.ResourceData, m inte
 	return nil
 }
 
-func ResourceCustomModelDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func ResourceModelDelete(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)

internal/services/inference/custom_model_test.go renamed to internal/services/inference/model_test.go

@@ -30,13 +30,13 @@ func TestAccCustomModel_Basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
-					resource "scaleway_inference_custom_model" "test" {
+					resource "scaleway_inference_model" "test" {
 						name = "%s"
 						url = "%s"
 					}`, modelName, modelURLCompatible),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckCustomModelExists(tt, "scaleway_inference_custom_model.test"),
-					resource.TestCheckResourceAttr("scaleway_inference_custom_model.test", "name", modelName),
+					testAccCheckCustomModelExists(tt, "scaleway_inference_model.test"),
+					resource.TestCheckResourceAttr("scaleway_inference_model.test", "name", modelName),
 				),
 			},
 		},
@@ -56,14 +56,14 @@ func TestAccCustomModel_DeployModelOnServer(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
-					resource "scaleway_inference_custom_model" "test" {
+					resource "scaleway_inference_model" "test" {
 						name = "%s"
 						url = "%s"
 					}
 					resource "scaleway_inference_deployment" "main" {
 						name = "%s"
 						node_type = "%s"
-						model_id = scaleway_inference_custom_model.test.id
+						model_id = scaleway_inference_model.test.id
   						public_endpoint {
     						is_enabled = true
  		 				}

internal/services/inference/testfuncs/checks.go

@@ -44,7 +44,7 @@ func IsDeploymentDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 func IsCustomModelDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		for _, rs := range s.RootModule().Resources {
-			if rs.Type != "scaleway_inference_custom_model" {
+			if rs.Type != "scaleway_inference_model" {
 				continue
 			}
 

internal/services/inference/testfuncs/sweep.go

@@ -16,10 +16,10 @@ func AddTestSweepers() {
 		Dependencies: nil,
 		F:            testSweepDeployment,
 	})
-	resource.AddTestSweepers("scaleway_inference_custom_model", &resource.Sweeper{
-		Name:         "scaleway_inference_custom_model",
+	resource.AddTestSweepers("scaleway_inference_model", &resource.Sweeper{
+		Name:         "scaleway_inference_model",
 		Dependencies: nil,
-		F:            testSweepCustomModel,
+		F:            testSweepModel,
 	})
 }
 
@@ -53,7 +53,7 @@ func testSweepDeployment(_ string) error {
 	})
 }
 
-func testSweepCustomModel(_ string) error {
+func testSweepModel(_ string) error {
 	return acctest.SweepRegions((&inference.API{}).Regions(), func(scwClient *scw.Client, region scw.Region) error {
 		inferenceAPI := inference.NewAPI(scwClient)