Skip to content

Commit cb7c8df

Browse files
Allow deleting google_logging_*_bucket_config (#5949) (#11538)
Signed-off-by: Modular Magician <[email protected]>
1 parent 791b9ef commit cb7c8df

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

.changelog/5949.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
logging: made `google_logging_*_bucket_config` deletable
3+
```

google/resource_logging_bucket_config.go

+19-3
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,25 @@ func resourceLoggingBucketConfigUpdate(d *schema.ResourceData, meta interface{})
262262
}
263263

264264
func resourceLoggingBucketConfigDelete(d *schema.ResourceData, meta interface{}) error {
265+
name := d.Get("bucket_id")
266+
for _, restrictedName := range []string{"_Required", "_Default"} {
267+
if name == restrictedName {
268+
log.Printf("[WARN] Default logging bucket configs cannot be deleted. Removing logging bucket config from state: %#v", d.Id())
269+
return nil
270+
}
271+
}
265272

266-
log.Printf("[WARN] Logging bucket configs cannot be deleted. Removing logging bucket config from state: %#v", d.Id())
267-
d.SetId("")
268-
273+
config := meta.(*Config)
274+
userAgent, err := generateUserAgentString(d, config.userAgent)
275+
if err != nil {
276+
return err
277+
}
278+
url, err := replaceVars(d, config, fmt.Sprintf("{{LoggingBasePath}}%s", d.Id()))
279+
if err != nil {
280+
return err
281+
}
282+
if _, err := sendRequestWithTimeout(config, "DELETE", "", url, userAgent, nil, d.Timeout(schema.TimeoutUpdate)); err != nil {
283+
return fmt.Errorf("Error deleting Logging Bucket Config %q: %s", d.Id(), err)
284+
}
269285
return nil
270286
}

0 commit comments

Comments
 (0)