add checks.go and change tests names

Author: Laure-di

internal/services/inference/deployment_test.go

@@ -2,13 +2,13 @@ package inference_test
 
 import (
 	"fmt"
+	inferencetestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/inference/testfuncs"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	inferenceSDK "github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
-	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/inference"
 )
 
@@ -19,7 +19,7 @@ func TestAccDeployment_Basic(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: tt.ProviderFactories,
-		CheckDestroy:      testAccCheckDeploymentDestroy(tt),
+		CheckDestroy:      inferencetestfuncs.IsDeploymentDestroy(tt),
 		Steps: []resource.TestStep{
 			{
 				Config: `
@@ -49,15 +49,15 @@ func TestAccDeployment_Endpoint(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: tt.ProviderFactories,
-		CheckDestroy:      testAccCheckDeploymentDestroy(tt),
+		CheckDestroy:      inferencetestfuncs.IsDeploymentDestroy(tt),
 		Steps: []resource.TestStep{
 			{
 				Config: `
 					resource "scaleway_vpc_private_network" "pn01" {
 						name = "private-network-test-inference"
 					}
 					resource "scaleway_inference_deployment" "main" {
-						name = "test-inferenceSDK-deployment-basic"
+						name = "test-inferenceSDK-deployment-endpoint-private"
 						node_type = "L4"
 						model_name = "meta/llama-3.1-8b-instruct:fp8"
 						endpoints {
@@ -77,7 +77,7 @@ func TestAccDeployment_Endpoint(t *testing.T) {
 						name = "private-network-test-inference"
 					}
 					resource "scaleway_inference_deployment" "main" {
-						name = "test-inferenceSDK-deployment-basic"
+						name = "test-inferenceSDK-deployment-basic-endpoints-private-public"
 						node_type = "L4"
 						model_name = "meta/llama-3.1-8b-instruct:fp8"
 						endpoints {
@@ -103,7 +103,7 @@ func TestAccDeployment_MinSize(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: tt.ProviderFactories,
-		CheckDestroy:      testAccCheckDeploymentDestroy(tt),
+		CheckDestroy:      inferencetestfuncs.IsDeploymentDestroy(tt),
 		Steps: []resource.TestStep{
 			{
 				Config: `
@@ -150,33 +150,3 @@ func testAccCheckDeploymentExists(tt *acctest.TestTools, n string) resource.Test
 		return nil
 	}
 }
-
-func testAccCheckDeploymentDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
-	return func(state *terraform.State) error {
-		for _, rs := range state.RootModule().Resources {
-			if rs.Type != "scaleway_inference_deployment" {
-				continue
-			}
-
-			api, region, id, err := inference.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
-			if err != nil {
-				return err
-			}
-
-			_, err = api.DeleteDeployment(&inferenceSDK.DeleteDeploymentRequest{
-				DeploymentID: id,
-				Region:       region,
-			})
-
-			if err == nil {
-				return fmt.Errorf("inferenceSDK deployment (%s) still exists", rs.Primary.ID)
-			}
-
-			if !httperrors.Is404(err) {
-				return err
-			}
-		}
-
-		return nil
-	}
-}

internal/services/inference/testfuncs/checks.go

@@ -0,0 +1,35 @@
+package inferencetestfuncs
+
+import (
+	"fmt"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+	inferenceSDK "github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/inference"
+)
+
+func IsDeploymentDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		for _, rs := range s.RootModule().Resources {
+			if rs.Type != "scaleway_inference_deployment" {
+				continue
+			}
+
+			inferenceAPI, region, ID, err := inference.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
+			if err != nil {
+				return err
+			}
+
+			deployment, err := inferenceAPI.GetDeployment(&inferenceSDK.GetDeploymentRequest{
+				Region:       region,
+				DeploymentID: ID,
+			})
+
+			if err == nil {
+				return fmt.Errorf("deployment %s (%s) still exists", deployment.Name, deployment.ID)
+			}
+		}
+		return nil
+	}
+}