Skip to content

Commit bcca1e0

Browse files
authored
fix: set resource id to "" when resource is found absent (#1241)
1 parent ec9e66a commit bcca1e0

5 files changed

+20
-0
lines changed

scaleway/resource_domain_zone.go

+4
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ func resourceScalewayDomainZoneRead(ctx context.Context, d *schema.ResourceData,
133133
}, scw.WithContext(ctx))
134134

135135
if err != nil {
136+
if is404Error(err) {
137+
d.SetId("")
138+
return nil
139+
}
136140
return diag.FromErr(err)
137141
}
138142

scaleway/resource_rdb_database.go

+4
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ func resourceScalewayRdbDatabaseRead(ctx context.Context, d *schema.ResourceData
133133

134134
database, err := getDatabase(ctx, rdbAPI, region, instanceID, databaseName)
135135
if err != nil {
136+
if is404Error(err) {
137+
d.SetId("")
138+
return nil
139+
}
136140
return diag.FromErr(err)
137141
}
138142

scaleway/resource_rdb_instance.go

+4
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,10 @@ func resourceScalewayRdbInstanceRead(ctx context.Context, d *schema.ResourceData
379379
// verify resource is ready
380380
res, err := waitForRDBInstance(ctx, rdbAPI, region, ID, d.Timeout(schema.TimeoutRead))
381381
if err != nil {
382+
if is404Error(err) {
383+
d.SetId("")
384+
return nil
385+
}
382386
return diag.FromErr(err)
383387
}
384388

scaleway/resource_vpc_gateway_network.go

+4
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,10 @@ func resourceScalewayVPCGatewayNetworkRead(ctx context.Context, d *schema.Resour
148148

149149
gatewayNetwork, err := waitForVPCGatewayNetwork(ctx, vpcgwAPI, zone, ID, d.Timeout(schema.TimeoutRead))
150150
if err != nil {
151+
if is404Error(err) {
152+
d.SetId("")
153+
return nil
154+
}
151155
return diag.FromErr(err)
152156
}
153157
_, err = waitForVPCPublicGateway(ctx, vpcgwAPI, zone, gatewayNetwork.GatewayID, d.Timeout(schema.TimeoutRead))

scaleway/resource_vpc_public_gateway.go

+4
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@ func resourceScalewayVPCPublicGatewayRead(ctx context.Context, d *schema.Resourc
117117

118118
gateway, err := waitForVPCPublicGateway(ctx, vpcgwAPI, zone, id, d.Timeout(schema.TimeoutRead))
119119
if err != nil {
120+
if is404Error(err) {
121+
d.SetId("")
122+
return nil
123+
}
120124
return diag.FromErr(err)
121125
}
122126

0 commit comments

Comments
 (0)