fix(mongodb): use regional ID parsing instead of zonal

jremy42 · jremy42 · commit 5bc9d86376f9 · 2025-09-03T16:58:15.000+02:00
diff --git a/internal/services/mongodb/data_source_instance.go b/internal/services/mongodb/data_source_instance.go
@@ -35,7 +35,7 @@ func DataSourceInstance() *schema.Resource {
 }
 
 func DataSourceInstanceRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
-	mongodbAPI, zone, region, err := newAPIWithZoneAndRegion(d, m)
+	mongodbAPI, region, err := newAPIWithRegion(d, m)
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -65,10 +65,10 @@ func DataSourceInstanceRead(ctx context.Context, d *schema.ResourceData, m any)
 		instanceID = foundInstance.ID
 	}
 
-	zonedID := datasource.NewZonedID(instanceID, zone)
-	d.SetId(zonedID)
+	regionalID := datasource.NewRegionalID(instanceID, region)
+	d.SetId(regionalID)
 
-	err = d.Set("instance_id", zonedID)
+	err = d.Set("instance_id", regionalID)
 	if err != nil {
 		return diag.FromErr(err)
 	}
diff --git a/internal/services/mongodb/helpers.go b/internal/services/mongodb/helpers.go
@@ -7,7 +7,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	mongodb "github.com/scaleway/scaleway-sdk-go/api/mongodb/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
-	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
+
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/transport"
 )
@@ -59,23 +60,9 @@ func newAPIWithRegion(d *schema.ResourceData, m any) (*mongodb.API, scw.Region,
 	return newAPI(m), region, nil
 }
 
-// NewAPIWithZoneAndID returns a mongoDB API with zone and ID extracted from the state
-func NewAPIWithZoneAndID(m any, id string) (*mongodb.API, scw.Zone, string, error) {
-	zone, ID, err := zonal.ParseID(id)
-	if err != nil {
-		return nil, "", "", err
-	}
-
-	return newAPI(m), zone, ID, nil
-}
-
+// NewAPIWithRegionAndID returns a mongoDB API with region and ID extracted from the state
 func NewAPIWithRegionAndID(m any, id string) (*mongodb.API, scw.Region, string, error) {
-	zone, ID, err := zonal.ParseID(id)
-	if err != nil {
-		return nil, "", "", err
-	}
-
-	region, err := zone.Region()
+	region, ID, err := regional.ParseID(id)
 	if err != nil {
 		return nil, "", "", err
 	}
diff --git a/internal/services/mongodb/instance.go b/internal/services/mongodb/instance.go
@@ -20,7 +20,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
-	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
+
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
@@ -263,7 +263,7 @@ func ResourceInstance() *schema.Resource {
 }
 
 func ResourceInstanceCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
-	mongodbAPI, zone, err := newAPIWithZone(d, m)
+	mongodbAPI, region, err := newAPIWithRegion(d, m)
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -361,7 +361,7 @@ func ResourceInstanceCreate(ctx context.Context, d *schema.ResourceData, m any)
 		}
 	}
 
-	d.SetId(zonal.NewIDString(zone, res.ID))
+	d.SetId(regional.NewIDString(region, res.ID))
 
 	_, err = waitForInstance(ctx, mongodbAPI, res.Region, res.ID, d.Timeout(schema.TimeoutCreate))
 	if err != nil {
diff --git a/internal/services/mongodb/instance_test.go b/internal/services/mongodb/instance_test.go
@@ -502,12 +502,7 @@ func IsInstanceDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
 				continue
 			}
 
-			mongodbAPI, zone, ID, err := mongodb.NewAPIWithZoneAndID(tt.Meta, rs.Primary.ID)
-			if err != nil {
-				return err
-			}
-
-			extractRegion, err := zone.Region()
+			mongodbAPI, extractRegion, ID, err := mongodb.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
 			if err != nil {
 				return err
 			}
diff --git a/internal/services/mongodb/snapshot.go b/internal/services/mongodb/snapshot.go
@@ -10,7 +10,6 @@ import (
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
-	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
 )
@@ -86,7 +85,7 @@ func ResourceSnapshot() *schema.Resource {
 }
 
 func ResourceSnapshotCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
-	mongodbAPI, zone, region, err := newAPIWithZoneAndRegion(d, m)
+	mongodbAPI, region, err := newAPIWithRegion(d, m)
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -105,7 +104,7 @@ func ResourceSnapshotCreate(ctx context.Context, d *schema.ResourceData, m any)
 	}
 
 	if snapshot != nil {
-		d.SetId(zonal.NewIDString(zone, snapshot.ID))
+		d.SetId(regional.NewIDString(region, snapshot.ID))
 
 		_, err = waitForSnapshot(ctx, mongodbAPI, region, instanceID, snapshot.ID, d.Timeout(schema.TimeoutCreate))
 		if err != nil {
@@ -122,7 +121,7 @@ func ResourceSnapshotRead(ctx context.Context, d *schema.ResourceData, m any) di
 		return diag.FromErr(err)
 	}
 
-	zone, snapshotID, err := zonal.ParseID(d.Id())
+	_, snapshotID, err := regional.ParseID(d.Id())
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -134,7 +133,7 @@ func ResourceSnapshotRead(ctx context.Context, d *schema.ResourceData, m any) di
 		return diag.FromErr(err)
 	}
 
-	_ = d.Set("instance_id", zonal.NewIDString(zone, *snapshot.InstanceID))
+	_ = d.Set("instance_id", regional.NewIDString(region, *snapshot.InstanceID))
 	_ = d.Set("name", snapshot.Name)
 	_ = d.Set("instance_name", snapshot.InstanceName)
 	_ = d.Set("size", int64(snapshot.SizeBytes))
@@ -154,7 +153,7 @@ func ResourceSnapshotUpdate(ctx context.Context, d *schema.ResourceData, m any)
 		return diag.FromErr(err)
 	}
 
-	_, snapshotID, err := zonal.ParseID(d.Id())
+	_, snapshotID, err := regional.ParseID(d.Id())
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -200,7 +199,7 @@ func ResourceSnapshotDelete(_ context.Context, d *schema.ResourceData, m any) di
 		return diag.FromErr(err)
 	}
 
-	_, snapshotID, err := zonal.ParseID(d.Id())
+	_, snapshotID, err := regional.ParseID(d.Id())
 	if err != nil {
 		return diag.FromErr(err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func DataSourceInstance() *schema.Resource {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`func DataSourceInstanceRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {`
`38`		`- mongodbAPI, zone, region, err := newAPIWithZoneAndRegion(d, m)`
	`38`	`+ mongodbAPI, region, err := newAPIWithRegion(d, m)`
`39`	`39`	`if err != nil {`
`40`	`40`	`return diag.FromErr(err)`
`41`	`41`	`}`
`@@ -65,10 +65,10 @@ func DataSourceInstanceRead(ctx context.Context, d *schema.ResourceData, m any)`
`65`	`65`	`instanceID = foundInstance.ID`
`66`	`66`	`}`
`67`	`67`
`68`		`- zonedID := datasource.NewZonedID(instanceID, zone)`
`69`		`- d.SetId(zonedID)`
	`68`	`+ regionalID := datasource.NewRegionalID(instanceID, region)`
	`69`	`+ d.SetId(regionalID)`
`70`	`70`
`71`		`- err = d.Set("instance_id", zonedID)`
	`71`	`+ err = d.Set("instance_id", regionalID)`
`72`	`72`	`if err != nil {`
`73`	`73`	`return diag.FromErr(err)`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"`
`21`	`21`	`"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"`
`22`	`22`	`"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"`
`23`		`- "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"`
	`23`	`+`
`24`	`24`	`"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"`
`25`	`25`	`"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam"`
`26`	`26`	`"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"`
`@@ -263,7 +263,7 @@ func ResourceInstance() *schema.Resource {`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`func ResourceInstanceCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {`
`266`		`- mongodbAPI, zone, err := newAPIWithZone(d, m)`
	`266`	`+ mongodbAPI, region, err := newAPIWithRegion(d, m)`
`267`	`267`	`if err != nil {`
`268`	`268`	`return diag.FromErr(err)`
`269`	`269`	`}`
`@@ -361,7 +361,7 @@ func ResourceInstanceCreate(ctx context.Context, d *schema.ResourceData, m any)`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`
`364`		`- d.SetId(zonal.NewIDString(zone, res.ID))`
	`364`	`+ d.SetId(regional.NewIDString(region, res.ID))`
`365`	`365`
`366`	`366`	`_, err = waitForInstance(ctx, mongodbAPI, res.Region, res.ID, d.Timeout(schema.TimeoutCreate))`
`367`	`367`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -502,12 +502,7 @@ func IsInstanceDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {`
`502`	`502`	`continue`
`503`	`503`	`}`
`504`	`504`
`505`		`- mongodbAPI, zone, ID, err := mongodb.NewAPIWithZoneAndID(tt.Meta, rs.Primary.ID)`
`506`		`- if err != nil {`
`507`		`- return err`
`508`		`- }`
`509`		`-`
`510`		`- extractRegion, err := zone.Region()`
	`505`	`+ mongodbAPI, extractRegion, ID, err := mongodb.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)`
`511`	`506`	`if err != nil {`
`512`	`507`	`return err`
`513`	`508`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import (`
`10`	`10`	`"github.com/scaleway/scaleway-sdk-go/scw"`
`11`	`11`	`"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"`
`12`	`12`	`"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"`
`13`		`- "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"`
`14`	`13`	`"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"`
`15`	`14`	`"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"`
`16`	`15`	`)`
`@@ -86,7 +85,7 @@ func ResourceSnapshot() *schema.Resource {`
`86`	`85`	`}`
`87`	`86`
`88`	`87`	`func ResourceSnapshotCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {`
`89`		`- mongodbAPI, zone, region, err := newAPIWithZoneAndRegion(d, m)`
	`88`	`+ mongodbAPI, region, err := newAPIWithRegion(d, m)`
`90`	`89`	`if err != nil {`
`91`	`90`	`return diag.FromErr(err)`
`92`	`91`	`}`
`@@ -105,7 +104,7 @@ func ResourceSnapshotCreate(ctx context.Context, d *schema.ResourceData, m any)`
`105`	`104`	`}`
`106`	`105`
`107`	`106`	`if snapshot != nil {`
`108`		`- d.SetId(zonal.NewIDString(zone, snapshot.ID))`
	`107`	`+ d.SetId(regional.NewIDString(region, snapshot.ID))`
`109`	`108`
`110`	`109`	`_, err = waitForSnapshot(ctx, mongodbAPI, region, instanceID, snapshot.ID, d.Timeout(schema.TimeoutCreate))`
`111`	`110`	`if err != nil {`
`@@ -122,7 +121,7 @@ func ResourceSnapshotRead(ctx context.Context, d *schema.ResourceData, m any) di`
`122`	`121`	`return diag.FromErr(err)`
`123`	`122`	`}`
`124`	`123`
`125`		`- zone, snapshotID, err := zonal.ParseID(d.Id())`
	`124`	`+ _, snapshotID, err := regional.ParseID(d.Id())`
`126`	`125`	`if err != nil {`
`127`	`126`	`return diag.FromErr(err)`
`128`	`127`	`}`
`@@ -134,7 +133,7 @@ func ResourceSnapshotRead(ctx context.Context, d *schema.ResourceData, m any) di`
`134`	`133`	`return diag.FromErr(err)`
`135`	`134`	`}`
`136`	`135`
`137`		`- _ = d.Set("instance_id", zonal.NewIDString(zone, *snapshot.InstanceID))`
	`136`	`+ _ = d.Set("instance_id", regional.NewIDString(region, *snapshot.InstanceID))`
`138`	`137`	`_ = d.Set("name", snapshot.Name)`
`139`	`138`	`_ = d.Set("instance_name", snapshot.InstanceName)`
`140`	`139`	`_ = d.Set("size", int64(snapshot.SizeBytes))`
`@@ -154,7 +153,7 @@ func ResourceSnapshotUpdate(ctx context.Context, d *schema.ResourceData, m any)`
`154`	`153`	`return diag.FromErr(err)`
`155`	`154`	`}`
`156`	`155`
`157`		`- _, snapshotID, err := zonal.ParseID(d.Id())`
	`156`	`+ _, snapshotID, err := regional.ParseID(d.Id())`
`158`	`157`	`if err != nil {`
`159`	`158`	`return diag.FromErr(err)`
`160`	`159`	`}`
`@@ -200,7 +199,7 @@ func ResourceSnapshotDelete(_ context.Context, d *schema.ResourceData, m any) di`
`200`	`199`	`return diag.FromErr(err)`
`201`	`200`	`}`
`202`	`201`
`203`		`- _, snapshotID, err := zonal.ParseID(d.Id())`
	`202`	`+ _, snapshotID, err := regional.ParseID(d.Id())`
`204`	`203`	`if err != nil {`
`205`	`204`	`return diag.FromErr(err)`
`206`	`205`	`}`