feat: improve locality handling and simplify test helpers for datawarehouse

Author: jremy42

go.sum

@@ -148,9 +148,11 @@ func ResourceDeployment() *schema.Resource {
 }
 
 func resourceDeploymentCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
-	api := NewAPI(meta)
+	api, region, err := datawarehouseAPIWithRegion(d, meta)
+	if err != nil {
+		return diag.FromErr(err)
+	}
 
-	region := scw.Region(d.Get("region").(string))
 	req := &datawarehouseapi.CreateDeploymentRequest{
 		Region:       region,
 		ProjectID:    d.Get("project_id").(string),
@@ -183,18 +185,18 @@ func resourceDeploymentCreate(ctx context.Context, d *schema.ResourceData, meta
 		return diag.FromErr(err)
 	}
 
-	d.SetId(deployment.ID)
+	d.SetId(regional.NewIDString(region, deployment.ID))
 
 	return resourceDeploymentRead(ctx, d, meta)
 }
 
 func resourceDeploymentRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
-	api := NewAPI(meta)
-
-	region := scw.Region(d.Get("region").(string))
-	id := d.Id()
+	api, region, id, err := NewAPIWithRegionAndID(meta, d.Id())
+	if err != nil {
+		return diag.FromErr(err)
+	}
 
-	_, err := waitForDatawarehouseDeployment(ctx, api, region, id, d.Timeout(schema.TimeoutRead))
+	_, err = waitForDatawarehouseDeployment(ctx, api, region, id, d.Timeout(schema.TimeoutRead))
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -213,7 +215,7 @@ func resourceDeploymentRead(ctx context.Context, d *schema.ResourceData, meta an
 		return diag.FromErr(err)
 	}
 
-	_ = d.Set("region", string(region))
+	_ = d.Set("region", string(deployment.Region))
 	_ = d.Set("project_id", deployment.ProjectID)
 	_ = d.Set("name", deployment.Name)
 	_ = d.Set("tags", types.FlattenSliceString(deployment.Tags))
@@ -237,14 +239,14 @@ func resourceDeploymentRead(ctx context.Context, d *schema.ResourceData, meta an
 }
 
 func resourceDeploymentUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
-	api := NewAPI(meta)
+	api, region, id, err := NewAPIWithRegionAndID(meta, d.Id())
+	if err != nil {
+		return diag.FromErr(err)
+	}
 
 	var diags diag.Diagnostics
 
-	region := scw.Region(d.Get("region").(string))
-	id := d.Id()
-
-	_, err := waitForDatawarehouseDeployment(ctx, api, region, id, d.Timeout(schema.TimeoutUpdate))
+	_, err = waitForDatawarehouseDeployment(ctx, api, region, id, d.Timeout(schema.TimeoutUpdate))
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -315,12 +317,12 @@ func resourceDeploymentUpdate(ctx context.Context, d *schema.ResourceData, meta
 }
 
 func resourceDeploymentDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
-	api := NewAPI(meta)
-
-	region := scw.Region(d.Get("region").(string))
-	id := d.Id()
+	api, region, id, err := NewAPIWithRegionAndID(meta, d.Id())
+	if err != nil {
+		return diag.FromErr(err)
+	}
 
-	_, err := waitForDatawarehouseDeployment(ctx, api, region, id, d.Timeout(schema.TimeoutDelete))
+	_, err = waitForDatawarehouseDeployment(ctx, api, region, id, d.Timeout(schema.TimeoutDelete))
 	if err != nil {
 		return diag.FromErr(err)
 	}

internal/services/datawarehouse/deployment.go

@@ -18,7 +18,7 @@ func TestAccDeployment_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 
-	latestVersion := fetchLatestClickHouseVersion(t, tt)
+	latestVersion := fetchLatestClickHouseVersion(tt)
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
@@ -79,10 +79,6 @@ resource "scaleway_datawarehouse_deployment" "main" {
 	})
 }
 
-// Helpers
-
-// isDeploymentPresent is now defined in helpers_test.go
-
 func isDeploymentDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		for _, rs := range s.RootModule().Resources {

internal/services/datawarehouse/deployment_test.go

@@ -3,7 +3,10 @@ package datawarehouse
 import (
 	"time"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	datawarehouseapi "github.com/scaleway/scaleway-sdk-go/api/datawarehouse/v1beta1"
+	"github.com/scaleway/scaleway-sdk-go/scw"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
 )
 
@@ -14,3 +17,27 @@ const (
 func NewAPI(m any) *datawarehouseapi.API {
 	return datawarehouseapi.NewAPI(meta.ExtractScwClient(m))
 }
+
+// datawarehouseAPIWithRegion returns a new Datawarehouse API and the region for a Create request
+func datawarehouseAPIWithRegion(d *schema.ResourceData, m any) (*datawarehouseapi.API, scw.Region, error) {
+	api := datawarehouseapi.NewAPI(meta.ExtractScwClient(m))
+
+	region, err := meta.ExtractRegion(d, m)
+	if err != nil {
+		return nil, "", err
+	}
+
+	return api, region, nil
+}
+
+// NewAPIWithRegionAndID returns a Datawarehouse API with region and ID extracted from the state
+func NewAPIWithRegionAndID(m any, id string) (*datawarehouseapi.API, scw.Region, string, error) {
+	api := datawarehouseapi.NewAPI(meta.ExtractScwClient(m))
+
+	region, id, err := regional.ParseID(id)
+	if err != nil {
+		return nil, "", "", err
+	}
+
+	return api, region, id, nil
+}

internal/services/datawarehouse/helpers.go

@@ -3,7 +3,6 @@ package datawarehouse_test
 import (
 	"context"
 	"fmt"
-	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
@@ -16,18 +15,18 @@ import (
 // Common helper functions shared across all datawarehouse tests
 
 // fetchLatestClickHouseVersion returns the latest available ClickHouse version for testing purposes
-func fetchLatestClickHouseVersion(t *testing.T, tt *acctest.TestTools) string {
-	t.Helper()
+func fetchLatestClickHouseVersion(tt *acctest.TestTools) string {
+	tt.T.Helper()
 
 	api := datawarehouse.NewAPI(tt.Meta)
 
 	versionsResp, err := api.ListVersions(&datawarehouseSDK.ListVersionsRequest{}, scw.WithAllPages())
 	if err != nil {
-		t.Fatalf("unable to fetch datawarehouse versions: %s", err)
+		tt.T.Fatalf("unable to fetch datawarehouse versions: %s", err)
 	}
 
 	if len(versionsResp.Versions) == 0 {
-		t.Fatal("no datawarehouse versions available")
+		tt.T.Fatal("no datawarehouse versions available")
 	}
 
 	return versionsResp.Versions[0].Version

internal/services/datawarehouse/helpers_test.go

@@ -18,7 +18,7 @@ func TestAccUser_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 
-	latestVersion := fetchLatestClickHouseVersion(t, tt)
+	latestVersion := fetchLatestClickHouseVersion(tt)
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },