Skip to content

Commit cb1ab68

Browse files
committed
Remove useless changes
1 parent 8f3cb02 commit cb1ab68

File tree

9 files changed

+9
-59
lines changed

9 files changed

+9
-59
lines changed

internal/locality/dsf.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package locality
22

33
import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
44

5+
// SuppressSDKNullAssignment aims to remove apply inconsistency on SDKv2 based resources
56
func SuppressSDKNullAssignment(k, old, new string, d *schema.ResourceData) bool {
67
return (new == "" && old != "") || (new != "" && old == "")
78
}

internal/provider/testdata/test-mux-server.cassette.yaml

Lines changed: 0 additions & 52 deletions
This file was deleted.

internal/services/instance/ip.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ func ResourceInstanceIPRead(ctx context.Context, d *schema.ResourceData, m any)
172172

173173
_ = d.Set("address", address)
174174
_ = d.Set("prefix", prefix)
175-
_ = d.Set("zone", res.IP.Zone)
175+
_ = d.Set("zone", zone)
176176
_ = d.Set("organization_id", res.IP.Organization)
177177
_ = d.Set("project_id", res.IP.Project)
178178
_ = d.Set("reverse", res.IP.Reverse)

internal/services/ipam/ip.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ func ResourceIPAMIPRead(ctx context.Context, d *schema.ResourceData, m any) diag
281281
_ = d.Set("created_at", types.FlattenTime(res.CreatedAt))
282282
_ = d.Set("updated_at", types.FlattenTime(res.UpdatedAt))
283283
_ = d.Set("is_ipv6", res.IsIPv6)
284-
_ = d.Set("region", res.Region.String())
284+
_ = d.Set("region", region)
285285

286286
if res.Zone != nil {
287287
_ = d.Set("zone", res.Zone.String())

internal/services/rdb/read_replica.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,10 @@ func ResourceRdbReadReplicaRead(ctx context.Context, d *schema.ResourceData, m a
224224
directAccess, privateNetwork := flattenReadReplicaEndpoints(rr.Endpoints)
225225
_ = d.Set("direct_access", directAccess)
226226
_ = d.Set("private_network", privateNetwork)
227+
228+
regionStr := region.String()
227229
_ = d.Set("same_zone", rr.SameZone)
228-
_ = d.Set("region", rr.Region.String())
230+
_ = d.Set("region", regionStr)
229231
_ = d.Set("instance_id", regional.NewIDString(region, rr.InstanceID))
230232

231233
return nil

internal/services/tem/domain_validation.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ func ResourceDomainValidationRead(ctx context.Context, d *schema.ResourceData, m
126126
}
127127

128128
_ = d.Set("validated", domain.Status == "checked")
129-
_ = d.Set("region", domain.Region.String())
130129

131130
return nil
132131
}

internal/services/vpc/private_network.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ func ResourceVPCPrivateNetworkRead(ctx context.Context, d *schema.ResourceData,
266266
_ = d.Set("updated_at", types.FlattenTime(pn.UpdatedAt))
267267
_ = d.Set("tags", pn.Tags)
268268
_ = d.Set("enable_default_route_propagation", pn.DefaultRoutePropagationEnabled)
269-
_ = d.Set("region", pn.Region.String())
269+
_ = d.Set("region", region)
270270
_ = d.Set("is_regional", true)
271271
_ = d.Set("zone", zone)
272272

internal/services/vpc/vpc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func ResourceVPCRead(ctx context.Context, d *schema.ResourceData, m any) diag.Di
142142
_ = d.Set("is_default", res.IsDefault)
143143
_ = d.Set("enable_routing", res.RoutingEnabled)
144144
_ = d.Set("enable_custom_routes_propagation", res.CustomRoutesPropagationEnabled)
145-
_ = d.Set("region", res.Region.String())
145+
_ = d.Set("region", region)
146146

147147
if len(res.Tags) > 0 {
148148
_ = d.Set("tags", res.Tags)

internal/services/webhosting/webhosting.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ func resourceWebhostingRead(ctx context.Context, d *schema.ResourceData, m any)
325325
_ = d.Set("dns_status", webhostingResponse.DNSStatus.String()) //nolint:staticcheck
326326
_ = d.Set("cpanel_urls", flattenHostingCpanelUrls(webhostingResponse.Platform.ControlPanel.URLs))
327327
_ = d.Set("username", webhostingResponse.User.Username)
328-
_ = d.Set("region", webhostingResponse.Region.String())
328+
_ = d.Set("region", string(region))
329329
_ = d.Set("organization_id", "")
330330
_ = d.Set("project_id", webhostingResponse.ProjectID)
331331

0 commit comments

Comments
 (0)