Skip to content

Commit 5839022

Browse files
ResourceManager : Update error messages for resource google_project_services in google-beta (#11494) (#8040)
[upstream:172ee304ecee6731bc4465f52c274b51ff26347e] Signed-off-by: Modular Magician <[email protected]>
1 parent e47b469 commit 5839022

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

.changelog/11494.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google-beta/services/resourcemanager/resource_google_project_service.go

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package resourcemanager
55
import (
66
"fmt"
77
"log"
8+
"regexp"
89
"strings"
910
"time"
1011

@@ -319,6 +320,9 @@ func disableServiceUsageProjectService(service, project string, d *schema.Resour
319320
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.ServiceUsageServiceBeingActivated},
320321
})
321322
if err != nil {
323+
if res, _ := regexp.MatchString("COMMON_SU_SERVICE_HAS_USAGE", err.Error()); res {
324+
return fmt.Errorf("Error disabling service %q for project %q: %v", service, project, strings.Replace(err.Error(), "check_if_service_has_usage=SKIP", "check_if_service_has_usage_on_destroy=false", -1))
325+
}
322326
return fmt.Errorf("Error disabling service %q for project %q: %v", service, project, err)
323327
}
324328
return nil

0 commit comments

Comments
 (0)