Skip to content

Commit 9e293c4

Browse files
UptimeCheckConfig custom delete for 400s (#9429) (#16535)
[upstream:c607d1f0236f684036c7a461bbc832ca40e54b0e] Signed-off-by: Modular Magician <[email protected]>
1 parent 241ee7e commit 9e293c4

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

.changelog/9429.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
monitoring: Added error message for `google_monitoring_uptime_check_config` deletes on 400 response to delete Alert Policies first.
3+
```

google/services/monitoring/resource_monitoring_uptime_check_config.go

+6
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"strings"
2525
"time"
2626

27+
"github.com/hashicorp/errwrap"
2728
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
2829
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
2930

@@ -847,7 +848,12 @@ func resourceMonitoringUptimeCheckConfigDelete(d *schema.ResourceData, meta inte
847848
Timeout: d.Timeout(schema.TimeoutDelete),
848849
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsMonitoringConcurrentEditError},
849850
})
851+
850852
if err != nil {
853+
if transport_tpg.IsGoogleApiErrorWithCode(err, 400) {
854+
err := fmt.Errorf("%w - please ensure all associated Alert Policies are deleted.", err)
855+
return errwrap.Wrapf("Error when reading or editing UptimeCheckConfig: {{err}}", err)
856+
}
851857
return transport_tpg.HandleNotFoundError(err, d, "UptimeCheckConfig")
852858
}
853859

0 commit comments

Comments
 (0)