Skip to content

Commit f695bc4

Browse files
Fix Datastream private connection resource destruction (#11394) (#19117)
[upstream:7230c2123c05b14f8f9d5e3029d9d4d955aafa66] Signed-off-by: Modular Magician <[email protected]>
1 parent b04c602 commit f695bc4

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

.changelog/11394.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
compute: fixed issue where sub-resources managed by `google_compute_forwarding_rule` prevented resource deletion
3+
```

google/services/datastream/resource_datastream_private_connection.go

+6
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"log"
2525
"net/http"
2626
"reflect"
27+
"strconv"
2728
"time"
2829

2930
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
@@ -416,6 +417,11 @@ func resourceDatastreamPrivateConnectionDelete(d *schema.ResourceData, meta inte
416417
}
417418

418419
headers := make(http.Header)
420+
// Add force=true query param to force deletion of private connection sub resources like Routes
421+
url, err = transport_tpg.AddQueryParams(url, map[string]string{"force": strconv.FormatBool(true)})
422+
if err != nil {
423+
return err
424+
}
419425

420426
log.Printf("[DEBUG] Deleting PrivateConnection %q", d.Id())
421427
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{

0 commit comments

Comments
 (0)