From f921d763d2edfd9c21fa3e4ac415269e4ec7e1ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Thu, 2 Oct 2025 14:06:05 +0200 Subject: [PATCH] chore: add testing for locality --- internal/services/baremetal/offer_data_source.go | 2 +- internal/services/inference/model.go | 1 + internal/services/instance/ip.go | 2 +- internal/services/instance/placement_group.go | 2 +- internal/services/instance/private_nic.go | 2 +- internal/services/instance/security_group.go | 2 +- internal/services/instance/server.go | 2 +- internal/services/instance/snapshot.go | 1 + internal/services/instance/volume.go | 2 +- internal/services/iot/device.go | 2 +- internal/services/iot/hub.go | 2 +- internal/services/iot/network.go | 2 +- internal/services/iot/routes.go | 2 +- internal/services/ipam/ip.go | 2 +- internal/services/ipam/ip_reverse_dns.go | 2 +- internal/services/k8s/acl.go | 2 +- internal/services/k8s/cluster.go | 2 +- internal/services/k8s/pool.go | 4 ++-- internal/services/marketplace/image_data_source.go | 2 +- internal/services/mnq/nats_credentials.go | 2 +- internal/services/rdb/instance.go | 2 +- internal/services/rdb/read_replica.go | 3 +-- internal/services/rdb/snapshots.go | 2 +- internal/services/secret/secret.go | 2 +- internal/services/secret/version.go | 2 +- internal/services/tem/domain.go | 2 +- internal/services/vpc/vpc.go | 2 +- internal/services/vpcgw/dhcp_reservation.go | 2 +- internal/services/vpcgw/ip.go | 2 +- internal/services/vpcgw/ip_reverse.go | 2 +- internal/services/vpcgw/pat_rule.go | 2 +- internal/services/webhosting/webhosting.go | 2 +- 32 files changed, 33 insertions(+), 32 deletions(-) diff --git a/internal/services/baremetal/offer_data_source.go b/internal/services/baremetal/offer_data_source.go index a71ba0695a..3d13487af1 100644 --- a/internal/services/baremetal/offer_data_source.go +++ b/internal/services/baremetal/offer_data_source.go @@ -204,7 +204,7 @@ func dataSourceOfferRead(ctx context.Context, d *schema.ResourceData, m any) dia zonedID := datasource.NewZonedID(offer.ID, zone) d.SetId(zonedID) _ = d.Set("offer_id", zonedID) - _ = d.Set("zone", zone) + _ = d.Set("zone", offer.zone) _ = d.Set("name", offer.Name) _ = d.Set("subscription_period", offer.SubscriptionPeriod) _ = d.Set("include_disabled", !offer.Enable) diff --git a/internal/services/inference/model.go b/internal/services/inference/model.go index 6b955406a7..5df7887ba8 100644 --- a/internal/services/inference/model.go +++ b/internal/services/inference/model.go @@ -203,6 +203,7 @@ func ResourceModelRead(ctx context.Context, d *schema.ResourceData, m any) diag. _ = d.Set("updated_at", types.FlattenTime(model.UpdatedAt)) _ = d.Set("has_eula", model.HasEula) _ = d.Set("nodes_support", flattenNodeSupport(model.NodesSupport)) + _ = d.Set("region", model.Region.String()) return nil } diff --git a/internal/services/instance/ip.go b/internal/services/instance/ip.go index fa372b5f83..45718bf844 100644 --- a/internal/services/instance/ip.go +++ b/internal/services/instance/ip.go @@ -172,7 +172,7 @@ func ResourceInstanceIPRead(ctx context.Context, d *schema.ResourceData, m any) _ = d.Set("address", address) _ = d.Set("prefix", prefix) - _ = d.Set("zone", zone) + _ = d.Set("zone", res.IP.Zone.String()) _ = d.Set("organization_id", res.IP.Organization) _ = d.Set("project_id", res.IP.Project) _ = d.Set("reverse", res.IP.Reverse) diff --git a/internal/services/instance/placement_group.go b/internal/services/instance/placement_group.go index 7307f848f6..9789711746 100644 --- a/internal/services/instance/placement_group.go +++ b/internal/services/instance/placement_group.go @@ -112,7 +112,7 @@ func ResourceInstancePlacementGroupRead(ctx context.Context, d *schema.ResourceD } _ = d.Set("name", res.PlacementGroup.Name) - _ = d.Set("zone", string(zone)) + _ = d.Set("zone", res.PlacementGroup.Zone.String()) _ = d.Set("organization_id", res.PlacementGroup.Organization) _ = d.Set("project_id", res.PlacementGroup.Project) _ = d.Set("policy_mode", res.PlacementGroup.PolicyMode.String()) diff --git a/internal/services/instance/private_nic.go b/internal/services/instance/private_nic.go index 400f18cd27..9a2e76244f 100644 --- a/internal/services/instance/private_nic.go +++ b/internal/services/instance/private_nic.go @@ -178,7 +178,7 @@ func ResourceInstancePrivateNICRead(ctx context.Context, d *schema.ResourceData, return diag.FromErr(err) } - _ = d.Set("zone", zone) + _ = d.Set("zone", privateNIC.) _ = d.Set("server_id", zonal.NewID(zone, privateNIC.ServerID).String()) _ = d.Set("private_network_id", regional.NewIDString(fetchRegion, privateNIC.PrivateNetworkID)) _ = d.Set("mac_address", privateNIC.MacAddress) diff --git a/internal/services/instance/security_group.go b/internal/services/instance/security_group.go index eb562b6a3a..6d2d80603f 100644 --- a/internal/services/instance/security_group.go +++ b/internal/services/instance/security_group.go @@ -160,7 +160,7 @@ func ResourceInstanceSecurityGroupRead(ctx context.Context, d *schema.ResourceDa return diag.FromErr(err) } - _ = d.Set("zone", zone) + _ = d.Set("zone", res.SecurityGroup.Zone.String()) _ = d.Set("organization_id", res.SecurityGroup.Organization) _ = d.Set("project_id", res.SecurityGroup.Project) _ = d.Set("name", res.SecurityGroup.Name) diff --git a/internal/services/instance/server.go b/internal/services/instance/server.go index 16b6d31569..381feaca6f 100644 --- a/internal/services/instance/server.go +++ b/internal/services/instance/server.go @@ -670,7 +670,7 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m a } _ = d.Set("state", state) - _ = d.Set("zone", string(zone)) + _ = d.Set("zone", server.Zone.String()) _ = d.Set("name", server.Name) _ = d.Set("boot_type", server.BootType) diff --git a/internal/services/instance/snapshot.go b/internal/services/instance/snapshot.go index c35f8ca8fb..4d153bf225 100644 --- a/internal/services/instance/snapshot.go +++ b/internal/services/instance/snapshot.go @@ -199,6 +199,7 @@ func ResourceInstanceSnapshotRead(ctx context.Context, d *schema.ResourceData, m _ = d.Set("created_at", snapshot.Snapshot.CreationDate.Format(time.RFC3339)) _ = d.Set("type", snapshot.Snapshot.VolumeType.String()) _ = d.Set("tags", snapshot.Snapshot.Tags) + _ = d.Set("zone", snapshot.Snapshot.Zone.String()) return nil } diff --git a/internal/services/instance/volume.go b/internal/services/instance/volume.go index af3a15827c..e4533c6155 100644 --- a/internal/services/instance/volume.go +++ b/internal/services/instance/volume.go @@ -165,7 +165,7 @@ func ResourceInstanceVolumeRead(ctx context.Context, d *schema.ResourceData, m a _ = d.Set("name", res.Volume.Name) _ = d.Set("organization_id", res.Volume.Organization) _ = d.Set("project_id", res.Volume.Project) - _ = d.Set("zone", string(zone)) + _ = d.Set("zone", res.Volume.Zone.String()) _ = d.Set("type", res.Volume.VolumeType.String()) _ = d.Set("tags", res.Volume.Tags) diff --git a/internal/services/iot/device.go b/internal/services/iot/device.go index 3ff2152a0b..a399d2509e 100644 --- a/internal/services/iot/device.go +++ b/internal/services/iot/device.go @@ -293,7 +293,7 @@ func ResourceIotDeviceRead(ctx context.Context, d *schema.ResourceData, m any) d return diag.FromErr(err) } - _ = d.Set("name", device.Name) + _ = d.Set("name", device.regName) _ = d.Set("status", device.Status) _ = d.Set("hub_id", regional.NewID(region, device.HubID).String()) _ = d.Set("created_at", device.CreatedAt.Format(time.RFC3339)) diff --git a/internal/services/iot/hub.go b/internal/services/iot/hub.go index b988187d0a..7e243bf8cc 100644 --- a/internal/services/iot/hub.go +++ b/internal/services/iot/hub.go @@ -229,7 +229,7 @@ func ResourceIotHubRead(ctx context.Context, d *schema.ResourceData, m any) diag return diag.FromErr(err) } - _ = d.Set("region", string(region)) + _ = d.Set("region", response.Region.String()) _ = d.Set("organization_id", response.OrganizationID) _ = d.Set("project_id", response.ProjectID) _ = d.Set("name", response.Name) diff --git a/internal/services/iot/network.go b/internal/services/iot/network.go index 9c639c7c77..23f6663656 100644 --- a/internal/services/iot/network.go +++ b/internal/services/iot/network.go @@ -135,7 +135,7 @@ func ResourceIotNetworkRead(ctx context.Context, d *schema.ResourceData, m any) _ = d.Set("hub_id", regional.NewID(region, network.HubID).String()) _ = d.Set("created_at", network.CreatedAt.Format(time.RFC3339)) _ = d.Set("topic_prefix", network.TopicPrefix) - _ = d.Set("region", string(region)) + _ = d.Set("region", network.string(region)) return nil } diff --git a/internal/services/iot/routes.go b/internal/services/iot/routes.go index 467108accb..ebcd6e2df8 100644 --- a/internal/services/iot/routes.go +++ b/internal/services/iot/routes.go @@ -272,7 +272,7 @@ func ResourceIotRouteRead(ctx context.Context, d *schema.ResourceData, m any) di return diag.FromErr(err) } - _ = d.Set("region", string(region)) + _ = d.Set("region", response.reg string(region)) _ = d.Set("name", response.Name) _ = d.Set("hub_id", response.HubID) _ = d.Set("topic", response.Topic) diff --git a/internal/services/ipam/ip.go b/internal/services/ipam/ip.go index af19925ada..d87c8b6074 100644 --- a/internal/services/ipam/ip.go +++ b/internal/services/ipam/ip.go @@ -281,7 +281,7 @@ func ResourceIPAMIPRead(ctx context.Context, d *schema.ResourceData, m any) diag _ = d.Set("created_at", types.FlattenTime(res.CreatedAt)) _ = d.Set("updated_at", types.FlattenTime(res.UpdatedAt)) _ = d.Set("is_ipv6", res.IsIPv6) - _ = d.Set("region", region) + _ = d.Set("region", res.Region.String()) if res.Zone != nil { _ = d.Set("zone", res.Zone.String()) diff --git a/internal/services/ipam/ip_reverse_dns.go b/internal/services/ipam/ip_reverse_dns.go index 532eb35dd8..bdda108800 100644 --- a/internal/services/ipam/ip_reverse_dns.go +++ b/internal/services/ipam/ip_reverse_dns.go @@ -121,7 +121,7 @@ func ResourceIPAMIPReverseDNSRead(ctx context.Context, d *schema.ResourceData, m } } - _ = d.Set("region", region) + _ = d.Set("region", res.Region.String()) return nil } diff --git a/internal/services/k8s/acl.go b/internal/services/k8s/acl.go index bdfcf1359e..06990f44a5 100644 --- a/internal/services/k8s/acl.go +++ b/internal/services/k8s/acl.go @@ -152,7 +152,7 @@ func ResourceACLRead(ctx context.Context, d *schema.ResourceData, m any) diag.Di } _ = d.Set("cluster_id", regional.NewIDString(region, clusterID)) - _ = d.Set("region", region) + _ = d.Set("region", acls.) _ = d.Set("acl_rules", flattenACL(acls.Rules)) return nil diff --git a/internal/services/k8s/cluster.go b/internal/services/k8s/cluster.go index 6e84fc4286..2565137193 100644 --- a/internal/services/k8s/cluster.go +++ b/internal/services/k8s/cluster.go @@ -550,7 +550,7 @@ func ResourceK8SClusterRead(ctx context.Context, d *schema.ResourceData, m any) return diag.FromErr(err) } - _ = d.Set("region", string(region)) + _ = d.Set("region", cluster.Region.String()) _ = d.Set("name", cluster.Name) _ = d.Set("type", cluster.Type) _ = d.Set("organization_id", cluster.OrganizationID) diff --git a/internal/services/k8s/pool.go b/internal/services/k8s/pool.go index 024cb95559..b3defcd570 100644 --- a/internal/services/k8s/pool.go +++ b/internal/services/k8s/pool.go @@ -431,8 +431,8 @@ func ResourceK8SPoolRead(ctx context.Context, d *schema.ResourceData, m any) dia _ = d.Set("updated_at", pool.UpdatedAt.Format(time.RFC3339)) _ = d.Set("status", pool.Status) _ = d.Set("kubelet_args", flattenKubeletArgs(pool.KubeletArgs)) - _ = d.Set("region", region) - _ = d.Set("zone", pool.Zone) + _ = d.Set("region", pool.Region.String()) + _ = d.Set("zone", pool.Zone.String()) _ = d.Set("upgrade_policy", poolUpgradePolicyFlatten(pool)) _ = d.Set("public_ip_disabled", pool.PublicIPDisabled) _ = d.Set("security_group_id", pool.SecurityGroupID) diff --git a/internal/services/marketplace/image_data_source.go b/internal/services/marketplace/image_data_source.go index b1822af09a..01cc5f6c0b 100644 --- a/internal/services/marketplace/image_data_source.go +++ b/internal/services/marketplace/image_data_source.go @@ -57,7 +57,7 @@ func DataSourceMarketplaceImageRead(ctx context.Context, d *schema.ResourceData, zonedID := datasource.NewZonedID(image.ID, zone) d.SetId(zonedID) - _ = d.Set("zone", zone) + _ = d.Set("zone", image.Zone.String()) _ = d.Set("label", image.Label) _ = d.Set("instance_type", d.Get("instance_type").(string)) _ = d.Set("image_type", image.Type) diff --git a/internal/services/mnq/nats_credentials.go b/internal/services/mnq/nats_credentials.go index 37906fa501..bb2939ceea 100644 --- a/internal/services/mnq/nats_credentials.go +++ b/internal/services/mnq/nats_credentials.go @@ -93,7 +93,7 @@ func ResourceMNQNatsCredentialsRead(ctx context.Context, d *schema.ResourceData, _ = d.Set("account_id", credentials.NatsAccountID) _ = d.Set("name", credentials.Name) - _ = d.Set("region", region) + _ = d.Set("region", credentials) return nil } diff --git a/internal/services/rdb/instance.go b/internal/services/rdb/instance.go index 89c1e0e779..da4f784b7c 100644 --- a/internal/services/rdb/instance.go +++ b/internal/services/rdb/instance.go @@ -663,7 +663,7 @@ func ResourceRdbInstanceRead(ctx context.Context, d *schema.ResourceData, m any) } _ = d.Set("read_replicas", []string{}) - _ = d.Set("region", string(region)) + _ = d.Set("region", res.Region.String()) _ = d.Set("organization_id", res.OrganizationID) _ = d.Set("project_id", res.ProjectID) diff --git a/internal/services/rdb/read_replica.go b/internal/services/rdb/read_replica.go index e20f4f3708..85f3e7d03b 100644 --- a/internal/services/rdb/read_replica.go +++ b/internal/services/rdb/read_replica.go @@ -225,9 +225,8 @@ func ResourceRdbReadReplicaRead(ctx context.Context, d *schema.ResourceData, m a _ = d.Set("direct_access", directAccess) _ = d.Set("private_network", privateNetwork) - regionStr := region.String() _ = d.Set("same_zone", rr.SameZone) - _ = d.Set("region", regionStr) + _ = d.Set("region", rr.Region.String()) _ = d.Set("instance_id", regional.NewIDString(region, rr.InstanceID)) return nil diff --git a/internal/services/rdb/snapshots.go b/internal/services/rdb/snapshots.go index e44eb8e368..9b58080fba 100644 --- a/internal/services/rdb/snapshots.go +++ b/internal/services/rdb/snapshots.go @@ -160,7 +160,7 @@ func ResourceRdbSnapshotRead(ctx context.Context, d *schema.ResourceData, meta a _ = d.Set("size", int(*res.Size)) } - _ = d.Set("region", region) + _ = d.Set("region", res.Region.String()) return nil } diff --git a/internal/services/secret/secret.go b/internal/services/secret/secret.go index 791c26d69b..30489173ff 100644 --- a/internal/services/secret/secret.go +++ b/internal/services/secret/secret.go @@ -266,7 +266,7 @@ func ResourceSecretRead(ctx context.Context, d *schema.ResourceData, m any) diag _ = d.Set("updated_at", types.FlattenTime(secretResponse.UpdatedAt)) _ = d.Set("status", secretResponse.Status.String()) _ = d.Set("version_count", int(versions.TotalCount)) - _ = d.Set("region", string(region)) + _ = d.Set("region", secretResponse.Region.String()) _ = d.Set("project_id", secretResponse.ProjectID) _ = d.Set("path", secretResponse.Path) _ = d.Set("protected", secretResponse.Protected) diff --git a/internal/services/secret/version.go b/internal/services/secret/version.go index 9a0a46f073..b89d2388fc 100644 --- a/internal/services/secret/version.go +++ b/internal/services/secret/version.go @@ -131,7 +131,7 @@ func ResourceVersionRead(ctx context.Context, d *schema.ResourceData, m any) dia _ = d.Set("created_at", types.FlattenTime(secretResponse.CreatedAt)) _ = d.Set("updated_at", types.FlattenTime(secretResponse.UpdatedAt)) _ = d.Set("status", secretResponse.Status.String()) - _ = d.Set("region", string(region)) + _ = d.Set("region", secretResponse.) return nil } diff --git a/internal/services/tem/domain.go b/internal/services/tem/domain.go index 20716f67d6..594760ccd5 100644 --- a/internal/services/tem/domain.go +++ b/internal/services/tem/domain.go @@ -259,7 +259,7 @@ func ResourceDomainRead(ctx context.Context, d *schema.ResourceData, m any) diag _ = d.Set("smtps_port_alternative", tem.SMTPSPortAlternative) _ = d.Set("mx_blackhole", tem.MXBlackhole) _ = d.Set("reputation", flattenDomainReputation(domain.Reputation)) - _ = d.Set("region", string(region)) + _ = d.Set("region", domain.Region.String()) _ = d.Set("project_id", domain.ProjectID) _ = d.Set("smtps_auth_user", domain.ProjectID) diff --git a/internal/services/vpc/vpc.go b/internal/services/vpc/vpc.go index d14d728937..a7394f3ad6 100644 --- a/internal/services/vpc/vpc.go +++ b/internal/services/vpc/vpc.go @@ -142,7 +142,7 @@ func ResourceVPCRead(ctx context.Context, d *schema.ResourceData, m any) diag.Di _ = d.Set("is_default", res.IsDefault) _ = d.Set("enable_routing", res.RoutingEnabled) _ = d.Set("enable_custom_routes_propagation", res.CustomRoutesPropagationEnabled) - _ = d.Set("region", region) + _ = d.Set("region", res.Region.String()) if len(res.Tags) > 0 { _ = d.Set("tags", res.Tags) diff --git a/internal/services/vpcgw/dhcp_reservation.go b/internal/services/vpcgw/dhcp_reservation.go index b1bcbe6f8f..5f0bd8c5cd 100644 --- a/internal/services/vpcgw/dhcp_reservation.go +++ b/internal/services/vpcgw/dhcp_reservation.go @@ -149,7 +149,7 @@ func ResourceVPCPublicGatewayDHCPReservationRead(ctx context.Context, d *schema. _ = d.Set("gateway_network_id", zonal.NewIDString(zone, entry.GatewayNetworkID)) _ = d.Set("created_at", entry.CreatedAt.Format(time.RFC3339)) _ = d.Set("updated_at", entry.UpdatedAt.Format(time.RFC3339)) - _ = d.Set("zone", zone) + _ = d.Set("zone", entry.Zone.String()) return nil } diff --git a/internal/services/vpcgw/ip.go b/internal/services/vpcgw/ip.go index 9168448d03..433c803d76 100644 --- a/internal/services/vpcgw/ip.go +++ b/internal/services/vpcgw/ip.go @@ -124,7 +124,7 @@ func ResourceIPRead(ctx context.Context, d *schema.ResourceData, m any) diag.Dia _ = d.Set("project_id", ip.ProjectID) _ = d.Set("created_at", ip.CreatedAt.Format(time.RFC3339)) _ = d.Set("updated_at", ip.UpdatedAt.Format(time.RFC3339)) - _ = d.Set("zone", zone) + _ = d.Set("zone", ip.Zone.String()) _ = d.Set("tags", ip.Tags) _ = d.Set("reverse", ip.Reverse) diff --git a/internal/services/vpcgw/ip_reverse.go b/internal/services/vpcgw/ip_reverse.go index e8d6084497..0cba136e84 100644 --- a/internal/services/vpcgw/ip_reverse.go +++ b/internal/services/vpcgw/ip_reverse.go @@ -104,7 +104,7 @@ func ResourceVPCPublicGatewayIPReverseDNSRead(ctx context.Context, d *schema.Res return diag.FromErr(err) } - _ = d.Set("zone", string(zone)) + _ = d.Set("zone", res.Zonestring(zone)) _ = d.Set("reverse", res.Reverse) return nil diff --git a/internal/services/vpcgw/pat_rule.go b/internal/services/vpcgw/pat_rule.go index 5f63685e89..fa572a28f5 100644 --- a/internal/services/vpcgw/pat_rule.go +++ b/internal/services/vpcgw/pat_rule.go @@ -157,7 +157,7 @@ func ResourceVPCPublicGatewayPATRuleRead(ctx context.Context, d *schema.Resource _ = d.Set("private_port", int(patRule.PrivatePort)) _ = d.Set("public_port", int(patRule.PublicPort)) _ = d.Set("protocol", patRule.Protocol.String()) - _ = d.Set("zone", zone) + _ = d.Set("zone", patRule.Zone.String()) return nil } diff --git a/internal/services/webhosting/webhosting.go b/internal/services/webhosting/webhosting.go index c390324b2b..bd2f8af644 100644 --- a/internal/services/webhosting/webhosting.go +++ b/internal/services/webhosting/webhosting.go @@ -325,7 +325,7 @@ func resourceWebhostingRead(ctx context.Context, d *schema.ResourceData, m any) _ = d.Set("dns_status", webhostingResponse.DNSStatus.String()) //nolint:staticcheck _ = d.Set("cpanel_urls", flattenHostingCpanelUrls(webhostingResponse.Platform.ControlPanel.URLs)) _ = d.Set("username", webhostingResponse.User.Username) - _ = d.Set("region", string(region)) + _ = d.Set("region", webhostingResponse.Regionstring(region)) _ = d.Set("organization_id", "") _ = d.Set("project_id", webhostingResponse.ProjectID)