Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ResourceManager : Update error messages for resource google_project_services in google-beta #11494

Merged
merged 8 commits into from
Aug 26, 2024
Merged

ResourceManager : Update error messages for resource google_project_services in google-beta #11494

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bf200a2
Adding new error message for the case when disabling service with usage.
shahmedhaCorp Aug 19, 2024
abf34f8
Adding new error message for the case when disabling service with usage.
shahmedhaCorp Aug 19, 2024
343c665
Adding new error message for the case when disabling service with usage.
shahmedhaCorp Aug 19, 2024
757388e
Adding new error message for the case when disabling service with usage.
shahmedhaCorp Aug 19, 2024
0887079
Fix build failures
shahmedhaCorp Aug 19, 2024
13d31bc
Merge branch 'GoogleCloudPlatform:main' into update-usage-error-message
shahmedhaCorp Aug 20, 2024
3432aea
Update mmv1/third_party/terraform/services/resourcemanager/resource_g…
shahmedhaCorp Aug 21, 2024
1d0f2ea
Merge branch 'GoogleCloudPlatform:main' into update-usage-error-message
shahmedhaCorp Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions mmv1/third_party/terraform/services/resourcemanager/resource_google_project_service.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,24 @@
package resourcemanager

import (
"fmt"
"log"
"strings"
"time"
"fmt"
"log"
"strings"
"time"
<% unless version == 'ga' -%>
"regexp"
<% end -%>

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"

tpgserviceusage "github.com/hashicorp/terraform-provider-google/google/services/serviceusage"
"github.com/hashicorp/terraform-provider-google/google/tpgresource"
transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
"github.com/hashicorp/terraform-provider-google/google/verify"
tpgserviceusage "github.com/hashicorp/terraform-provider-google/google/services/serviceusage"
"github.com/hashicorp/terraform-provider-google/google/tpgresource"
transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
"github.com/hashicorp/terraform-provider-google/google/verify"

"google.golang.org/api/googleapi"
"google.golang.org/api/serviceusage/v1"
"google.golang.org/api/googleapi"
"google.golang.org/api/serviceusage/v1"
)

// These services can only be enabled as a side-effect of enabling other services,
Expand Down Expand Up @@ -332,6 +335,11 @@ func disableServiceUsageProjectService(service, project string, d *schema.Resour
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.ServiceUsageServiceBeingActivated},
})
if err != nil {
<% unless version == 'ga' -%>
if res, _ := regexp.MatchString("COMMON_SU_SERVICE_HAS_USAGE", err.Error()); res {
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))
}
<% end -%>
return fmt.Errorf("Error disabling service %q for project %q: %v", service, project, err)
}
return nil
Expand Down