Skip to content

Commit bf2d104

Browse files
committed
detach pn in delete resource
1 parent cadfcdf commit bf2d104

File tree

4 files changed

+2209
-1462
lines changed

4 files changed

+2209
-1462
lines changed

internal/services/mongodb/instance.go

+20-1
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,26 @@ func ResourceInstanceDelete(ctx context.Context, d *schema.ResourceData, m inter
550550
return diag.FromErr(err)
551551
}
552552

553+
instance, err := waitForInstance(ctx, mongodbAPI, region, ID, d.Timeout(schema.TimeoutDelete))
554+
if err != nil {
555+
return diag.FromErr(err)
556+
}
557+
558+
for _, endpoint := range instance.Endpoints {
559+
if endpoint.PrivateNetwork != nil {
560+
err := mongodbAPI.DeleteEndpoint(
561+
&mongodb.DeleteEndpointRequest{
562+
EndpointID: endpoint.ID,
563+
Region: region,
564+
},
565+
scw.WithContext(ctx),
566+
)
567+
if err != nil {
568+
return diag.FromErr(err)
569+
}
570+
}
571+
}
572+
553573
_, err = waitForInstance(ctx, mongodbAPI, region, ID, d.Timeout(schema.TimeoutDelete))
554574
if err != nil {
555575
return diag.FromErr(err)
@@ -569,6 +589,5 @@ func ResourceInstanceDelete(ctx context.Context, d *schema.ResourceData, m inter
569589
}
570590

571591
d.SetId("")
572-
573592
return nil
574593
}

internal/services/mongodb/instance_test.go

-5
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ func TestAccMongoDBInstance_WithPrivateNetwork(t *testing.T) {
234234
private_network {
235235
pn_id = "${scaleway_vpc_private_network.pn01.id}"
236236
}
237-
depends_on = [scaleway_vpc_private_network.pn01]
238237
}
239238
`,
240239
Check: resource.ComposeTestCheckFunc(
@@ -300,8 +299,6 @@ func TestAccMongoDBInstance_UpdatePrivateNetwork(t *testing.T) {
300299
private_network {
301300
pn_id = "${scaleway_vpc_private_network.pn01.id}"
302301
}
303-
depends_on = [scaleway_vpc_private_network.pn01, scaleway_vpc_private_network.pn02]
304-
305302
}
306303
`,
307304
Check: resource.ComposeTestCheckFunc(
@@ -334,7 +331,6 @@ func TestAccMongoDBInstance_UpdatePrivateNetwork(t *testing.T) {
334331
private_network {
335332
pn_id = "${scaleway_vpc_private_network.pn02.id}"
336333
}
337-
depends_on = [scaleway_vpc_private_network.pn01, scaleway_vpc_private_network.pn02]
338334
}
339335
`,
340336
Check: resource.ComposeTestCheckFunc(
@@ -364,7 +360,6 @@ func TestAccMongoDBInstance_UpdatePrivateNetwork(t *testing.T) {
364360
node_number = 1
365361
user_name = "my_initial_user"
366362
password = "thiZ_is_v&ry_s3cret"
367-
depends_on = [scaleway_vpc_private_network.pn01, scaleway_vpc_private_network.pn02]
368363
}
369364
`,
370365
Check: resource.ComposeTestCheckFunc(

0 commit comments

Comments
 (0)