Skip to content

Commit 354e3b8

Browse files
google_iap_settings: use billing project instead of GetProject (#14630) (#23724)
[upstream:5e2291e93dd33a5794970e2789b84c7e30b8e467] Signed-off-by: Modular Magician <[email protected]>
1 parent 6023512 commit 354e3b8

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.changelog/14630.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
iap: fixed an issue where deleting `google_iap_settings` without setting `GOOGLE_PROJECT` incorrectly failed
3+
```

google/services/iap/resource_iap_settings.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -557,9 +557,9 @@ func resourceIapSettingsDelete(d *schema.ResourceData, meta interface{}) error {
557557
return err
558558
}
559559

560-
project, err := tpgresource.GetProject(d, config)
561-
if err != nil {
562-
return fmt.Errorf("Error fetching project for Settings: %s", err)
560+
billingProject := ""
561+
if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
562+
billingProject = bp
563563
}
564564

565565
headers := make(http.Header)
@@ -571,7 +571,7 @@ func resourceIapSettingsDelete(d *schema.ResourceData, meta interface{}) error {
571571
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
572572
Config: config,
573573
Method: "PATCH",
574-
Project: project,
574+
Project: billingProject,
575575
RawURL: url,
576576
UserAgent: userAgent,
577577
Body: obj,

0 commit comments

Comments
 (0)