diff --git a/google/acctest/bootstrap_test_utils.go b/google/acctest/bootstrap_test_utils.go deleted file mode 100644 index 606981823f4..00000000000 --- a/google/acctest/bootstrap_test_utils.go +++ /dev/null @@ -1,347 +0,0 @@ -// Copyright IBM Corp. 2014, 2026 -// SPDX-License-Identifier: MPL-2.0 -// ---------------------------------------------------------------------------- -// -// *** AUTO GENERATED CODE *** Type: Handwritten *** -// -// ---------------------------------------------------------------------------- -// -// This code is generated by Magic Modules using the following: -// -// Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/acctest/bootstrap_test_utils.go -// -// DO NOT EDIT this file directly. Any changes made to this file will be -// overwritten during the next generation cycle. -// -// ---------------------------------------------------------------------------- -package acctest - -import ( - "fmt" - "log" - "strings" - "testing" - "time" - - "github.com/hashicorp/terraform-provider-google/google/envvar" - tpgcloudbilling "github.com/hashicorp/terraform-provider-google/google/services/cloudbilling" - "github.com/hashicorp/terraform-provider-google/google/services/iambeta" - "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" - rmClient "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager/client" - "github.com/hashicorp/terraform-provider-google/google/services/resourcemanagerv3" - "github.com/hashicorp/terraform-provider-google/google/tpgresource" - transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - resourceManagerV3 "google.golang.org/api/cloudresourcemanager/v3" - - "google.golang.org/api/cloudbilling/v1" - cloudresourcemanager "google.golang.org/api/cloudresourcemanager/v1" - iam "google.golang.org/api/iam/v1" -) - -var serviceAccountPrefix = "tf-bootstrap-sa-" -var serviceAccountDisplay = "Bootstrapped Service Account for Terraform tests" - -// Some tests need a second service account, other than the test runner, to assert functionality on. -// This provides a well-known service account that can be used when dynamically creating a service -// account isn't an option. -func getOrCreateServiceAccount(config *transport_tpg.Config, project, serviceAccountEmail string) (*iam.ServiceAccount, error) { - name := fmt.Sprintf("projects/%s/serviceAccounts/%s@%s.iam.gserviceaccount.com", project, serviceAccountEmail, project) - log.Printf("[DEBUG] Verifying %s as bootstrapped service account.\n", name) - - sa, err := iambeta.NewClient(config, config.UserAgent).Projects.ServiceAccounts.Get(name).Do() - if err != nil && !transport_tpg.IsGoogleApiErrorWithCode(err, 404) { - return nil, fmt.Errorf("encountered a non-404 error when looking for bootstrapped service account %s: %w", name, err) - } - - if sa == nil { - log.Printf("[DEBUG] Account missing. Creating %s as bootstrapped service account.\n", name) - sa = &iam.ServiceAccount{ - DisplayName: serviceAccountDisplay, - } - - r := &iam.CreateServiceAccountRequest{ - AccountId: serviceAccountEmail, - ServiceAccount: sa, - } - sa, err = iambeta.NewClient(config, config.UserAgent).Projects.ServiceAccounts.Create("projects/"+project, r).Do() - if err != nil { - return nil, fmt.Errorf("error when creating bootstrapped service account %s: %w", name, err) - } - } - - return sa, nil -} - -// In order to test impersonation we need to grant the testRunner's account the ability to grant tokens -// on a different service account. Granting permissions takes time and there is no operation to wait on -// so instead this creates a single service account once per test-suite with the correct permissions. -// The first time this test is run it will fail, but subsequent runs will succeed. -func impersonationServiceAccountPermissions(config *transport_tpg.Config, sa *iam.ServiceAccount, testRunner string) error { - log.Printf("[DEBUG] Setting service account permissions.\n") - policy := iam.Policy{ - Bindings: []*iam.Binding{}, - } - - binding := &iam.Binding{ - Role: "roles/iam.serviceAccountTokenCreator", - Members: []string{"serviceAccount:" + sa.Email, "serviceAccount:" + testRunner}, - } - policy.Bindings = append(policy.Bindings, binding) - - // Overwrite the roles each time on this service account. This is because this account is - // only created for the test suite and will stop snowflaking of permissions to get tests - // to run. Overwriting permissions on 1 service account shouldn't affect others. - _, err := iambeta.NewClient(config, config.UserAgent).Projects.ServiceAccounts.SetIamPolicy(sa.Name, &iam.SetIamPolicyRequest{ - Policy: &policy, - }).Do() - if err != nil { - return err - } - - return nil -} - -// A separate testId should be used for each test, to create separate service accounts for each, -// and avoid race conditions where the policy of the same service account is being modified by 2 -// tests at once. This is needed as long as the function overwrites the policy on every run. -func BootstrapServiceAccount(t *testing.T, testId, testRunner string) string { - project := envvar.GetTestProjectFromEnv() - serviceAccountEmail := serviceAccountPrefix + testId - - config := transport_tpg.BootstrapConfig(t) - if config == nil { - return "" - } - - sa, err := getOrCreateServiceAccount(config, project, serviceAccountEmail) - if err != nil { - t.Fatalf("Bootstrapping failed. Cannot retrieve service account, %s", err) - } - - err = impersonationServiceAccountPermissions(config, sa, testRunner) - if err != nil { - t.Fatalf("Bootstrapping failed. Cannot set service account permissions, %s", err) - } - - return sa.Email -} - -var SharedServicePerimeterProjectPrefix = "tf-bootstrap-sp-" - -func BootstrapServicePerimeterProjects(t *testing.T, desiredProjects int) []*cloudresourcemanager.Project { - config := transport_tpg.BootstrapConfig(t) - if config == nil { - return nil - } - - org := envvar.GetTestOrgFromEnv(t) - - // The filter endpoint works differently if you provide both the parent id and parent type, and - // doesn't seem to allow for prefix matching. Don't change this to include the parent type unless - // that API behavior changes. - prefixFilter := fmt.Sprintf("id:%s* parent.id:%s", SharedServicePerimeterProjectPrefix, org) - res, err := rmClient.NewClient(config, config.UserAgent).Projects.List().Filter(prefixFilter).Do() - if err != nil { - t.Fatalf("Error getting shared test projects: %s", err) - } - - projects := res.Projects - for len(projects) < desiredProjects { - pid := SharedServicePerimeterProjectPrefix + RandString(t, 10) - project := &cloudresourcemanager.Project{ - ProjectId: pid, - Name: "TF Service Perimeter Test", - Parent: &cloudresourcemanager.ResourceId{ - Type: "organization", - Id: org, - }, - } - op, err := rmClient.NewClient(config, config.UserAgent).Projects.Create(project).Do() - if err != nil { - t.Fatalf("Error bootstrapping shared test project: %s", err) - } - - opAsMap, err := tpgresource.ConvertToMap(op) - if err != nil { - t.Fatalf("Error bootstrapping shared test project: %s", err) - } - - err = resourcemanager.ResourceManagerOperationWaitTime(config, opAsMap, "creating project", config.UserAgent, 4) - if err != nil { - t.Fatalf("Error bootstrapping shared test project: %s", err) - } - - p, err := rmClient.NewClient(config, config.UserAgent).Projects.Get(pid).Do() - if err != nil { - t.Fatalf("Error getting shared test project: %s", err) - } - projects = append(projects, p) - } - - return projects -} - -// BootstrapFolder creates or get a folder having a input folderDisplayName within a TestOrgEnv -func BootstrapFolder(t *testing.T, folderDisplayName string) *resourceManagerV3.Folder { - config := transport_tpg.BootstrapConfig(t) - if config == nil { - return nil - } - - crmClient := resourcemanagerv3.NewClient(config, config.UserAgent) - searchQuery := fmt.Sprintf("displayName=%s", folderDisplayName) - folderSearchResp, err := crmClient.Folders.Search().Query(searchQuery).Do() - if err != nil { - t.Fatalf("error searching for folder with displayName: %s", folderDisplayName) - } - var folder *resourceManagerV3.Folder - if len(folderSearchResp.Folders) == 0 { - op, err := crmClient.Folders.Create(&resourceManagerV3.Folder{ - DisplayName: folderDisplayName, - Parent: fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), - }).Do() - if err != nil { - t.Fatalf("error bootstrapping test folder: %s", err) - } - - opAsMap, err := tpgresource.ConvertToMap(op) - if err != nil { - t.Fatalf("error converting folder operation map: %s", err) - } - var responseMap map[string]interface{} - err = resourcemanager.ResourceManagerOperationWaitTimeWithResponse(config, opAsMap, &responseMap, "creating folder", config.UserAgent, 4*time.Minute) - if err != nil { - t.Fatalf("error waiting for create folder operation: %s", err) - } - folder, err = crmClient.Folders.Get(responseMap["name"].(string)).Do() - if err != nil { - t.Fatalf("error getting folder: %s", err) - } - } else { - folder = folderSearchResp.Folders[0] - } - - if folder.State == "DELETE_REQUESTED" { - _, err := crmClient.Folders.Undelete(folder.Name, &resourceManagerV3.UndeleteFolderRequest{}).Do() - if err != nil { - t.Fatalf("error undeleting folder: %s", err) - } - } - return folder -} - -// BootstrapProject will create or get a project named -// "" that will persist across test runs, -// where projectIDSuffix is based off of getTestProjectFromEnv(). The reason -// for the naming is to isolate bootstrapped projects by test environment. -// Given the existing projects being used by our team, the prefix provided to -// this function can be no longer than 18 characters. -func BootstrapProject(t *testing.T, projectIDPrefix, billingAccount string, services []string) *cloudresourcemanager.Project { - org := envvar.GetTestOrgFromEnv(t) - parent := &cloudresourcemanager.ResourceId{ - Type: "organization", - Id: org, - } - projectIDSuffix := strings.Replace(envvar.GetTestProjectFromEnv(), "ci-test-project-", "", 1) - projectID := projectIDPrefix + projectIDSuffix - - return BootstrapProjectWithParent(t, projectID, billingAccount, parent, services) -} - -func BootstrapProjectWithParent(t *testing.T, projectID string, billingAccount string, parent *cloudresourcemanager.ResourceId, services []string) *cloudresourcemanager.Project { - config := transport_tpg.BootstrapConfig(t) - if config == nil { - return nil - } - crmClient := rmClient.NewClient(config, config.UserAgent) - - project, err := crmClient.Projects.Get(projectID).Do() - if err != nil { - if !transport_tpg.IsGoogleApiErrorWithCode(err, 403) { - t.Fatalf("Error getting bootstrapped project: %s", err) - } - op, err := crmClient.Projects.Create(&cloudresourcemanager.Project{ - ProjectId: projectID, - Name: "Bootstrapped Test Project", - Parent: parent, - }).Do() - if err != nil { - t.Fatalf("Error creating bootstrapped test project: %s", err) - } - - opAsMap, err := tpgresource.ConvertToMap(op) - if err != nil { - t.Fatalf("Error converting create project operation to map: %s", err) - } - - err = resourcemanager.ResourceManagerOperationWaitTime(config, opAsMap, "creating project", config.UserAgent, 4*time.Minute) - if err != nil { - t.Fatalf("Error waiting for create project operation: %s", err) - } - - project, err = crmClient.Projects.Get(projectID).Do() - if err != nil { - t.Fatalf("Error getting bootstrapped project: %s", err) - } - - } - - if project.LifecycleState == "DELETE_REQUESTED" { - _, err := crmClient.Projects.Undelete(projectID, &cloudresourcemanager.UndeleteProjectRequest{}).Do() - if err != nil { - t.Fatalf("Error undeleting bootstrapped project: %s", err) - } - } - - if billingAccount != "" { - billingClient := tpgcloudbilling.NewClient(config, config.UserAgent) - var pbi *cloudbilling.ProjectBillingInfo - err = transport_tpg.Retry(transport_tpg.RetryOptions{ - RetryFunc: func() error { - var reqErr error - pbi, reqErr = billingClient.Projects.GetBillingInfo(resourcemanager.PrefixedProject(projectID)).Do() - return reqErr - }, - Timeout: 30 * time.Second, - }) - if err != nil { - t.Fatalf("Error getting billing info for project %q: %v", projectID, err) - } - if strings.TrimPrefix(pbi.BillingAccountName, "billingAccounts/") != billingAccount { - pbi.BillingAccountName = "billingAccounts/" + billingAccount - err := transport_tpg.Retry(transport_tpg.RetryOptions{ - RetryFunc: func() error { - _, err := tpgcloudbilling.NewClient(config, config.UserAgent).Projects.UpdateBillingInfo(resourcemanager.PrefixedProject(projectID), pbi).Do() - return err - }, - Timeout: 2 * time.Minute, - }) - if err != nil { - t.Fatalf("Error setting billing account for project %q to %q: %s", projectID, billingAccount, err) - } - } - } - - if len(services) > 0 { - - enabledServices, err := resourcemanager.ListCurrentlyEnabledServices(projectID, "", config.UserAgent, config, 1*time.Minute) - if err != nil { - t.Fatalf("Error listing services for project %q: %s", projectID, err) - } - - servicesToEnable := make([]string, 0, len(services)) - for _, service := range services { - if _, ok := enabledServices[service]; !ok { - servicesToEnable = append(servicesToEnable, service) - } - } - - if len(servicesToEnable) > 0 { - if err := resourcemanager.EnableServiceUsageProjectServices(servicesToEnable, projectID, "", config.UserAgent, config, 10*time.Minute); err != nil { - t.Fatalf("Error enabling services for project %q: %s", projectID, err) - } - } - } - - return project -} diff --git a/google/acctest/provider_test_utils.go b/google/acctest/provider_test_utils.go index 05b596919eb..c729ba48865 100644 --- a/google/acctest/provider_test_utils.go +++ b/google/acctest/provider_test_utils.go @@ -38,6 +38,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/provider" tpgcloudbilling "github.com/hashicorp/terraform-provider-google/google/services/cloudbilling" + "github.com/hashicorp/terraform-provider-google/google/services/iambeta" tpgiamcredentials "github.com/hashicorp/terraform-provider-google/google/services/iamcredentials" "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" rmClient "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager/client" @@ -266,8 +267,8 @@ func SetupProjectsAndGetAccessToken(org, billing, pid, service string, config *t } // Create a service account for project-1 - serviceAccountEmail := serviceAccountPrefix + service - sa1, err := getOrCreateServiceAccount(config, pid, serviceAccountEmail) + serviceAccountEmail := iambeta.ServiceAccountPrefix + service + sa1, err := iambeta.GetOrCreateServiceAccount(config, pid, serviceAccountEmail) if err != nil { return "", fmt.Errorf("error creating service account %s in 'project-1' with project id %s: %w", serviceAccountEmail, pid, err) } diff --git a/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_egress_policy_test.go b/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_egress_policy_test.go index a8d2a9fa32b..c155c0caac1 100644 --- a/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_egress_policy_test.go +++ b/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_egress_policy_test.go @@ -26,20 +26,80 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/accesscontextmanager" + "github.com/hashicorp/terraform-provider-google/google/services/iambeta" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + rmClient "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager/client" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" + + cloudresourcemanager "google.golang.org/api/cloudresourcemanager/v1" ) +var SharedServicePerimeterProjectPrefix = "tf-bootstrap-sp-" + +func BootstrapServicePerimeterProjects(t *testing.T, desiredProjects int) []*cloudresourcemanager.Project { + config := transport_tpg.BootstrapConfig(t) + if config == nil { + return nil + } + + org := envvar.GetTestOrgFromEnv(t) + + // The filter endpoint works differently if you provide both the parent id and parent type, and + // doesn't seem to allow for prefix matching. Don't change this to include the parent type unless + // that API behavior changes. + prefixFilter := fmt.Sprintf("id:%s* parent.id:%s", SharedServicePerimeterProjectPrefix, org) + res, err := rmClient.NewClient(config, config.UserAgent).Projects.List().Filter(prefixFilter).Do() + if err != nil { + t.Fatalf("Error getting shared test projects: %s", err) + } + + projects := res.Projects + for len(projects) < desiredProjects { + pid := SharedServicePerimeterProjectPrefix + acctest.RandString(t, 10) + project := &cloudresourcemanager.Project{ + ProjectId: pid, + Name: "TF Service Perimeter Test", + Parent: &cloudresourcemanager.ResourceId{ + Type: "organization", + Id: org, + }, + } + op, err := rmClient.NewClient(config, config.UserAgent).Projects.Create(project).Do() + if err != nil { + t.Fatalf("Error bootstrapping shared test project: %s", err) + } + + opAsMap, err := tpgresource.ConvertToMap(op) + if err != nil { + t.Fatalf("Error bootstrapping shared test project: %s", err) + } + + err = resourcemanager.ResourceManagerOperationWaitTime(config, opAsMap, "creating project", config.UserAgent, 4) + if err != nil { + t.Fatalf("Error bootstrapping shared test project: %s", err) + } + + p, err := rmClient.NewClient(config, config.UserAgent).Projects.Get(pid).Do() + if err != nil { + t.Fatalf("Error getting shared test project: %s", err) + } + projects = append(projects, p) + } + + return projects +} + // Since each test here is acting on the same organization and only one AccessPolicy // can exist, they need to be run serially. See AccessPolicy for the test runner. func testAccAccessContextManagerServicePerimeterDryRunEgressPolicy_basicTest(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) - //projects := acctest.BootstrapServicePerimeterProjects(t, 1) + //projects := BootstrapServicePerimeterProjects(t, 1) // Bootstrap a service account to use as egress from identity initialServiceAccount := envvar.GetTestServiceAccountFromEnv(t) - serviceAccount := acctest.BootstrapServiceAccount(t, "acm-egress-1", initialServiceAccount) + serviceAccount := iambeta.BootstrapServiceAccount(t, "acm-egress-1", initialServiceAccount) policyTitle := acctest.RandString(t, 10) perimeterTitle := "perimeter" diff --git a/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_ingress_policy_test.go b/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_ingress_policy_test.go index 111ee674d04..7c50e3d503d 100644 --- a/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_ingress_policy_test.go +++ b/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_ingress_policy_test.go @@ -26,6 +26,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/accesscontextmanager" + "github.com/hashicorp/terraform-provider-google/google/services/iambeta" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) @@ -35,11 +36,11 @@ import ( func testAccAccessContextManagerServicePerimeterDryRunIngressPolicy_basicTest(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) - //projects := acctest.BootstrapServicePerimeterProjects(t, 1) + //projects := BootstrapServicePerimeterProjects(t, 1) // Bootstrap a service account to use as ingress from identity initialServiceAccount := envvar.GetTestServiceAccountFromEnv(t) - serviceAccount := acctest.BootstrapServiceAccount(t, "acm-ingress-1", initialServiceAccount) + serviceAccount := iambeta.BootstrapServiceAccount(t, "acm-ingress-1", initialServiceAccount) policyTitle := acctest.RandString(t, 10) perimeterTitle := "perimeter" diff --git a/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource_test.go b/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource_test.go index 409eaee367d..168c48f6161 100644 --- a/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource_test.go +++ b/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource_test.go @@ -34,7 +34,7 @@ import ( func testAccAccessContextManagerServicePerimeterDryRunResource_basicTest(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) - projects := acctest.BootstrapServicePerimeterProjects(t, 2) + projects := BootstrapServicePerimeterProjects(t, 2) policyTitle := "my policy" perimeterTitle := "perimeter" diff --git a/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy_test.go b/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy_test.go index 6e03bf0ef19..5a0b148c55b 100644 --- a/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy_test.go +++ b/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy_test.go @@ -26,6 +26,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/accesscontextmanager" + "github.com/hashicorp/terraform-provider-google/google/services/iambeta" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) @@ -38,9 +39,9 @@ func testAccAccessContextManagerServicePerimeterEgressPolicy_basicTest(t *testin // Bootstrap a service account to use as egress from identity initialServiceAccount := envvar.GetTestServiceAccountFromEnv(t) - serviceAccount := acctest.BootstrapServiceAccount(t, "acm-egress-2", initialServiceAccount) + serviceAccount := iambeta.BootstrapServiceAccount(t, "acm-egress-2", initialServiceAccount) - //projects := acctest.BootstrapServicePerimeterProjects(t, 1) + //projects := BootstrapServicePerimeterProjects(t, 1) policyTitle := acctest.RandString(t, 10) perimeterTitle := "perimeter" projectNumber := envvar.GetTestProjectNumberFromEnv() diff --git a/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy_test.go b/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy_test.go index 1b72bc9ad2f..f58f3f85be8 100644 --- a/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy_test.go +++ b/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy_test.go @@ -26,6 +26,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/accesscontextmanager" + "github.com/hashicorp/terraform-provider-google/google/services/iambeta" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) @@ -35,11 +36,11 @@ import ( func testAccAccessContextManagerServicePerimeterIngressPolicy_basicTest(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) - //projects := acctest.BootstrapServicePerimeterProjects(t, 1) + //projects := BootstrapServicePerimeterProjects(t, 1) // Bootstrap a service account to use as ingress from identity initialServiceAccount := envvar.GetTestServiceAccountFromEnv(t) - serviceAccount := acctest.BootstrapServiceAccount(t, "acm-ingress-2", initialServiceAccount) + serviceAccount := iambeta.BootstrapServiceAccount(t, "acm-ingress-2", initialServiceAccount) policyTitle := acctest.RandString(t, 10) perimeterTitle := "perimeter" diff --git a/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_resource_test.go b/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_resource_test.go index 2b6fe1d4cb4..3e485a6e832 100644 --- a/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_resource_test.go +++ b/google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_resource_test.go @@ -34,7 +34,7 @@ import ( func testAccAccessContextManagerServicePerimeterResource_basicTest(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) - projects := acctest.BootstrapServicePerimeterProjects(t, 2) + projects := BootstrapServicePerimeterProjects(t, 2) policyTitle := "my policy" perimeterTitle := "perimeter" diff --git a/google/services/alloydb/resource_alloydb_backup_generated_test.go b/google/services/alloydb/resource_alloydb_backup_generated_test.go index 766f320b72d..6c09c0d1406 100644 --- a/google/services/alloydb/resource_alloydb_backup_generated_test.go +++ b/google/services/alloydb/resource_alloydb_backup_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/alloydb" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/alloydb/resource_alloydb_cluster_generated_test.go b/google/services/alloydb/resource_alloydb_cluster_generated_test.go index e71de9ee8b9..0ff128a8f24 100644 --- a/google/services/alloydb/resource_alloydb_cluster_generated_test.go +++ b/google/services/alloydb/resource_alloydb_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/alloydb" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/alloydb/resource_alloydb_instance_generated_test.go b/google/services/alloydb/resource_alloydb_instance_generated_test.go index b08913a8c26..5ee5439dd54 100644 --- a/google/services/alloydb/resource_alloydb_instance_generated_test.go +++ b/google/services/alloydb/resource_alloydb_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/alloydb" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/alloydb/resource_alloydb_user_generated_test.go b/google/services/alloydb/resource_alloydb_user_generated_test.go index d67293624d6..a7c4f74686b 100644 --- a/google/services/alloydb/resource_alloydb_user_generated_test.go +++ b/google/services/alloydb/resource_alloydb_user_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/alloydb" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_addons_config_generated_test.go b/google/services/apigee/resource_apigee_addons_config_generated_test.go index 2b71b9ba013..feb6f92e188 100644 --- a/google/services/apigee/resource_apigee_addons_config_generated_test.go +++ b/google/services/apigee/resource_apigee_addons_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_api_deployment_generated_test.go b/google/services/apigee/resource_apigee_api_deployment_generated_test.go index 9d8ba7dbd01..fcf26e83aee 100644 --- a/google/services/apigee/resource_apigee_api_deployment_generated_test.go +++ b/google/services/apigee/resource_apigee_api_deployment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_api_product_generated_test.go b/google/services/apigee/resource_apigee_api_product_generated_test.go index 785978bf0d5..099eed27e27 100644 --- a/google/services/apigee/resource_apigee_api_product_generated_test.go +++ b/google/services/apigee/resource_apigee_api_product_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_app_group_generated_test.go b/google/services/apigee/resource_apigee_app_group_generated_test.go index 46a5c8a7ab7..793a509826e 100644 --- a/google/services/apigee/resource_apigee_app_group_generated_test.go +++ b/google/services/apigee/resource_apigee_app_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_control_plane_access_generated_test.go b/google/services/apigee/resource_apigee_control_plane_access_generated_test.go index 9a6913c99e7..2258f9c2a75 100644 --- a/google/services/apigee/resource_apigee_control_plane_access_generated_test.go +++ b/google/services/apigee/resource_apigee_control_plane_access_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_data_collector_generated_test.go b/google/services/apigee/resource_apigee_data_collector_generated_test.go index ccb46b7c400..4e52f23c294 100644 --- a/google/services/apigee/resource_apigee_data_collector_generated_test.go +++ b/google/services/apigee/resource_apigee_data_collector_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_developer_app_generated_test.go b/google/services/apigee/resource_apigee_developer_app_generated_test.go index 5e5b1b5235c..4f55669c446 100644 --- a/google/services/apigee/resource_apigee_developer_app_generated_test.go +++ b/google/services/apigee/resource_apigee_developer_app_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_developer_generated_test.go b/google/services/apigee/resource_apigee_developer_generated_test.go index fc3e3233b6f..66ac09aebef 100644 --- a/google/services/apigee/resource_apigee_developer_generated_test.go +++ b/google/services/apigee/resource_apigee_developer_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_dns_zone_generated_test.go b/google/services/apigee/resource_apigee_dns_zone_generated_test.go index 4633ba0ab7c..b58a0eff9c2 100644 --- a/google/services/apigee/resource_apigee_dns_zone_generated_test.go +++ b/google/services/apigee/resource_apigee_dns_zone_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_env_keystore_generated_test.go b/google/services/apigee/resource_apigee_env_keystore_generated_test.go index e18812b388d..5170a0f23df 100644 --- a/google/services/apigee/resource_apigee_env_keystore_generated_test.go +++ b/google/services/apigee/resource_apigee_env_keystore_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_env_references_generated_test.go b/google/services/apigee/resource_apigee_env_references_generated_test.go index 36258b6e2cc..16800558b10 100644 --- a/google/services/apigee/resource_apigee_env_references_generated_test.go +++ b/google/services/apigee/resource_apigee_env_references_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_envgroup_attachment_generated_test.go b/google/services/apigee/resource_apigee_envgroup_attachment_generated_test.go index 141f9fb4567..496a723d530 100644 --- a/google/services/apigee/resource_apigee_envgroup_attachment_generated_test.go +++ b/google/services/apigee/resource_apigee_envgroup_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_envgroup_generated_test.go b/google/services/apigee/resource_apigee_envgroup_generated_test.go index d61d815a1bd..283e3f4e516 100644 --- a/google/services/apigee/resource_apigee_envgroup_generated_test.go +++ b/google/services/apigee/resource_apigee_envgroup_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_environment_addons_config_generated_test.go b/google/services/apigee/resource_apigee_environment_addons_config_generated_test.go index 83caf5df85b..9bfddcbc629 100644 --- a/google/services/apigee/resource_apigee_environment_addons_config_generated_test.go +++ b/google/services/apigee/resource_apigee_environment_addons_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_environment_generated_test.go b/google/services/apigee/resource_apigee_environment_generated_test.go index c3d0e500346..04063ee878c 100644 --- a/google/services/apigee/resource_apigee_environment_generated_test.go +++ b/google/services/apigee/resource_apigee_environment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_environment_keyvaluemaps_entries_generated_test.go b/google/services/apigee/resource_apigee_environment_keyvaluemaps_entries_generated_test.go index 0ceadd91484..5d03f625d24 100644 --- a/google/services/apigee/resource_apigee_environment_keyvaluemaps_entries_generated_test.go +++ b/google/services/apigee/resource_apigee_environment_keyvaluemaps_entries_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_environment_keyvaluemaps_generated_test.go b/google/services/apigee/resource_apigee_environment_keyvaluemaps_generated_test.go index fbbccc12652..9d4101f5526 100644 --- a/google/services/apigee/resource_apigee_environment_keyvaluemaps_generated_test.go +++ b/google/services/apigee/resource_apigee_environment_keyvaluemaps_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_instance_attachment_generated_test.go b/google/services/apigee/resource_apigee_instance_attachment_generated_test.go index 1ae4f6c3e0b..aa422949d1f 100644 --- a/google/services/apigee/resource_apigee_instance_attachment_generated_test.go +++ b/google/services/apigee/resource_apigee_instance_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_instance_generated_test.go b/google/services/apigee/resource_apigee_instance_generated_test.go index 71dca162e69..e19d9e1249e 100644 --- a/google/services/apigee/resource_apigee_instance_generated_test.go +++ b/google/services/apigee/resource_apigee_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go b/google/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go index 19124537743..c10578098e7 100644 --- a/google/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go +++ b/google/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_nat_address_generated_test.go b/google/services/apigee/resource_apigee_nat_address_generated_test.go index a8d7a826989..7da64b3bca2 100644 --- a/google/services/apigee/resource_apigee_nat_address_generated_test.go +++ b/google/services/apigee/resource_apigee_nat_address_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_organization_generated_test.go b/google/services/apigee/resource_apigee_organization_generated_test.go index 5c4f0f9f5d8..74e8e747860 100644 --- a/google/services/apigee/resource_apigee_organization_generated_test.go +++ b/google/services/apigee/resource_apigee_organization_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_security_feedback_generated_test.go b/google/services/apigee/resource_apigee_security_feedback_generated_test.go index 37fa37a6d7c..c1bdb57f487 100644 --- a/google/services/apigee/resource_apigee_security_feedback_generated_test.go +++ b/google/services/apigee/resource_apigee_security_feedback_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_security_monitoring_condition_generated_test.go b/google/services/apigee/resource_apigee_security_monitoring_condition_generated_test.go index 69defe798b8..d44258c05b7 100644 --- a/google/services/apigee/resource_apigee_security_monitoring_condition_generated_test.go +++ b/google/services/apigee/resource_apigee_security_monitoring_condition_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_security_profile_v2_generated_test.go b/google/services/apigee/resource_apigee_security_profile_v2_generated_test.go index e30b02c49f0..a365b3980f9 100644 --- a/google/services/apigee/resource_apigee_security_profile_v2_generated_test.go +++ b/google/services/apigee/resource_apigee_security_profile_v2_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_space_generated_test.go b/google/services/apigee/resource_apigee_space_generated_test.go index 5a08798551f..0e22a7e6915 100644 --- a/google/services/apigee/resource_apigee_space_generated_test.go +++ b/google/services/apigee/resource_apigee_space_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_sync_authorization_generated_test.go b/google/services/apigee/resource_apigee_sync_authorization_generated_test.go index 9b8dcb42367..2ecac725bc3 100644 --- a/google/services/apigee/resource_apigee_sync_authorization_generated_test.go +++ b/google/services/apigee/resource_apigee_sync_authorization_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apigee/resource_apigee_target_server_generated_test.go b/google/services/apigee/resource_apigee_target_server_generated_test.go index 389791e93df..10f36e87312 100644 --- a/google/services/apigee/resource_apigee_target_server_generated_test.go +++ b/google/services/apigee/resource_apigee_target_server_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apigee" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apihub/resource_apihub_host_project_registration_generated_test.go b/google/services/apihub/resource_apihub_host_project_registration_generated_test.go index 55deef9cb8b..507635e1850 100644 --- a/google/services/apihub/resource_apihub_host_project_registration_generated_test.go +++ b/google/services/apihub/resource_apihub_host_project_registration_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apihub" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/appengine/resource_app_engine_application_url_dispatch_rules_generated_test.go b/google/services/appengine/resource_app_engine_application_url_dispatch_rules_generated_test.go index d689dbb77b1..ac71f5e39dc 100644 --- a/google/services/appengine/resource_app_engine_application_url_dispatch_rules_generated_test.go +++ b/google/services/appengine/resource_app_engine_application_url_dispatch_rules_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/appengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/appengine/resource_app_engine_domain_mapping_generated_test.go b/google/services/appengine/resource_app_engine_domain_mapping_generated_test.go index 2fe39b7f9c2..f2d2dae7f45 100644 --- a/google/services/appengine/resource_app_engine_domain_mapping_generated_test.go +++ b/google/services/appengine/resource_app_engine_domain_mapping_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/appengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/appengine/resource_app_engine_firewall_rule_generated_test.go b/google/services/appengine/resource_app_engine_firewall_rule_generated_test.go index 7942b6e8736..bd085e66056 100644 --- a/google/services/appengine/resource_app_engine_firewall_rule_generated_test.go +++ b/google/services/appengine/resource_app_engine_firewall_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/appengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/appengine/resource_app_engine_service_network_settings_generated_test.go b/google/services/appengine/resource_app_engine_service_network_settings_generated_test.go index a4337814fb9..ed4c7636dc4 100644 --- a/google/services/appengine/resource_app_engine_service_network_settings_generated_test.go +++ b/google/services/appengine/resource_app_engine_service_network_settings_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/appengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/appengine/resource_app_engine_service_split_traffic_generated_test.go b/google/services/appengine/resource_app_engine_service_split_traffic_generated_test.go index 5f280e0c4da..110381f6e69 100644 --- a/google/services/appengine/resource_app_engine_service_split_traffic_generated_test.go +++ b/google/services/appengine/resource_app_engine_service_split_traffic_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/appengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/appengine/resource_app_engine_standard_app_version_generated_test.go b/google/services/appengine/resource_app_engine_standard_app_version_generated_test.go index 2ffe5b09c64..c535f6a61c9 100644 --- a/google/services/appengine/resource_app_engine_standard_app_version_generated_test.go +++ b/google/services/appengine/resource_app_engine_standard_app_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/appengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apphub/resource_apphub_application_generated_test.go b/google/services/apphub/resource_apphub_application_generated_test.go index a0fb16e92b6..322e48db0c7 100644 --- a/google/services/apphub/resource_apphub_application_generated_test.go +++ b/google/services/apphub/resource_apphub_application_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apphub" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apphub/resource_apphub_service_generated_test.go b/google/services/apphub/resource_apphub_service_generated_test.go index c8edc2db345..b0646c3a973 100644 --- a/google/services/apphub/resource_apphub_service_generated_test.go +++ b/google/services/apphub/resource_apphub_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apphub" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apphub/resource_apphub_service_project_attachment_generated_test.go b/google/services/apphub/resource_apphub_service_project_attachment_generated_test.go index 36e78513070..5287036e7ff 100644 --- a/google/services/apphub/resource_apphub_service_project_attachment_generated_test.go +++ b/google/services/apphub/resource_apphub_service_project_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apphub" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/apphub/resource_apphub_workload_generated_test.go b/google/services/apphub/resource_apphub_workload_generated_test.go index 770281ebc9e..18601b753ff 100644 --- a/google/services/apphub/resource_apphub_workload_generated_test.go +++ b/google/services/apphub/resource_apphub_workload_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/apphub" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/artifactregistry/resource_artifact_registry_repository_generated_test.go b/google/services/artifactregistry/resource_artifact_registry_repository_generated_test.go index 8c55d18f630..bdc26c26549 100644 --- a/google/services/artifactregistry/resource_artifact_registry_repository_generated_test.go +++ b/google/services/artifactregistry/resource_artifact_registry_repository_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/artifactregistry" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/artifactregistry/resource_artifact_registry_rule_generated_test.go b/google/services/artifactregistry/resource_artifact_registry_rule_generated_test.go index 5551f0d6d63..db295dd0a51 100644 --- a/google/services/artifactregistry/resource_artifact_registry_rule_generated_test.go +++ b/google/services/artifactregistry/resource_artifact_registry_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/artifactregistry" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/backupdr/resource_backup_dr_backup_plan_association_generated_test.go b/google/services/backupdr/resource_backup_dr_backup_plan_association_generated_test.go index 4389224d0c8..5393bd0deb7 100644 --- a/google/services/backupdr/resource_backup_dr_backup_plan_association_generated_test.go +++ b/google/services/backupdr/resource_backup_dr_backup_plan_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/backupdr" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/backupdr/resource_backup_dr_backup_plan_generated_test.go b/google/services/backupdr/resource_backup_dr_backup_plan_generated_test.go index f08e8588324..bce4c231c69 100644 --- a/google/services/backupdr/resource_backup_dr_backup_plan_generated_test.go +++ b/google/services/backupdr/resource_backup_dr_backup_plan_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/backupdr" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/backupdr/resource_backup_dr_backup_vault_generated_test.go b/google/services/backupdr/resource_backup_dr_backup_vault_generated_test.go index 28b203c6a8e..a6a61001441 100644 --- a/google/services/backupdr/resource_backup_dr_backup_vault_generated_test.go +++ b/google/services/backupdr/resource_backup_dr_backup_vault_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/backupdr" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -120,7 +123,7 @@ resource "google_backup_dr_backup_vault" "backup-vault-test" { func TestAccBackupDRBackupVault_backupDrBackupVaultCmekExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-backupdr.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/backupdr/resource_backup_dr_restore_workload_generated_test.go b/google/services/backupdr/resource_backup_dr_restore_workload_generated_test.go index e89fd779e8c..4ea3dcff96c 100644 --- a/google/services/backupdr/resource_backup_dr_restore_workload_generated_test.go +++ b/google/services/backupdr/resource_backup_dr_restore_workload_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/backupdr" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/backupdr/resource_backup_dr_service_config_generated_test.go b/google/services/backupdr/resource_backup_dr_service_config_generated_test.go index 870b45484bc..0d881674251 100644 --- a/google/services/backupdr/resource_backup_dr_service_config_generated_test.go +++ b/google/services/backupdr/resource_backup_dr_service_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/backupdr" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/beyondcorp/resource_beyondcorp_app_connection_generated_test.go b/google/services/beyondcorp/resource_beyondcorp_app_connection_generated_test.go index 2b56cb3a098..ef8c4ba7827 100644 --- a/google/services/beyondcorp/resource_beyondcorp_app_connection_generated_test.go +++ b/google/services/beyondcorp/resource_beyondcorp_app_connection_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/beyondcorp" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/beyondcorp/resource_beyondcorp_app_connector_generated_test.go b/google/services/beyondcorp/resource_beyondcorp_app_connector_generated_test.go index 662034215c6..2ce60876b42 100644 --- a/google/services/beyondcorp/resource_beyondcorp_app_connector_generated_test.go +++ b/google/services/beyondcorp/resource_beyondcorp_app_connector_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/beyondcorp" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/beyondcorp/resource_beyondcorp_app_gateway_generated_test.go b/google/services/beyondcorp/resource_beyondcorp_app_gateway_generated_test.go index 35a5315be10..abbed350838 100644 --- a/google/services/beyondcorp/resource_beyondcorp_app_gateway_generated_test.go +++ b/google/services/beyondcorp/resource_beyondcorp_app_gateway_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/beyondcorp" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/beyondcorp/resource_beyondcorp_security_gateway_application_generated_test.go b/google/services/beyondcorp/resource_beyondcorp_security_gateway_application_generated_test.go index 884be6ffa76..34255c221ae 100644 --- a/google/services/beyondcorp/resource_beyondcorp_security_gateway_application_generated_test.go +++ b/google/services/beyondcorp/resource_beyondcorp_security_gateway_application_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/beyondcorp" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/beyondcorp/resource_beyondcorp_security_gateway_generated_test.go b/google/services/beyondcorp/resource_beyondcorp_security_gateway_generated_test.go index fbbba6a8c57..1db82c0aa38 100644 --- a/google/services/beyondcorp/resource_beyondcorp_security_gateway_generated_test.go +++ b/google/services/beyondcorp/resource_beyondcorp_security_gateway_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/beyondcorp" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/biglake/resource_biglake_catalog_generated_test.go b/google/services/biglake/resource_biglake_catalog_generated_test.go index 2b36d0291db..cd5e77cb640 100644 --- a/google/services/biglake/resource_biglake_catalog_generated_test.go +++ b/google/services/biglake/resource_biglake_catalog_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/biglake" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/biglake/resource_biglake_database_generated_test.go b/google/services/biglake/resource_biglake_database_generated_test.go index 5df5d4f03a6..0e5f9966c47 100644 --- a/google/services/biglake/resource_biglake_database_generated_test.go +++ b/google/services/biglake/resource_biglake_database_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/biglake" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/biglake/resource_biglake_table_generated_test.go b/google/services/biglake/resource_biglake_table_generated_test.go index 764b01f2d42..c1b46068365 100644 --- a/google/services/biglake/resource_biglake_table_generated_test.go +++ b/google/services/biglake/resource_biglake_table_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/biglake" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/biglakeiceberg/resource_biglake_iceberg_catalog_generated_test.go b/google/services/biglakeiceberg/resource_biglake_iceberg_catalog_generated_test.go index c737c47d63c..985ac0cb664 100644 --- a/google/services/biglakeiceberg/resource_biglake_iceberg_catalog_generated_test.go +++ b/google/services/biglakeiceberg/resource_biglake_iceberg_catalog_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/biglakeiceberg" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/biglakeiceberg/resource_biglake_iceberg_namespace_generated_test.go b/google/services/biglakeiceberg/resource_biglake_iceberg_namespace_generated_test.go index c6a6f236287..09afe5f2665 100644 --- a/google/services/biglakeiceberg/resource_biglake_iceberg_namespace_generated_test.go +++ b/google/services/biglakeiceberg/resource_biglake_iceberg_namespace_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/biglakeiceberg" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/biglakeiceberg/resource_biglake_iceberg_table_generated_test.go b/google/services/biglakeiceberg/resource_biglake_iceberg_table_generated_test.go index 8ed0177be54..d9064699e84 100644 --- a/google/services/biglakeiceberg/resource_biglake_iceberg_table_generated_test.go +++ b/google/services/biglakeiceberg/resource_biglake_iceberg_table_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/biglakeiceberg" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigquery/resource_bigquery_dataset_generated_test.go b/google/services/bigquery/resource_bigquery_dataset_generated_test.go index 5f43c5a1f2a..f6dcb8bf16b 100644 --- a/google/services/bigquery/resource_bigquery_dataset_generated_test.go +++ b/google/services/bigquery/resource_bigquery_dataset_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigquery" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigquery/resource_bigquery_job_generated_test.go b/google/services/bigquery/resource_bigquery_job_generated_test.go index 7b19188e86e..8ea52ea7f3a 100644 --- a/google/services/bigquery/resource_bigquery_job_generated_test.go +++ b/google/services/bigquery/resource_bigquery_job_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigquery" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigquery/resource_bigquery_routine_generated_test.go b/google/services/bigquery/resource_bigquery_routine_generated_test.go index 308bae536be..b484ae99895 100644 --- a/google/services/bigquery/resource_bigquery_routine_generated_test.go +++ b/google/services/bigquery/resource_bigquery_routine_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigquery" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigquery/resource_bigquery_row_access_policy_generated_test.go b/google/services/bigquery/resource_bigquery_row_access_policy_generated_test.go index 479d5733929..65f5ce74da8 100644 --- a/google/services/bigquery/resource_bigquery_row_access_policy_generated_test.go +++ b/google/services/bigquery/resource_bigquery_row_access_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigquery" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange_generated_test.go b/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange_generated_test.go index f4032f6652e..6f20aed3965 100644 --- a/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange_generated_test.go +++ b/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigqueryanalyticshub" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_generated_test.go b/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_generated_test.go index 5c251c646f4..47eeb343476 100644 --- a/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_generated_test.go +++ b/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigqueryanalyticshub" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_subscription_generated_test.go b/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_subscription_generated_test.go index 005e281d873..1403f342a8c 100644 --- a/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_subscription_generated_test.go +++ b/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_subscription_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigqueryanalyticshub" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigqueryconnection/resource_bigquery_connection_generated_test.go b/google/services/bigqueryconnection/resource_bigquery_connection_generated_test.go index ad19fe16894..15d36effcf5 100644 --- a/google/services/bigqueryconnection/resource_bigquery_connection_generated_test.go +++ b/google/services/bigqueryconnection/resource_bigquery_connection_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigqueryconnection" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -579,7 +582,7 @@ resource "google_dataproc_cluster" "basic" { func TestAccBigqueryConnectionConnection_bigqueryConnectionSqlWithCmekExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:bq-{project_number}@bigquery-encryption.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_generated_test.go b/google/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_generated_test.go index c561ad7b77c..c3762f29989 100644 --- a/google/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_generated_test.go +++ b/google/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigquerydatapolicy" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigquerydatapolicyv2/resource_bigquery_datapolicyv2_data_policy_generated_test.go b/google/services/bigquerydatapolicyv2/resource_bigquery_datapolicyv2_data_policy_generated_test.go index 415c04d2226..7f6f959d546 100644 --- a/google/services/bigquerydatapolicyv2/resource_bigquery_datapolicyv2_data_policy_generated_test.go +++ b/google/services/bigquerydatapolicyv2/resource_bigquery_datapolicyv2_data_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigquerydatapolicyv2" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigqueryreservation/resource_bigquery_bi_reservation_generated_test.go b/google/services/bigqueryreservation/resource_bigquery_bi_reservation_generated_test.go index a1970903844..e05e1be7877 100644 --- a/google/services/bigqueryreservation/resource_bigquery_bi_reservation_generated_test.go +++ b/google/services/bigqueryreservation/resource_bigquery_bi_reservation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigqueryreservation" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigqueryreservation/resource_bigquery_capacity_commitment_generated_test.go b/google/services/bigqueryreservation/resource_bigquery_capacity_commitment_generated_test.go index 585a9890c1c..ea8a23a6a37 100644 --- a/google/services/bigqueryreservation/resource_bigquery_capacity_commitment_generated_test.go +++ b/google/services/bigqueryreservation/resource_bigquery_capacity_commitment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigqueryreservation" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigqueryreservation/resource_bigquery_reservation_assignment_generated_test.go b/google/services/bigqueryreservation/resource_bigquery_reservation_assignment_generated_test.go index 5f039efaaa0..f75342da544 100644 --- a/google/services/bigqueryreservation/resource_bigquery_reservation_assignment_generated_test.go +++ b/google/services/bigqueryreservation/resource_bigquery_reservation_assignment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigqueryreservation" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigqueryreservation/resource_bigquery_reservation_generated_test.go b/google/services/bigqueryreservation/resource_bigquery_reservation_generated_test.go index 7160d512749..438ac949d24 100644 --- a/google/services/bigqueryreservation/resource_bigquery_reservation_generated_test.go +++ b/google/services/bigqueryreservation/resource_bigquery_reservation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigqueryreservation" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigqueryreservation/resource_bigquery_reservation_group_generated_test.go b/google/services/bigqueryreservation/resource_bigquery_reservation_group_generated_test.go index 471aa27d085..78f29a4cb7d 100644 --- a/google/services/bigqueryreservation/resource_bigquery_reservation_group_generated_test.go +++ b/google/services/bigqueryreservation/resource_bigquery_reservation_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigqueryreservation" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigtable/resource_bigtable_app_profile_generated_test.go b/google/services/bigtable/resource_bigtable_app_profile_generated_test.go index e22b3377501..8144de61751 100644 --- a/google/services/bigtable/resource_bigtable_app_profile_generated_test.go +++ b/google/services/bigtable/resource_bigtable_app_profile_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigtable" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigtable/resource_bigtable_logical_view_generated_test.go b/google/services/bigtable/resource_bigtable_logical_view_generated_test.go index 1e705f49420..b1c696f2875 100644 --- a/google/services/bigtable/resource_bigtable_logical_view_generated_test.go +++ b/google/services/bigtable/resource_bigtable_logical_view_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigtable" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigtable/resource_bigtable_materialized_view_generated_test.go b/google/services/bigtable/resource_bigtable_materialized_view_generated_test.go index 9bbf002ddc8..ee5a48c366d 100644 --- a/google/services/bigtable/resource_bigtable_materialized_view_generated_test.go +++ b/google/services/bigtable/resource_bigtable_materialized_view_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigtable" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/bigtable/resource_bigtable_schema_bundle_generated_test.go b/google/services/bigtable/resource_bigtable_schema_bundle_generated_test.go index bb874a100d4..18337328c05 100644 --- a/google/services/bigtable/resource_bigtable_schema_bundle_generated_test.go +++ b/google/services/bigtable/resource_bigtable_schema_bundle_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/bigtable" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/billingbudgets/resource_billing_budget_generated_test.go b/google/services/billingbudgets/resource_billing_budget_generated_test.go index 40365f3b103..0e359c3eeff 100644 --- a/google/services/billingbudgets/resource_billing_budget_generated_test.go +++ b/google/services/billingbudgets/resource_billing_budget_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/billingbudgets" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/binaryauthorization/resource_binary_authorization_attestor_generated_test.go b/google/services/binaryauthorization/resource_binary_authorization_attestor_generated_test.go index 3f8387e3f90..fdfacd785fe 100644 --- a/google/services/binaryauthorization/resource_binary_authorization_attestor_generated_test.go +++ b/google/services/binaryauthorization/resource_binary_authorization_attestor_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/binaryauthorization" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/blockchainnodeengine/resource_blockchain_node_engine_blockchain_nodes_generated_test.go b/google/services/blockchainnodeengine/resource_blockchain_node_engine_blockchain_nodes_generated_test.go index 7a7e90f0f77..1a7eec6896d 100644 --- a/google/services/blockchainnodeengine/resource_blockchain_node_engine_blockchain_nodes_generated_test.go +++ b/google/services/blockchainnodeengine/resource_blockchain_node_engine_blockchain_nodes_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/blockchainnodeengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/certificatemanager/resource_certificate_manager_certificate_generated_test.go b/google/services/certificatemanager/resource_certificate_manager_certificate_generated_test.go index 0ea05b1b72f..c73c7f84099 100644 --- a/google/services/certificatemanager/resource_certificate_manager_certificate_generated_test.go +++ b/google/services/certificatemanager/resource_certificate_manager_certificate_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/certificatemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/certificatemanager/resource_certificate_manager_certificate_issuance_config_generated_test.go b/google/services/certificatemanager/resource_certificate_manager_certificate_issuance_config_generated_test.go index ef81ac672e4..07d52f7168c 100644 --- a/google/services/certificatemanager/resource_certificate_manager_certificate_issuance_config_generated_test.go +++ b/google/services/certificatemanager/resource_certificate_manager_certificate_issuance_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/certificatemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/certificatemanager/resource_certificate_manager_certificate_map_entry_generated_test.go b/google/services/certificatemanager/resource_certificate_manager_certificate_map_entry_generated_test.go index 552a7ba3305..58c8013f20e 100644 --- a/google/services/certificatemanager/resource_certificate_manager_certificate_map_entry_generated_test.go +++ b/google/services/certificatemanager/resource_certificate_manager_certificate_map_entry_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/certificatemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/certificatemanager/resource_certificate_manager_certificate_map_generated_test.go b/google/services/certificatemanager/resource_certificate_manager_certificate_map_generated_test.go index a732dc4b1d7..ad790ecba6f 100644 --- a/google/services/certificatemanager/resource_certificate_manager_certificate_map_generated_test.go +++ b/google/services/certificatemanager/resource_certificate_manager_certificate_map_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/certificatemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/certificatemanager/resource_certificate_manager_dns_authorization_generated_test.go b/google/services/certificatemanager/resource_certificate_manager_dns_authorization_generated_test.go index daf144e30a3..3979883a4bf 100644 --- a/google/services/certificatemanager/resource_certificate_manager_dns_authorization_generated_test.go +++ b/google/services/certificatemanager/resource_certificate_manager_dns_authorization_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/certificatemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/certificatemanager/resource_certificate_manager_trust_config_generated_test.go b/google/services/certificatemanager/resource_certificate_manager_trust_config_generated_test.go index 7255d158eff..e4c67c40d2f 100644 --- a/google/services/certificatemanager/resource_certificate_manager_trust_config_generated_test.go +++ b/google/services/certificatemanager/resource_certificate_manager_trust_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/certificatemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/ces/resource_ces_agent_generated_test.go b/google/services/ces/resource_ces_agent_generated_test.go index ed23c3d95ae..9c04f38d41c 100644 --- a/google/services/ces/resource_ces_agent_generated_test.go +++ b/google/services/ces/resource_ces_agent_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/ces" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/ces/resource_ces_app_generated_test.go b/google/services/ces/resource_ces_app_generated_test.go index cd8c79fd9e3..0748bff3dd2 100644 --- a/google/services/ces/resource_ces_app_generated_test.go +++ b/google/services/ces/resource_ces_app_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/ces" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/ces/resource_ces_app_root_agent_association_generated_test.go b/google/services/ces/resource_ces_app_root_agent_association_generated_test.go index c6e09f5b860..acb557d88c0 100644 --- a/google/services/ces/resource_ces_app_root_agent_association_generated_test.go +++ b/google/services/ces/resource_ces_app_root_agent_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/ces" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/ces/resource_ces_app_version_generated_test.go b/google/services/ces/resource_ces_app_version_generated_test.go index 32de717d7e5..e78d993a3c2 100644 --- a/google/services/ces/resource_ces_app_version_generated_test.go +++ b/google/services/ces/resource_ces_app_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/ces" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/ces/resource_ces_deployment_generated_test.go b/google/services/ces/resource_ces_deployment_generated_test.go index ed1cc624861..4c401aead72 100644 --- a/google/services/ces/resource_ces_deployment_generated_test.go +++ b/google/services/ces/resource_ces_deployment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/ces" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/ces/resource_ces_example_generated_test.go b/google/services/ces/resource_ces_example_generated_test.go index 6ae0180d181..8f254cbbc32 100644 --- a/google/services/ces/resource_ces_example_generated_test.go +++ b/google/services/ces/resource_ces_example_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/ces" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/ces/resource_ces_guardrail_generated_test.go b/google/services/ces/resource_ces_guardrail_generated_test.go index bddcaf1e56d..2ffaa25b63e 100644 --- a/google/services/ces/resource_ces_guardrail_generated_test.go +++ b/google/services/ces/resource_ces_guardrail_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/ces" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/ces/resource_ces_tool_generated_test.go b/google/services/ces/resource_ces_tool_generated_test.go index 986da7f6bd3..48dfeecf4d7 100644 --- a/google/services/ces/resource_ces_tool_generated_test.go +++ b/google/services/ces/resource_ces_tool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/ces" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/ces/resource_ces_toolset_generated_test.go b/google/services/ces/resource_ces_toolset_generated_test.go index f9f391729aa..a8a689a89c2 100644 --- a/google/services/ces/resource_ces_toolset_generated_test.go +++ b/google/services/ces/resource_ces_toolset_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/ces" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/chronicle/resource_chronicle_dashboard_chart_generated_test.go b/google/services/chronicle/resource_chronicle_dashboard_chart_generated_test.go index 4995fd3bb6c..543badb5d3b 100644 --- a/google/services/chronicle/resource_chronicle_dashboard_chart_generated_test.go +++ b/google/services/chronicle/resource_chronicle_dashboard_chart_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/chronicle" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/chronicle/resource_chronicle_data_access_label_generated_test.go b/google/services/chronicle/resource_chronicle_data_access_label_generated_test.go index fe54df705b9..5a0aceb7049 100644 --- a/google/services/chronicle/resource_chronicle_data_access_label_generated_test.go +++ b/google/services/chronicle/resource_chronicle_data_access_label_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/chronicle" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/chronicle/resource_chronicle_data_access_scope_generated_test.go b/google/services/chronicle/resource_chronicle_data_access_scope_generated_test.go index 516bdf73996..d6972021e82 100644 --- a/google/services/chronicle/resource_chronicle_data_access_scope_generated_test.go +++ b/google/services/chronicle/resource_chronicle_data_access_scope_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/chronicle" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/chronicle/resource_chronicle_data_table_generated_test.go b/google/services/chronicle/resource_chronicle_data_table_generated_test.go index 87aac6444ea..7d21aa8d31e 100644 --- a/google/services/chronicle/resource_chronicle_data_table_generated_test.go +++ b/google/services/chronicle/resource_chronicle_data_table_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/chronicle" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/chronicle/resource_chronicle_data_table_row_generated_test.go b/google/services/chronicle/resource_chronicle_data_table_row_generated_test.go index bf5fc583242..64b6d0a262b 100644 --- a/google/services/chronicle/resource_chronicle_data_table_row_generated_test.go +++ b/google/services/chronicle/resource_chronicle_data_table_row_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/chronicle" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/chronicle/resource_chronicle_native_dashboard_generated_test.go b/google/services/chronicle/resource_chronicle_native_dashboard_generated_test.go index 1269985e268..7d1a4179717 100644 --- a/google/services/chronicle/resource_chronicle_native_dashboard_generated_test.go +++ b/google/services/chronicle/resource_chronicle_native_dashboard_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/chronicle" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/chronicle/resource_chronicle_reference_list_generated_test.go b/google/services/chronicle/resource_chronicle_reference_list_generated_test.go index be4d0f3a17c..ca45b86eac6 100644 --- a/google/services/chronicle/resource_chronicle_reference_list_generated_test.go +++ b/google/services/chronicle/resource_chronicle_reference_list_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/chronicle" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/chronicle/resource_chronicle_retrohunt_generated_test.go b/google/services/chronicle/resource_chronicle_retrohunt_generated_test.go index ccc05f3b489..0f1f16038a0 100644 --- a/google/services/chronicle/resource_chronicle_retrohunt_generated_test.go +++ b/google/services/chronicle/resource_chronicle_retrohunt_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/chronicle" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/chronicle/resource_chronicle_rule_deployment_generated_test.go b/google/services/chronicle/resource_chronicle_rule_deployment_generated_test.go index 418f8c96327..62550c64300 100644 --- a/google/services/chronicle/resource_chronicle_rule_deployment_generated_test.go +++ b/google/services/chronicle/resource_chronicle_rule_deployment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/chronicle" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/chronicle/resource_chronicle_rule_generated_test.go b/google/services/chronicle/resource_chronicle_rule_generated_test.go index 4de5954d606..3cf482a5083 100644 --- a/google/services/chronicle/resource_chronicle_rule_generated_test.go +++ b/google/services/chronicle/resource_chronicle_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/chronicle" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/chronicle/resource_chronicle_watchlist_generated_test.go b/google/services/chronicle/resource_chronicle_watchlist_generated_test.go index 42ec197d8b1..ebb09a32ed6 100644 --- a/google/services/chronicle/resource_chronicle_watchlist_generated_test.go +++ b/google/services/chronicle/resource_chronicle_watchlist_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/chronicle" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudasset/resource_cloud_asset_folder_feed_generated_test.go b/google/services/cloudasset/resource_cloud_asset_folder_feed_generated_test.go index d611fbcaa95..aed7993c017 100644 --- a/google/services/cloudasset/resource_cloud_asset_folder_feed_generated_test.go +++ b/google/services/cloudasset/resource_cloud_asset_folder_feed_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudasset" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudasset/resource_cloud_asset_organization_feed_generated_test.go b/google/services/cloudasset/resource_cloud_asset_organization_feed_generated_test.go index f14d598546b..e0c725403e2 100644 --- a/google/services/cloudasset/resource_cloud_asset_organization_feed_generated_test.go +++ b/google/services/cloudasset/resource_cloud_asset_organization_feed_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudasset" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudasset/resource_cloud_asset_project_feed_generated_test.go b/google/services/cloudasset/resource_cloud_asset_project_feed_generated_test.go index 9fcfc472b9c..421cce8865b 100644 --- a/google/services/cloudasset/resource_cloud_asset_project_feed_generated_test.go +++ b/google/services/cloudasset/resource_cloud_asset_project_feed_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudasset" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudbilling/resource_billing_project_info_generated_test.go b/google/services/cloudbilling/resource_billing_project_info_generated_test.go index 3f4efa34a1f..c326a667ce7 100644 --- a/google/services/cloudbilling/resource_billing_project_info_generated_test.go +++ b/google/services/cloudbilling/resource_billing_project_info_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudbilling" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudbuild/resource_cloudbuild_bitbucket_server_config_generated_test.go b/google/services/cloudbuild/resource_cloudbuild_bitbucket_server_config_generated_test.go index abbe1c4d818..bb1620d26b4 100644 --- a/google/services/cloudbuild/resource_cloudbuild_bitbucket_server_config_generated_test.go +++ b/google/services/cloudbuild/resource_cloudbuild_bitbucket_server_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudbuild" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudbuild/resource_cloudbuild_trigger_generated_test.go b/google/services/cloudbuild/resource_cloudbuild_trigger_generated_test.go index 9a1fd6eab5f..64e26a16350 100644 --- a/google/services/cloudbuild/resource_cloudbuild_trigger_generated_test.go +++ b/google/services/cloudbuild/resource_cloudbuild_trigger_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudbuild" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudbuildv2/resource_cloudbuildv2_connection_generated_test.go b/google/services/cloudbuildv2/resource_cloudbuildv2_connection_generated_test.go index 1c5f18deb41..d1adb7f096e 100644 --- a/google/services/cloudbuildv2/resource_cloudbuildv2_connection_generated_test.go +++ b/google/services/cloudbuildv2/resource_cloudbuildv2_connection_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudbuildv2" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudbuildv2/resource_cloudbuildv2_repository_generated_test.go b/google/services/cloudbuildv2/resource_cloudbuildv2_repository_generated_test.go index 4adfa82b1fa..08b210fd7de 100644 --- a/google/services/cloudbuildv2/resource_cloudbuildv2_repository_generated_test.go +++ b/google/services/cloudbuildv2/resource_cloudbuildv2_repository_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudbuildv2" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/clouddeploy/resource_clouddeploy_automation_generated_test.go b/google/services/clouddeploy/resource_clouddeploy_automation_generated_test.go index 99c5bdb7c5d..43fc4a8a3d0 100644 --- a/google/services/clouddeploy/resource_clouddeploy_automation_generated_test.go +++ b/google/services/clouddeploy/resource_clouddeploy_automation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/clouddeploy" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/clouddeploy/resource_clouddeploy_custom_target_type_generated_test.go b/google/services/clouddeploy/resource_clouddeploy_custom_target_type_generated_test.go index f4faa05b02b..8eeaef6c2f4 100644 --- a/google/services/clouddeploy/resource_clouddeploy_custom_target_type_generated_test.go +++ b/google/services/clouddeploy/resource_clouddeploy_custom_target_type_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/clouddeploy" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/clouddeploy/resource_clouddeploy_deploy_policy_generated_test.go b/google/services/clouddeploy/resource_clouddeploy_deploy_policy_generated_test.go index 4f166189b1e..d28c14ca23e 100644 --- a/google/services/clouddeploy/resource_clouddeploy_deploy_policy_generated_test.go +++ b/google/services/clouddeploy/resource_clouddeploy_deploy_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/clouddeploy" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudfunctions/resource_cloudfunctions_function_test.go b/google/services/cloudfunctions/resource_cloudfunctions_function_test.go index c18fc7a78bf..708cc480623 100644 --- a/google/services/cloudfunctions/resource_cloudfunctions_function_test.go +++ b/google/services/cloudfunctions/resource_cloudfunctions_function_test.go @@ -27,6 +27,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" tpgcloudfunctions "github.com/hashicorp/terraform-provider-google/google/services/cloudfunctions" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "google.golang.org/api/cloudfunctions/v1" ) @@ -43,7 +44,7 @@ const testSecretEnvVarFunctionPath = "./test-fixtures/secret_environment_variabl const testSecretVolumesMountFunctionPath = "./test-fixtures/secret_volumes_mount.js" func bootstrapGcfAdminAgents(t *testing.T) { - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcf-admin-robot.iam.gserviceaccount.com", Role: "roles/vpcaccess.admin", diff --git a/google/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go b/google/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go index 0ae09c06300..910490c299a 100644 --- a/google/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go +++ b/google/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudfunctions2" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -254,7 +257,7 @@ resource "google_cloudfunctions2_function" "function" { func TestAccCloudfunctions2function_cloudfunctions2BasicGcsExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -407,7 +410,7 @@ resource "google_cloudfunctions2_function" "function" { func TestAccCloudfunctions2function_cloudfunctions2BasicAuditlogsExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -689,7 +692,7 @@ resource "google_cloudfunctions2_function" "function" { func TestAccCloudfunctions2function_cloudfunctions2SecretEnvExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -804,7 +807,7 @@ resource "google_secret_manager_secret_version" "secret" { func TestAccCloudfunctions2function_cloudfunctions2SecretVolumeExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/cloudfunctions2/resource_cloudfunctions2_function_test.go b/google/services/cloudfunctions2/resource_cloudfunctions2_function_test.go index 1969a9ff41d..073e4d7a18e 100644 --- a/google/services/cloudfunctions2/resource_cloudfunctions2_function_test.go +++ b/google/services/cloudfunctions2/resource_cloudfunctions2_function_test.go @@ -23,6 +23,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" ) func TestAccCloudFunctions2Function_update(t *testing.T) { @@ -214,7 +215,7 @@ func TestAccCloudFunctions2Function_fullUpdate(t *testing.T) { "random_suffix": randomSuffix, } - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/cloudrun/resource_cloud_run_domain_mapping_generated_test.go b/google/services/cloudrun/resource_cloud_run_domain_mapping_generated_test.go index af78ae6b7be..a7c76b615a1 100644 --- a/google/services/cloudrun/resource_cloud_run_domain_mapping_generated_test.go +++ b/google/services/cloudrun/resource_cloud_run_domain_mapping_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudrun" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudrun/resource_cloud_run_service_generated_test.go b/google/services/cloudrun/resource_cloud_run_service_generated_test.go index 1f3ec4cfd56..58f831631f7 100644 --- a/google/services/cloudrun/resource_cloud_run_service_generated_test.go +++ b/google/services/cloudrun/resource_cloud_run_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudrun" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go b/google/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go index e4c854dcca5..e589575de1d 100644 --- a/google/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go +++ b/google/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudrunv2" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudrunv2/resource_cloud_run_v2_service_generated_test.go b/google/services/cloudrunv2/resource_cloud_run_v2_service_generated_test.go index 7d72bf934e2..aea58b47b35 100644 --- a/google/services/cloudrunv2/resource_cloud_run_v2_service_generated_test.go +++ b/google/services/cloudrunv2/resource_cloud_run_v2_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudrunv2" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudrunv2/resource_cloud_run_v2_worker_pool_generated_test.go b/google/services/cloudrunv2/resource_cloud_run_v2_worker_pool_generated_test.go index 93ba95c81f3..1df3757b029 100644 --- a/google/services/cloudrunv2/resource_cloud_run_v2_worker_pool_generated_test.go +++ b/google/services/cloudrunv2/resource_cloud_run_v2_worker_pool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudrunv2" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudscheduler/resource_cloud_scheduler_job_generated_test.go b/google/services/cloudscheduler/resource_cloud_scheduler_job_generated_test.go index 18e7c84fde5..e0bbeba7f6c 100644 --- a/google/services/cloudscheduler/resource_cloud_scheduler_job_generated_test.go +++ b/google/services/cloudscheduler/resource_cloud_scheduler_job_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudscheduler" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudsecuritycompliance/resource_cloud_security_compliance_cloud_control_generated_test.go b/google/services/cloudsecuritycompliance/resource_cloud_security_compliance_cloud_control_generated_test.go index 758d8cafbfc..ad3f0866a4b 100644 --- a/google/services/cloudsecuritycompliance/resource_cloud_security_compliance_cloud_control_generated_test.go +++ b/google/services/cloudsecuritycompliance/resource_cloud_security_compliance_cloud_control_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudsecuritycompliance" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_deployment_generated_test.go b/google/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_deployment_generated_test.go index 9ff09c19c46..97d4a3b7da8 100644 --- a/google/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_deployment_generated_test.go +++ b/google/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_deployment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudsecuritycompliance" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_generated_test.go b/google/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_generated_test.go index 66e36bf952c..9f1a8abc5e3 100644 --- a/google/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_generated_test.go +++ b/google/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudsecuritycompliance" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/cloudtasks/resource_cloud_tasks_queue_generated_test.go b/google/services/cloudtasks/resource_cloud_tasks_queue_generated_test.go index 35e38d3741f..6e8e16da195 100644 --- a/google/services/cloudtasks/resource_cloud_tasks_queue_generated_test.go +++ b/google/services/cloudtasks/resource_cloud_tasks_queue_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/cloudtasks" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/colab/resource_colab_notebook_execution_generated_test.go b/google/services/colab/resource_colab_notebook_execution_generated_test.go index e72a5030582..6aa7b5462ad 100644 --- a/google/services/colab/resource_colab_notebook_execution_generated_test.go +++ b/google/services/colab/resource_colab_notebook_execution_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/colab" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/colab/resource_colab_runtime_generated_test.go b/google/services/colab/resource_colab_runtime_generated_test.go index e2c581ba2dd..c3d8b670ae1 100644 --- a/google/services/colab/resource_colab_runtime_generated_test.go +++ b/google/services/colab/resource_colab_runtime_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/colab" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/colab/resource_colab_runtime_template_generated_test.go b/google/services/colab/resource_colab_runtime_template_generated_test.go index 4a0c58f966f..9b59330e282 100644 --- a/google/services/colab/resource_colab_runtime_template_generated_test.go +++ b/google/services/colab/resource_colab_runtime_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/colab" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/colab/resource_colab_schedule_generated_test.go b/google/services/colab/resource_colab_schedule_generated_test.go index 32463fa05fd..9e4c1300e2a 100644 --- a/google/services/colab/resource_colab_schedule_generated_test.go +++ b/google/services/colab/resource_colab_schedule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/colab" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/composer/resource_composer_environment_test.go b/google/services/composer/resource_composer_environment_test.go index 3484e40da65..67b449288e6 100644 --- a/google/services/composer/resource_composer_environment_test.go +++ b/google/services/composer/resource_composer_environment_test.go @@ -29,6 +29,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/services/composer" tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -40,7 +41,7 @@ const testComposerBucketPrefix = "tf-test-composer-bucket" const testComposerNetworkAttachmentPrefix = "tf-test-composer-nta" func bootstrapComposerServiceAgents(t *testing.T) { - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@cloudcomposer-accounts.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/composer/resource_composer_user_workloads_config_map_generated_test.go b/google/services/composer/resource_composer_user_workloads_config_map_generated_test.go index 04321a4c7f1..0e291325f96 100644 --- a/google/services/composer/resource_composer_user_workloads_config_map_generated_test.go +++ b/google/services/composer/resource_composer_user_workloads_config_map_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/composer" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_address_generated_test.go b/google/services/compute/resource_compute_address_generated_test.go index 5781c7f563c..1bb27bb6f65 100644 --- a/google/services/compute/resource_compute_address_generated_test.go +++ b/google/services/compute/resource_compute_address_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_autoscaler_generated_test.go b/google/services/compute/resource_compute_autoscaler_generated_test.go index bafa0343f81..9874ba5cc99 100644 --- a/google/services/compute/resource_compute_autoscaler_generated_test.go +++ b/google/services/compute/resource_compute_autoscaler_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_backend_bucket_generated_test.go b/google/services/compute/resource_compute_backend_bucket_generated_test.go index 225fbf413f3..892df9e76c5 100644 --- a/google/services/compute/resource_compute_backend_bucket_generated_test.go +++ b/google/services/compute/resource_compute_backend_bucket_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_backend_service_generated_test.go b/google/services/compute/resource_compute_backend_service_generated_test.go index c8c54c7d28e..cc89e2feb52 100644 --- a/google/services/compute/resource_compute_backend_service_generated_test.go +++ b/google/services/compute/resource_compute_backend_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_cross_site_network_generated_test.go b/google/services/compute/resource_compute_cross_site_network_generated_test.go index 1c38f7add27..eec600072fe 100644 --- a/google/services/compute/resource_compute_cross_site_network_generated_test.go +++ b/google/services/compute/resource_compute_cross_site_network_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_disk_generated_test.go b/google/services/compute/resource_compute_disk_generated_test.go index dd64a7ac500..c1d41b8e386 100644 --- a/google/services/compute/resource_compute_disk_generated_test.go +++ b/google/services/compute/resource_compute_disk_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_disk_resource_policy_attachment_generated_test.go b/google/services/compute/resource_compute_disk_resource_policy_attachment_generated_test.go index c6c9cb58cc1..7413178cd74 100644 --- a/google/services/compute/resource_compute_disk_resource_policy_attachment_generated_test.go +++ b/google/services/compute/resource_compute_disk_resource_policy_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_disk_test.go b/google/services/compute/resource_compute_disk_test.go index b5e9c3b6252..26010043f7d 100644 --- a/google/services/compute/resource_compute_disk_test.go +++ b/google/services/compute/resource_compute_disk_test.go @@ -29,6 +29,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) @@ -677,7 +678,7 @@ func TestAccComputeDisk_encryptionKMS(t *testing.T) { importID := fmt.Sprintf("%s/%s/%s", pid, "us-central1-a", diskName) var disk map[string]interface{} - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@compute-system.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/compute/resource_compute_external_vpn_gateway_generated_test.go b/google/services/compute/resource_compute_external_vpn_gateway_generated_test.go index f4d64c05f05..5deb90b876f 100644 --- a/google/services/compute/resource_compute_external_vpn_gateway_generated_test.go +++ b/google/services/compute/resource_compute_external_vpn_gateway_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_firewall_generated_test.go b/google/services/compute/resource_compute_firewall_generated_test.go index a90d31309cc..de5f77cac3f 100644 --- a/google/services/compute/resource_compute_firewall_generated_test.go +++ b/google/services/compute/resource_compute_firewall_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_firewall_policy_generated_test.go b/google/services/compute/resource_compute_firewall_policy_generated_test.go index c35b5fddd6c..03215b75be3 100644 --- a/google/services/compute/resource_compute_firewall_policy_generated_test.go +++ b/google/services/compute/resource_compute_firewall_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_firewall_policy_rule_generated_test.go b/google/services/compute/resource_compute_firewall_policy_rule_generated_test.go index 9918bfdff6d..cc46495038b 100644 --- a/google/services/compute/resource_compute_firewall_policy_rule_generated_test.go +++ b/google/services/compute/resource_compute_firewall_policy_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_firewall_policy_with_rules_generated_test.go b/google/services/compute/resource_compute_firewall_policy_with_rules_generated_test.go index de18c4c6c6e..02fe3c6d792 100644 --- a/google/services/compute/resource_compute_firewall_policy_with_rules_generated_test.go +++ b/google/services/compute/resource_compute_firewall_policy_with_rules_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_forwarding_rule_generated_test.go b/google/services/compute/resource_compute_forwarding_rule_generated_test.go index a0218be763e..dc35e2be3a4 100644 --- a/google/services/compute/resource_compute_forwarding_rule_generated_test.go +++ b/google/services/compute/resource_compute_forwarding_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_global_address_generated_test.go b/google/services/compute/resource_compute_global_address_generated_test.go index 68fcafc4d85..8bbfccc3516 100644 --- a/google/services/compute/resource_compute_global_address_generated_test.go +++ b/google/services/compute/resource_compute_global_address_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_global_forwarding_rule_generated_test.go b/google/services/compute/resource_compute_global_forwarding_rule_generated_test.go index 31048ac73ec..7c4471a7c13 100644 --- a/google/services/compute/resource_compute_global_forwarding_rule_generated_test.go +++ b/google/services/compute/resource_compute_global_forwarding_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_global_network_endpoint_group_generated_test.go b/google/services/compute/resource_compute_global_network_endpoint_group_generated_test.go index a87ff710a41..1d0ceb12682 100644 --- a/google/services/compute/resource_compute_global_network_endpoint_group_generated_test.go +++ b/google/services/compute/resource_compute_global_network_endpoint_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_ha_vpn_gateway_generated_test.go b/google/services/compute/resource_compute_ha_vpn_gateway_generated_test.go index 4b392b1a9f5..d21dc725261 100644 --- a/google/services/compute/resource_compute_ha_vpn_gateway_generated_test.go +++ b/google/services/compute/resource_compute_ha_vpn_gateway_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_health_check_generated_test.go b/google/services/compute/resource_compute_health_check_generated_test.go index 3ec111560c8..7a93989f35d 100644 --- a/google/services/compute/resource_compute_health_check_generated_test.go +++ b/google/services/compute/resource_compute_health_check_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_http_health_check_generated_test.go b/google/services/compute/resource_compute_http_health_check_generated_test.go index caaafb0ce49..8206a5cd6a7 100644 --- a/google/services/compute/resource_compute_http_health_check_generated_test.go +++ b/google/services/compute/resource_compute_http_health_check_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_https_health_check_generated_test.go b/google/services/compute/resource_compute_https_health_check_generated_test.go index cb6e367ce08..feaec076fff 100644 --- a/google/services/compute/resource_compute_https_health_check_generated_test.go +++ b/google/services/compute/resource_compute_https_health_check_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_image_generated_test.go b/google/services/compute/resource_compute_image_generated_test.go index ad01e93f2cf..c4db718c537 100644 --- a/google/services/compute/resource_compute_image_generated_test.go +++ b/google/services/compute/resource_compute_image_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_instance_group_named_port_generated_test.go b/google/services/compute/resource_compute_instance_group_named_port_generated_test.go index 628067b1c48..f5e3f37372b 100644 --- a/google/services/compute/resource_compute_instance_group_named_port_generated_test.go +++ b/google/services/compute/resource_compute_instance_group_named_port_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_instance_settings_generated_test.go b/google/services/compute/resource_compute_instance_settings_generated_test.go index 395a08abe37..c592d239855 100644 --- a/google/services/compute/resource_compute_instance_settings_generated_test.go +++ b/google/services/compute/resource_compute_instance_settings_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_instance_test.go b/google/services/compute/resource_compute_instance_test.go index 2876d148024..54bb6b4a78c 100644 --- a/google/services/compute/resource_compute_instance_test.go +++ b/google/services/compute/resource_compute_instance_test.go @@ -34,6 +34,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-provider-google/google/tpgresource" "github.com/stretchr/testify/assert" @@ -886,7 +887,7 @@ func TestAccComputeInstance_kmsDiskEncryption(t *testing.T) { }, } - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@compute-system.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -958,7 +959,7 @@ func TestAccComputeInstance_instanceEncryption(t *testing.T) { "desired_status": "RUNNING", } - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:{project_number}-compute@developer.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/compute/resource_compute_instant_snapshot_generated_test.go b/google/services/compute/resource_compute_instant_snapshot_generated_test.go index 57688a71d33..dac6c0936c6 100644 --- a/google/services/compute/resource_compute_instant_snapshot_generated_test.go +++ b/google/services/compute/resource_compute_instant_snapshot_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_interconnect_attachment_generated_test.go b/google/services/compute/resource_compute_interconnect_attachment_generated_test.go index 379db9dd116..21e6edeb198 100644 --- a/google/services/compute/resource_compute_interconnect_attachment_generated_test.go +++ b/google/services/compute/resource_compute_interconnect_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_interconnect_attachment_group_generated_test.go b/google/services/compute/resource_compute_interconnect_attachment_group_generated_test.go index 04001ac0d88..e0c5f485e04 100644 --- a/google/services/compute/resource_compute_interconnect_attachment_group_generated_test.go +++ b/google/services/compute/resource_compute_interconnect_attachment_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_interconnect_generated_test.go b/google/services/compute/resource_compute_interconnect_generated_test.go index c3325ca6450..d600dc3834e 100644 --- a/google/services/compute/resource_compute_interconnect_generated_test.go +++ b/google/services/compute/resource_compute_interconnect_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_interconnect_group_generated_test.go b/google/services/compute/resource_compute_interconnect_group_generated_test.go index 2ddbc2d49f2..a9c8fea947d 100644 --- a/google/services/compute/resource_compute_interconnect_group_generated_test.go +++ b/google/services/compute/resource_compute_interconnect_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_managed_ssl_certificate_generated_test.go b/google/services/compute/resource_compute_managed_ssl_certificate_generated_test.go index d4f8a43696c..82c73f9a81e 100644 --- a/google/services/compute/resource_compute_managed_ssl_certificate_generated_test.go +++ b/google/services/compute/resource_compute_managed_ssl_certificate_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_network_attachment_generated_test.go b/google/services/compute/resource_compute_network_attachment_generated_test.go index 37b7078e16d..ed6194d2984 100644 --- a/google/services/compute/resource_compute_network_attachment_generated_test.go +++ b/google/services/compute/resource_compute_network_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_network_endpoint_group_generated_test.go b/google/services/compute/resource_compute_network_endpoint_group_generated_test.go index afa8fa6a1a7..7ad26bbd446 100644 --- a/google/services/compute/resource_compute_network_endpoint_group_generated_test.go +++ b/google/services/compute/resource_compute_network_endpoint_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_network_firewall_policy_association_generated_test.go b/google/services/compute/resource_compute_network_firewall_policy_association_generated_test.go index c774e86423a..d4b6450f0fe 100644 --- a/google/services/compute/resource_compute_network_firewall_policy_association_generated_test.go +++ b/google/services/compute/resource_compute_network_firewall_policy_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_network_firewall_policy_generated_test.go b/google/services/compute/resource_compute_network_firewall_policy_generated_test.go index 9ed6b10b36e..bf8e5b3da3f 100644 --- a/google/services/compute/resource_compute_network_firewall_policy_generated_test.go +++ b/google/services/compute/resource_compute_network_firewall_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_network_firewall_policy_rule_generated_test.go b/google/services/compute/resource_compute_network_firewall_policy_rule_generated_test.go index 6719dc99954..e35511ab1af 100644 --- a/google/services/compute/resource_compute_network_firewall_policy_rule_generated_test.go +++ b/google/services/compute/resource_compute_network_firewall_policy_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_network_firewall_policy_with_rules_generated_test.go b/google/services/compute/resource_compute_network_firewall_policy_with_rules_generated_test.go index db8d502e547..58fcab93fe1 100644 --- a/google/services/compute/resource_compute_network_firewall_policy_with_rules_generated_test.go +++ b/google/services/compute/resource_compute_network_firewall_policy_with_rules_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_network_generated_test.go b/google/services/compute/resource_compute_network_generated_test.go index 0c1147135aa..8ca648e0ded 100644 --- a/google/services/compute/resource_compute_network_generated_test.go +++ b/google/services/compute/resource_compute_network_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_network_peering_routes_config_generated_test.go b/google/services/compute/resource_compute_network_peering_routes_config_generated_test.go index e6455a9ba20..1b20d48ef4c 100644 --- a/google/services/compute/resource_compute_network_peering_routes_config_generated_test.go +++ b/google/services/compute/resource_compute_network_peering_routes_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_node_group_generated_test.go b/google/services/compute/resource_compute_node_group_generated_test.go index faa12ccb402..0e086217802 100644 --- a/google/services/compute/resource_compute_node_group_generated_test.go +++ b/google/services/compute/resource_compute_node_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_node_template_generated_test.go b/google/services/compute/resource_compute_node_template_generated_test.go index 8e4fe69e044..2afb3ce461f 100644 --- a/google/services/compute/resource_compute_node_template_generated_test.go +++ b/google/services/compute/resource_compute_node_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_organization_security_policy_association_generated_test.go b/google/services/compute/resource_compute_organization_security_policy_association_generated_test.go index 9575c6d215f..7db46ef112c 100644 --- a/google/services/compute/resource_compute_organization_security_policy_association_generated_test.go +++ b/google/services/compute/resource_compute_organization_security_policy_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_organization_security_policy_generated_test.go b/google/services/compute/resource_compute_organization_security_policy_generated_test.go index de118990da2..ad14fed71ff 100644 --- a/google/services/compute/resource_compute_organization_security_policy_generated_test.go +++ b/google/services/compute/resource_compute_organization_security_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_organization_security_policy_rule_generated_test.go b/google/services/compute/resource_compute_organization_security_policy_rule_generated_test.go index 13306514615..a962d52b6a1 100644 --- a/google/services/compute/resource_compute_organization_security_policy_rule_generated_test.go +++ b/google/services/compute/resource_compute_organization_security_policy_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_packet_mirroring_generated_test.go b/google/services/compute/resource_compute_packet_mirroring_generated_test.go index 8c5d2bfdb26..6947fc55645 100644 --- a/google/services/compute/resource_compute_packet_mirroring_generated_test.go +++ b/google/services/compute/resource_compute_packet_mirroring_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_preview_feature_generated_test.go b/google/services/compute/resource_compute_preview_feature_generated_test.go index 2f0b6955e08..c92e01d8d23 100644 --- a/google/services/compute/resource_compute_preview_feature_generated_test.go +++ b/google/services/compute/resource_compute_preview_feature_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_autoscaler_generated_test.go b/google/services/compute/resource_compute_region_autoscaler_generated_test.go index 177405908fe..8d2c41c6fd2 100644 --- a/google/services/compute/resource_compute_region_autoscaler_generated_test.go +++ b/google/services/compute/resource_compute_region_autoscaler_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_backend_service_generated_test.go b/google/services/compute/resource_compute_region_backend_service_generated_test.go index ccece34e5de..3738be5f813 100644 --- a/google/services/compute/resource_compute_region_backend_service_generated_test.go +++ b/google/services/compute/resource_compute_region_backend_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_composite_health_check_generated_test.go b/google/services/compute/resource_compute_region_composite_health_check_generated_test.go index da7c377fc94..031c832502a 100644 --- a/google/services/compute/resource_compute_region_composite_health_check_generated_test.go +++ b/google/services/compute/resource_compute_region_composite_health_check_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_disk_generated_test.go b/google/services/compute/resource_compute_region_disk_generated_test.go index bb9ce06edb7..d2011d2292b 100644 --- a/google/services/compute/resource_compute_region_disk_generated_test.go +++ b/google/services/compute/resource_compute_region_disk_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_disk_resource_policy_attachment_generated_test.go b/google/services/compute/resource_compute_region_disk_resource_policy_attachment_generated_test.go index 53a72e55f23..8921c7057cd 100644 --- a/google/services/compute/resource_compute_region_disk_resource_policy_attachment_generated_test.go +++ b/google/services/compute/resource_compute_region_disk_resource_policy_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_disk_test.go b/google/services/compute/resource_compute_region_disk_test.go index 0fe1c7f850e..6542677f178 100644 --- a/google/services/compute/resource_compute_region_disk_test.go +++ b/google/services/compute/resource_compute_region_disk_test.go @@ -32,6 +32,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "google.golang.org/api/compute/v1" ) @@ -868,7 +869,7 @@ func TestAccComputeRegionDisk_fromImageKMS(t *testing.T) { "disk_name": diskName, } - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@compute-system.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -1064,7 +1065,7 @@ func TestAccComputeRegionDisk_fromImageKMSWithServiceAccount(t *testing.T) { "disk_name": diskName, } - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@compute-system.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/compute/resource_compute_region_health_aggregation_policy_generated_test.go b/google/services/compute/resource_compute_region_health_aggregation_policy_generated_test.go index 823ffc6e2c6..11e37b47de6 100644 --- a/google/services/compute/resource_compute_region_health_aggregation_policy_generated_test.go +++ b/google/services/compute/resource_compute_region_health_aggregation_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_health_check_generated_test.go b/google/services/compute/resource_compute_region_health_check_generated_test.go index 506cf60e536..ddf1b11ebc7 100644 --- a/google/services/compute/resource_compute_region_health_check_generated_test.go +++ b/google/services/compute/resource_compute_region_health_check_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_health_source_generated_test.go b/google/services/compute/resource_compute_region_health_source_generated_test.go index d741a23922d..32873fcd252 100644 --- a/google/services/compute/resource_compute_region_health_source_generated_test.go +++ b/google/services/compute/resource_compute_region_health_source_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_instant_snapshot_generated_test.go b/google/services/compute/resource_compute_region_instant_snapshot_generated_test.go index e5b9436faf9..972590d275f 100644 --- a/google/services/compute/resource_compute_region_instant_snapshot_generated_test.go +++ b/google/services/compute/resource_compute_region_instant_snapshot_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_network_endpoint_generated_test.go b/google/services/compute/resource_compute_region_network_endpoint_generated_test.go index 17c57abe032..953c27fdfbd 100644 --- a/google/services/compute/resource_compute_region_network_endpoint_generated_test.go +++ b/google/services/compute/resource_compute_region_network_endpoint_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_network_endpoint_group_generated_test.go b/google/services/compute/resource_compute_region_network_endpoint_group_generated_test.go index 41b7630a480..8a925cfc935 100644 --- a/google/services/compute/resource_compute_region_network_endpoint_group_generated_test.go +++ b/google/services/compute/resource_compute_region_network_endpoint_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_network_firewall_policy_association_generated_test.go b/google/services/compute/resource_compute_region_network_firewall_policy_association_generated_test.go index a5e1547613a..b276504d411 100644 --- a/google/services/compute/resource_compute_region_network_firewall_policy_association_generated_test.go +++ b/google/services/compute/resource_compute_region_network_firewall_policy_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_network_firewall_policy_generated_test.go b/google/services/compute/resource_compute_region_network_firewall_policy_generated_test.go index 34e46828d1e..6ce7dffaf6a 100644 --- a/google/services/compute/resource_compute_region_network_firewall_policy_generated_test.go +++ b/google/services/compute/resource_compute_region_network_firewall_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_network_firewall_policy_rule_generated_test.go b/google/services/compute/resource_compute_region_network_firewall_policy_rule_generated_test.go index 42eb42ac9da..b3790a2a236 100644 --- a/google/services/compute/resource_compute_region_network_firewall_policy_rule_generated_test.go +++ b/google/services/compute/resource_compute_region_network_firewall_policy_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_network_firewall_policy_with_rules_generated_test.go b/google/services/compute/resource_compute_region_network_firewall_policy_with_rules_generated_test.go index 5fe56bb76ba..c0f3ab88595 100644 --- a/google/services/compute/resource_compute_region_network_firewall_policy_with_rules_generated_test.go +++ b/google/services/compute/resource_compute_region_network_firewall_policy_with_rules_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_security_policy_generated_test.go b/google/services/compute/resource_compute_region_security_policy_generated_test.go index 71c7959e0d1..92763021614 100644 --- a/google/services/compute/resource_compute_region_security_policy_generated_test.go +++ b/google/services/compute/resource_compute_region_security_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_security_policy_rule_generated_test.go b/google/services/compute/resource_compute_region_security_policy_rule_generated_test.go index a4f9bc4a611..ffeb2de7d3d 100644 --- a/google/services/compute/resource_compute_region_security_policy_rule_generated_test.go +++ b/google/services/compute/resource_compute_region_security_policy_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_ssl_certificate_generated_test.go b/google/services/compute/resource_compute_region_ssl_certificate_generated_test.go index 146968ea34d..a7f2e94f572 100644 --- a/google/services/compute/resource_compute_region_ssl_certificate_generated_test.go +++ b/google/services/compute/resource_compute_region_ssl_certificate_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_target_http_proxy_generated_test.go b/google/services/compute/resource_compute_region_target_http_proxy_generated_test.go index 88a91d0bce2..37a0d9c998a 100644 --- a/google/services/compute/resource_compute_region_target_http_proxy_generated_test.go +++ b/google/services/compute/resource_compute_region_target_http_proxy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_target_https_proxy_generated_test.go b/google/services/compute/resource_compute_region_target_https_proxy_generated_test.go index 43c6cc589e3..605829866db 100644 --- a/google/services/compute/resource_compute_region_target_https_proxy_generated_test.go +++ b/google/services/compute/resource_compute_region_target_https_proxy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_target_tcp_proxy_generated_test.go b/google/services/compute/resource_compute_region_target_tcp_proxy_generated_test.go index 0bc24b9422f..bb0e9f9af43 100644 --- a/google/services/compute/resource_compute_region_target_tcp_proxy_generated_test.go +++ b/google/services/compute/resource_compute_region_target_tcp_proxy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_region_url_map_generated_test.go b/google/services/compute/resource_compute_region_url_map_generated_test.go index f53345e5441..768b44d216d 100644 --- a/google/services/compute/resource_compute_region_url_map_generated_test.go +++ b/google/services/compute/resource_compute_region_url_map_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_reservation_generated_test.go b/google/services/compute/resource_compute_reservation_generated_test.go index f07313f646c..184a786115a 100644 --- a/google/services/compute/resource_compute_reservation_generated_test.go +++ b/google/services/compute/resource_compute_reservation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_resize_request_generated_test.go b/google/services/compute/resource_compute_resize_request_generated_test.go index c3576420581..39416e9a3ba 100644 --- a/google/services/compute/resource_compute_resize_request_generated_test.go +++ b/google/services/compute/resource_compute_resize_request_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_resource_policy_attachment_generated_test.go b/google/services/compute/resource_compute_resource_policy_attachment_generated_test.go index 6b06cffe978..2407fb2f055 100644 --- a/google/services/compute/resource_compute_resource_policy_attachment_generated_test.go +++ b/google/services/compute/resource_compute_resource_policy_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_resource_policy_generated_test.go b/google/services/compute/resource_compute_resource_policy_generated_test.go index 14f87769635..f12e9e2c9b6 100644 --- a/google/services/compute/resource_compute_resource_policy_generated_test.go +++ b/google/services/compute/resource_compute_resource_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_route_generated_test.go b/google/services/compute/resource_compute_route_generated_test.go index 5019927a8c6..8fd2afd17cd 100644 --- a/google/services/compute/resource_compute_route_generated_test.go +++ b/google/services/compute/resource_compute_route_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_router_generated_test.go b/google/services/compute/resource_compute_router_generated_test.go index a398edeb70f..8d0538013c6 100644 --- a/google/services/compute/resource_compute_router_generated_test.go +++ b/google/services/compute/resource_compute_router_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_router_route_policy_generated_test.go b/google/services/compute/resource_compute_router_route_policy_generated_test.go index 1d48f86388b..358e43ebbe7 100644 --- a/google/services/compute/resource_compute_router_route_policy_generated_test.go +++ b/google/services/compute/resource_compute_router_route_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_security_policy_rule_generated_test.go b/google/services/compute/resource_compute_security_policy_rule_generated_test.go index 3db2998725d..3e0a50b521f 100644 --- a/google/services/compute/resource_compute_security_policy_rule_generated_test.go +++ b/google/services/compute/resource_compute_security_policy_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_service_attachment_generated_test.go b/google/services/compute/resource_compute_service_attachment_generated_test.go index 7fc4ba49e2c..98500f06d4f 100644 --- a/google/services/compute/resource_compute_service_attachment_generated_test.go +++ b/google/services/compute/resource_compute_service_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_snapshot_generated_test.go b/google/services/compute/resource_compute_snapshot_generated_test.go index 7fa709d3915..f5df282ecbb 100644 --- a/google/services/compute/resource_compute_snapshot_generated_test.go +++ b/google/services/compute/resource_compute_snapshot_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_ssl_certificate_generated_test.go b/google/services/compute/resource_compute_ssl_certificate_generated_test.go index 67f83a19a4b..59ec2fd9e0f 100644 --- a/google/services/compute/resource_compute_ssl_certificate_generated_test.go +++ b/google/services/compute/resource_compute_ssl_certificate_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_ssl_policy_generated_test.go b/google/services/compute/resource_compute_ssl_policy_generated_test.go index eb199ee374a..0a2fd53c84e 100644 --- a/google/services/compute/resource_compute_ssl_policy_generated_test.go +++ b/google/services/compute/resource_compute_ssl_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_subnetwork_generated_test.go b/google/services/compute/resource_compute_subnetwork_generated_test.go index 3da35f05c0f..9c6b85f354c 100644 --- a/google/services/compute/resource_compute_subnetwork_generated_test.go +++ b/google/services/compute/resource_compute_subnetwork_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_target_grpc_proxy_generated_test.go b/google/services/compute/resource_compute_target_grpc_proxy_generated_test.go index 7b8ab75c147..1c78afc8ada 100644 --- a/google/services/compute/resource_compute_target_grpc_proxy_generated_test.go +++ b/google/services/compute/resource_compute_target_grpc_proxy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_target_http_proxy_generated_test.go b/google/services/compute/resource_compute_target_http_proxy_generated_test.go index a3ca607c5b3..baa467efc42 100644 --- a/google/services/compute/resource_compute_target_http_proxy_generated_test.go +++ b/google/services/compute/resource_compute_target_http_proxy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_target_https_proxy_generated_test.go b/google/services/compute/resource_compute_target_https_proxy_generated_test.go index ab8ffb4cc74..1e219dc8808 100644 --- a/google/services/compute/resource_compute_target_https_proxy_generated_test.go +++ b/google/services/compute/resource_compute_target_https_proxy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_target_instance_generated_test.go b/google/services/compute/resource_compute_target_instance_generated_test.go index 7be054c9c95..b484be2e7c7 100644 --- a/google/services/compute/resource_compute_target_instance_generated_test.go +++ b/google/services/compute/resource_compute_target_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_target_ssl_proxy_generated_test.go b/google/services/compute/resource_compute_target_ssl_proxy_generated_test.go index 510a22db5a1..2f1524ad495 100644 --- a/google/services/compute/resource_compute_target_ssl_proxy_generated_test.go +++ b/google/services/compute/resource_compute_target_ssl_proxy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_target_tcp_proxy_generated_test.go b/google/services/compute/resource_compute_target_tcp_proxy_generated_test.go index 1fe017acf9c..1c546ca4ac6 100644 --- a/google/services/compute/resource_compute_target_tcp_proxy_generated_test.go +++ b/google/services/compute/resource_compute_target_tcp_proxy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_url_map_generated_test.go b/google/services/compute/resource_compute_url_map_generated_test.go index 687032784d9..665793ca3a5 100644 --- a/google/services/compute/resource_compute_url_map_generated_test.go +++ b/google/services/compute/resource_compute_url_map_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_vpn_gateway_generated_test.go b/google/services/compute/resource_compute_vpn_gateway_generated_test.go index 159b9f89c73..1c4d18a6f8a 100644 --- a/google/services/compute/resource_compute_vpn_gateway_generated_test.go +++ b/google/services/compute/resource_compute_vpn_gateway_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_vpn_tunnel_generated_test.go b/google/services/compute/resource_compute_vpn_tunnel_generated_test.go index a9df9b588dc..72b042554ac 100644 --- a/google/services/compute/resource_compute_vpn_tunnel_generated_test.go +++ b/google/services/compute/resource_compute_vpn_tunnel_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/compute/resource_compute_wire_group_generated_test.go b/google/services/compute/resource_compute_wire_group_generated_test.go index 504b62e5614..89d1b1121cc 100644 --- a/google/services/compute/resource_compute_wire_group_generated_test.go +++ b/google/services/compute/resource_compute_wire_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/contactcenterinsights/resource_contact_center_insights_analysis_rule_generated_test.go b/google/services/contactcenterinsights/resource_contact_center_insights_analysis_rule_generated_test.go index 4b725e08cb4..138769d13e3 100644 --- a/google/services/contactcenterinsights/resource_contact_center_insights_analysis_rule_generated_test.go +++ b/google/services/contactcenterinsights/resource_contact_center_insights_analysis_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/contactcenterinsights" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/contactcenterinsights/resource_contact_center_insights_assessment_rule_generated_test.go b/google/services/contactcenterinsights/resource_contact_center_insights_assessment_rule_generated_test.go index d96b300cf16..93eef1d5389 100644 --- a/google/services/contactcenterinsights/resource_contact_center_insights_assessment_rule_generated_test.go +++ b/google/services/contactcenterinsights/resource_contact_center_insights_assessment_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/contactcenterinsights" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/contactcenterinsights/resource_contact_center_insights_auto_labeling_rule_generated_test.go b/google/services/contactcenterinsights/resource_contact_center_insights_auto_labeling_rule_generated_test.go index e6877a9dfbb..e0c0c3daf94 100644 --- a/google/services/contactcenterinsights/resource_contact_center_insights_auto_labeling_rule_generated_test.go +++ b/google/services/contactcenterinsights/resource_contact_center_insights_auto_labeling_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/contactcenterinsights" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/contactcenterinsights/resource_contact_center_insights_encryption_spec_generated_test.go b/google/services/contactcenterinsights/resource_contact_center_insights_encryption_spec_generated_test.go index 342a99f769c..fe3ebaa2d9b 100644 --- a/google/services/contactcenterinsights/resource_contact_center_insights_encryption_spec_generated_test.go +++ b/google/services/contactcenterinsights/resource_contact_center_insights_encryption_spec_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/contactcenterinsights" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/contactcenterinsights/resource_contact_center_insights_qa_question_generated_test.go b/google/services/contactcenterinsights/resource_contact_center_insights_qa_question_generated_test.go index c70049787c2..ec241bcad72 100644 --- a/google/services/contactcenterinsights/resource_contact_center_insights_qa_question_generated_test.go +++ b/google/services/contactcenterinsights/resource_contact_center_insights_qa_question_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/contactcenterinsights" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/contactcenterinsights/resource_contact_center_insights_qa_scorecard_generated_test.go b/google/services/contactcenterinsights/resource_contact_center_insights_qa_scorecard_generated_test.go index ea31b88efde..765c3526cdf 100644 --- a/google/services/contactcenterinsights/resource_contact_center_insights_qa_scorecard_generated_test.go +++ b/google/services/contactcenterinsights/resource_contact_center_insights_qa_scorecard_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/contactcenterinsights" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/contactcenterinsights/resource_contact_center_insights_qa_scorecard_revision_generated_test.go b/google/services/contactcenterinsights/resource_contact_center_insights_qa_scorecard_revision_generated_test.go index 2b557fe71e0..bb7fe5b86bd 100644 --- a/google/services/contactcenterinsights/resource_contact_center_insights_qa_scorecard_revision_generated_test.go +++ b/google/services/contactcenterinsights/resource_contact_center_insights_qa_scorecard_revision_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/contactcenterinsights" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/contactcenterinsights/resource_contact_center_insights_view_generated_test.go b/google/services/contactcenterinsights/resource_contact_center_insights_view_generated_test.go index 0a6d8971f3e..c53bef2cc0c 100644 --- a/google/services/contactcenterinsights/resource_contact_center_insights_view_generated_test.go +++ b/google/services/contactcenterinsights/resource_contact_center_insights_view_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/contactcenterinsights" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/container/resource_container_cluster_test.go b/google/services/container/resource_container_cluster_test.go index 5f242644daf..079096a1876 100644 --- a/google/services/container/resource_container_cluster_test.go +++ b/google/services/container/resource_container_cluster_test.go @@ -31,11 +31,12 @@ import ( tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" "github.com/hashicorp/terraform-provider-google/google/services/container" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" cloudkms "google.golang.org/api/cloudkms/v1" ) func bootstrapGkeTagManagerServiceAgents(t *testing.T) { - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@container-engine-robot.iam.gserviceaccount.com", Role: "roles/resourcemanager.tagAdmin", @@ -2887,7 +2888,7 @@ func TestAccContainerCluster_withBootDiskKmsKey(t *testing.T) { networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@compute-system.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -5327,7 +5328,7 @@ func TestAccContainerCluster_nodeAutoprovisioningDefaultsBootDiskKmsKey(t *testi networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@compute-system.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -6393,7 +6394,7 @@ func TestAccContainerCluster_WithCPAFeatures(t *testing.T) { // *ALL* Cloud KMS keys in the project. A more realistic usage would be to // grant the service agent the necessary roles only on the individual keys // we have created. - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@container-engine-robot.iam.gserviceaccount.com", Role: "roles/container.cloudKmsKeyUser", @@ -12926,7 +12927,7 @@ func TestAccContainerCluster_withConfidentialBootDisk(t *testing.T) { networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@compute-system.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -12992,7 +12993,7 @@ func TestAccContainerCluster_withConfidentialBootDiskNodeConfig(t *testing.T) { networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@compute-system.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -15754,7 +15755,7 @@ func TestAccContainerCluster_WithCPAFeaturesUpdate(t *testing.T) { // *ALL* Cloud KMS keys in the project. A more realistic usage would be to // grant the service agent the necessary roles only on the individual keys // we have created. - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@container-engine-robot.iam.gserviceaccount.com", Role: "roles/container.cloudKmsKeyUser", diff --git a/google/services/container/resource_container_node_pool_test.go b/google/services/container/resource_container_node_pool_test.go index 45ef29abae4..5ffc9a41721 100644 --- a/google/services/container/resource_container_node_pool_test.go +++ b/google/services/container/resource_container_node_pool_test.go @@ -29,6 +29,7 @@ import ( tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" "github.com/hashicorp/terraform-provider-google/google/services/container" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-provider-google/google/services/tags" ) @@ -5297,7 +5298,7 @@ func TestAccContainerNodePool_withConfidentialBootDisk(t *testing.T) { networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@compute-system.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/containeranalysis/resource_container_analysis_note_generated_test.go b/google/services/containeranalysis/resource_container_analysis_note_generated_test.go index 46a5825ba55..6d11c9031e4 100644 --- a/google/services/containeranalysis/resource_container_analysis_note_generated_test.go +++ b/google/services/containeranalysis/resource_container_analysis_note_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/containeranalysis" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/containerattached/resource_container_attached_cluster_generated_test.go b/google/services/containerattached/resource_container_attached_cluster_generated_test.go index 0743476f03f..ca8ca9d5cd6 100644 --- a/google/services/containerattached/resource_container_attached_cluster_generated_test.go +++ b/google/services/containerattached/resource_container_attached_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/containerattached" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/databasemigrationservice/resource_database_migration_service_connection_profile_generated_test.go b/google/services/databasemigrationservice/resource_database_migration_service_connection_profile_generated_test.go index 2b1267526a2..80a3b623455 100644 --- a/google/services/databasemigrationservice/resource_database_migration_service_connection_profile_generated_test.go +++ b/google/services/databasemigrationservice/resource_database_migration_service_connection_profile_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/databasemigrationservice" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/databasemigrationservice/resource_database_migration_service_migration_job_generated_test.go b/google/services/databasemigrationservice/resource_database_migration_service_migration_job_generated_test.go index 3bce3252815..ac8686b3ea4 100644 --- a/google/services/databasemigrationservice/resource_database_migration_service_migration_job_generated_test.go +++ b/google/services/databasemigrationservice/resource_database_migration_service_migration_job_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/databasemigrationservice" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/databasemigrationservice/resource_database_migration_service_private_connection_generated_test.go b/google/services/databasemigrationservice/resource_database_migration_service_private_connection_generated_test.go index 2c45091c198..4b074686804 100644 --- a/google/services/databasemigrationservice/resource_database_migration_service_private_connection_generated_test.go +++ b/google/services/databasemigrationservice/resource_database_migration_service_private_connection_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/databasemigrationservice" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datacatalog/resource_data_catalog_entry_generated_test.go b/google/services/datacatalog/resource_data_catalog_entry_generated_test.go index 23460ee2a57..fbce42dc374 100644 --- a/google/services/datacatalog/resource_data_catalog_entry_generated_test.go +++ b/google/services/datacatalog/resource_data_catalog_entry_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datacatalog" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datacatalog/resource_data_catalog_entry_group_generated_test.go b/google/services/datacatalog/resource_data_catalog_entry_group_generated_test.go index 119cd0d4ab1..d74df2b9763 100644 --- a/google/services/datacatalog/resource_data_catalog_entry_group_generated_test.go +++ b/google/services/datacatalog/resource_data_catalog_entry_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datacatalog" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datacatalog/resource_data_catalog_policy_tag_generated_test.go b/google/services/datacatalog/resource_data_catalog_policy_tag_generated_test.go index 1aa9c3219cd..be77f655ba0 100644 --- a/google/services/datacatalog/resource_data_catalog_policy_tag_generated_test.go +++ b/google/services/datacatalog/resource_data_catalog_policy_tag_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datacatalog" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datacatalog/resource_data_catalog_tag_generated_test.go b/google/services/datacatalog/resource_data_catalog_tag_generated_test.go index 175b606cdc7..94f5418c678 100644 --- a/google/services/datacatalog/resource_data_catalog_tag_generated_test.go +++ b/google/services/datacatalog/resource_data_catalog_tag_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datacatalog" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datacatalog/resource_data_catalog_tag_template_generated_test.go b/google/services/datacatalog/resource_data_catalog_tag_template_generated_test.go index 5644b180de2..7455ed485b0 100644 --- a/google/services/datacatalog/resource_data_catalog_tag_template_generated_test.go +++ b/google/services/datacatalog/resource_data_catalog_tag_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datacatalog" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datacatalog/resource_data_catalog_taxonomy_generated_test.go b/google/services/datacatalog/resource_data_catalog_taxonomy_generated_test.go index 38cec123432..dcdc97e0afe 100644 --- a/google/services/datacatalog/resource_data_catalog_taxonomy_generated_test.go +++ b/google/services/datacatalog/resource_data_catalog_taxonomy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datacatalog" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataflow/resource_dataflow_job_test.go b/google/services/dataflow/resource_dataflow_job_test.go index 91221ae84a5..1269551fd4b 100644 --- a/google/services/dataflow/resource_dataflow_job_test.go +++ b/google/services/dataflow/resource_dataflow_job_test.go @@ -30,6 +30,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/terraform" compute_tpg "github.com/hashicorp/terraform-provider-google/google/services/compute" "github.com/hashicorp/terraform-provider-google/google/services/dataflow" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" dataflowapi "google.golang.org/api/dataflow/v1b3" "github.com/hashicorp/terraform-provider-google/google/acctest" @@ -405,7 +406,7 @@ func TestAccDataflowJob_withKmsKey(t *testing.T) { bucket := "tf-test-dataflow-gcs-" + randStr job := "tf-test-dataflow-job-" + randStr - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@compute-system.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/dataform/resource_dataform_folder_generated_test.go b/google/services/dataform/resource_dataform_folder_generated_test.go index 890090180e5..8a6af63eda1 100644 --- a/google/services/dataform/resource_dataform_folder_generated_test.go +++ b/google/services/dataform/resource_dataform_folder_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataform" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataform/resource_dataform_team_folder_generated_test.go b/google/services/dataform/resource_dataform_team_folder_generated_test.go index b60005c7ea4..70bc4609129 100644 --- a/google/services/dataform/resource_dataform_team_folder_generated_test.go +++ b/google/services/dataform/resource_dataform_team_folder_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataform" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datafusion/resource_data_fusion_instance_generated_test.go b/google/services/datafusion/resource_data_fusion_instance_generated_test.go index 84586693f86..c72da06024f 100644 --- a/google/services/datafusion/resource_data_fusion_instance_generated_test.go +++ b/google/services/datafusion/resource_data_fusion_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datafusion" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datalineage/resource_data_lineage_config_generated_test.go b/google/services/datalineage/resource_data_lineage_config_generated_test.go index c7f5d0c224e..1212a94bb03 100644 --- a/google/services/datalineage/resource_data_lineage_config_generated_test.go +++ b/google/services/datalineage/resource_data_lineage_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datalineage" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datalossprevention/resource_data_loss_prevention_deidentify_template_generated_test.go b/google/services/datalossprevention/resource_data_loss_prevention_deidentify_template_generated_test.go index d2acc5ebb01..0bea0d076fc 100644 --- a/google/services/datalossprevention/resource_data_loss_prevention_deidentify_template_generated_test.go +++ b/google/services/datalossprevention/resource_data_loss_prevention_deidentify_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datalossprevention" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datalossprevention/resource_data_loss_prevention_discovery_config_generated_test.go b/google/services/datalossprevention/resource_data_loss_prevention_discovery_config_generated_test.go index bcc341f1fe9..ea9830d476f 100644 --- a/google/services/datalossprevention/resource_data_loss_prevention_discovery_config_generated_test.go +++ b/google/services/datalossprevention/resource_data_loss_prevention_discovery_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datalossprevention" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datalossprevention/resource_data_loss_prevention_inspect_template_generated_test.go b/google/services/datalossprevention/resource_data_loss_prevention_inspect_template_generated_test.go index affb33faabe..30ceaaa557d 100644 --- a/google/services/datalossprevention/resource_data_loss_prevention_inspect_template_generated_test.go +++ b/google/services/datalossprevention/resource_data_loss_prevention_inspect_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datalossprevention" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datalossprevention/resource_data_loss_prevention_job_trigger_generated_test.go b/google/services/datalossprevention/resource_data_loss_prevention_job_trigger_generated_test.go index cd6c54f145f..407bfa8680d 100644 --- a/google/services/datalossprevention/resource_data_loss_prevention_job_trigger_generated_test.go +++ b/google/services/datalossprevention/resource_data_loss_prevention_job_trigger_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datalossprevention" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datalossprevention/resource_data_loss_prevention_stored_info_type_generated_test.go b/google/services/datalossprevention/resource_data_loss_prevention_stored_info_type_generated_test.go index 607d25e8a8b..553ff44eac3 100644 --- a/google/services/datalossprevention/resource_data_loss_prevention_stored_info_type_generated_test.go +++ b/google/services/datalossprevention/resource_data_loss_prevention_stored_info_type_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datalossprevention" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datapipeline/resource_data_pipeline_pipeline_generated_test.go b/google/services/datapipeline/resource_data_pipeline_pipeline_generated_test.go index 826e384b31d..e178d0ed9dc 100644 --- a/google/services/datapipeline/resource_data_pipeline_pipeline_generated_test.go +++ b/google/services/datapipeline/resource_data_pipeline_pipeline_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datapipeline" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataplex/resource_dataplex_aspect_type_generated_test.go b/google/services/dataplex/resource_dataplex_aspect_type_generated_test.go index 5269de4e8ea..836501b1c6c 100644 --- a/google/services/dataplex/resource_dataplex_aspect_type_generated_test.go +++ b/google/services/dataplex/resource_dataplex_aspect_type_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataplex" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataplex/resource_dataplex_datascan_generated_test.go b/google/services/dataplex/resource_dataplex_datascan_generated_test.go index 0a640a4a782..cbe35cc1086 100644 --- a/google/services/dataplex/resource_dataplex_datascan_generated_test.go +++ b/google/services/dataplex/resource_dataplex_datascan_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataplex" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataplex/resource_dataplex_entry_generated_test.go b/google/services/dataplex/resource_dataplex_entry_generated_test.go index 98fba42792c..4208d822cfa 100644 --- a/google/services/dataplex/resource_dataplex_entry_generated_test.go +++ b/google/services/dataplex/resource_dataplex_entry_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataplex" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataplex/resource_dataplex_entry_group_generated_test.go b/google/services/dataplex/resource_dataplex_entry_group_generated_test.go index 29c51f0d503..e1011a7f35c 100644 --- a/google/services/dataplex/resource_dataplex_entry_group_generated_test.go +++ b/google/services/dataplex/resource_dataplex_entry_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataplex" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataplex/resource_dataplex_entry_link_generated_test.go b/google/services/dataplex/resource_dataplex_entry_link_generated_test.go index ecc4561cfb2..42c3eeea43b 100644 --- a/google/services/dataplex/resource_dataplex_entry_link_generated_test.go +++ b/google/services/dataplex/resource_dataplex_entry_link_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataplex" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataplex/resource_dataplex_entry_type_generated_test.go b/google/services/dataplex/resource_dataplex_entry_type_generated_test.go index aade2b68e7e..9457cf6f535 100644 --- a/google/services/dataplex/resource_dataplex_entry_type_generated_test.go +++ b/google/services/dataplex/resource_dataplex_entry_type_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataplex" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataplex/resource_dataplex_glossary_category_generated_test.go b/google/services/dataplex/resource_dataplex_glossary_category_generated_test.go index 5f37b734001..4ee41ddeae5 100644 --- a/google/services/dataplex/resource_dataplex_glossary_category_generated_test.go +++ b/google/services/dataplex/resource_dataplex_glossary_category_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataplex" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataplex/resource_dataplex_glossary_generated_test.go b/google/services/dataplex/resource_dataplex_glossary_generated_test.go index c48aad39e37..50e6044e28f 100644 --- a/google/services/dataplex/resource_dataplex_glossary_generated_test.go +++ b/google/services/dataplex/resource_dataplex_glossary_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataplex" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataplex/resource_dataplex_glossary_term_generated_test.go b/google/services/dataplex/resource_dataplex_glossary_term_generated_test.go index b13877db236..130e579be66 100644 --- a/google/services/dataplex/resource_dataplex_glossary_term_generated_test.go +++ b/google/services/dataplex/resource_dataplex_glossary_term_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataplex" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataplex/resource_dataplex_task_generated_test.go b/google/services/dataplex/resource_dataplex_task_generated_test.go index 311f28e1208..5dde2a1d83b 100644 --- a/google/services/dataplex/resource_dataplex_task_generated_test.go +++ b/google/services/dataplex/resource_dataplex_task_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataplex" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataproc/resource_dataproc_autoscaling_policy_generated_test.go b/google/services/dataproc/resource_dataproc_autoscaling_policy_generated_test.go index 64fef99ef44..4a33053922c 100644 --- a/google/services/dataproc/resource_dataproc_autoscaling_policy_generated_test.go +++ b/google/services/dataproc/resource_dataproc_autoscaling_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataproc" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataproc/resource_dataproc_batch_generated_test.go b/google/services/dataproc/resource_dataproc_batch_generated_test.go index 28336947968..21fc1bf16a2 100644 --- a/google/services/dataproc/resource_dataproc_batch_generated_test.go +++ b/google/services/dataproc/resource_dataproc_batch_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataproc" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataproc/resource_dataproc_cluster_test.go b/google/services/dataproc/resource_dataproc_cluster_test.go index 67befee26b6..d0a508f59c6 100644 --- a/google/services/dataproc/resource_dataproc_cluster_test.go +++ b/google/services/dataproc/resource_dataproc_cluster_test.go @@ -34,6 +34,7 @@ import ( tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" dataproc_tpg "github.com/hashicorp/terraform-provider-google/google/services/dataproc" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-provider-google/google/services/storage" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -383,7 +384,7 @@ func TestAccDataprocCluster_withResourceManagerTags(t *testing.T) { subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) // TODO: remove this IAM binding once tagUser permissions are present in Dataproc Service Agent role. - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: fmt.Sprintf("serviceAccount:service-%s@dataproc-accounts.iam.gserviceaccount.com", projectNumber), Role: "roles/resourcemanager.tagUser", @@ -1266,7 +1267,7 @@ func TestAccDataprocCluster_KMS(t *testing.T) { subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@compute-system.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/dataproc/resource_dataproc_session_template_generated_test.go b/google/services/dataproc/resource_dataproc_session_template_generated_test.go index eb74fd46db3..1119cb4a830 100644 --- a/google/services/dataproc/resource_dataproc_session_template_generated_test.go +++ b/google/services/dataproc/resource_dataproc_session_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataproc" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataproc/resource_dataproc_session_template_test.go b/google/services/dataproc/resource_dataproc_session_template_test.go index a00d898669b..152a2333112 100644 --- a/google/services/dataproc/resource_dataproc_session_template_test.go +++ b/google/services/dataproc/resource_dataproc_session_template_test.go @@ -25,12 +25,13 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" ) func TestAccDataprocSessionTemplate_update(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@dataproc-accounts.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/dataprocgdc/resource_dataproc_gdc_application_environment_generated_test.go b/google/services/dataprocgdc/resource_dataproc_gdc_application_environment_generated_test.go index a5c678dea8e..a2434c50165 100644 --- a/google/services/dataprocgdc/resource_dataproc_gdc_application_environment_generated_test.go +++ b/google/services/dataprocgdc/resource_dataproc_gdc_application_environment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataprocgdc" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataprocgdc/resource_dataproc_gdc_service_instance_generated_test.go b/google/services/dataprocgdc/resource_dataproc_gdc_service_instance_generated_test.go index 49faa181556..18365fbc0e5 100644 --- a/google/services/dataprocgdc/resource_dataproc_gdc_service_instance_generated_test.go +++ b/google/services/dataprocgdc/resource_dataproc_gdc_service_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataprocgdc" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataprocgdc/resource_dataproc_gdc_spark_application_generated_test.go b/google/services/dataprocgdc/resource_dataproc_gdc_spark_application_generated_test.go index 2f802e7fb9e..d944667abb6 100644 --- a/google/services/dataprocgdc/resource_dataproc_gdc_spark_application_generated_test.go +++ b/google/services/dataprocgdc/resource_dataproc_gdc_spark_application_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataprocgdc" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataprocmetastore/resource_dataproc_metastore_federation_generated_test.go b/google/services/dataprocmetastore/resource_dataproc_metastore_federation_generated_test.go index 60090ff2031..09e5916baf7 100644 --- a/google/services/dataprocmetastore/resource_dataproc_metastore_federation_generated_test.go +++ b/google/services/dataprocmetastore/resource_dataproc_metastore_federation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataprocmetastore" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dataprocmetastore/resource_dataproc_metastore_service_generated_test.go b/google/services/dataprocmetastore/resource_dataproc_metastore_service_generated_test.go index f55a0f05bd1..142b78b78d6 100644 --- a/google/services/dataprocmetastore/resource_dataproc_metastore_service_generated_test.go +++ b/google/services/dataprocmetastore/resource_dataproc_metastore_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dataprocmetastore" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datastream/resource_datastream_connection_profile_generated_test.go b/google/services/datastream/resource_datastream_connection_profile_generated_test.go index 9a61ce76ab3..9cb62d8d934 100644 --- a/google/services/datastream/resource_datastream_connection_profile_generated_test.go +++ b/google/services/datastream/resource_datastream_connection_profile_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datastream" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datastream/resource_datastream_private_connection_generated_test.go b/google/services/datastream/resource_datastream_private_connection_generated_test.go index b3a88215e9c..03eb32ac630 100644 --- a/google/services/datastream/resource_datastream_private_connection_generated_test.go +++ b/google/services/datastream/resource_datastream_private_connection_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datastream" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/datastream/resource_datastream_stream_generated_test.go b/google/services/datastream/resource_datastream_stream_generated_test.go index 547ece0ae27..8c82d8c4d83 100644 --- a/google/services/datastream/resource_datastream_stream_generated_test.go +++ b/google/services/datastream/resource_datastream_stream_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/datastream" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/developerconnect/resource_developer_connect_account_connector_generated_test.go b/google/services/developerconnect/resource_developer_connect_account_connector_generated_test.go index 4700469ced0..834163cbc2a 100644 --- a/google/services/developerconnect/resource_developer_connect_account_connector_generated_test.go +++ b/google/services/developerconnect/resource_developer_connect_account_connector_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/developerconnect" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/developerconnect/resource_developer_connect_connection_generated_test.go b/google/services/developerconnect/resource_developer_connect_connection_generated_test.go index a7459cf3768..0f5d1c884d6 100644 --- a/google/services/developerconnect/resource_developer_connect_connection_generated_test.go +++ b/google/services/developerconnect/resource_developer_connect_connection_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/developerconnect" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/developerconnect/resource_developer_connect_git_repository_link_generated_test.go b/google/services/developerconnect/resource_developer_connect_git_repository_link_generated_test.go index d36c997c88e..cb06084b8fe 100644 --- a/google/services/developerconnect/resource_developer_connect_git_repository_link_generated_test.go +++ b/google/services/developerconnect/resource_developer_connect_git_repository_link_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/developerconnect" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/developerconnect/resource_developer_connect_insights_config_generated_test.go b/google/services/developerconnect/resource_developer_connect_insights_config_generated_test.go index b4234145c78..4f4afa73304 100644 --- a/google/services/developerconnect/resource_developer_connect_insights_config_generated_test.go +++ b/google/services/developerconnect/resource_developer_connect_insights_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/developerconnect" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflow/resource_dialogflow_agent_generated_test.go b/google/services/dialogflow/resource_dialogflow_agent_generated_test.go index 35ffffaeea0..cf90597545b 100644 --- a/google/services/dialogflow/resource_dialogflow_agent_generated_test.go +++ b/google/services/dialogflow/resource_dialogflow_agent_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflow" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflow/resource_dialogflow_conversation_profile_generated_test.go b/google/services/dialogflow/resource_dialogflow_conversation_profile_generated_test.go index ac391811e58..da7443be2e1 100644 --- a/google/services/dialogflow/resource_dialogflow_conversation_profile_generated_test.go +++ b/google/services/dialogflow/resource_dialogflow_conversation_profile_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflow" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflow/resource_dialogflow_environment_generated_test.go b/google/services/dialogflow/resource_dialogflow_environment_generated_test.go index 04d2c81717f..29c977517bb 100644 --- a/google/services/dialogflow/resource_dialogflow_environment_generated_test.go +++ b/google/services/dialogflow/resource_dialogflow_environment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflow" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflow/resource_dialogflow_generator_generated_test.go b/google/services/dialogflow/resource_dialogflow_generator_generated_test.go index 91bb6dac25b..1e83ae00793 100644 --- a/google/services/dialogflow/resource_dialogflow_generator_generated_test.go +++ b/google/services/dialogflow/resource_dialogflow_generator_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflow" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflow/resource_dialogflow_intent_generated_test.go b/google/services/dialogflow/resource_dialogflow_intent_generated_test.go index 25067dc10c4..0a3ab37cfd9 100644 --- a/google/services/dialogflow/resource_dialogflow_intent_generated_test.go +++ b/google/services/dialogflow/resource_dialogflow_intent_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflow" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflow/resource_dialogflow_version_generated_test.go b/google/services/dialogflow/resource_dialogflow_version_generated_test.go index ba7c5c7e8d9..131d03d1091 100644 --- a/google/services/dialogflow/resource_dialogflow_version_generated_test.go +++ b/google/services/dialogflow/resource_dialogflow_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflow" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_agent_generated_test.go b/google/services/dialogflowcx/resource_dialogflow_cx_agent_generated_test.go index 062632862a9..2efd94fcf4f 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_agent_generated_test.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_agent_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_entity_type_generated_test.go b/google/services/dialogflowcx/resource_dialogflow_cx_entity_type_generated_test.go index 89683867f00..6655a98763f 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_entity_type_generated_test.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_entity_type_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_environment_generated_test.go b/google/services/dialogflowcx/resource_dialogflow_cx_environment_generated_test.go index 1583bf527d0..5828ea13fc1 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_environment_generated_test.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_environment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_flow_generated_test.go b/google/services/dialogflowcx/resource_dialogflow_cx_flow_generated_test.go index b34f9fad07f..7dcb2094852 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_flow_generated_test.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_flow_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_generative_settings_generated_test.go b/google/services/dialogflowcx/resource_dialogflow_cx_generative_settings_generated_test.go index acb4dd93622..30929a7fafb 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_generative_settings_generated_test.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_generative_settings_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_generator_generated_test.go b/google/services/dialogflowcx/resource_dialogflow_cx_generator_generated_test.go index 91a009d6e7b..11d8a9aef07 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_generator_generated_test.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_generator_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_intent_generated_test.go b/google/services/dialogflowcx/resource_dialogflow_cx_intent_generated_test.go index 8a7a69e68c2..713adf6f01b 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_intent_generated_test.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_intent_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_page_generated_test.go b/google/services/dialogflowcx/resource_dialogflow_cx_page_generated_test.go index b10bac90c50..3d110f22572 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_page_generated_test.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_page_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_playbook_generated_test.go b/google/services/dialogflowcx/resource_dialogflow_cx_playbook_generated_test.go index 57fa68bc3d5..a0594f5e0b2 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_playbook_generated_test.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_playbook_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_security_settings_generated_test.go b/google/services/dialogflowcx/resource_dialogflow_cx_security_settings_generated_test.go index 532d6f7bf6c..d93a79991dc 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_security_settings_generated_test.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_security_settings_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_test_case_generated_test.go b/google/services/dialogflowcx/resource_dialogflow_cx_test_case_generated_test.go index 1b6afcf88f7..251658be9ce 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_test_case_generated_test.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_test_case_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_tool_generated_test.go b/google/services/dialogflowcx/resource_dialogflow_cx_tool_generated_test.go index b2a9c47e3f8..26d489fd0d8 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_tool_generated_test.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_tool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_tool_version_generated_test.go b/google/services/dialogflowcx/resource_dialogflow_cx_tool_version_generated_test.go index 5a7f625ca59..cc4c8261edc 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_tool_version_generated_test.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_tool_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_version_generated_test.go b/google/services/dialogflowcx/resource_dialogflow_cx_version_generated_test.go index f9285138dd9..25f04c3d71b 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_version_generated_test.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_webhook_generated_test.go b/google/services/dialogflowcx/resource_dialogflow_cx_webhook_generated_test.go index ae103085a23..44ee1be5a04 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_webhook_generated_test.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_webhook_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/discoveryengine/resource_discovery_engine_acl_config_generated_test.go b/google/services/discoveryengine/resource_discovery_engine_acl_config_generated_test.go index 8ae09ca6284..1157c8c3404 100644 --- a/google/services/discoveryengine/resource_discovery_engine_acl_config_generated_test.go +++ b/google/services/discoveryengine/resource_discovery_engine_acl_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/discoveryengine/resource_discovery_engine_assistant_generated_test.go b/google/services/discoveryengine/resource_discovery_engine_assistant_generated_test.go index 937d8bcd02c..9c7ccfdf545 100644 --- a/google/services/discoveryengine/resource_discovery_engine_assistant_generated_test.go +++ b/google/services/discoveryengine/resource_discovery_engine_assistant_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/discoveryengine/resource_discovery_engine_chat_engine_generated_test.go b/google/services/discoveryengine/resource_discovery_engine_chat_engine_generated_test.go index d64d8d65dd7..96b6c1085c3 100644 --- a/google/services/discoveryengine/resource_discovery_engine_chat_engine_generated_test.go +++ b/google/services/discoveryengine/resource_discovery_engine_chat_engine_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/discoveryengine/resource_discovery_engine_control_generated_test.go b/google/services/discoveryengine/resource_discovery_engine_control_generated_test.go index e4528878cdc..6cec2e187a8 100644 --- a/google/services/discoveryengine/resource_discovery_engine_control_generated_test.go +++ b/google/services/discoveryengine/resource_discovery_engine_control_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/discoveryengine/resource_discovery_engine_data_connector_generated_test.go b/google/services/discoveryengine/resource_discovery_engine_data_connector_generated_test.go index 1523b215067..1364d1811df 100644 --- a/google/services/discoveryengine/resource_discovery_engine_data_connector_generated_test.go +++ b/google/services/discoveryengine/resource_discovery_engine_data_connector_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/discoveryengine/resource_discovery_engine_data_store_generated_test.go b/google/services/discoveryengine/resource_discovery_engine_data_store_generated_test.go index 2424983cd38..6cf3ccd38d3 100644 --- a/google/services/discoveryengine/resource_discovery_engine_data_store_generated_test.go +++ b/google/services/discoveryengine/resource_discovery_engine_data_store_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/discoveryengine/resource_discovery_engine_recommendation_engine_generated_test.go b/google/services/discoveryengine/resource_discovery_engine_recommendation_engine_generated_test.go index 9991396face..7193d3ea1d6 100644 --- a/google/services/discoveryengine/resource_discovery_engine_recommendation_engine_generated_test.go +++ b/google/services/discoveryengine/resource_discovery_engine_recommendation_engine_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/discoveryengine/resource_discovery_engine_schema_generated_test.go b/google/services/discoveryengine/resource_discovery_engine_schema_generated_test.go index 23406211388..908ba8268f7 100644 --- a/google/services/discoveryengine/resource_discovery_engine_schema_generated_test.go +++ b/google/services/discoveryengine/resource_discovery_engine_schema_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/discoveryengine/resource_discovery_engine_search_engine_generated_test.go b/google/services/discoveryengine/resource_discovery_engine_search_engine_generated_test.go index e62460a2b80..67d67da2b7f 100644 --- a/google/services/discoveryengine/resource_discovery_engine_search_engine_generated_test.go +++ b/google/services/discoveryengine/resource_discovery_engine_search_engine_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/discoveryengine/resource_discovery_engine_sitemap_generated_test.go b/google/services/discoveryengine/resource_discovery_engine_sitemap_generated_test.go index ad16af7695d..56ea8c56741 100644 --- a/google/services/discoveryengine/resource_discovery_engine_sitemap_generated_test.go +++ b/google/services/discoveryengine/resource_discovery_engine_sitemap_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/discoveryengine/resource_discovery_engine_target_site_generated_test.go b/google/services/discoveryengine/resource_discovery_engine_target_site_generated_test.go index a763bc23285..6cdd8aab76b 100644 --- a/google/services/discoveryengine/resource_discovery_engine_target_site_generated_test.go +++ b/google/services/discoveryengine/resource_discovery_engine_target_site_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/discoveryengine/resource_discovery_engine_widget_config_generated_test.go b/google/services/discoveryengine/resource_discovery_engine_widget_config_generated_test.go index 8090e008908..5de1cb1f8b1 100644 --- a/google/services/discoveryengine/resource_discovery_engine_widget_config_generated_test.go +++ b/google/services/discoveryengine/resource_discovery_engine_widget_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dns/resource_dns_managed_zone_generated_test.go b/google/services/dns/resource_dns_managed_zone_generated_test.go index 780098599b4..fc37aa45191 100644 --- a/google/services/dns/resource_dns_managed_zone_generated_test.go +++ b/google/services/dns/resource_dns_managed_zone_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dns" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dns/resource_dns_policy_generated_test.go b/google/services/dns/resource_dns_policy_generated_test.go index 24c8d16f65a..af26a45d314 100644 --- a/google/services/dns/resource_dns_policy_generated_test.go +++ b/google/services/dns/resource_dns_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dns" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dns/resource_dns_response_policy_generated_test.go b/google/services/dns/resource_dns_response_policy_generated_test.go index 3a68285588f..cb8052a3c3e 100644 --- a/google/services/dns/resource_dns_response_policy_generated_test.go +++ b/google/services/dns/resource_dns_response_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dns" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/dns/resource_dns_response_policy_rule_generated_test.go b/google/services/dns/resource_dns_response_policy_rule_generated_test.go index 7a2ccd690a3..4c791622d8c 100644 --- a/google/services/dns/resource_dns_response_policy_rule_generated_test.go +++ b/google/services/dns/resource_dns_response_policy_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/dns" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/documentai/resource_document_ai_processor_default_version_generated_test.go b/google/services/documentai/resource_document_ai_processor_default_version_generated_test.go index 5c15f846cb5..fc168996380 100644 --- a/google/services/documentai/resource_document_ai_processor_default_version_generated_test.go +++ b/google/services/documentai/resource_document_ai_processor_default_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/documentai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/documentai/resource_document_ai_processor_generated_test.go b/google/services/documentai/resource_document_ai_processor_generated_test.go index cf00280166b..02fea020670 100644 --- a/google/services/documentai/resource_document_ai_processor_generated_test.go +++ b/google/services/documentai/resource_document_ai_processor_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/documentai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/documentai/resource_document_ai_schema_generated_test.go b/google/services/documentai/resource_document_ai_schema_generated_test.go index 170f3b23f3d..9a2f510f1e2 100644 --- a/google/services/documentai/resource_document_ai_schema_generated_test.go +++ b/google/services/documentai/resource_document_ai_schema_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/documentai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/essentialcontacts/resource_essential_contacts_contact_generated_test.go b/google/services/essentialcontacts/resource_essential_contacts_contact_generated_test.go index c0e2023f48c..9a3f9cd2f08 100644 --- a/google/services/essentialcontacts/resource_essential_contacts_contact_generated_test.go +++ b/google/services/essentialcontacts/resource_essential_contacts_contact_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/essentialcontacts" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/eventarc/resource_eventarc_channel_generated_test.go b/google/services/eventarc/resource_eventarc_channel_generated_test.go index 4f77fa7576a..6630b803856 100644 --- a/google/services/eventarc/resource_eventarc_channel_generated_test.go +++ b/google/services/eventarc/resource_eventarc_channel_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/eventarc" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -60,7 +63,7 @@ var ( func TestAccEventarcChannel_eventarcChannelWithCmekExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-eventarc.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/eventarc/resource_eventarc_channel_test.go b/google/services/eventarc/resource_eventarc_channel_test.go index e4b5ee6808b..805b44b184b 100644 --- a/google/services/eventarc/resource_eventarc_channel_test.go +++ b/google/services/eventarc/resource_eventarc_channel_test.go @@ -22,6 +22,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) @@ -38,7 +39,7 @@ func TestAccEventarcChannel_cryptoKeyUpdate(t *testing.T) { "key2": kms.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", region, "tf-bootstrap-eventarc-channel-key2").CryptoKey.Name, "random_suffix": acctest.RandString(t, 10), } - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-eventarc.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/eventarc/resource_eventarc_google_channel_config_test.go b/google/services/eventarc/resource_eventarc_google_channel_config_test.go index 6b11d2688ba..2132b551ef0 100644 --- a/google/services/eventarc/resource_eventarc_google_channel_config_test.go +++ b/google/services/eventarc/resource_eventarc_google_channel_config_test.go @@ -22,6 +22,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/plancheck" @@ -56,7 +57,7 @@ func testAccEventarcGoogleChannelConfig_basic(t *testing.T) { "region": region, "random_suffix": acctest.RandString(t, 10), } - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-eventarc.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -96,7 +97,7 @@ func testAccEventarcGoogleChannelConfig_longForm(t *testing.T) { "region": region, "random_suffix": acctest.RandString(t, 10), } - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-eventarc.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -140,7 +141,7 @@ func testAccEventarcGoogleChannelConfig_cryptoKeyUpdate(t *testing.T) { "key1": kms.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", region, "tf-bootstrap-eventarc-google-channel-config-key1").CryptoKey.Name, "key2": kms.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", region, "tf-bootstrap-eventarc-google-channel-config-key2").CryptoKey.Name, } - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-eventarc.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/eventarc/resource_eventarc_message_bus_test.go b/google/services/eventarc/resource_eventarc_message_bus_test.go index 2bc29ecec96..29d8a74fabf 100644 --- a/google/services/eventarc/resource_eventarc_message_bus_test.go +++ b/google/services/eventarc/resource_eventarc_message_bus_test.go @@ -27,6 +27,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) @@ -61,7 +62,7 @@ func testAccEventarcMessageBus_basic(t *testing.T) { "region": envvar.GetTestRegionFromEnv(), "random_suffix": acctest.RandString(t, 10), } - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-eventarc.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -110,7 +111,7 @@ func testAccEventarcMessageBus_cryptoKey(t *testing.T) { "key": kms.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", region, "tf-bootstrap-eventarc-messagebus-key").CryptoKey.Name, "random_suffix": acctest.RandString(t, 10), } - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-eventarc.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -157,7 +158,7 @@ func testAccEventarcMessageBus_update(t *testing.T) { "key2": kms.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", region, "tf-bootstrap-eventarc-messagebus-key2").CryptoKey.Name, "random_suffix": acctest.RandString(t, 10), } - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-eventarc.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -262,7 +263,7 @@ func testAccEventarcMessageBus_googleApiSource(t *testing.T) { "region": region, "random_suffix": acctest.RandString(t, 10), } - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-eventarc.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -329,7 +330,7 @@ func testAccEventarcMessageBus_updateGoogleApiSource(t *testing.T) { "region": region, "random_suffix": acctest.RandString(t, 10), } - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-eventarc.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/eventarc/resource_eventarc_pipeline_generated_test.go b/google/services/eventarc/resource_eventarc_pipeline_generated_test.go index 44f7524a791..b1e50cce3c3 100644 --- a/google/services/eventarc/resource_eventarc_pipeline_generated_test.go +++ b/google/services/eventarc/resource_eventarc_pipeline_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/eventarc" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -442,7 +445,7 @@ EOF func TestAccEventarcPipeline_eventarcPipelineWithCmekAndAvroFormatExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-eventarc.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/eventarc/resource_eventarc_pipeline_test.go b/google/services/eventarc/resource_eventarc_pipeline_test.go index 74463b4aa7d..e9fe30a7068 100644 --- a/google/services/eventarc/resource_eventarc_pipeline_test.go +++ b/google/services/eventarc/resource_eventarc_pipeline_test.go @@ -22,6 +22,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/plancheck" @@ -42,7 +43,7 @@ func TestAccEventarcPipeline_update(t *testing.T) { "random_suffix": randomSuffix, } - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-eventarc.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/eventarc/resource_eventarc_trigger_generated_test.go b/google/services/eventarc/resource_eventarc_trigger_generated_test.go index 60a19139837..b4eb3ce80c6 100644 --- a/google/services/eventarc/resource_eventarc_trigger_generated_test.go +++ b/google/services/eventarc/resource_eventarc_trigger_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/eventarc" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -201,7 +204,7 @@ resource "google_eventarc_trigger" "primary" { func TestAccEventarcTrigger_eventarcTriggerWithChannelCmekExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-eventarc.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/filestore/resource_filestore_backup_generated_test.go b/google/services/filestore/resource_filestore_backup_generated_test.go index 6c42313b6eb..06d3ab315bc 100644 --- a/google/services/filestore/resource_filestore_backup_generated_test.go +++ b/google/services/filestore/resource_filestore_backup_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/filestore" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/filestore/resource_filestore_instance_generated_test.go b/google/services/filestore/resource_filestore_instance_generated_test.go index ddde8993ace..05a25ea4af2 100644 --- a/google/services/filestore/resource_filestore_instance_generated_test.go +++ b/google/services/filestore/resource_filestore_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/filestore" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/filestore/resource_filestore_snapshot_generated_test.go b/google/services/filestore/resource_filestore_snapshot_generated_test.go index dc804466304..b814ce6bca5 100644 --- a/google/services/filestore/resource_filestore_snapshot_generated_test.go +++ b/google/services/filestore/resource_filestore_snapshot_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/filestore" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/firebaseappcheck/resource_firebase_app_check_resource_policy_generated_test.go b/google/services/firebaseappcheck/resource_firebase_app_check_resource_policy_generated_test.go index f5f10325687..d550dff7738 100644 --- a/google/services/firebaseappcheck/resource_firebase_app_check_resource_policy_generated_test.go +++ b/google/services/firebaseappcheck/resource_firebase_app_check_resource_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/firebaseappcheck" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/firebaseappcheck/resource_firebase_app_check_service_config_generated_test.go b/google/services/firebaseappcheck/resource_firebase_app_check_service_config_generated_test.go index 7406f987f8a..a58395d4458 100644 --- a/google/services/firebaseappcheck/resource_firebase_app_check_service_config_generated_test.go +++ b/google/services/firebaseappcheck/resource_firebase_app_check_service_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/firebaseappcheck" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/firebaseapphosting/resource_firebase_app_hosting_backend_generated_test.go b/google/services/firebaseapphosting/resource_firebase_app_hosting_backend_generated_test.go index ffdbcd44743..59276f8c336 100644 --- a/google/services/firebaseapphosting/resource_firebase_app_hosting_backend_generated_test.go +++ b/google/services/firebaseapphosting/resource_firebase_app_hosting_backend_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/firebaseapphosting" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/firebaseapphosting/resource_firebase_app_hosting_build_generated_test.go b/google/services/firebaseapphosting/resource_firebase_app_hosting_build_generated_test.go index 0939b8ab75e..686ebda4677 100644 --- a/google/services/firebaseapphosting/resource_firebase_app_hosting_build_generated_test.go +++ b/google/services/firebaseapphosting/resource_firebase_app_hosting_build_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/firebaseapphosting" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/firebaseapphosting/resource_firebase_app_hosting_default_domain_generated_test.go b/google/services/firebaseapphosting/resource_firebase_app_hosting_default_domain_generated_test.go index c6ae55b6557..8357bec1082 100644 --- a/google/services/firebaseapphosting/resource_firebase_app_hosting_default_domain_generated_test.go +++ b/google/services/firebaseapphosting/resource_firebase_app_hosting_default_domain_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/firebaseapphosting" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/firebaseapphosting/resource_firebase_app_hosting_domain_generated_test.go b/google/services/firebaseapphosting/resource_firebase_app_hosting_domain_generated_test.go index c905c9f8d4d..2a9c47e2074 100644 --- a/google/services/firebaseapphosting/resource_firebase_app_hosting_domain_generated_test.go +++ b/google/services/firebaseapphosting/resource_firebase_app_hosting_domain_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/firebaseapphosting" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/firebaseapphosting/resource_firebase_app_hosting_traffic_generated_test.go b/google/services/firebaseapphosting/resource_firebase_app_hosting_traffic_generated_test.go index 681e652e227..2eb714dae91 100644 --- a/google/services/firebaseapphosting/resource_firebase_app_hosting_traffic_generated_test.go +++ b/google/services/firebaseapphosting/resource_firebase_app_hosting_traffic_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/firebaseapphosting" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/firebasedataconnect/resource_firebase_data_connect_service_generated_test.go b/google/services/firebasedataconnect/resource_firebase_data_connect_service_generated_test.go index 2017deb51eb..45d6df130e5 100644 --- a/google/services/firebasedataconnect/resource_firebase_data_connect_service_generated_test.go +++ b/google/services/firebasedataconnect/resource_firebase_data_connect_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/firebasedataconnect" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/firestore/resource_firestore_backup_schedule_generated_test.go b/google/services/firestore/resource_firestore_backup_schedule_generated_test.go index 12a123f1ab6..292047f1f56 100644 --- a/google/services/firestore/resource_firestore_backup_schedule_generated_test.go +++ b/google/services/firestore/resource_firestore_backup_schedule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/firestore" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/firestore/resource_firestore_database_generated_test.go b/google/services/firestore/resource_firestore_database_generated_test.go index ddea741ad21..cf3adaccf9f 100644 --- a/google/services/firestore/resource_firestore_database_generated_test.go +++ b/google/services/firestore/resource_firestore_database_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/firestore" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/firestore/resource_firestore_document_generated_test.go b/google/services/firestore/resource_firestore_document_generated_test.go index c90633d0af0..df13a7cb91f 100644 --- a/google/services/firestore/resource_firestore_document_generated_test.go +++ b/google/services/firestore/resource_firestore_document_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/firestore" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/firestore/resource_firestore_field_generated_test.go b/google/services/firestore/resource_firestore_field_generated_test.go index b84d2f8de5d..346bde29c26 100644 --- a/google/services/firestore/resource_firestore_field_generated_test.go +++ b/google/services/firestore/resource_firestore_field_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/firestore" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/firestore/resource_firestore_index_generated_test.go b/google/services/firestore/resource_firestore_index_generated_test.go index 7ba071ac8c6..f40b9b9f749 100644 --- a/google/services/firestore/resource_firestore_index_generated_test.go +++ b/google/services/firestore/resource_firestore_index_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/firestore" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/firestore/resource_firestore_user_creds_generated_test.go b/google/services/firestore/resource_firestore_user_creds_generated_test.go index 8da7b6eef65..8136479e748 100644 --- a/google/services/firestore/resource_firestore_user_creds_generated_test.go +++ b/google/services/firestore/resource_firestore_user_creds_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/firestore" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gemini/resource_gemini_gemini_gcp_enablement_setting_generated_test.go b/google/services/gemini/resource_gemini_gemini_gcp_enablement_setting_generated_test.go index 9eb6de8f2f4..39c442c8098 100644 --- a/google/services/gemini/resource_gemini_gemini_gcp_enablement_setting_generated_test.go +++ b/google/services/gemini/resource_gemini_gemini_gcp_enablement_setting_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gemini" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gemini/resource_gemini_logging_setting_generated_test.go b/google/services/gemini/resource_gemini_logging_setting_generated_test.go index e55cbea6005..957bf211592 100644 --- a/google/services/gemini/resource_gemini_logging_setting_generated_test.go +++ b/google/services/gemini/resource_gemini_logging_setting_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gemini" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gemini/resource_gemini_release_channel_setting_generated_test.go b/google/services/gemini/resource_gemini_release_channel_setting_generated_test.go index bc15e451ce2..c0bb009e701 100644 --- a/google/services/gemini/resource_gemini_release_channel_setting_generated_test.go +++ b/google/services/gemini/resource_gemini_release_channel_setting_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gemini" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gkebackup/resource_gke_backup_backup_channel_generated_test.go b/google/services/gkebackup/resource_gke_backup_backup_channel_generated_test.go index decb2d0af42..a8d20e52548 100644 --- a/google/services/gkebackup/resource_gke_backup_backup_channel_generated_test.go +++ b/google/services/gkebackup/resource_gke_backup_backup_channel_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gkebackup" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gkebackup/resource_gke_backup_backup_plan_generated_test.go b/google/services/gkebackup/resource_gke_backup_backup_plan_generated_test.go index 18629436f7c..ee7b21f334d 100644 --- a/google/services/gkebackup/resource_gke_backup_backup_plan_generated_test.go +++ b/google/services/gkebackup/resource_gke_backup_backup_plan_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gkebackup" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gkebackup/resource_gke_backup_restore_channel_generated_test.go b/google/services/gkebackup/resource_gke_backup_restore_channel_generated_test.go index 1950b8f82d4..790d03b9d2f 100644 --- a/google/services/gkebackup/resource_gke_backup_restore_channel_generated_test.go +++ b/google/services/gkebackup/resource_gke_backup_restore_channel_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gkebackup" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gkebackup/resource_gke_backup_restore_plan_generated_test.go b/google/services/gkebackup/resource_gke_backup_restore_plan_generated_test.go index 0ed4644571c..f8133bad048 100644 --- a/google/services/gkebackup/resource_gke_backup_restore_plan_generated_test.go +++ b/google/services/gkebackup/resource_gke_backup_restore_plan_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gkebackup" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gkehub/resource_gke_hub_membership_generated_test.go b/google/services/gkehub/resource_gke_hub_membership_generated_test.go index 23bc4f9a24b..3f1a6a4d402 100644 --- a/google/services/gkehub/resource_gke_hub_membership_generated_test.go +++ b/google/services/gkehub/resource_gke_hub_membership_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gkehub" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go b/google/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go index 73338bfb7f2..3dc815cbe4e 100644 --- a/google/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go +++ b/google/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gkehub2" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gkehub2/resource_gke_hub_namespace_generated_test.go b/google/services/gkehub2/resource_gke_hub_namespace_generated_test.go index b9531a98271..2cb9044d8ba 100644 --- a/google/services/gkehub2/resource_gke_hub_namespace_generated_test.go +++ b/google/services/gkehub2/resource_gke_hub_namespace_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gkehub2" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gkehub2/resource_gke_hub_scope_generated_test.go b/google/services/gkehub2/resource_gke_hub_scope_generated_test.go index 82d9b51f02c..047069fadcf 100644 --- a/google/services/gkehub2/resource_gke_hub_scope_generated_test.go +++ b/google/services/gkehub2/resource_gke_hub_scope_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gkehub2" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_generated_test.go b/google/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_generated_test.go index ab7461ea3df..5abd9d42f6e 100644 --- a/google/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_generated_test.go +++ b/google/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gkehub2" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gkeonprem/resource_gkeonprem_bare_metal_admin_cluster_generated_test.go b/google/services/gkeonprem/resource_gkeonprem_bare_metal_admin_cluster_generated_test.go index 3ebac6e1e08..9049993c100 100644 --- a/google/services/gkeonprem/resource_gkeonprem_bare_metal_admin_cluster_generated_test.go +++ b/google/services/gkeonprem/resource_gkeonprem_bare_metal_admin_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gkeonprem" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_generated_test.go b/google/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_generated_test.go index 352fb0d4c85..3fa13d4582e 100644 --- a/google/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_generated_test.go +++ b/google/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gkeonprem" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_generated_test.go b/google/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_generated_test.go index b19a632a993..2e2402a70d4 100644 --- a/google/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_generated_test.go +++ b/google/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gkeonprem" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gkeonprem/resource_gkeonprem_vmware_admin_cluster_generated_test.go b/google/services/gkeonprem/resource_gkeonprem_vmware_admin_cluster_generated_test.go index 381025caee6..a559dca36fd 100644 --- a/google/services/gkeonprem/resource_gkeonprem_vmware_admin_cluster_generated_test.go +++ b/google/services/gkeonprem/resource_gkeonprem_vmware_admin_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gkeonprem" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gkeonprem/resource_gkeonprem_vmware_cluster_generated_test.go b/google/services/gkeonprem/resource_gkeonprem_vmware_cluster_generated_test.go index a88ea7e54c8..ebf15c3e54d 100644 --- a/google/services/gkeonprem/resource_gkeonprem_vmware_cluster_generated_test.go +++ b/google/services/gkeonprem/resource_gkeonprem_vmware_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gkeonprem" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/gkeonprem/resource_gkeonprem_vmware_node_pool_generated_test.go b/google/services/gkeonprem/resource_gkeonprem_vmware_node_pool_generated_test.go index b4277cac26e..e038eea7a8f 100644 --- a/google/services/gkeonprem/resource_gkeonprem_vmware_node_pool_generated_test.go +++ b/google/services/gkeonprem/resource_gkeonprem_vmware_node_pool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/gkeonprem" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/healthcare/resource_healthcare_consent_store_generated_test.go b/google/services/healthcare/resource_healthcare_consent_store_generated_test.go index 3aee6f910c1..5595f8c9a6a 100644 --- a/google/services/healthcare/resource_healthcare_consent_store_generated_test.go +++ b/google/services/healthcare/resource_healthcare_consent_store_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/healthcare" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/healthcare/resource_healthcare_dataset_generated_test.go b/google/services/healthcare/resource_healthcare_dataset_generated_test.go index d6550c21c9e..90acd29b483 100644 --- a/google/services/healthcare/resource_healthcare_dataset_generated_test.go +++ b/google/services/healthcare/resource_healthcare_dataset_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/healthcare" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/healthcare/resource_healthcare_dicom_store_generated_test.go b/google/services/healthcare/resource_healthcare_dicom_store_generated_test.go index b5344b2ea58..1e47a9f54f1 100644 --- a/google/services/healthcare/resource_healthcare_dicom_store_generated_test.go +++ b/google/services/healthcare/resource_healthcare_dicom_store_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/healthcare" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/healthcare/resource_healthcare_fhir_store_generated_test.go b/google/services/healthcare/resource_healthcare_fhir_store_generated_test.go index 8839714026f..ebb6a2f7b9c 100644 --- a/google/services/healthcare/resource_healthcare_fhir_store_generated_test.go +++ b/google/services/healthcare/resource_healthcare_fhir_store_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/healthcare" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -124,7 +127,7 @@ resource "google_healthcare_dataset" "dataset" { func TestAccHealthcareFhirStore_healthcareFhirStoreStreamingConfigExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-healthcare.iam.gserviceaccount.com", Role: "roles/bigquery.dataEditor", diff --git a/google/services/healthcare/resource_healthcare_hl7_v2_store_generated_test.go b/google/services/healthcare/resource_healthcare_hl7_v2_store_generated_test.go index c415271c60e..67098fa4260 100644 --- a/google/services/healthcare/resource_healthcare_hl7_v2_store_generated_test.go +++ b/google/services/healthcare/resource_healthcare_hl7_v2_store_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/healthcare" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/healthcare/resource_healthcare_pipeline_job_generated_test.go b/google/services/healthcare/resource_healthcare_pipeline_job_generated_test.go index 04e694561c1..96cc256027d 100644 --- a/google/services/healthcare/resource_healthcare_pipeline_job_generated_test.go +++ b/google/services/healthcare/resource_healthcare_pipeline_job_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/healthcare" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/healthcare/resource_healthcare_workspace_generated_test.go b/google/services/healthcare/resource_healthcare_workspace_generated_test.go index be9662ec899..6924ed8598d 100644 --- a/google/services/healthcare/resource_healthcare_workspace_generated_test.go +++ b/google/services/healthcare/resource_healthcare_workspace_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/healthcare" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/hypercomputecluster/resource_hypercomputecluster_cluster_generated_test.go b/google/services/hypercomputecluster/resource_hypercomputecluster_cluster_generated_test.go index 14f0452bbdf..62ac844c66f 100644 --- a/google/services/hypercomputecluster/resource_hypercomputecluster_cluster_generated_test.go +++ b/google/services/hypercomputecluster/resource_hypercomputecluster_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/hypercomputecluster" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iam2/resource_iam_deny_policy_generated_test.go b/google/services/iam2/resource_iam_deny_policy_generated_test.go index 1fad3301e02..195626d9ae2 100644 --- a/google/services/iam2/resource_iam_deny_policy_generated_test.go +++ b/google/services/iam2/resource_iam_deny_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iam2" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iam3/resource_iam_folders_policy_binding_generated_test.go b/google/services/iam3/resource_iam_folders_policy_binding_generated_test.go index 46e55d88549..2c95d4bf6b5 100644 --- a/google/services/iam3/resource_iam_folders_policy_binding_generated_test.go +++ b/google/services/iam3/resource_iam_folders_policy_binding_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iam3" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iam3/resource_iam_organizations_policy_binding_generated_test.go b/google/services/iam3/resource_iam_organizations_policy_binding_generated_test.go index da62b2f14ed..d35e40e5895 100644 --- a/google/services/iam3/resource_iam_organizations_policy_binding_generated_test.go +++ b/google/services/iam3/resource_iam_organizations_policy_binding_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iam3" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iam3/resource_iam_principal_access_boundary_policy_generated_test.go b/google/services/iam3/resource_iam_principal_access_boundary_policy_generated_test.go index c1ea4dbf9e2..f761625d6e2 100644 --- a/google/services/iam3/resource_iam_principal_access_boundary_policy_generated_test.go +++ b/google/services/iam3/resource_iam_principal_access_boundary_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iam3" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iam3/resource_iam_projects_policy_binding_generated_test.go b/google/services/iam3/resource_iam_projects_policy_binding_generated_test.go index ea57cae67c4..06bda90953c 100644 --- a/google/services/iam3/resource_iam_projects_policy_binding_generated_test.go +++ b/google/services/iam3/resource_iam_projects_policy_binding_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iam3" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iambeta/bootstrap_test_utils.go b/google/services/iambeta/bootstrap_test_utils.go new file mode 100644 index 00000000000..00536051061 --- /dev/null +++ b/google/services/iambeta/bootstrap_test_utils.go @@ -0,0 +1,116 @@ +// Copyright IBM Corp. 2014, 2026 +// SPDX-License-Identifier: MPL-2.0 +// ---------------------------------------------------------------------------- +// +// *** AUTO GENERATED CODE *** Type: Handwritten *** +// +// ---------------------------------------------------------------------------- +// +// This code is generated by Magic Modules using the following: +// +// Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/iambeta/bootstrap_test_utils.go +// +// DO NOT EDIT this file directly. Any changes made to this file will be +// overwritten during the next generation cycle. +// +// ---------------------------------------------------------------------------- +package iambeta + +import ( + "fmt" + "log" + "testing" + + "github.com/hashicorp/terraform-provider-google/google/envvar" + transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" + + iam "google.golang.org/api/iam/v1" +) + +var ServiceAccountPrefix = "tf-bootstrap-sa-" +var serviceAccountDisplay = "Bootstrapped Service Account for Terraform tests" + +// Some tests need a second service account, other than the test runner, to assert functionality on. +// This provides a well-known service account that can be used when dynamically creating a service +// account isn't an option. +func GetOrCreateServiceAccount(config *transport_tpg.Config, project, serviceAccountEmail string) (*iam.ServiceAccount, error) { + name := fmt.Sprintf("projects/%s/serviceAccounts/%s@%s.iam.gserviceaccount.com", project, serviceAccountEmail, project) + log.Printf("[DEBUG] Verifying %s as bootstrapped service account.\n", name) + + sa, err := NewClient(config, config.UserAgent).Projects.ServiceAccounts.Get(name).Do() + if err != nil && !transport_tpg.IsGoogleApiErrorWithCode(err, 404) { + return nil, fmt.Errorf("encountered a non-404 error when looking for bootstrapped service account %s: %w", name, err) + } + + if sa == nil { + log.Printf("[DEBUG] Account missing. Creating %s as bootstrapped service account.\n", name) + sa = &iam.ServiceAccount{ + DisplayName: serviceAccountDisplay, + } + + r := &iam.CreateServiceAccountRequest{ + AccountId: serviceAccountEmail, + ServiceAccount: sa, + } + sa, err = NewClient(config, config.UserAgent).Projects.ServiceAccounts.Create("projects/"+project, r).Do() + if err != nil { + return nil, fmt.Errorf("error when creating bootstrapped service account %s: %w", name, err) + } + } + + return sa, nil +} + +// In order to test impersonation we need to grant the testRunner's account the ability to grant tokens +// on a different service account. Granting permissions takes time and there is no operation to wait on +// so instead this creates a single service account once per test-suite with the correct permissions. +// The first time this test is run it will fail, but subsequent runs will succeed. +func impersonationServiceAccountPermissions(config *transport_tpg.Config, sa *iam.ServiceAccount, testRunner string) error { + log.Printf("[DEBUG] Setting service account permissions.\n") + policy := iam.Policy{ + Bindings: []*iam.Binding{}, + } + + binding := &iam.Binding{ + Role: "roles/iam.serviceAccountTokenCreator", + Members: []string{"serviceAccount:" + sa.Email, "serviceAccount:" + testRunner}, + } + policy.Bindings = append(policy.Bindings, binding) + + // Overwrite the roles each time on this service account. This is because this account is + // only created for the test suite and will stop snowflaking of permissions to get tests + // to run. Overwriting permissions on 1 service account shouldn't affect others. + _, err := NewClient(config, config.UserAgent).Projects.ServiceAccounts.SetIamPolicy(sa.Name, &iam.SetIamPolicyRequest{ + Policy: &policy, + }).Do() + if err != nil { + return err + } + + return nil +} + +// A separate testId should be used for each test, to create separate service accounts for each, +// and avoid race conditions where the policy of the same service account is being modified by 2 +// tests at once. This is needed as long as the function overwrites the policy on every run. +func BootstrapServiceAccount(t *testing.T, testId, testRunner string) string { + project := envvar.GetTestProjectFromEnv() + serviceAccountEmail := ServiceAccountPrefix + testId + + config := transport_tpg.BootstrapConfig(t) + if config == nil { + return "" + } + + sa, err := GetOrCreateServiceAccount(config, project, serviceAccountEmail) + if err != nil { + t.Fatalf("Bootstrapping failed. Cannot retrieve service account, %s", err) + } + + err = impersonationServiceAccountPermissions(config, sa, testRunner) + if err != nil { + t.Fatalf("Bootstrapping failed. Cannot set service account permissions, %s", err) + } + + return sa.Email +} diff --git a/google/services/iambeta/resource_iam_workload_identity_pool_generated_test.go b/google/services/iambeta/resource_iam_workload_identity_pool_generated_test.go index 5ba8604f10e..8db6944b8d1 100644 --- a/google/services/iambeta/resource_iam_workload_identity_pool_generated_test.go +++ b/google/services/iambeta/resource_iam_workload_identity_pool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iambeta" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iambeta/resource_iam_workload_identity_pool_managed_identity_generated_test.go b/google/services/iambeta/resource_iam_workload_identity_pool_managed_identity_generated_test.go index a0a71d18c53..fa75041feba 100644 --- a/google/services/iambeta/resource_iam_workload_identity_pool_managed_identity_generated_test.go +++ b/google/services/iambeta/resource_iam_workload_identity_pool_managed_identity_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iambeta" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iambeta/resource_iam_workload_identity_pool_namespace_generated_test.go b/google/services/iambeta/resource_iam_workload_identity_pool_namespace_generated_test.go index 79d7b5991be..8c4cc1b6c88 100644 --- a/google/services/iambeta/resource_iam_workload_identity_pool_namespace_generated_test.go +++ b/google/services/iambeta/resource_iam_workload_identity_pool_namespace_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iambeta" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iambeta/resource_iam_workload_identity_pool_provider_generated_test.go b/google/services/iambeta/resource_iam_workload_identity_pool_provider_generated_test.go index bd45ebe0742..dcb60da2178 100644 --- a/google/services/iambeta/resource_iam_workload_identity_pool_provider_generated_test.go +++ b/google/services/iambeta/resource_iam_workload_identity_pool_provider_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iambeta" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iamworkforcepool/resource_iam_oauth_client_credential_generated_test.go b/google/services/iamworkforcepool/resource_iam_oauth_client_credential_generated_test.go index ce343e4d9f4..9cbd7b78664 100644 --- a/google/services/iamworkforcepool/resource_iam_oauth_client_credential_generated_test.go +++ b/google/services/iamworkforcepool/resource_iam_oauth_client_credential_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iamworkforcepool" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iamworkforcepool/resource_iam_oauth_client_generated_test.go b/google/services/iamworkforcepool/resource_iam_oauth_client_generated_test.go index 06e632345b4..1e9c314b171 100644 --- a/google/services/iamworkforcepool/resource_iam_oauth_client_generated_test.go +++ b/google/services/iamworkforcepool/resource_iam_oauth_client_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iamworkforcepool" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iamworkforcepool/resource_iam_workforce_pool_generated_test.go b/google/services/iamworkforcepool/resource_iam_workforce_pool_generated_test.go index 6a2215bae7e..be436716746 100644 --- a/google/services/iamworkforcepool/resource_iam_workforce_pool_generated_test.go +++ b/google/services/iamworkforcepool/resource_iam_workforce_pool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iamworkforcepool" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iamworkforcepool/resource_iam_workforce_pool_provider_generated_test.go b/google/services/iamworkforcepool/resource_iam_workforce_pool_provider_generated_test.go index 4812eed2626..e7df5676033 100644 --- a/google/services/iamworkforcepool/resource_iam_workforce_pool_provider_generated_test.go +++ b/google/services/iamworkforcepool/resource_iam_workforce_pool_provider_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iamworkforcepool" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iamworkforcepool/resource_iam_workforce_pool_provider_key_generated_test.go b/google/services/iamworkforcepool/resource_iam_workforce_pool_provider_key_generated_test.go index 9c0fc062438..491fd44ce70 100644 --- a/google/services/iamworkforcepool/resource_iam_workforce_pool_provider_key_generated_test.go +++ b/google/services/iamworkforcepool/resource_iam_workforce_pool_provider_key_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iamworkforcepool" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iamworkforcepool/resource_iam_workforce_pool_provider_scim_tenant_generated_test.go b/google/services/iamworkforcepool/resource_iam_workforce_pool_provider_scim_tenant_generated_test.go index 784ef198289..6dc983913d2 100644 --- a/google/services/iamworkforcepool/resource_iam_workforce_pool_provider_scim_tenant_generated_test.go +++ b/google/services/iamworkforcepool/resource_iam_workforce_pool_provider_scim_tenant_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iamworkforcepool" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iamworkforcepool/resource_iam_workforce_pool_provider_scim_token_generated_test.go b/google/services/iamworkforcepool/resource_iam_workforce_pool_provider_scim_token_generated_test.go index 345798f2d54..c9c3476abb4 100644 --- a/google/services/iamworkforcepool/resource_iam_workforce_pool_provider_scim_token_generated_test.go +++ b/google/services/iamworkforcepool/resource_iam_workforce_pool_provider_scim_token_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iamworkforcepool" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iap/resource_iap_client_generated_test.go b/google/services/iap/resource_iap_client_generated_test.go index c138ec1e437..72e2e17e7b7 100644 --- a/google/services/iap/resource_iap_client_generated_test.go +++ b/google/services/iap/resource_iap_client_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iap" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iap/resource_iap_settings_generated_test.go b/google/services/iap/resource_iap_settings_generated_test.go index 8630306243b..589ca2412dd 100644 --- a/google/services/iap/resource_iap_settings_generated_test.go +++ b/google/services/iap/resource_iap_settings_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iap" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/iap/resource_iap_tunnel_dest_group_generated_test.go b/google/services/iap/resource_iap_tunnel_dest_group_generated_test.go index 70306391a20..19210375c11 100644 --- a/google/services/iap/resource_iap_tunnel_dest_group_generated_test.go +++ b/google/services/iap/resource_iap_tunnel_dest_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/iap" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/identityplatform/resource_identity_platform_config_generated_test.go b/google/services/identityplatform/resource_identity_platform_config_generated_test.go index 1c97f516a67..ab0e2ef0126 100644 --- a/google/services/identityplatform/resource_identity_platform_config_generated_test.go +++ b/google/services/identityplatform/resource_identity_platform_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/identityplatform" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/identityplatform/resource_identity_platform_inbound_saml_config_generated_test.go b/google/services/identityplatform/resource_identity_platform_inbound_saml_config_generated_test.go index 6edefb33042..944bac1cfa2 100644 --- a/google/services/identityplatform/resource_identity_platform_inbound_saml_config_generated_test.go +++ b/google/services/identityplatform/resource_identity_platform_inbound_saml_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/identityplatform" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/identityplatform/resource_identity_platform_oauth_idp_config_generated_test.go b/google/services/identityplatform/resource_identity_platform_oauth_idp_config_generated_test.go index 482331653c7..766abd37e9e 100644 --- a/google/services/identityplatform/resource_identity_platform_oauth_idp_config_generated_test.go +++ b/google/services/identityplatform/resource_identity_platform_oauth_idp_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/identityplatform" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_generated_test.go b/google/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_generated_test.go index e24a1251c9e..d1ef3ee5bf9 100644 --- a/google/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_generated_test.go +++ b/google/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/identityplatform" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/identityplatform/resource_identity_platform_tenant_generated_test.go b/google/services/identityplatform/resource_identity_platform_tenant_generated_test.go index fd6922fdfbd..02e176af1ce 100644 --- a/google/services/identityplatform/resource_identity_platform_tenant_generated_test.go +++ b/google/services/identityplatform/resource_identity_platform_tenant_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/identityplatform" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_generated_test.go b/google/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_generated_test.go index 7cdf4d9c958..8858d83d146 100644 --- a/google/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_generated_test.go +++ b/google/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/identityplatform" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_generated_test.go b/google/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_generated_test.go index 3bd08a56d3c..c3110521834 100644 --- a/google/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_generated_test.go +++ b/google/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/identityplatform" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_generated_test.go b/google/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_generated_test.go index c67de979e49..241c731bab8 100644 --- a/google/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_generated_test.go +++ b/google/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/integrationconnectors" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/integrationconnectors/resource_integration_connectors_managed_zone_generated_test.go b/google/services/integrationconnectors/resource_integration_connectors_managed_zone_generated_test.go index 84b6610840b..2f28b9e1d70 100644 --- a/google/services/integrationconnectors/resource_integration_connectors_managed_zone_generated_test.go +++ b/google/services/integrationconnectors/resource_integration_connectors_managed_zone_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/integrationconnectors" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/integrations/resource_integrations_auth_config_generated_test.go b/google/services/integrations/resource_integrations_auth_config_generated_test.go index ee217a01dd0..2d11eb8a666 100644 --- a/google/services/integrations/resource_integrations_auth_config_generated_test.go +++ b/google/services/integrations/resource_integrations_auth_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/integrations" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/integrations/resource_integrations_client_generated_test.go b/google/services/integrations/resource_integrations_client_generated_test.go index 2f87f44f24c..9e9b3c469a0 100644 --- a/google/services/integrations/resource_integrations_client_generated_test.go +++ b/google/services/integrations/resource_integrations_client_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/integrations" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -102,7 +105,7 @@ resource "google_integrations_client" "example" { func TestAccIntegrationsClient_integrationsClientFullExample(t *testing.T) { acctest.SkipIfVcr(t) t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-integrations.iam.gserviceaccount.com", Role: "roles/cloudkmskacls.serviceAgent", diff --git a/google/services/kms/data_source_google_kms_auotokey_config_test.go b/google/services/kms/data_source_google_kms_auotokey_config_test.go index d02e6ab006b..3c9c42928fd 100644 --- a/google/services/kms/data_source_google_kms_auotokey_config_test.go +++ b/google/services/kms/data_source_google_kms_auotokey_config_test.go @@ -29,6 +29,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-provider-google/google/services/resourcemanagerv3" tpgserviceusage "github.com/hashicorp/terraform-provider-google/google/services/serviceusage" "github.com/hashicorp/terraform-provider-google/google/tpgresource" @@ -131,13 +132,13 @@ func setupAutokeyTestResources(t *testing.T, config *transport_tpg.Config) (*res t.Errorf("unable to bootstrap KMS keyHandle. Cannot get current usr: %s", err) } // create a folder to configure autokey config and resource folder - autokeyFolder := acctest.BootstrapFolder(t, defaultAutokeyTestFolderName) + autokeyFolder := BootstrapFolder(t, defaultAutokeyTestFolderName) parent := &cloudresourcemanager.ResourceId{ Type: "folder", Id: strings.Split(autokeyFolder.Name, "/")[1], } // create and setup kms project for hosting keyring and keys for autokey - kmsProject := acctest.BootstrapProjectWithParent(t, defaultAutokeyTestKmsProject, envvar.GetTestBillingAccountFromEnv(t), parent, []string{CloudKmsSrviceName}) + kmsProject := resourcemanager.BootstrapProjectWithParent(t, defaultAutokeyTestKmsProject, envvar.GetTestBillingAccountFromEnv(t), parent, []string{CloudKmsSrviceName}) kmsProjectID := fmt.Sprintf("projects/%s", kmsProject.ProjectId) kmsSAEmail, err := GenerateCloudKmsServiceIdentity(config, fmt.Sprintf("%v", kmsProject.ProjectNumber)) if err != nil { @@ -157,7 +158,7 @@ func setupAutokeyTestResources(t *testing.T, config *transport_tpg.Config) (*res } // create and setup resource folder to host keyhandle - resourceProject := acctest.BootstrapProjectWithParent(t, defaultAutokeyTestResourceProject, envvar.GetTestBillingAccountFromEnv(t), parent, []string{}) + resourceProject := resourcemanager.BootstrapProjectWithParent(t, defaultAutokeyTestResourceProject, envvar.GetTestBillingAccountFromEnv(t), parent, []string{}) return autokeyFolder, kmsProject, resourceProject } @@ -277,6 +278,55 @@ func setPolicy(crmService *resourceManagerV3.Service, resourceType string, resou return nil } +// BootstrapFolder creates or get a folder having a input folderDisplayName within a TestOrgEnv +func BootstrapFolder(t *testing.T, folderDisplayName string) *resourceManagerV3.Folder { + config := transport_tpg.BootstrapConfig(t) + if config == nil { + return nil + } + + crmClient := resourcemanagerv3.NewClient(config, config.UserAgent) + searchQuery := fmt.Sprintf("displayName=%s", folderDisplayName) + folderSearchResp, err := crmClient.Folders.Search().Query(searchQuery).Do() + if err != nil { + t.Fatalf("error searching for folder with displayName: %s", folderDisplayName) + } + var folder *resourceManagerV3.Folder + if len(folderSearchResp.Folders) == 0 { + op, err := crmClient.Folders.Create(&resourceManagerV3.Folder{ + DisplayName: folderDisplayName, + Parent: fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), + }).Do() + if err != nil { + t.Fatalf("error bootstrapping test folder: %s", err) + } + + opAsMap, err := tpgresource.ConvertToMap(op) + if err != nil { + t.Fatalf("error converting folder operation map: %s", err) + } + var responseMap map[string]interface{} + err = resourcemanager.ResourceManagerOperationWaitTimeWithResponse(config, opAsMap, &responseMap, "creating folder", config.UserAgent, 4*time.Minute) + if err != nil { + t.Fatalf("error waiting for create folder operation: %s", err) + } + folder, err = crmClient.Folders.Get(responseMap["name"].(string)).Do() + if err != nil { + t.Fatalf("error getting folder: %s", err) + } + } else { + folder = folderSearchResp.Folders[0] + } + + if folder.State == "DELETE_REQUESTED" { + _, err := crmClient.Folders.Undelete(folder.Name, &resourceManagerV3.UndeleteFolderRequest{}).Do() + if err != nil { + t.Fatalf("error undeleting folder: %s", err) + } + } + return folder +} + func TestAccDataSourceGoogleKmsAutokeyConfig_basic(t *testing.T) { kmsAutokey := BootstrapKMSAutokeyKeyHandle(t) folder := fmt.Sprintf("folders/%s", strings.Split(kmsAutokey.AutokeyConfig.Name, "/")[1]) diff --git a/google/services/logging/resource_logging_folder_settings_generated_test.go b/google/services/logging/resource_logging_folder_settings_generated_test.go index 015913bca85..a1e725c20ec 100644 --- a/google/services/logging/resource_logging_folder_settings_generated_test.go +++ b/google/services/logging/resource_logging_folder_settings_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/logging" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/logging/resource_logging_linked_dataset_generated_test.go b/google/services/logging/resource_logging_linked_dataset_generated_test.go index 9655cb19ca7..fca14168d34 100644 --- a/google/services/logging/resource_logging_linked_dataset_generated_test.go +++ b/google/services/logging/resource_logging_linked_dataset_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/logging" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/logging/resource_logging_log_scope_generated_test.go b/google/services/logging/resource_logging_log_scope_generated_test.go index 0554818f19d..e12a2cb1b74 100644 --- a/google/services/logging/resource_logging_log_scope_generated_test.go +++ b/google/services/logging/resource_logging_log_scope_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/logging" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/logging/resource_logging_log_view_generated_test.go b/google/services/logging/resource_logging_log_view_generated_test.go index 7170118e7f9..8d1523771ed 100644 --- a/google/services/logging/resource_logging_log_view_generated_test.go +++ b/google/services/logging/resource_logging_log_view_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/logging" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/logging/resource_logging_metric_generated_test.go b/google/services/logging/resource_logging_metric_generated_test.go index 014451712ea..05ec5fb8ec6 100644 --- a/google/services/logging/resource_logging_metric_generated_test.go +++ b/google/services/logging/resource_logging_metric_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/logging" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/logging/resource_logging_saved_query_generated_test.go b/google/services/logging/resource_logging_saved_query_generated_test.go index 566d6d46da7..f54a5096878 100644 --- a/google/services/logging/resource_logging_saved_query_generated_test.go +++ b/google/services/logging/resource_logging_saved_query_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/logging" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/looker/resource_looker_instance_generated_test.go b/google/services/looker/resource_looker_instance_generated_test.go index 938caaf4c39..934dbbb5de8 100644 --- a/google/services/looker/resource_looker_instance_generated_test.go +++ b/google/services/looker/resource_looker_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/looker" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/looker/resource_looker_instance_test.go b/google/services/looker/resource_looker_instance_test.go index 1abb3e48255..f13a3d6bdc2 100644 --- a/google/services/looker/resource_looker_instance_test.go +++ b/google/services/looker/resource_looker_instance_test.go @@ -23,6 +23,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" ) func TestAccLookerInstance_update(t *testing.T) { @@ -163,7 +164,7 @@ func TestAccLookerInstance_updatePeriodicExport(t *testing.T) { "random_suffix": suffix, } - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { // For writing/managing the export files in GCS Member: "serviceAccount:service-{project_number}@gcp-sa-looker.iam.gserviceaccount.com", diff --git a/google/services/lustre/resource_lustre_instance_generated_test.go b/google/services/lustre/resource_lustre_instance_generated_test.go index 59ac2fa69a9..596538187a3 100644 --- a/google/services/lustre/resource_lustre_instance_generated_test.go +++ b/google/services/lustre/resource_lustre_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/lustre" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/managedkafka/resource_managed_kafka_acl_generated_test.go b/google/services/managedkafka/resource_managed_kafka_acl_generated_test.go index b46e25b88e4..ab4526ad08a 100644 --- a/google/services/managedkafka/resource_managed_kafka_acl_generated_test.go +++ b/google/services/managedkafka/resource_managed_kafka_acl_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/managedkafka" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/managedkafka/resource_managed_kafka_cluster_generated_test.go b/google/services/managedkafka/resource_managed_kafka_cluster_generated_test.go index d26154ad9e5..9835091446b 100644 --- a/google/services/managedkafka/resource_managed_kafka_cluster_generated_test.go +++ b/google/services/managedkafka/resource_managed_kafka_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/managedkafka" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/managedkafka/resource_managed_kafka_connect_cluster_generated_test.go b/google/services/managedkafka/resource_managed_kafka_connect_cluster_generated_test.go index 7d260a80c70..a3a8e93a169 100644 --- a/google/services/managedkafka/resource_managed_kafka_connect_cluster_generated_test.go +++ b/google/services/managedkafka/resource_managed_kafka_connect_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/managedkafka" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/managedkafka/resource_managed_kafka_connector_generated_test.go b/google/services/managedkafka/resource_managed_kafka_connector_generated_test.go index 8370aad13e8..02f27721465 100644 --- a/google/services/managedkafka/resource_managed_kafka_connector_generated_test.go +++ b/google/services/managedkafka/resource_managed_kafka_connector_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/managedkafka" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/managedkafka/resource_managed_kafka_topic_generated_test.go b/google/services/managedkafka/resource_managed_kafka_topic_generated_test.go index de57aa33a44..8e869a94701 100644 --- a/google/services/managedkafka/resource_managed_kafka_topic_generated_test.go +++ b/google/services/managedkafka/resource_managed_kafka_topic_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/managedkafka" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/memcache/resource_memcache_instance_generated_test.go b/google/services/memcache/resource_memcache_instance_generated_test.go index 0ceb6460848..e433fa95d76 100644 --- a/google/services/memcache/resource_memcache_instance_generated_test.go +++ b/google/services/memcache/resource_memcache_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/memcache" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/memorystore/resource_memorystore_instance_desired_user_created_endpoints_generated_test.go b/google/services/memorystore/resource_memorystore_instance_desired_user_created_endpoints_generated_test.go index b1b6e52f097..4c783a4e165 100644 --- a/google/services/memorystore/resource_memorystore_instance_desired_user_created_endpoints_generated_test.go +++ b/google/services/memorystore/resource_memorystore_instance_desired_user_created_endpoints_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/memorystore" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/memorystore/resource_memorystore_instance_generated_test.go b/google/services/memorystore/resource_memorystore_instance_generated_test.go index 7f11fc4d9df..b689585bce6 100644 --- a/google/services/memorystore/resource_memorystore_instance_generated_test.go +++ b/google/services/memorystore/resource_memorystore_instance_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/memorystore" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -157,7 +160,7 @@ data "google_project" "project" { func TestAccMemorystoreInstance_memorystoreInstanceFullExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-memorystore.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -557,7 +560,7 @@ data "google_project" "project" { func TestAccMemorystoreInstance_memorystoreInstanceFlexibleCaExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-memorystore.iam.gserviceaccount.com", Role: "roles/privateca.certificateRequester", diff --git a/google/services/migrationcenter/resource_migration_center_group_generated_test.go b/google/services/migrationcenter/resource_migration_center_group_generated_test.go index d62de86995d..519ecec8f85 100644 --- a/google/services/migrationcenter/resource_migration_center_group_generated_test.go +++ b/google/services/migrationcenter/resource_migration_center_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/migrationcenter" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/migrationcenter/resource_migration_center_preference_set_generated_test.go b/google/services/migrationcenter/resource_migration_center_preference_set_generated_test.go index ff7866e3bbf..3e700986d79 100644 --- a/google/services/migrationcenter/resource_migration_center_preference_set_generated_test.go +++ b/google/services/migrationcenter/resource_migration_center_preference_set_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/migrationcenter" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/modelarmor/resource_model_armor_template_generated_test.go b/google/services/modelarmor/resource_model_armor_template_generated_test.go index 8a5ec16fb8a..48a077e3a63 100644 --- a/google/services/modelarmor/resource_model_armor_template_generated_test.go +++ b/google/services/modelarmor/resource_model_armor_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/modelarmor" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/modelarmorglobal/resource_model_armor_floorsetting_test.go b/google/services/modelarmorglobal/resource_model_armor_floorsetting_test.go index 53d5bb9180e..4cc87733b08 100644 --- a/google/services/modelarmorglobal/resource_model_armor_floorsetting_test.go +++ b/google/services/modelarmorglobal/resource_model_armor_floorsetting_test.go @@ -20,19 +20,18 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" ) func TestAccModelArmorGlobalFloorsetting_update(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "project_id": acctest.BootstrapProject(t, "tf-boot-magf-", envvar.GetTestBillingAccountFromEnv(t), []string{"modelarmor.googleapis.com"}).ProjectId, + "project_id": resourcemanager.BootstrapProject(t, "tf-boot-magf-", envvar.GetTestBillingAccountFromEnv(t), []string{"modelarmor.googleapis.com"}).ProjectId, } acctest.VcrTest(t, resource.TestCase{ diff --git a/google/services/monitoring/resource_monitoring_custom_service_generated_test.go b/google/services/monitoring/resource_monitoring_custom_service_generated_test.go index 1c56198c6b8..dcfb60c108e 100644 --- a/google/services/monitoring/resource_monitoring_custom_service_generated_test.go +++ b/google/services/monitoring/resource_monitoring_custom_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/monitoring" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/monitoring/resource_monitoring_group_generated_test.go b/google/services/monitoring/resource_monitoring_group_generated_test.go index cfa7f93e8e8..7f394ca5126 100644 --- a/google/services/monitoring/resource_monitoring_group_generated_test.go +++ b/google/services/monitoring/resource_monitoring_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/monitoring" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/monitoring/resource_monitoring_metric_descriptor_generated_test.go b/google/services/monitoring/resource_monitoring_metric_descriptor_generated_test.go index fc8d89fca32..7c434e79af4 100644 --- a/google/services/monitoring/resource_monitoring_metric_descriptor_generated_test.go +++ b/google/services/monitoring/resource_monitoring_metric_descriptor_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/monitoring" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/monitoring/resource_monitoring_monitored_project_generated_test.go b/google/services/monitoring/resource_monitoring_monitored_project_generated_test.go index 982e644b4d8..064a4cac3a8 100644 --- a/google/services/monitoring/resource_monitoring_monitored_project_generated_test.go +++ b/google/services/monitoring/resource_monitoring_monitored_project_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/monitoring" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/monitoring/resource_monitoring_notification_channel_generated_test.go b/google/services/monitoring/resource_monitoring_notification_channel_generated_test.go index 85edcd0ad8b..73d4dfb76fc 100644 --- a/google/services/monitoring/resource_monitoring_notification_channel_generated_test.go +++ b/google/services/monitoring/resource_monitoring_notification_channel_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/monitoring" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/monitoring/resource_monitoring_service_generated_test.go b/google/services/monitoring/resource_monitoring_service_generated_test.go index c718b325c24..ff1686eb19f 100644 --- a/google/services/monitoring/resource_monitoring_service_generated_test.go +++ b/google/services/monitoring/resource_monitoring_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/monitoring" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/monitoring/resource_monitoring_slo_generated_test.go b/google/services/monitoring/resource_monitoring_slo_generated_test.go index 8816e1ae617..d55146b490c 100644 --- a/google/services/monitoring/resource_monitoring_slo_generated_test.go +++ b/google/services/monitoring/resource_monitoring_slo_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/monitoring" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/monitoring/resource_monitoring_uptime_check_config_generated_test.go b/google/services/monitoring/resource_monitoring_uptime_check_config_generated_test.go index 97e67401c0c..915ad2fc8d6 100644 --- a/google/services/monitoring/resource_monitoring_uptime_check_config_generated_test.go +++ b/google/services/monitoring/resource_monitoring_uptime_check_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/monitoring" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/netapp/resource_netapp_active_directory_generated_test.go b/google/services/netapp/resource_netapp_active_directory_generated_test.go index 2cf72bc5ab4..fc04a018109 100644 --- a/google/services/netapp/resource_netapp_active_directory_generated_test.go +++ b/google/services/netapp/resource_netapp_active_directory_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/netapp" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/netapp/resource_netapp_backup_generated_test.go b/google/services/netapp/resource_netapp_backup_generated_test.go index 900d22b93ef..91f1feca74e 100644 --- a/google/services/netapp/resource_netapp_backup_generated_test.go +++ b/google/services/netapp/resource_netapp_backup_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/netapp" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/netapp/resource_netapp_backup_policy_generated_test.go b/google/services/netapp/resource_netapp_backup_policy_generated_test.go index 983d8e894bb..912f1b0f939 100644 --- a/google/services/netapp/resource_netapp_backup_policy_generated_test.go +++ b/google/services/netapp/resource_netapp_backup_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/netapp" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/netapp/resource_netapp_host_group_generated_test.go b/google/services/netapp/resource_netapp_host_group_generated_test.go index abe01137670..acb32fe3d2b 100644 --- a/google/services/netapp/resource_netapp_host_group_generated_test.go +++ b/google/services/netapp/resource_netapp_host_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/netapp" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/netapp/resource_netapp_kmsconfig_generated_test.go b/google/services/netapp/resource_netapp_kmsconfig_generated_test.go index e139747015a..5c8f75539e6 100644 --- a/google/services/netapp/resource_netapp_kmsconfig_generated_test.go +++ b/google/services/netapp/resource_netapp_kmsconfig_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/netapp" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/netapp/resource_netapp_storage_pool_generated_test.go b/google/services/netapp/resource_netapp_storage_pool_generated_test.go index b2f30f433a7..9383e05b5e5 100644 --- a/google/services/netapp/resource_netapp_storage_pool_generated_test.go +++ b/google/services/netapp/resource_netapp_storage_pool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/netapp" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/netapp/resource_netapp_volume_generated_test.go b/google/services/netapp/resource_netapp_volume_generated_test.go index 5db8fcdad30..459e433d20b 100644 --- a/google/services/netapp/resource_netapp_volume_generated_test.go +++ b/google/services/netapp/resource_netapp_volume_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/netapp" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/netapp/resource_netapp_volume_quota_rule_generated_test.go b/google/services/netapp/resource_netapp_volume_quota_rule_generated_test.go index 122dae42ad1..f12a55aceae 100644 --- a/google/services/netapp/resource_netapp_volume_quota_rule_generated_test.go +++ b/google/services/netapp/resource_netapp_volume_quota_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/netapp" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/netapp/resource_netapp_volume_replication_generated_test.go b/google/services/netapp/resource_netapp_volume_replication_generated_test.go index b06d42d2ae4..08359bb8de7 100644 --- a/google/services/netapp/resource_netapp_volume_replication_generated_test.go +++ b/google/services/netapp/resource_netapp_volume_replication_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/netapp" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/netapp/resource_netapp_volume_snapshot_generated_test.go b/google/services/netapp/resource_netapp_volume_snapshot_generated_test.go index b0743eaf829..d5cee41a1dc 100644 --- a/google/services/netapp/resource_netapp_volume_snapshot_generated_test.go +++ b/google/services/netapp/resource_netapp_volume_snapshot_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/netapp" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkconnectivity/resource_network_connectivity_destination_generated_test.go b/google/services/networkconnectivity/resource_network_connectivity_destination_generated_test.go index f150e1f2a0f..9fcfd24dec6 100644 --- a/google/services/networkconnectivity/resource_network_connectivity_destination_generated_test.go +++ b/google/services/networkconnectivity/resource_network_connectivity_destination_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkconnectivity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkconnectivity/resource_network_connectivity_group_generated_test.go b/google/services/networkconnectivity/resource_network_connectivity_group_generated_test.go index 6df60693a67..8c346a1c98d 100644 --- a/google/services/networkconnectivity/resource_network_connectivity_group_generated_test.go +++ b/google/services/networkconnectivity/resource_network_connectivity_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkconnectivity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkconnectivity/resource_network_connectivity_hub_generated_test.go b/google/services/networkconnectivity/resource_network_connectivity_hub_generated_test.go index 333ae2fd96d..c14e56ae3c8 100644 --- a/google/services/networkconnectivity/resource_network_connectivity_hub_generated_test.go +++ b/google/services/networkconnectivity/resource_network_connectivity_hub_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkconnectivity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkconnectivity/resource_network_connectivity_multicloud_data_transfer_config_generated_test.go b/google/services/networkconnectivity/resource_network_connectivity_multicloud_data_transfer_config_generated_test.go index a2a70731f17..2ab24153c65 100644 --- a/google/services/networkconnectivity/resource_network_connectivity_multicloud_data_transfer_config_generated_test.go +++ b/google/services/networkconnectivity/resource_network_connectivity_multicloud_data_transfer_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkconnectivity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkconnectivity/resource_network_connectivity_policy_based_route_generated_test.go b/google/services/networkconnectivity/resource_network_connectivity_policy_based_route_generated_test.go index ed853e3f6b4..3adce201743 100644 --- a/google/services/networkconnectivity/resource_network_connectivity_policy_based_route_generated_test.go +++ b/google/services/networkconnectivity/resource_network_connectivity_policy_based_route_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkconnectivity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkconnectivity/resource_network_connectivity_regional_endpoint_generated_test.go b/google/services/networkconnectivity/resource_network_connectivity_regional_endpoint_generated_test.go index c501f44f119..f181e17b8fa 100644 --- a/google/services/networkconnectivity/resource_network_connectivity_regional_endpoint_generated_test.go +++ b/google/services/networkconnectivity/resource_network_connectivity_regional_endpoint_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkconnectivity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkconnectivity/resource_network_connectivity_spoke_generated_test.go b/google/services/networkconnectivity/resource_network_connectivity_spoke_generated_test.go index dd1a0d954e7..0460ab12ac7 100644 --- a/google/services/networkconnectivity/resource_network_connectivity_spoke_generated_test.go +++ b/google/services/networkconnectivity/resource_network_connectivity_spoke_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkconnectivity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkconnectivityv1/resource_network_connectivity_internal_range_generated_test.go b/google/services/networkconnectivityv1/resource_network_connectivity_internal_range_generated_test.go index c529c1b919e..f3cd8b85094 100644 --- a/google/services/networkconnectivityv1/resource_network_connectivity_internal_range_generated_test.go +++ b/google/services/networkconnectivityv1/resource_network_connectivity_internal_range_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkconnectivityv1" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkconnectivityv1/resource_network_connectivity_service_connection_policy_generated_test.go b/google/services/networkconnectivityv1/resource_network_connectivity_service_connection_policy_generated_test.go index 8735392eb31..f8aa278e69a 100644 --- a/google/services/networkconnectivityv1/resource_network_connectivity_service_connection_policy_generated_test.go +++ b/google/services/networkconnectivityv1/resource_network_connectivity_service_connection_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkconnectivityv1" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkmanagement/resource_network_management_connectivity_test_resource_generated_test.go b/google/services/networkmanagement/resource_network_management_connectivity_test_resource_generated_test.go index 566ea862158..7e52ed00bd7 100644 --- a/google/services/networkmanagement/resource_network_management_connectivity_test_resource_generated_test.go +++ b/google/services/networkmanagement/resource_network_management_connectivity_test_resource_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkmanagement" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkmanagement/resource_network_management_organization_vpc_flow_logs_config_generated_test.go b/google/services/networkmanagement/resource_network_management_organization_vpc_flow_logs_config_generated_test.go index 8a37b3835b7..0ba74d73cb4 100644 --- a/google/services/networkmanagement/resource_network_management_organization_vpc_flow_logs_config_generated_test.go +++ b/google/services/networkmanagement/resource_network_management_organization_vpc_flow_logs_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkmanagement" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkmanagement/resource_network_management_vpc_flow_logs_config_generated_test.go b/google/services/networkmanagement/resource_network_management_vpc_flow_logs_config_generated_test.go index dca1df61b7f..d13296ff97a 100644 --- a/google/services/networkmanagement/resource_network_management_vpc_flow_logs_config_generated_test.go +++ b/google/services/networkmanagement/resource_network_management_vpc_flow_logs_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkmanagement" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_address_group_generated_test.go b/google/services/networksecurity/resource_network_security_address_group_generated_test.go index 39805a93f6f..a0e6e1874ec 100644 --- a/google/services/networksecurity/resource_network_security_address_group_generated_test.go +++ b/google/services/networksecurity/resource_network_security_address_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_authz_policy_generated_test.go b/google/services/networksecurity/resource_network_security_authz_policy_generated_test.go index 97310049a0c..b00511bb89b 100644 --- a/google/services/networksecurity/resource_network_security_authz_policy_generated_test.go +++ b/google/services/networksecurity/resource_network_security_authz_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_backend_authentication_config_generated_test.go b/google/services/networksecurity/resource_network_security_backend_authentication_config_generated_test.go index 22860936ff9..d7e2b254e06 100644 --- a/google/services/networksecurity/resource_network_security_backend_authentication_config_generated_test.go +++ b/google/services/networksecurity/resource_network_security_backend_authentication_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_client_tls_policy_generated_test.go b/google/services/networksecurity/resource_network_security_client_tls_policy_generated_test.go index 02014757f27..5d392c2b290 100644 --- a/google/services/networksecurity/resource_network_security_client_tls_policy_generated_test.go +++ b/google/services/networksecurity/resource_network_security_client_tls_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_gateway_security_policy_generated_test.go b/google/services/networksecurity/resource_network_security_gateway_security_policy_generated_test.go index f9e7a2ebbd5..e0368efa28e 100644 --- a/google/services/networksecurity/resource_network_security_gateway_security_policy_generated_test.go +++ b/google/services/networksecurity/resource_network_security_gateway_security_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_gateway_security_policy_rule_generated_test.go b/google/services/networksecurity/resource_network_security_gateway_security_policy_rule_generated_test.go index 2065bc53c0f..0a359e47736 100644 --- a/google/services/networksecurity/resource_network_security_gateway_security_policy_rule_generated_test.go +++ b/google/services/networksecurity/resource_network_security_gateway_security_policy_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_intercept_deployment_generated_test.go b/google/services/networksecurity/resource_network_security_intercept_deployment_generated_test.go index 58407c00fc1..52847393372 100644 --- a/google/services/networksecurity/resource_network_security_intercept_deployment_generated_test.go +++ b/google/services/networksecurity/resource_network_security_intercept_deployment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_intercept_deployment_group_generated_test.go b/google/services/networksecurity/resource_network_security_intercept_deployment_group_generated_test.go index 37e000cf2b5..3a7b8de25b1 100644 --- a/google/services/networksecurity/resource_network_security_intercept_deployment_group_generated_test.go +++ b/google/services/networksecurity/resource_network_security_intercept_deployment_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_intercept_endpoint_group_association_generated_test.go b/google/services/networksecurity/resource_network_security_intercept_endpoint_group_association_generated_test.go index 6da0dc0f6d1..afea1dbf23c 100644 --- a/google/services/networksecurity/resource_network_security_intercept_endpoint_group_association_generated_test.go +++ b/google/services/networksecurity/resource_network_security_intercept_endpoint_group_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_intercept_endpoint_group_generated_test.go b/google/services/networksecurity/resource_network_security_intercept_endpoint_group_generated_test.go index 74dc229aede..2625611345e 100644 --- a/google/services/networksecurity/resource_network_security_intercept_endpoint_group_generated_test.go +++ b/google/services/networksecurity/resource_network_security_intercept_endpoint_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_mirroring_deployment_generated_test.go b/google/services/networksecurity/resource_network_security_mirroring_deployment_generated_test.go index b3959d1a740..58e412d3689 100644 --- a/google/services/networksecurity/resource_network_security_mirroring_deployment_generated_test.go +++ b/google/services/networksecurity/resource_network_security_mirroring_deployment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_mirroring_deployment_group_generated_test.go b/google/services/networksecurity/resource_network_security_mirroring_deployment_group_generated_test.go index c19b8a27161..883d7113c51 100644 --- a/google/services/networksecurity/resource_network_security_mirroring_deployment_group_generated_test.go +++ b/google/services/networksecurity/resource_network_security_mirroring_deployment_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_mirroring_endpoint_generated_test.go b/google/services/networksecurity/resource_network_security_mirroring_endpoint_generated_test.go index f1915eedbe0..64beddad53f 100644 --- a/google/services/networksecurity/resource_network_security_mirroring_endpoint_generated_test.go +++ b/google/services/networksecurity/resource_network_security_mirroring_endpoint_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_mirroring_endpoint_group_association_generated_test.go b/google/services/networksecurity/resource_network_security_mirroring_endpoint_group_association_generated_test.go index 5b1b99741d5..bfd8eae69ce 100644 --- a/google/services/networksecurity/resource_network_security_mirroring_endpoint_group_association_generated_test.go +++ b/google/services/networksecurity/resource_network_security_mirroring_endpoint_group_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_mirroring_endpoint_group_generated_test.go b/google/services/networksecurity/resource_network_security_mirroring_endpoint_group_generated_test.go index 4a1968cb31c..5adc42a665e 100644 --- a/google/services/networksecurity/resource_network_security_mirroring_endpoint_group_generated_test.go +++ b/google/services/networksecurity/resource_network_security_mirroring_endpoint_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_security_profile_generated_test.go b/google/services/networksecurity/resource_network_security_security_profile_generated_test.go index ea36597a663..3e1a8296a89 100644 --- a/google/services/networksecurity/resource_network_security_security_profile_generated_test.go +++ b/google/services/networksecurity/resource_network_security_security_profile_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_security_profile_group_generated_test.go b/google/services/networksecurity/resource_network_security_security_profile_group_generated_test.go index 88bfbfeef0f..048d5e5974d 100644 --- a/google/services/networksecurity/resource_network_security_security_profile_group_generated_test.go +++ b/google/services/networksecurity/resource_network_security_security_profile_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_server_tls_policy_generated_test.go b/google/services/networksecurity/resource_network_security_server_tls_policy_generated_test.go index a051620fd71..9dae2245e2b 100644 --- a/google/services/networksecurity/resource_network_security_server_tls_policy_generated_test.go +++ b/google/services/networksecurity/resource_network_security_server_tls_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_tls_inspection_policy_generated_test.go b/google/services/networksecurity/resource_network_security_tls_inspection_policy_generated_test.go index 07763222f91..b899268de46 100644 --- a/google/services/networksecurity/resource_network_security_tls_inspection_policy_generated_test.go +++ b/google/services/networksecurity/resource_network_security_tls_inspection_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networksecurity/resource_network_security_url_lists_generated_test.go b/google/services/networksecurity/resource_network_security_url_lists_generated_test.go index 1c0f40fb3f8..61e28ec5318 100644 --- a/google/services/networksecurity/resource_network_security_url_lists_generated_test.go +++ b/google/services/networksecurity/resource_network_security_url_lists_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networksecurity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_authz_extension_generated_test.go b/google/services/networkservices/resource_network_services_authz_extension_generated_test.go index 1b9483faf74..4468bdeefde 100644 --- a/google/services/networkservices/resource_network_services_authz_extension_generated_test.go +++ b/google/services/networkservices/resource_network_services_authz_extension_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_edge_cache_keyset_generated_test.go b/google/services/networkservices/resource_network_services_edge_cache_keyset_generated_test.go index e5a007c4f08..77c68af3af5 100644 --- a/google/services/networkservices/resource_network_services_edge_cache_keyset_generated_test.go +++ b/google/services/networkservices/resource_network_services_edge_cache_keyset_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_edge_cache_origin_generated_test.go b/google/services/networkservices/resource_network_services_edge_cache_origin_generated_test.go index b51f7eb031a..434fc92a248 100644 --- a/google/services/networkservices/resource_network_services_edge_cache_origin_generated_test.go +++ b/google/services/networkservices/resource_network_services_edge_cache_origin_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_edge_cache_service_generated_test.go b/google/services/networkservices/resource_network_services_edge_cache_service_generated_test.go index c9e09716b85..1c5c0089c19 100644 --- a/google/services/networkservices/resource_network_services_edge_cache_service_generated_test.go +++ b/google/services/networkservices/resource_network_services_edge_cache_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_endpoint_policy_generated_test.go b/google/services/networkservices/resource_network_services_endpoint_policy_generated_test.go index 6866bbdd324..4392e369082 100644 --- a/google/services/networkservices/resource_network_services_endpoint_policy_generated_test.go +++ b/google/services/networkservices/resource_network_services_endpoint_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_gateway_generated_test.go b/google/services/networkservices/resource_network_services_gateway_generated_test.go index 89abc88864d..e0d49a381ab 100644 --- a/google/services/networkservices/resource_network_services_gateway_generated_test.go +++ b/google/services/networkservices/resource_network_services_gateway_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_grpc_route_generated_test.go b/google/services/networkservices/resource_network_services_grpc_route_generated_test.go index 0cf075499ad..86188127911 100644 --- a/google/services/networkservices/resource_network_services_grpc_route_generated_test.go +++ b/google/services/networkservices/resource_network_services_grpc_route_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_http_route_generated_test.go b/google/services/networkservices/resource_network_services_http_route_generated_test.go index c5827e3f88b..c230c2c9551 100644 --- a/google/services/networkservices/resource_network_services_http_route_generated_test.go +++ b/google/services/networkservices/resource_network_services_http_route_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_lb_route_extension_generated_test.go b/google/services/networkservices/resource_network_services_lb_route_extension_generated_test.go index 868c8abd55a..1db98b1c029 100644 --- a/google/services/networkservices/resource_network_services_lb_route_extension_generated_test.go +++ b/google/services/networkservices/resource_network_services_lb_route_extension_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_lb_traffic_extension_generated_test.go b/google/services/networkservices/resource_network_services_lb_traffic_extension_generated_test.go index f3009a1b5bc..88f2bcc1170 100644 --- a/google/services/networkservices/resource_network_services_lb_traffic_extension_generated_test.go +++ b/google/services/networkservices/resource_network_services_lb_traffic_extension_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_mesh_generated_test.go b/google/services/networkservices/resource_network_services_mesh_generated_test.go index ed5042f0e1f..3c2c8f76d1b 100644 --- a/google/services/networkservices/resource_network_services_mesh_generated_test.go +++ b/google/services/networkservices/resource_network_services_mesh_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_multicast_consumer_association_generated_test.go b/google/services/networkservices/resource_network_services_multicast_consumer_association_generated_test.go index e6c62480e0a..34840afd558 100644 --- a/google/services/networkservices/resource_network_services_multicast_consumer_association_generated_test.go +++ b/google/services/networkservices/resource_network_services_multicast_consumer_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_multicast_domain_activation_generated_test.go b/google/services/networkservices/resource_network_services_multicast_domain_activation_generated_test.go index 4cd35ca9eb2..efa9e001da8 100644 --- a/google/services/networkservices/resource_network_services_multicast_domain_activation_generated_test.go +++ b/google/services/networkservices/resource_network_services_multicast_domain_activation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_multicast_domain_generated_test.go b/google/services/networkservices/resource_network_services_multicast_domain_generated_test.go index d402e724335..2c10f9775b1 100644 --- a/google/services/networkservices/resource_network_services_multicast_domain_generated_test.go +++ b/google/services/networkservices/resource_network_services_multicast_domain_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_multicast_domain_group_generated_test.go b/google/services/networkservices/resource_network_services_multicast_domain_group_generated_test.go index 7785a407a35..3df080bf31a 100644 --- a/google/services/networkservices/resource_network_services_multicast_domain_group_generated_test.go +++ b/google/services/networkservices/resource_network_services_multicast_domain_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_multicast_group_consumer_activation_generated_test.go b/google/services/networkservices/resource_network_services_multicast_group_consumer_activation_generated_test.go index d1ed1b4a2e9..5c6b27c6bf3 100644 --- a/google/services/networkservices/resource_network_services_multicast_group_consumer_activation_generated_test.go +++ b/google/services/networkservices/resource_network_services_multicast_group_consumer_activation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_multicast_group_producer_activation_generated_test.go b/google/services/networkservices/resource_network_services_multicast_group_producer_activation_generated_test.go index ef8d611f4b1..afa9d837474 100644 --- a/google/services/networkservices/resource_network_services_multicast_group_producer_activation_generated_test.go +++ b/google/services/networkservices/resource_network_services_multicast_group_producer_activation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_multicast_group_range_activation_generated_test.go b/google/services/networkservices/resource_network_services_multicast_group_range_activation_generated_test.go index e1881542903..cb3a28e4d87 100644 --- a/google/services/networkservices/resource_network_services_multicast_group_range_activation_generated_test.go +++ b/google/services/networkservices/resource_network_services_multicast_group_range_activation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_multicast_group_range_generated_test.go b/google/services/networkservices/resource_network_services_multicast_group_range_generated_test.go index 32a17376108..10543f5a96f 100644 --- a/google/services/networkservices/resource_network_services_multicast_group_range_generated_test.go +++ b/google/services/networkservices/resource_network_services_multicast_group_range_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_multicast_producer_association_generated_test.go b/google/services/networkservices/resource_network_services_multicast_producer_association_generated_test.go index 7da19a79e07..92e7e401431 100644 --- a/google/services/networkservices/resource_network_services_multicast_producer_association_generated_test.go +++ b/google/services/networkservices/resource_network_services_multicast_producer_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_tcp_route_generated_test.go b/google/services/networkservices/resource_network_services_tcp_route_generated_test.go index fdbd89716c4..b392a05f348 100644 --- a/google/services/networkservices/resource_network_services_tcp_route_generated_test.go +++ b/google/services/networkservices/resource_network_services_tcp_route_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/networkservices/resource_network_services_tls_route_generated_test.go b/google/services/networkservices/resource_network_services_tls_route_generated_test.go index e25fc6eebd7..0f407031b3e 100644 --- a/google/services/networkservices/resource_network_services_tls_route_generated_test.go +++ b/google/services/networkservices/resource_network_services_tls_route_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/networkservices" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/notebooks/resource_notebooks_environment_generated_test.go b/google/services/notebooks/resource_notebooks_environment_generated_test.go index 21d69a32a99..01c2327c64f 100644 --- a/google/services/notebooks/resource_notebooks_environment_generated_test.go +++ b/google/services/notebooks/resource_notebooks_environment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/notebooks" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/notebooks/resource_notebooks_instance_generated_test.go b/google/services/notebooks/resource_notebooks_instance_generated_test.go index 271d11c9a20..3f5b60b8aee 100644 --- a/google/services/notebooks/resource_notebooks_instance_generated_test.go +++ b/google/services/notebooks/resource_notebooks_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/notebooks" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/notebooks/resource_notebooks_runtime_generated_test.go b/google/services/notebooks/resource_notebooks_runtime_generated_test.go index 1e142eadcb1..d913be01e8e 100644 --- a/google/services/notebooks/resource_notebooks_runtime_generated_test.go +++ b/google/services/notebooks/resource_notebooks_runtime_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/notebooks" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/observability/resource_observability_trace_scope_generated_test.go b/google/services/observability/resource_observability_trace_scope_generated_test.go index 971ac5b8f5d..dee173bf15e 100644 --- a/google/services/observability/resource_observability_trace_scope_generated_test.go +++ b/google/services/observability/resource_observability_trace_scope_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/observability" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/oracledatabase/resource_oracle_database_autonomous_database_generated_test.go b/google/services/oracledatabase/resource_oracle_database_autonomous_database_generated_test.go index 64080eacd94..e832349df9d 100644 --- a/google/services/oracledatabase/resource_oracle_database_autonomous_database_generated_test.go +++ b/google/services/oracledatabase/resource_oracle_database_autonomous_database_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/oracledatabase" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/oracledatabase/resource_oracle_database_cloud_exadata_infrastructure_generated_test.go b/google/services/oracledatabase/resource_oracle_database_cloud_exadata_infrastructure_generated_test.go index 3528f10beec..ec2040f8ac0 100644 --- a/google/services/oracledatabase/resource_oracle_database_cloud_exadata_infrastructure_generated_test.go +++ b/google/services/oracledatabase/resource_oracle_database_cloud_exadata_infrastructure_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/oracledatabase" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/oracledatabase/resource_oracle_database_cloud_vm_cluster_generated_test.go b/google/services/oracledatabase/resource_oracle_database_cloud_vm_cluster_generated_test.go index ba49fd921f2..ac174b37f54 100644 --- a/google/services/oracledatabase/resource_oracle_database_cloud_vm_cluster_generated_test.go +++ b/google/services/oracledatabase/resource_oracle_database_cloud_vm_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/oracledatabase" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/oracledatabase/resource_oracle_database_db_system_generated_test.go b/google/services/oracledatabase/resource_oracle_database_db_system_generated_test.go index 09e0fb9459c..bc6db872085 100644 --- a/google/services/oracledatabase/resource_oracle_database_db_system_generated_test.go +++ b/google/services/oracledatabase/resource_oracle_database_db_system_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/oracledatabase" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/oracledatabase/resource_oracle_database_exadb_vm_cluster_generated_test.go b/google/services/oracledatabase/resource_oracle_database_exadb_vm_cluster_generated_test.go index f2bde2ce785..4d0455df3ae 100644 --- a/google/services/oracledatabase/resource_oracle_database_exadb_vm_cluster_generated_test.go +++ b/google/services/oracledatabase/resource_oracle_database_exadb_vm_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/oracledatabase" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/oracledatabase/resource_oracle_database_exascale_db_storage_vault_generated_test.go b/google/services/oracledatabase/resource_oracle_database_exascale_db_storage_vault_generated_test.go index 9518f2a9006..5afbb26fc45 100644 --- a/google/services/oracledatabase/resource_oracle_database_exascale_db_storage_vault_generated_test.go +++ b/google/services/oracledatabase/resource_oracle_database_exascale_db_storage_vault_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/oracledatabase" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/oracledatabase/resource_oracle_database_odb_network_generated_test.go b/google/services/oracledatabase/resource_oracle_database_odb_network_generated_test.go index 01615a77e8e..51a1bf2b2ed 100644 --- a/google/services/oracledatabase/resource_oracle_database_odb_network_generated_test.go +++ b/google/services/oracledatabase/resource_oracle_database_odb_network_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/oracledatabase" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/oracledatabase/resource_oracle_database_odb_subnet_generated_test.go b/google/services/oracledatabase/resource_oracle_database_odb_subnet_generated_test.go index ac7c5206616..afcf8d7d730 100644 --- a/google/services/oracledatabase/resource_oracle_database_odb_subnet_generated_test.go +++ b/google/services/oracledatabase/resource_oracle_database_odb_subnet_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/oracledatabase" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/orgpolicy/resource_org_policy_custom_constraint_generated_test.go b/google/services/orgpolicy/resource_org_policy_custom_constraint_generated_test.go index 996e892c17b..96eae1ba381 100644 --- a/google/services/orgpolicy/resource_org_policy_custom_constraint_generated_test.go +++ b/google/services/orgpolicy/resource_org_policy_custom_constraint_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/orgpolicy" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/osconfig/resource_os_config_patch_deployment_generated_test.go b/google/services/osconfig/resource_os_config_patch_deployment_generated_test.go index ae96eca476d..af19519a957 100644 --- a/google/services/osconfig/resource_os_config_patch_deployment_generated_test.go +++ b/google/services/osconfig/resource_os_config_patch_deployment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/osconfig" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_generated_test.go b/google/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_generated_test.go index 94f06e8baeb..a2b1705e37d 100644 --- a/google/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_generated_test.go +++ b/google/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/osconfigv2" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -54,7 +57,7 @@ var ( func TestAccOSConfigV2PolicyOrchestratorForOrganization_osconfigv2PolicyOrchestratorForOrganizationBasicExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-org-{organization_id}@gcp-sa-osconfig.iam.gserviceaccount.com", Role: "roles/osconfig.serviceAgent", diff --git a/google/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_test.go b/google/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_test.go index a145fd96f72..ee8615f18a7 100644 --- a/google/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_test.go +++ b/google/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_test.go @@ -22,10 +22,11 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" ) func TestAccOSConfigV2PolicyOrchestratorForOrganization_basic(t *testing.T) { - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-org-{organization_id}@gcp-sa-osconfig.iam.gserviceaccount.com", Role: "roles/osconfig.serviceAgent", diff --git a/google/services/osconfigv2/resource_os_config_v2_policy_orchestrator_generated_test.go b/google/services/osconfigv2/resource_os_config_v2_policy_orchestrator_generated_test.go index ebe39f81bf4..50046a11168 100644 --- a/google/services/osconfigv2/resource_os_config_v2_policy_orchestrator_generated_test.go +++ b/google/services/osconfigv2/resource_os_config_v2_policy_orchestrator_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/osconfigv2" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -54,7 +57,7 @@ var ( func TestAccOSConfigV2PolicyOrchestrator_osconfigv2PolicyOrchestratorBasicExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-osconfig.iam.gserviceaccount.com", Role: "roles/osconfig.serviceAgent", diff --git a/google/services/osconfigv2/resource_os_config_v2_policy_orchestrator_test.go b/google/services/osconfigv2/resource_os_config_v2_policy_orchestrator_test.go index 50467210e88..5930c718464 100644 --- a/google/services/osconfigv2/resource_os_config_v2_policy_orchestrator_test.go +++ b/google/services/osconfigv2/resource_os_config_v2_policy_orchestrator_test.go @@ -22,12 +22,13 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" ) func TestAccOSConfigV2PolicyOrchestrator_basic(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-osconfig.iam.gserviceaccount.com", Role: "roles/osconfig.serviceAgent", diff --git a/google/services/oslogin/resource_os_login_ssh_public_key_generated_test.go b/google/services/oslogin/resource_os_login_ssh_public_key_generated_test.go index 0a2e2fea481..c9925bccaa1 100644 --- a/google/services/oslogin/resource_os_login_ssh_public_key_generated_test.go +++ b/google/services/oslogin/resource_os_login_ssh_public_key_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/oslogin" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/parallelstore/resource_parallelstore_instance_generated_test.go b/google/services/parallelstore/resource_parallelstore_instance_generated_test.go index 4bd12f46d56..9ace7f2ea90 100644 --- a/google/services/parallelstore/resource_parallelstore_instance_generated_test.go +++ b/google/services/parallelstore/resource_parallelstore_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/parallelstore" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/parametermanager/data_source_parameter_manager_parameter_version_test.go b/google/services/parametermanager/data_source_parameter_manager_parameter_version_test.go index fe87282abe2..bfd91557c1a 100644 --- a/google/services/parametermanager/data_source_parameter_manager_parameter_version_test.go +++ b/google/services/parametermanager/data_source_parameter_manager_parameter_version_test.go @@ -26,6 +26,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" ) func TestAccDataSourceParameterManagerParameterVersion_basicWithResourceReference(t *testing.T) { @@ -207,7 +208,7 @@ data "google_parameter_manager_parameter_version" "parameter-version-with-yaml-d func TestAccDataSourceParameterManagerParameterVersion_withKmsKey(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pm.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/parametermanager/resource_parameter_manager_parameter_generated_test.go b/google/services/parametermanager/resource_parameter_manager_parameter_generated_test.go index adef8ba0e02..e1da090bd2d 100644 --- a/google/services/parametermanager/resource_parameter_manager_parameter_generated_test.go +++ b/google/services/parametermanager/resource_parameter_manager_parameter_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/parametermanager" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -195,7 +198,7 @@ resource "google_parameter_manager_parameter" "parameter-with-labels" { func TestAccParameterManagerParameter_parameterWithKmsKeyExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pm.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/parametermanager/resource_parameter_manager_parameter_test.go b/google/services/parametermanager/resource_parameter_manager_parameter_test.go index ac1b91266db..51fb3a16b63 100644 --- a/google/services/parametermanager/resource_parameter_manager_parameter_test.go +++ b/google/services/parametermanager/resource_parameter_manager_parameter_test.go @@ -23,6 +23,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" ) func TestAccParameterManagerParameter_labelsUpdate(t *testing.T) { @@ -122,7 +123,7 @@ resource "google_parameter_manager_parameter" "parameter-with-labels" { func TestAccParameterManagerParameter_kmsKeyUpdate(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pm.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/parametermanager/resource_parameter_manager_parameter_version_generated_test.go b/google/services/parametermanager/resource_parameter_manager_parameter_version_generated_test.go index dd19dbda3eb..02388473a18 100644 --- a/google/services/parametermanager/resource_parameter_manager_parameter_version_generated_test.go +++ b/google/services/parametermanager/resource_parameter_manager_parameter_version_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/parametermanager" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -150,7 +153,7 @@ resource "google_parameter_manager_parameter_version" "parameter-version-with-js func TestAccParameterManagerParameterVersion_parameterVersionWithKmsKeyExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pm.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_test.go b/google/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_test.go index 3ac427d70dc..34437a01383 100644 --- a/google/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_test.go +++ b/google/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_test.go @@ -26,6 +26,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" ) func TestAccDataSourceParameterManagerRegionalRegionalParameterVersion_basicWithResourceReference(t *testing.T) { @@ -213,7 +214,7 @@ data "google_parameter_manager_regional_parameter_version" "regional-parameter-v func TestAccDataSourceParameterManagerRegionalRegionalParameterVersion_withKmsKey(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pm.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/parametermanagerregional/resource_parameter_manager_regional_parameter_generated_test.go b/google/services/parametermanagerregional/resource_parameter_manager_regional_parameter_generated_test.go index e90023480f7..773b4dca856 100644 --- a/google/services/parametermanagerregional/resource_parameter_manager_regional_parameter_generated_test.go +++ b/google/services/parametermanagerregional/resource_parameter_manager_regional_parameter_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/parametermanagerregional" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -198,7 +201,7 @@ resource "google_parameter_manager_regional_parameter" "regional-parameter-with- func TestAccParameterManagerRegionalRegionalParameter_regionalParameterWithKmsKeyExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pm.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/parametermanagerregional/resource_parameter_manager_regional_parameter_test.go b/google/services/parametermanagerregional/resource_parameter_manager_regional_parameter_test.go index ad4eafd7bda..f8d14cd97ca 100644 --- a/google/services/parametermanagerregional/resource_parameter_manager_regional_parameter_test.go +++ b/google/services/parametermanagerregional/resource_parameter_manager_regional_parameter_test.go @@ -23,6 +23,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" ) func TestAccParameterManagerRegionalRegionalParameter_import(t *testing.T) { @@ -169,7 +170,7 @@ resource "google_parameter_manager_regional_parameter" "regional-parameter-with- func TestAccParameterManagerRegionalRegionalParameter_kmskeyUpdate(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pm.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/parametermanagerregional/resource_parameter_manager_regional_parameter_version_generated_test.go b/google/services/parametermanagerregional/resource_parameter_manager_regional_parameter_version_generated_test.go index 75ce865f94c..c17c0ddcef9 100644 --- a/google/services/parametermanagerregional/resource_parameter_manager_regional_parameter_version_generated_test.go +++ b/google/services/parametermanagerregional/resource_parameter_manager_regional_parameter_version_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/parametermanagerregional" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -200,7 +203,7 @@ resource "google_parameter_manager_regional_parameter_version" "regional-paramet func TestAccParameterManagerRegionalRegionalParameterVersion_regionalParameterVersionWithKmsKeyExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pm.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/privateca/resource_privateca_ca_pool_generated_test.go b/google/services/privateca/resource_privateca_ca_pool_generated_test.go index 945ae2d058a..28f35b45f94 100644 --- a/google/services/privateca/resource_privateca_ca_pool_generated_test.go +++ b/google/services/privateca/resource_privateca_ca_pool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/privateca" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/privateca/resource_privateca_ca_pool_test.go b/google/services/privateca/resource_privateca_ca_pool_test.go index 387563d3e2d..6fb2e04b36c 100644 --- a/google/services/privateca/resource_privateca_ca_pool_test.go +++ b/google/services/privateca/resource_privateca_ca_pool_test.go @@ -28,6 +28,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/kms" "github.com/hashicorp/terraform-provider-google/google/services/privateca" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) @@ -530,7 +531,7 @@ resource "google_privateca_ca_pool" "default" { func TestAccPrivatecaCaPool_CmekKeyUpdate(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-privateca.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/privateca/resource_privateca_certificate_authority_generated_test.go b/google/services/privateca/resource_privateca_certificate_authority_generated_test.go index bda733af458..6f61690c0df 100644 --- a/google/services/privateca/resource_privateca_certificate_authority_generated_test.go +++ b/google/services/privateca/resource_privateca_certificate_authority_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/privateca" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/privateca/resource_privateca_certificate_generated_test.go b/google/services/privateca/resource_privateca_certificate_generated_test.go index 1ab02efcf8b..5c42ad96121 100644 --- a/google/services/privateca/resource_privateca_certificate_generated_test.go +++ b/google/services/privateca/resource_privateca_certificate_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/privateca" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/privateca/resource_privateca_certificate_template_generated_test.go b/google/services/privateca/resource_privateca_certificate_template_generated_test.go index 0c8b4d18107..8c819295efc 100644 --- a/google/services/privateca/resource_privateca_certificate_template_generated_test.go +++ b/google/services/privateca/resource_privateca_certificate_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/privateca" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_generated_test.go b/google/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_generated_test.go index 41a27ae3de7..e2b8efdccf8 100644 --- a/google/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_generated_test.go +++ b/google/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/privilegedaccessmanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/pubsub/resource_pubsub_schema_generated_test.go b/google/services/pubsub/resource_pubsub_schema_generated_test.go index 23c4f551b64..46582ecde86 100644 --- a/google/services/pubsub/resource_pubsub_schema_generated_test.go +++ b/google/services/pubsub/resource_pubsub_schema_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/pubsub" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/pubsub/resource_pubsub_subscription_generated_test.go b/google/services/pubsub/resource_pubsub_subscription_generated_test.go index b352fd7f017..7491ec15174 100644 --- a/google/services/pubsub/resource_pubsub_subscription_generated_test.go +++ b/google/services/pubsub/resource_pubsub_subscription_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/pubsub" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -299,7 +302,7 @@ resource "google_pubsub_subscription" "example" { func TestAccPubsubSubscription_pubsubSubscriptionPushBqExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com", Role: "roles/bigquery.dataEditor", @@ -387,7 +390,7 @@ EOF func TestAccPubsubSubscription_pubsubSubscriptionPushBqTableSchemaExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com", Role: "roles/bigquery.dataEditor", diff --git a/google/services/pubsub/resource_pubsub_subscription_test.go b/google/services/pubsub/resource_pubsub_subscription_test.go index a0ddf610290..3133a9d68f5 100644 --- a/google/services/pubsub/resource_pubsub_subscription_test.go +++ b/google/services/pubsub/resource_pubsub_subscription_test.go @@ -25,6 +25,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/pubsub" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-provider-google/google/services/tags" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) @@ -260,7 +261,7 @@ func TestAccPubsubSubscriptionBigQuery_serviceAccount(t *testing.T) { serviceAccount := fmt.Sprintf("bq-test-sa-%s", acctest.RandString(t, 10)) serviceAccount2 := fmt.Sprintf("bq-test-sa2-%s", acctest.RandString(t, 10)) - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com", Role: "roles/bigquery.dataEditor", diff --git a/google/services/pubsub/resource_pubsub_topic_generated_test.go b/google/services/pubsub/resource_pubsub_topic_generated_test.go index f9f7b44b145..627a5a6948e 100644 --- a/google/services/pubsub/resource_pubsub_topic_generated_test.go +++ b/google/services/pubsub/resource_pubsub_topic_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/pubsub" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/pubsub/resource_pubsub_topic_test.go b/google/services/pubsub/resource_pubsub_topic_test.go index a7e06565668..7274c52c9ca 100644 --- a/google/services/pubsub/resource_pubsub_topic_test.go +++ b/google/services/pubsub/resource_pubsub_topic_test.go @@ -24,6 +24,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-provider-google/google/services/tags" ) @@ -67,7 +68,7 @@ func TestAccPubsubTopic_cmek(t *testing.T) { bootstrapped := kms.BootstrapKMSKey(t) topicName := fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10)) - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/pubsublite/resource_pubsub_lite_reservation_generated_test.go b/google/services/pubsublite/resource_pubsub_lite_reservation_generated_test.go index 5515f337c57..6562d122b10 100644 --- a/google/services/pubsublite/resource_pubsub_lite_reservation_generated_test.go +++ b/google/services/pubsublite/resource_pubsub_lite_reservation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/pubsublite" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/pubsublite/resource_pubsub_lite_subscription_generated_test.go b/google/services/pubsublite/resource_pubsub_lite_subscription_generated_test.go index b32c78eb7b6..d8aafb41379 100644 --- a/google/services/pubsublite/resource_pubsub_lite_subscription_generated_test.go +++ b/google/services/pubsublite/resource_pubsub_lite_subscription_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/pubsublite" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/pubsublite/resource_pubsub_lite_topic_generated_test.go b/google/services/pubsublite/resource_pubsub_lite_topic_generated_test.go index c79a5caa891..5263ff809b3 100644 --- a/google/services/pubsublite/resource_pubsub_lite_topic_generated_test.go +++ b/google/services/pubsublite/resource_pubsub_lite_topic_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/pubsublite" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/redis/resource_redis_cluster_generated_test.go b/google/services/redis/resource_redis_cluster_generated_test.go index a7e11e78009..b480d65ff66 100644 --- a/google/services/redis/resource_redis_cluster_generated_test.go +++ b/google/services/redis/resource_redis_cluster_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/redis" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -768,7 +771,7 @@ resource "google_compute_network" "consumer_net" { func TestAccRedisCluster_redisClusterCmekExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@cloud-redis.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", @@ -859,7 +862,7 @@ resource "google_compute_network" "consumer_net" { func TestAccRedisCluster_redisClusterFlexibleCaExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@cloud-redis.iam.gserviceaccount.com", Role: "roles/privateca.certificateRequester", diff --git a/google/services/redis/resource_redis_cluster_user_created_connections_generated_test.go b/google/services/redis/resource_redis_cluster_user_created_connections_generated_test.go index 207a3109869..ed3f8937e49 100644 --- a/google/services/redis/resource_redis_cluster_user_created_connections_generated_test.go +++ b/google/services/redis/resource_redis_cluster_user_created_connections_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/redis" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/redis/resource_redis_instance_generated_test.go b/google/services/redis/resource_redis_instance_generated_test.go index 84b7157cf10..7be95d8df4e 100644 --- a/google/services/redis/resource_redis_instance_generated_test.go +++ b/google/services/redis/resource_redis_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/redis" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/acctest/bootstrap_iam_test_utils.go b/google/services/resourcemanager/bootstrap_iam_test_utils.go similarity index 98% rename from google/acctest/bootstrap_iam_test_utils.go rename to google/services/resourcemanager/bootstrap_iam_test_utils.go index 8b848280ca7..10d8b8d5f13 100644 --- a/google/acctest/bootstrap_iam_test_utils.go +++ b/google/services/resourcemanager/bootstrap_iam_test_utils.go @@ -8,13 +8,13 @@ // // This code is generated by Magic Modules using the following: // -// Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/acctest/bootstrap_iam_test_utils.go +// Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/resourcemanager/bootstrap_iam_test_utils.go // // DO NOT EDIT this file directly. Any changes made to this file will be // overwritten during the next generation cycle. // // ---------------------------------------------------------------------------- -package acctest +package resourcemanager import ( "strconv" diff --git a/google/services/resourcemanager/bootstrap_test_utils.go b/google/services/resourcemanager/bootstrap_test_utils.go new file mode 100644 index 00000000000..d59a314bf7b --- /dev/null +++ b/google/services/resourcemanager/bootstrap_test_utils.go @@ -0,0 +1,148 @@ +// Copyright IBM Corp. 2014, 2026 +// SPDX-License-Identifier: MPL-2.0 +// ---------------------------------------------------------------------------- +// +// *** AUTO GENERATED CODE *** Type: Handwritten *** +// +// ---------------------------------------------------------------------------- +// +// This code is generated by Magic Modules using the following: +// +// Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/resourcemanager/bootstrap_test_utils.go +// +// DO NOT EDIT this file directly. Any changes made to this file will be +// overwritten during the next generation cycle. +// +// ---------------------------------------------------------------------------- +package resourcemanager + +import ( + "strings" + "testing" + "time" + + "github.com/hashicorp/terraform-provider-google/google/envvar" + tpgcloudbilling "github.com/hashicorp/terraform-provider-google/google/services/cloudbilling" + rmClient "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager/client" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" + transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" + + "google.golang.org/api/cloudbilling/v1" + cloudresourcemanager "google.golang.org/api/cloudresourcemanager/v1" +) + +// BootstrapProject will create or get a project named +// "" that will persist across test runs, +// where projectIDSuffix is based off of getTestProjectFromEnv(). The reason +// for the naming is to isolate bootstrapped projects by test environment. +// Given the existing projects being used by our team, the prefix provided to +// this function can be no longer than 18 characters. +func BootstrapProject(t *testing.T, projectIDPrefix, billingAccount string, services []string) *cloudresourcemanager.Project { + org := envvar.GetTestOrgFromEnv(t) + parent := &cloudresourcemanager.ResourceId{ + Type: "organization", + Id: org, + } + projectIDSuffix := strings.Replace(envvar.GetTestProjectFromEnv(), "ci-test-project-", "", 1) + projectID := projectIDPrefix + projectIDSuffix + + return BootstrapProjectWithParent(t, projectID, billingAccount, parent, services) +} + +func BootstrapProjectWithParent(t *testing.T, projectID string, billingAccount string, parent *cloudresourcemanager.ResourceId, services []string) *cloudresourcemanager.Project { + config := transport_tpg.BootstrapConfig(t) + if config == nil { + return nil + } + crmClient := rmClient.NewClient(config, config.UserAgent) + + project, err := crmClient.Projects.Get(projectID).Do() + if err != nil { + if !transport_tpg.IsGoogleApiErrorWithCode(err, 403) { + t.Fatalf("Error getting bootstrapped project: %s", err) + } + op, err := crmClient.Projects.Create(&cloudresourcemanager.Project{ + ProjectId: projectID, + Name: "Bootstrapped Test Project", + Parent: parent, + }).Do() + if err != nil { + t.Fatalf("Error creating bootstrapped test project: %s", err) + } + + opAsMap, err := tpgresource.ConvertToMap(op) + if err != nil { + t.Fatalf("Error converting create project operation to map: %s", err) + } + + err = ResourceManagerOperationWaitTime(config, opAsMap, "creating project", config.UserAgent, 4*time.Minute) + if err != nil { + t.Fatalf("Error waiting for create project operation: %s", err) + } + + project, err = crmClient.Projects.Get(projectID).Do() + if err != nil { + t.Fatalf("Error getting bootstrapped project: %s", err) + } + + } + + if project.LifecycleState == "DELETE_REQUESTED" { + _, err := crmClient.Projects.Undelete(projectID, &cloudresourcemanager.UndeleteProjectRequest{}).Do() + if err != nil { + t.Fatalf("Error undeleting bootstrapped project: %s", err) + } + } + + if billingAccount != "" { + billingClient := tpgcloudbilling.NewClient(config, config.UserAgent) + var pbi *cloudbilling.ProjectBillingInfo + err = transport_tpg.Retry(transport_tpg.RetryOptions{ + RetryFunc: func() error { + var reqErr error + pbi, reqErr = billingClient.Projects.GetBillingInfo(PrefixedProject(projectID)).Do() + return reqErr + }, + Timeout: 30 * time.Second, + }) + if err != nil { + t.Fatalf("Error getting billing info for project %q: %v", projectID, err) + } + if strings.TrimPrefix(pbi.BillingAccountName, "billingAccounts/") != billingAccount { + pbi.BillingAccountName = "billingAccounts/" + billingAccount + err := transport_tpg.Retry(transport_tpg.RetryOptions{ + RetryFunc: func() error { + _, err := tpgcloudbilling.NewClient(config, config.UserAgent).Projects.UpdateBillingInfo(PrefixedProject(projectID), pbi).Do() + return err + }, + Timeout: 2 * time.Minute, + }) + if err != nil { + t.Fatalf("Error setting billing account for project %q to %q: %s", projectID, billingAccount, err) + } + } + } + + if len(services) > 0 { + + enabledServices, err := ListCurrentlyEnabledServices(projectID, "", config.UserAgent, config, 1*time.Minute) + if err != nil { + t.Fatalf("Error listing services for project %q: %s", projectID, err) + } + + servicesToEnable := make([]string, 0, len(services)) + for _, service := range services { + if _, ok := enabledServices[service]; !ok { + servicesToEnable = append(servicesToEnable, service) + } + } + + if len(servicesToEnable) > 0 { + if err := EnableServiceUsageProjectServices(servicesToEnable, projectID, "", config.UserAgent, config, 10*time.Minute); err != nil { + t.Fatalf("Error enabling services for project %q: %s", projectID, err) + } + } + } + + return project +} diff --git a/google/services/resourcemanager/data_source_google_service_account_access_token_test.go b/google/services/resourcemanager/data_source_google_service_account_access_token_test.go index 3fec69cb5a4..d8f6620b1de 100644 --- a/google/services/resourcemanager/data_source_google_service_account_access_token_test.go +++ b/google/services/resourcemanager/data_source_google_service_account_access_token_test.go @@ -23,6 +23,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/services/iambeta" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -50,7 +51,7 @@ func TestAccDataSourceGoogleServiceAccountAccessToken_basic(t *testing.T) { resourceName := "data.google_service_account_access_token.default" serviceAccount := envvar.GetTestServiceAccountFromEnv(t) - targetServiceAccountEmail := acctest.BootstrapServiceAccount(t, "acctoken", serviceAccount) + targetServiceAccountEmail := iambeta.BootstrapServiceAccount(t, "acctoken", serviceAccount) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, diff --git a/google/services/resourcemanager/data_source_google_service_account_id_token_test.go b/google/services/resourcemanager/data_source_google_service_account_id_token_test.go index 491952ce158..c3a8620e9a5 100644 --- a/google/services/resourcemanager/data_source_google_service_account_id_token_test.go +++ b/google/services/resourcemanager/data_source_google_service_account_id_token_test.go @@ -28,6 +28,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/services/iambeta" ) const targetAudience = "https://foo.bar/" @@ -89,7 +90,7 @@ func TestAccDataSourceGoogleServiceAccountIdToken_impersonation(t *testing.T) { resourceName := "data.google_service_account_id_token.default" serviceAccount := envvar.GetTestServiceAccountFromEnv(t) - targetServiceAccountEmail := acctest.BootstrapServiceAccount(t, "idtoken-imp", serviceAccount) + targetServiceAccountEmail := iambeta.BootstrapServiceAccount(t, "idtoken-imp", serviceAccount) resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, diff --git a/google/services/resourcemanager/data_source_google_service_account_jwt_test.go b/google/services/resourcemanager/data_source_google_service_account_jwt_test.go index 84e07f9be2b..99a767a87ab 100644 --- a/google/services/resourcemanager/data_source_google_service_account_jwt_test.go +++ b/google/services/resourcemanager/data_source_google_service_account_jwt_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/services/iambeta" "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" ) @@ -116,7 +117,7 @@ func TestAccDataSourceGoogleServiceAccountJwt(t *testing.T) { resourceName := "data.google_service_account_jwt.default" serviceAccount := envvar.GetTestServiceAccountFromEnv(t) - targetServiceAccountEmail := acctest.BootstrapServiceAccount(t, "jwt", serviceAccount) + targetServiceAccountEmail := iambeta.BootstrapServiceAccount(t, "jwt", serviceAccount) staticTime := time.Now() diff --git a/google/services/resourcemanager/ephemeral_google_service_account_access_token_test.go b/google/services/resourcemanager/ephemeral_google_service_account_access_token_test.go index a2ce8e4ed02..aed56a73e02 100644 --- a/google/services/resourcemanager/ephemeral_google_service_account_access_token_test.go +++ b/google/services/resourcemanager/ephemeral_google_service_account_access_token_test.go @@ -22,6 +22,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/services/iambeta" ) var defaultMaxLifetime string = "3600s" @@ -30,7 +31,7 @@ func TestAccEphemeralServiceAccountToken_basic(t *testing.T) { t.Parallel() serviceAccount := envvar.GetTestServiceAccountFromEnv(t) - targetServiceAccountEmail := acctest.BootstrapServiceAccount(t, "basic", serviceAccount) + targetServiceAccountEmail := iambeta.BootstrapServiceAccount(t, "basic", serviceAccount) context := map[string]interface{}{ "ephemeral_resource_name": "token", @@ -63,9 +64,9 @@ func TestAccEphemeralServiceAccountToken_withDelegates(t *testing.T) { t.Parallel() initialServiceAccount := envvar.GetTestServiceAccountFromEnv(t) - delegateServiceAccountEmailOne := acctest.BootstrapServiceAccount(t, "delegate1", initialServiceAccount) // SA_2 - delegateServiceAccountEmailTwo := acctest.BootstrapServiceAccount(t, "delegate2", delegateServiceAccountEmailOne) // SA_3 - targetServiceAccountEmail := acctest.BootstrapServiceAccount(t, "target", delegateServiceAccountEmailTwo) // SA_4 + delegateServiceAccountEmailOne := iambeta.BootstrapServiceAccount(t, "delegate1", initialServiceAccount) // SA_2 + delegateServiceAccountEmailTwo := iambeta.BootstrapServiceAccount(t, "delegate2", delegateServiceAccountEmailOne) // SA_3 + targetServiceAccountEmail := iambeta.BootstrapServiceAccount(t, "target", delegateServiceAccountEmailTwo) // SA_4 context := map[string]interface{}{ "ephemeral_resource_name": "token", @@ -98,7 +99,7 @@ func TestAccEphemeralServiceAccountToken_withCustomLifetime(t *testing.T) { t.Parallel() serviceAccount := envvar.GetTestServiceAccountFromEnv(t) - targetServiceAccountEmail := acctest.BootstrapServiceAccount(t, "lifetime", serviceAccount) + targetServiceAccountEmail := iambeta.BootstrapServiceAccount(t, "lifetime", serviceAccount) context := map[string]interface{}{ "ephemeral_resource_name": "token", diff --git a/google/services/resourcemanager/ephemeral_google_service_account_id_token_test.go b/google/services/resourcemanager/ephemeral_google_service_account_id_token_test.go index 09075413e6c..9e810bf3248 100644 --- a/google/services/resourcemanager/ephemeral_google_service_account_id_token_test.go +++ b/google/services/resourcemanager/ephemeral_google_service_account_id_token_test.go @@ -23,13 +23,14 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/services/iambeta" ) func TestAccEphemeralServiceAccountIdToken_basic(t *testing.T) { t.Parallel() serviceAccount := envvar.GetTestServiceAccountFromEnv(t) - targetServiceAccountEmail := acctest.BootstrapServiceAccount(t, "idtoken", serviceAccount) + targetServiceAccountEmail := iambeta.BootstrapServiceAccount(t, "idtoken", serviceAccount) resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -46,9 +47,9 @@ func TestAccEphemeralServiceAccountIdToken_withDelegates(t *testing.T) { t.Parallel() initialServiceAccount := envvar.GetTestServiceAccountFromEnv(t) - delegateServiceAccountEmailOne := acctest.BootstrapServiceAccount(t, "id-delegate1", initialServiceAccount) // SA_2 - delegateServiceAccountEmailTwo := acctest.BootstrapServiceAccount(t, "id-delegate2", delegateServiceAccountEmailOne) // SA_3 - targetServiceAccountEmail := acctest.BootstrapServiceAccount(t, "id-target", delegateServiceAccountEmailTwo) // SA_4 + delegateServiceAccountEmailOne := iambeta.BootstrapServiceAccount(t, "id-delegate1", initialServiceAccount) // SA_2 + delegateServiceAccountEmailTwo := iambeta.BootstrapServiceAccount(t, "id-delegate2", delegateServiceAccountEmailOne) // SA_3 + targetServiceAccountEmail := iambeta.BootstrapServiceAccount(t, "id-target", delegateServiceAccountEmailTwo) // SA_4 resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -65,7 +66,7 @@ func TestAccEphemeralServiceAccountIdToken_withEmptyDelegates(t *testing.T) { t.Parallel() initialServiceAccount := envvar.GetTestServiceAccountFromEnv(t) - targetServiceAccountEmail := acctest.BootstrapServiceAccount(t, "no-del", initialServiceAccount) // SA_4 + targetServiceAccountEmail := iambeta.BootstrapServiceAccount(t, "no-del", initialServiceAccount) // SA_4 resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -85,7 +86,7 @@ func TestAccEphemeralServiceAccountIdToken_withIncludeEmail(t *testing.T) { t.Parallel() serviceAccount := envvar.GetTestServiceAccountFromEnv(t) - targetServiceAccountEmail := acctest.BootstrapServiceAccount(t, "idtoken-email", serviceAccount) + targetServiceAccountEmail := iambeta.BootstrapServiceAccount(t, "idtoken-email", serviceAccount) resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, diff --git a/google/services/resourcemanager/ephemeral_google_service_account_jwt_test.go b/google/services/resourcemanager/ephemeral_google_service_account_jwt_test.go index 22010135ab7..0cf7b577d05 100644 --- a/google/services/resourcemanager/ephemeral_google_service_account_jwt_test.go +++ b/google/services/resourcemanager/ephemeral_google_service_account_jwt_test.go @@ -22,13 +22,14 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/services/iambeta" ) func TestAccEphemeralServiceAccountJwt_basic(t *testing.T) { t.Parallel() serviceAccount := envvar.GetTestServiceAccountFromEnv(t) - targetServiceAccountEmail := acctest.BootstrapServiceAccount(t, "jwt-basic", serviceAccount) + targetServiceAccountEmail := iambeta.BootstrapServiceAccount(t, "jwt-basic", serviceAccount) context := map[string]interface{}{ "ephemeral_resource_name": "jwt", @@ -61,9 +62,9 @@ func TestAccEphemeralServiceAccountJwt_withDelegates(t *testing.T) { t.Parallel() initialServiceAccount := envvar.GetTestServiceAccountFromEnv(t) - delegateServiceAccountEmailOne := acctest.BootstrapServiceAccount(t, "jwt-delegate1", initialServiceAccount) // SA_2 - delegateServiceAccountEmailTwo := acctest.BootstrapServiceAccount(t, "jwt-delegate2", delegateServiceAccountEmailOne) // SA_3 - targetServiceAccountEmail := acctest.BootstrapServiceAccount(t, "jwt-target", delegateServiceAccountEmailTwo) // SA_4 + delegateServiceAccountEmailOne := iambeta.BootstrapServiceAccount(t, "jwt-delegate1", initialServiceAccount) // SA_2 + delegateServiceAccountEmailTwo := iambeta.BootstrapServiceAccount(t, "jwt-delegate2", delegateServiceAccountEmailOne) // SA_3 + targetServiceAccountEmail := iambeta.BootstrapServiceAccount(t, "jwt-target", delegateServiceAccountEmailTwo) // SA_4 context := map[string]interface{}{ "ephemeral_resource_name": "jwt", @@ -97,7 +98,7 @@ func TestAccEphemeralServiceAccountJwt_withExpiresIn(t *testing.T) { t.Parallel() serviceAccount := envvar.GetTestServiceAccountFromEnv(t) - targetServiceAccountEmail := acctest.BootstrapServiceAccount(t, "expiry", serviceAccount) + targetServiceAccountEmail := iambeta.BootstrapServiceAccount(t, "expiry", serviceAccount) context := map[string]interface{}{ "ephemeral_resource_name": "jwt", diff --git a/google/services/resourcemanager/ephemeral_google_service_account_key_test.go b/google/services/resourcemanager/ephemeral_google_service_account_key_test.go index 284c9ba8941..f607206a9bb 100644 --- a/google/services/resourcemanager/ephemeral_google_service_account_key_test.go +++ b/google/services/resourcemanager/ephemeral_google_service_account_key_test.go @@ -23,6 +23,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/services/iambeta" ) func TestAccEphemeralServiceAccountKey_create(t *testing.T) { @@ -143,7 +144,7 @@ func TestAccEphemeralServiceAccountKey_fetch(t *testing.T) { t.Parallel() serviceAccount := envvar.GetTestServiceAccountFromEnv(t) - targetServiceAccountEmail := acctest.BootstrapServiceAccount(t, "key-basic", serviceAccount) + targetServiceAccountEmail := iambeta.BootstrapServiceAccount(t, "key-basic", serviceAccount) resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), diff --git a/google/services/secretmanager/resource_secret_manager_secret_generated_test.go b/google/services/secretmanager/resource_secret_manager_secret_generated_test.go index 16190117a65..ea6bbca3dee 100644 --- a/google/services/secretmanager/resource_secret_manager_secret_generated_test.go +++ b/google/services/secretmanager/resource_secret_manager_secret_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/secretmanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/secretmanager/resource_secret_manager_secret_version_generated_test.go b/google/services/secretmanager/resource_secret_manager_secret_version_generated_test.go index 916085b4b26..ed8f554efbd 100644 --- a/google/services/secretmanager/resource_secret_manager_secret_version_generated_test.go +++ b/google/services/secretmanager/resource_secret_manager_secret_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/secretmanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/secretmanagerregional/resource_secret_manager_regional_secret_generated_test.go b/google/services/secretmanagerregional/resource_secret_manager_regional_secret_generated_test.go index b6b51bb3b26..47b693bd48b 100644 --- a/google/services/secretmanagerregional/resource_secret_manager_regional_secret_generated_test.go +++ b/google/services/secretmanagerregional/resource_secret_manager_regional_secret_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/secretmanagerregional" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/secretmanagerregional/resource_secret_manager_regional_secret_version_generated_test.go b/google/services/secretmanagerregional/resource_secret_manager_regional_secret_version_generated_test.go index 2203d2afe34..c4377614bec 100644 --- a/google/services/secretmanagerregional/resource_secret_manager_regional_secret_version_generated_test.go +++ b/google/services/secretmanagerregional/resource_secret_manager_regional_secret_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/secretmanagerregional" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/securesourcemanager/resource_secure_source_manager_branch_rule_generated_test.go b/google/services/securesourcemanager/resource_secure_source_manager_branch_rule_generated_test.go index 93099e6df8e..68bf432d454 100644 --- a/google/services/securesourcemanager/resource_secure_source_manager_branch_rule_generated_test.go +++ b/google/services/securesourcemanager/resource_secure_source_manager_branch_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/securesourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/securesourcemanager/resource_secure_source_manager_hook_generated_test.go b/google/services/securesourcemanager/resource_secure_source_manager_hook_generated_test.go index fabfe9f485d..295df260846 100644 --- a/google/services/securesourcemanager/resource_secure_source_manager_hook_generated_test.go +++ b/google/services/securesourcemanager/resource_secure_source_manager_hook_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/securesourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/securesourcemanager/resource_secure_source_manager_instance_generated_test.go b/google/services/securesourcemanager/resource_secure_source_manager_instance_generated_test.go index 734f1781b95..521ee17cd6e 100644 --- a/google/services/securesourcemanager/resource_secure_source_manager_instance_generated_test.go +++ b/google/services/securesourcemanager/resource_secure_source_manager_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/securesourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/securesourcemanager/resource_secure_source_manager_repository_generated_test.go b/google/services/securesourcemanager/resource_secure_source_manager_repository_generated_test.go index d13b08155b8..cb2505b183c 100644 --- a/google/services/securesourcemanager/resource_secure_source_manager_repository_generated_test.go +++ b/google/services/securesourcemanager/resource_secure_source_manager_repository_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/securesourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/securitycenter/resource_scc_mute_config_generated_test.go b/google/services/securitycenter/resource_scc_mute_config_generated_test.go index da207cc14c2..ed2a602fdd9 100644 --- a/google/services/securitycenter/resource_scc_mute_config_generated_test.go +++ b/google/services/securitycenter/resource_scc_mute_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/securitycenter" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/securitycenter/resource_scc_notification_config_generated_test.go b/google/services/securitycenter/resource_scc_notification_config_generated_test.go index 60cf1d66bf3..9587c5c47cc 100644 --- a/google/services/securitycenter/resource_scc_notification_config_generated_test.go +++ b/google/services/securitycenter/resource_scc_notification_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/securitycenter" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/securitycenter/resource_scc_project_notification_config_generated_test.go b/google/services/securitycenter/resource_scc_project_notification_config_generated_test.go index 0bcc5ce20ea..2787c877e08 100644 --- a/google/services/securitycenter/resource_scc_project_notification_config_generated_test.go +++ b/google/services/securitycenter/resource_scc_project_notification_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/securitycenter" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/securitycenterv2/resource_scc_v2_organization_mute_config_generated_test.go b/google/services/securitycenterv2/resource_scc_v2_organization_mute_config_generated_test.go index 8062c6f67e8..2bfcc542767 100644 --- a/google/services/securitycenterv2/resource_scc_v2_organization_mute_config_generated_test.go +++ b/google/services/securitycenterv2/resource_scc_v2_organization_mute_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/securitycenterv2" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/securitycenterv2/resource_scc_v2_organization_notification_config_generated_test.go b/google/services/securitycenterv2/resource_scc_v2_organization_notification_config_generated_test.go index 5269b0312a8..2523812cc73 100644 --- a/google/services/securitycenterv2/resource_scc_v2_organization_notification_config_generated_test.go +++ b/google/services/securitycenterv2/resource_scc_v2_organization_notification_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/securitycenterv2" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/securitycenterv2/resource_scc_v2_project_notification_config_generated_test.go b/google/services/securitycenterv2/resource_scc_v2_project_notification_config_generated_test.go index e3ced5515c1..eca65866391 100644 --- a/google/services/securitycenterv2/resource_scc_v2_project_notification_config_generated_test.go +++ b/google/services/securitycenterv2/resource_scc_v2_project_notification_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/securitycenterv2" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/securityposture/resource_securityposture_posture_generated_test.go b/google/services/securityposture/resource_securityposture_posture_generated_test.go index c2e17947fa6..615e3b38548 100644 --- a/google/services/securityposture/resource_securityposture_posture_generated_test.go +++ b/google/services/securityposture/resource_securityposture_posture_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/securityposture" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/servicedirectory/resource_service_directory_endpoint_generated_test.go b/google/services/servicedirectory/resource_service_directory_endpoint_generated_test.go index 98a05acdfa0..9ecd8cec1c1 100644 --- a/google/services/servicedirectory/resource_service_directory_endpoint_generated_test.go +++ b/google/services/servicedirectory/resource_service_directory_endpoint_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/servicedirectory" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/servicedirectory/resource_service_directory_namespace_generated_test.go b/google/services/servicedirectory/resource_service_directory_namespace_generated_test.go index 3fa56f4c2f2..0ef5f2fe416 100644 --- a/google/services/servicedirectory/resource_service_directory_namespace_generated_test.go +++ b/google/services/servicedirectory/resource_service_directory_namespace_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/servicedirectory" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/servicedirectory/resource_service_directory_service_generated_test.go b/google/services/servicedirectory/resource_service_directory_service_generated_test.go index 6878e65adfd..3e65ee8335b 100644 --- a/google/services/servicedirectory/resource_service_directory_service_generated_test.go +++ b/google/services/servicedirectory/resource_service_directory_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/servicedirectory" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/servicenetworking/resource_service_networking_vpc_service_controls_generated_test.go b/google/services/servicenetworking/resource_service_networking_vpc_service_controls_generated_test.go index 33636d1ee0c..e989f937d79 100644 --- a/google/services/servicenetworking/resource_service_networking_vpc_service_controls_generated_test.go +++ b/google/services/servicenetworking/resource_service_networking_vpc_service_controls_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/servicenetworking" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/sourcerepo/resource_sourcerepo_repository_generated_test.go b/google/services/sourcerepo/resource_sourcerepo_repository_generated_test.go index c0f167ffd27..941e92e173b 100644 --- a/google/services/sourcerepo/resource_sourcerepo_repository_generated_test.go +++ b/google/services/sourcerepo/resource_sourcerepo_repository_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/sourcerepo" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/spanner/resource_spanner_backup_schedule_generated_test.go b/google/services/spanner/resource_spanner_backup_schedule_generated_test.go index cd9a4ed12ab..06c7366c152 100644 --- a/google/services/spanner/resource_spanner_backup_schedule_generated_test.go +++ b/google/services/spanner/resource_spanner_backup_schedule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/spanner" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/spanner/resource_spanner_database_generated_test.go b/google/services/spanner/resource_spanner_database_generated_test.go index 5ef7383dfd0..6b723c6a1b0 100644 --- a/google/services/spanner/resource_spanner_database_generated_test.go +++ b/google/services/spanner/resource_spanner_database_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/spanner" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/spanner/resource_spanner_database_test.go b/google/services/spanner/resource_spanner_database_test.go index b2b2c387c02..ac290e5a192 100644 --- a/google/services/spanner/resource_spanner_database_test.go +++ b/google/services/spanner/resource_spanner_database_test.go @@ -25,6 +25,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" ) func TestAccSpannerDatabase_basic(t *testing.T) { @@ -643,7 +644,7 @@ resource "google_spanner_database" "database" { func TestAccSpannerDatabase_cmek(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-spanner.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/spanner/resource_spanner_instance_config_generated_test.go b/google/services/spanner/resource_spanner_instance_config_generated_test.go index ef64a94c6e1..04d9216e42e 100644 --- a/google/services/spanner/resource_spanner_instance_config_generated_test.go +++ b/google/services/spanner/resource_spanner_instance_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/spanner" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/spanner/resource_spanner_instance_generated_test.go b/google/services/spanner/resource_spanner_instance_generated_test.go index 0ea66cb05fb..08a4090e982 100644 --- a/google/services/spanner/resource_spanner_instance_generated_test.go +++ b/google/services/spanner/resource_spanner_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/spanner" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/spanner/resource_spanner_instance_partition_generated_test.go b/google/services/spanner/resource_spanner_instance_partition_generated_test.go index 72f33d7cd50..878e2cb70a0 100644 --- a/google/services/spanner/resource_spanner_instance_partition_generated_test.go +++ b/google/services/spanner/resource_spanner_instance_partition_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/spanner" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/sql/resource_sql_database_generated_test.go b/google/services/sql/resource_sql_database_generated_test.go index c5c8fa0aa46..cda9815c469 100644 --- a/google/services/sql/resource_sql_database_generated_test.go +++ b/google/services/sql/resource_sql_database_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/sql" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/sql/resource_sql_source_representation_instance_generated_test.go b/google/services/sql/resource_sql_source_representation_instance_generated_test.go index dfef0e2e0a5..8d8084008de 100644 --- a/google/services/sql/resource_sql_source_representation_instance_generated_test.go +++ b/google/services/sql/resource_sql_source_representation_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/sql" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/storage/resource_storage_anywhere_cache_generated_test.go b/google/services/storage/resource_storage_anywhere_cache_generated_test.go index 7b12a4a5a19..55eb5d7049a 100644 --- a/google/services/storage/resource_storage_anywhere_cache_generated_test.go +++ b/google/services/storage/resource_storage_anywhere_cache_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/storage" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/storage/resource_storage_bucket_access_control_generated_test.go b/google/services/storage/resource_storage_bucket_access_control_generated_test.go index 99e727b795b..298a658e7b8 100644 --- a/google/services/storage/resource_storage_bucket_access_control_generated_test.go +++ b/google/services/storage/resource_storage_bucket_access_control_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/storage" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/storage/resource_storage_default_object_access_control_generated_test.go b/google/services/storage/resource_storage_default_object_access_control_generated_test.go index 93ba5133cd9..906848a276b 100644 --- a/google/services/storage/resource_storage_default_object_access_control_generated_test.go +++ b/google/services/storage/resource_storage_default_object_access_control_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/storage" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/storage/resource_storage_folder_generated_test.go b/google/services/storage/resource_storage_folder_generated_test.go index ba3288978a9..3912b0184df 100644 --- a/google/services/storage/resource_storage_folder_generated_test.go +++ b/google/services/storage/resource_storage_folder_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/storage" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/storage/resource_storage_hmac_key_generated_test.go b/google/services/storage/resource_storage_hmac_key_generated_test.go index 0a01c8e6d7a..056a77622a2 100644 --- a/google/services/storage/resource_storage_hmac_key_generated_test.go +++ b/google/services/storage/resource_storage_hmac_key_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/storage" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/storage/resource_storage_managed_folder_generated_test.go b/google/services/storage/resource_storage_managed_folder_generated_test.go index 1d1c347f046..b1bc860d45a 100644 --- a/google/services/storage/resource_storage_managed_folder_generated_test.go +++ b/google/services/storage/resource_storage_managed_folder_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/storage" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/storage/resource_storage_object_access_control_generated_test.go b/google/services/storage/resource_storage_object_access_control_generated_test.go index 4f23a12417c..af272960f34 100644 --- a/google/services/storage/resource_storage_object_access_control_generated_test.go +++ b/google/services/storage/resource_storage_object_access_control_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/storage" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/storagebatchoperations/resource_storage_batch_operations_job_generated_test.go b/google/services/storagebatchoperations/resource_storage_batch_operations_job_generated_test.go index f2c6131821a..59cc99a7f86 100644 --- a/google/services/storagebatchoperations/resource_storage_batch_operations_job_generated_test.go +++ b/google/services/storagebatchoperations/resource_storage_batch_operations_job_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/storagebatchoperations" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/storagecontrol/data_source_storage_control_project_intelligence_config_test.go b/google/services/storagecontrol/data_source_storage_control_project_intelligence_config_test.go index 71115ff319e..cc986824763 100644 --- a/google/services/storagecontrol/data_source_storage_control_project_intelligence_config_test.go +++ b/google/services/storagecontrol/data_source_storage_control_project_intelligence_config_test.go @@ -22,6 +22,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" ) func TestAccDataSourceGoogleStorageControlProjectIntelligenceConfig_basic(t *testing.T) { @@ -29,7 +30,7 @@ func TestAccDataSourceGoogleStorageControlProjectIntelligenceConfig_basic(t *tes context := map[string]interface{}{ "random_suffix": acctest.RandString(t, 10), - "project": acctest.BootstrapProject(t, "tf-boot-stor-int-", envvar.GetTestBillingAccountFromEnv(t), []string{"storage.googleapis.com"}).ProjectId, + "project": resourcemanager.BootstrapProject(t, "tf-boot-stor-int-", envvar.GetTestBillingAccountFromEnv(t), []string{"storage.googleapis.com"}).ProjectId, } acctest.VcrTest(t, resource.TestCase{ diff --git a/google/services/storagecontrol/resource_storage_control_project_intelligence_config_test.go b/google/services/storagecontrol/resource_storage_control_project_intelligence_config_test.go index 8b52fdd9722..33baf89d0f1 100644 --- a/google/services/storagecontrol/resource_storage_control_project_intelligence_config_test.go +++ b/google/services/storagecontrol/resource_storage_control_project_intelligence_config_test.go @@ -22,13 +22,14 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" ) func TestAccStorageControlProjectIntelligenceConfig_update(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "project": acctest.BootstrapProject(t, "tf-boot-stor-int-", envvar.GetTestBillingAccountFromEnv(t), []string{"storage.googleapis.com"}).ProjectId, + "project": resourcemanager.BootstrapProject(t, "tf-boot-stor-int-", envvar.GetTestBillingAccountFromEnv(t), []string{"storage.googleapis.com"}).ProjectId, "random_suffix": acctest.RandString(t, 10), } diff --git a/google/services/storageinsights/resource_storage_insights_dataset_config_generated_test.go b/google/services/storageinsights/resource_storage_insights_dataset_config_generated_test.go index 97beca59eb4..44c644a9da8 100644 --- a/google/services/storageinsights/resource_storage_insights_dataset_config_generated_test.go +++ b/google/services/storageinsights/resource_storage_insights_dataset_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/storageinsights" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/storageinsights/resource_storage_insights_report_config_generated_test.go b/google/services/storageinsights/resource_storage_insights_report_config_generated_test.go index 4380b34aabd..e4e23098a1e 100644 --- a/google/services/storageinsights/resource_storage_insights_report_config_generated_test.go +++ b/google/services/storageinsights/resource_storage_insights_report_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/storageinsights" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/storagetransfer/resource_storage_transfer_job_test.go b/google/services/storagetransfer/resource_storage_transfer_job_test.go index 9b1e449e6b0..70f81e9e568 100644 --- a/google/services/storagetransfer/resource_storage_transfer_job_test.go +++ b/google/services/storagetransfer/resource_storage_transfer_job_test.go @@ -24,6 +24,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-provider-google/google/services/storagetransfer" ) @@ -130,7 +131,7 @@ func TestAccStorageTransferJob_updateLoggingConfig(t *testing.T) { func TestAccStorageTransferReplicationJob_basic(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gs-project-accounts.iam.gserviceaccount.com", Role: "roles/pubsub.publisher", @@ -264,7 +265,7 @@ func TestAccStorageTransferJob_omitScheduleEndDate(t *testing.T) { func TestAccStorageTransferJob_posixSource(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:project-{project_number}@storage-transfer-service.iam.gserviceaccount.com", Role: "roles/pubsub.admin", @@ -302,7 +303,7 @@ func TestAccStorageTransferJob_posixSource(t *testing.T) { func TestAccStorageTransferJob_posixSink(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:project-{project_number}@storage-transfer-service.iam.gserviceaccount.com", Role: "roles/pubsub.admin", @@ -560,7 +561,7 @@ func TestAccStorageTransferJob_notificationConfig(t *testing.T) { func TestAccStorageTransferJob_hdfsSource(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:project-{project_number}@storage-transfer-service.iam.gserviceaccount.com", Role: "roles/pubsub.admin", diff --git a/google/services/transcoder/resource_transcoder_job_generated_test.go b/google/services/transcoder/resource_transcoder_job_generated_test.go index 04866754001..b6f895142ea 100644 --- a/google/services/transcoder/resource_transcoder_job_generated_test.go +++ b/google/services/transcoder/resource_transcoder_job_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/transcoder" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/transcoder/resource_transcoder_job_template_generated_test.go b/google/services/transcoder/resource_transcoder_job_template_generated_test.go index b188afd26b1..13716bcaa31 100644 --- a/google/services/transcoder/resource_transcoder_job_template_generated_test.go +++ b/google/services/transcoder/resource_transcoder_job_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/transcoder" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vectorsearch/resource_vector_search_collection_generated_test.go b/google/services/vectorsearch/resource_vector_search_collection_generated_test.go index ea269b095f1..9ab61c9aa26 100644 --- a/google/services/vectorsearch/resource_vector_search_collection_generated_test.go +++ b/google/services/vectorsearch/resource_vector_search_collection_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vectorsearch" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vertexai/resource_vertex_ai_cache_config_generated_test.go b/google/services/vertexai/resource_vertex_ai_cache_config_generated_test.go index 66208f9336d..ac2343a22f6 100644 --- a/google/services/vertexai/resource_vertex_ai_cache_config_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_cache_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vertexai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vertexai/resource_vertex_ai_dataset_generated_test.go b/google/services/vertexai/resource_vertex_ai_dataset_generated_test.go index 11c5c66c3cd..d2718558e42 100644 --- a/google/services/vertexai/resource_vertex_ai_dataset_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_dataset_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vertexai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vertexai/resource_vertex_ai_deployment_resource_pool_generated_test.go b/google/services/vertexai/resource_vertex_ai_deployment_resource_pool_generated_test.go index f6d1f1858b2..8aa9cf8257a 100644 --- a/google/services/vertexai/resource_vertex_ai_deployment_resource_pool_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_deployment_resource_pool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vertexai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vertexai/resource_vertex_ai_endpoint_generated_test.go b/google/services/vertexai/resource_vertex_ai_endpoint_generated_test.go index 34c46fca6ca..d4c7f1979d9 100644 --- a/google/services/vertexai/resource_vertex_ai_endpoint_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_endpoint_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vertexai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vertexai/resource_vertex_ai_feature_group_feature_generated_test.go b/google/services/vertexai/resource_vertex_ai_feature_group_feature_generated_test.go index b9bd6c971a0..065fd35f8e4 100644 --- a/google/services/vertexai/resource_vertex_ai_feature_group_feature_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_feature_group_feature_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vertexai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vertexai/resource_vertex_ai_feature_group_generated_test.go b/google/services/vertexai/resource_vertex_ai_feature_group_generated_test.go index 4fe6b9c94f8..796eadfaaf5 100644 --- a/google/services/vertexai/resource_vertex_ai_feature_group_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_feature_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vertexai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vertexai/resource_vertex_ai_feature_online_store_featureview_generated_test.go b/google/services/vertexai/resource_vertex_ai_feature_online_store_featureview_generated_test.go index cc188401286..41b8c0b7ddd 100644 --- a/google/services/vertexai/resource_vertex_ai_feature_online_store_featureview_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_feature_online_store_featureview_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vertexai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vertexai/resource_vertex_ai_feature_online_store_generated_test.go b/google/services/vertexai/resource_vertex_ai_feature_online_store_generated_test.go index b5e58cb71ce..915bb54d43c 100644 --- a/google/services/vertexai/resource_vertex_ai_feature_online_store_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_feature_online_store_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vertexai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vertexai/resource_vertex_ai_featurestore_entitytype_feature_generated_test.go b/google/services/vertexai/resource_vertex_ai_featurestore_entitytype_feature_generated_test.go index dbef78f0d37..5081a052e95 100644 --- a/google/services/vertexai/resource_vertex_ai_featurestore_entitytype_feature_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_featurestore_entitytype_feature_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vertexai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vertexai/resource_vertex_ai_featurestore_entitytype_generated_test.go b/google/services/vertexai/resource_vertex_ai_featurestore_entitytype_generated_test.go index 606813cc193..1a066ea09b0 100644 --- a/google/services/vertexai/resource_vertex_ai_featurestore_entitytype_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_featurestore_entitytype_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vertexai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vertexai/resource_vertex_ai_featurestore_generated_test.go b/google/services/vertexai/resource_vertex_ai_featurestore_generated_test.go index fb2cf6140c5..aafeaec67ff 100644 --- a/google/services/vertexai/resource_vertex_ai_featurestore_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_featurestore_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vertexai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vertexai/resource_vertex_ai_index_endpoint_deployed_index_generated_test.go b/google/services/vertexai/resource_vertex_ai_index_endpoint_deployed_index_generated_test.go index b09e2d7b6e8..adb33f9e9e5 100644 --- a/google/services/vertexai/resource_vertex_ai_index_endpoint_deployed_index_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_index_endpoint_deployed_index_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vertexai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vertexai/resource_vertex_ai_index_endpoint_generated_test.go b/google/services/vertexai/resource_vertex_ai_index_endpoint_generated_test.go index f09e96a7828..d6e454b20ce 100644 --- a/google/services/vertexai/resource_vertex_ai_index_endpoint_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_index_endpoint_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vertexai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vertexai/resource_vertex_ai_index_generated_test.go b/google/services/vertexai/resource_vertex_ai_index_generated_test.go index b08e57eaa0c..f572e5291cb 100644 --- a/google/services/vertexai/resource_vertex_ai_index_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_index_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vertexai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vertexai/resource_vertex_ai_reasoning_engine_generated_test.go b/google/services/vertexai/resource_vertex_ai_reasoning_engine_generated_test.go index 83b309d434e..6b6995b5305 100644 --- a/google/services/vertexai/resource_vertex_ai_reasoning_engine_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_reasoning_engine_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vertexai" + + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -423,7 +426,7 @@ resource "google_project_iam_member" "tenant_ar_reader" { func TestAccVertexAIReasoningEngine_vertexAiReasoningEngineFullExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-aiplatform.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/vertexai/resource_vertex_ai_reasoning_engine_test.go b/google/services/vertexai/resource_vertex_ai_reasoning_engine_test.go index b72e4129831..44f40f2dc37 100644 --- a/google/services/vertexai/resource_vertex_ai_reasoning_engine_test.go +++ b/google/services/vertexai/resource_vertex_ai_reasoning_engine_test.go @@ -24,12 +24,13 @@ import ( "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" ) func TestAccVertexAIReasoningEngine_vertexAiReasoningEngineUpdate(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-aiplatform.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/vertexai/resource_vertex_ai_tensorboard_generated_test.go b/google/services/vertexai/resource_vertex_ai_tensorboard_generated_test.go index fd8bd76c392..51aa93be401 100644 --- a/google/services/vertexai/resource_vertex_ai_tensorboard_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_tensorboard_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vertexai" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vmwareengine/resource_vmwareengine_cluster_test.go b/google/services/vmwareengine/resource_vmwareengine_cluster_test.go index 6a1b671f42f..955a39eca61 100644 --- a/google/services/vmwareengine/resource_vmwareengine_cluster_test.go +++ b/google/services/vmwareengine/resource_vmwareengine_cluster_test.go @@ -28,6 +28,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-provider-google/google/services/servicenetworking" "github.com/hashicorp/terraform-provider-google/google/services/vmwareengine" "github.com/hashicorp/terraform-provider-google/google/tpgresource" @@ -38,7 +39,7 @@ func TestAccVmwareengineCluster_vmwareEngineClusterUpdate(t *testing.T) { acctest.SkipIfVcr(t) t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-vmwareengine.iam.gserviceaccount.com", Role: "roles/file.viewer", diff --git a/google/services/vmwareengine/resource_vmwareengine_datastore_test.go b/google/services/vmwareengine/resource_vmwareengine_datastore_test.go index 9d3f3db6cd3..68b8666c0be 100644 --- a/google/services/vmwareengine/resource_vmwareengine_datastore_test.go +++ b/google/services/vmwareengine/resource_vmwareengine_datastore_test.go @@ -27,6 +27,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-provider-google/google/services/servicenetworking" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -92,7 +93,7 @@ resource "google_vmwareengine_datastore" "example_thirdparty" { func TestAccVmwareengineDatastore_vmwareEngineDatastoreFilestore_update(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-vmwareengine.iam.gserviceaccount.com", Role: "roles/file.viewer", @@ -180,7 +181,7 @@ resource "google_vmwareengine_datastore" "example_filestore" { func TestAccVmwareengineDatastore_vmwareEngineDatastoreNetapp_update(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-vmwareengine.iam.gserviceaccount.com", Role: "roles/netapp.viewer", diff --git a/google/services/vmwareengine/resource_vmwareengine_network_generated_test.go b/google/services/vmwareengine/resource_vmwareengine_network_generated_test.go index 00bc5e989b9..79f2e295749 100644 --- a/google/services/vmwareengine/resource_vmwareengine_network_generated_test.go +++ b/google/services/vmwareengine/resource_vmwareengine_network_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vmwareengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vmwareengine/resource_vmwareengine_network_peering_generated_test.go b/google/services/vmwareengine/resource_vmwareengine_network_peering_generated_test.go index 372107a2c6c..803882682c0 100644 --- a/google/services/vmwareengine/resource_vmwareengine_network_peering_generated_test.go +++ b/google/services/vmwareengine/resource_vmwareengine_network_peering_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vmwareengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vmwareengine/resource_vmwareengine_network_policy_generated_test.go b/google/services/vmwareengine/resource_vmwareengine_network_policy_generated_test.go index 59affeee8a2..89ad871bad7 100644 --- a/google/services/vmwareengine/resource_vmwareengine_network_policy_generated_test.go +++ b/google/services/vmwareengine/resource_vmwareengine_network_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vmwareengine" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/vpcaccess/resource_vpc_access_connector_generated_test.go b/google/services/vpcaccess/resource_vpc_access_connector_generated_test.go index edad2788f18..c9bb44de88e 100644 --- a/google/services/vpcaccess/resource_vpc_access_connector_generated_test.go +++ b/google/services/vpcaccess/resource_vpc_access_connector_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/vpcaccess" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/workbench/resource_workbench_instance_generated_test.go b/google/services/workbench/resource_workbench_instance_generated_test.go index 70e020db44d..3a08bdb65c1 100644 --- a/google/services/workbench/resource_workbench_instance_generated_test.go +++ b/google/services/workbench/resource_workbench_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/workbench" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/workflows/resource_workflows_workflow_generated_test.go b/google/services/workflows/resource_workflows_workflow_generated_test.go index 75689c4d851..d5144b60d0e 100644 --- a/google/services/workflows/resource_workflows_workflow_generated_test.go +++ b/google/services/workflows/resource_workflows_workflow_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/workflows" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/workflows/resource_workflows_workflow_test.go b/google/services/workflows/resource_workflows_workflow_test.go index bca3d7e84f7..24025239e42 100644 --- a/google/services/workflows/resource_workflows_workflow_test.go +++ b/google/services/workflows/resource_workflows_workflow_test.go @@ -25,6 +25,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/services/kms" + "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager" "github.com/hashicorp/terraform-provider-google/google/services/workflows" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) @@ -311,7 +312,7 @@ func TestAccWorkflowsWorkflow_CMEK(t *testing.T) { workflowName := fmt.Sprintf("tf-test-acc-workflow-%d", acctest.RandInt(t)) bootstrapped := kms.BootstrapKMSKeyInLocation(t, "us-central1") - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-workflows.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google/services/workloadidentity/resource_workload_identity_service_agent_generated_test.go b/google/services/workloadidentity/resource_workload_identity_service_agent_generated_test.go index 0e9240c8f93..bd94ea45261 100644 --- a/google/services/workloadidentity/resource_workload_identity_service_agent_generated_test.go +++ b/google/services/workloadidentity/resource_workload_identity_service_agent_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/workloadidentity" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/workstations/resource_workstations_workstation_cluster_generated_test.go b/google/services/workstations/resource_workstations_workstation_cluster_generated_test.go index 6109fbbfea8..3bae4ce9d41 100644 --- a/google/services/workstations/resource_workstations_workstation_cluster_generated_test.go +++ b/google/services/workstations/resource_workstations_workstation_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/workstations" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/workstations/resource_workstations_workstation_config_generated_test.go b/google/services/workstations/resource_workstations_workstation_config_generated_test.go index b81c177176f..2a2e8bb8e00 100644 --- a/google/services/workstations/resource_workstations_workstation_config_generated_test.go +++ b/google/services/workstations/resource_workstations_workstation_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/workstations" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" diff --git a/google/services/workstations/resource_workstations_workstation_generated_test.go b/google/services/workstations/resource_workstations_workstation_generated_test.go index 409f301eb90..6f9b1cc37b9 100644 --- a/google/services/workstations/resource_workstations_workstation_generated_test.go +++ b/google/services/workstations/resource_workstations_workstation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/workstations" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"