diff --git a/google-beta/acctest/bootstrap_test_utils.go b/google-beta/acctest/bootstrap_test_utils.go deleted file mode 100644 index 27f99cd9b8c..00000000000 --- a/google-beta/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-beta/google-beta/envvar" - tpgcloudbilling "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudbilling" - "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iambeta" - "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" - rmClient "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager/client" - "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanagerv3" - "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" - transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/acctest/provider_test_utils.go b/google-beta/acctest/provider_test_utils.go index b734a407df9..c5ba3f44948 100644 --- a/google-beta/acctest/provider_test_utils.go +++ b/google-beta/acctest/provider_test_utils.go @@ -38,6 +38,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/provider" tpgcloudbilling "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudbilling" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iambeta" tpgiamcredentials "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iamcredentials" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" rmClient "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_egress_policy_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_egress_policy_test.go index 07ef751b7ee..2f7b05112c4 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_egress_policy_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/accesscontextmanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iambeta" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + rmClient "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager/client" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_ingress_policy_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_ingress_policy_test.go index f69f424991b..f769a078740 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_ingress_policy_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/accesscontextmanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iambeta" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource_test.go index f550851ca6e..ade12e51acc 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource_test.go +++ b/google-beta/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-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy_test.go index 1cbed015e30..84e4ddea85f 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy_test.go +++ b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy_test.go @@ -26,6 +26,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/accesscontextmanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iambeta" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy_test.go index 28f7738760f..d62ff3b697d 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy_test.go +++ b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy_test.go @@ -26,6 +26,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/accesscontextmanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iambeta" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_resource_test.go b/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_resource_test.go index 0731276f754..21c69bb9e50 100644 --- a/google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_resource_test.go +++ b/google-beta/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-beta/services/alloydb/resource_alloydb_backup_generated_test.go b/google-beta/services/alloydb/resource_alloydb_backup_generated_test.go index df2a04a30ac..b4ac52aea3f 100644 --- a/google-beta/services/alloydb/resource_alloydb_backup_generated_test.go +++ b/google-beta/services/alloydb/resource_alloydb_backup_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/alloydb" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/alloydb/resource_alloydb_cluster_generated_test.go b/google-beta/services/alloydb/resource_alloydb_cluster_generated_test.go index d2feeb63d68..ac7a0a3cb30 100644 --- a/google-beta/services/alloydb/resource_alloydb_cluster_generated_test.go +++ b/google-beta/services/alloydb/resource_alloydb_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/alloydb" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/alloydb/resource_alloydb_instance_generated_test.go b/google-beta/services/alloydb/resource_alloydb_instance_generated_test.go index 3aee6c487c6..415bf3f1d4f 100644 --- a/google-beta/services/alloydb/resource_alloydb_instance_generated_test.go +++ b/google-beta/services/alloydb/resource_alloydb_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/alloydb" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/alloydb/resource_alloydb_user_generated_test.go b/google-beta/services/alloydb/resource_alloydb_user_generated_test.go index 50eb7b39e63..1894e2ce054 100644 --- a/google-beta/services/alloydb/resource_alloydb_user_generated_test.go +++ b/google-beta/services/alloydb/resource_alloydb_user_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/alloydb" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigateway/resource_api_gateway_api_config_generated_test.go b/google-beta/services/apigateway/resource_api_gateway_api_config_generated_test.go index f30fe9750eb..aec511308ee 100644 --- a/google-beta/services/apigateway/resource_api_gateway_api_config_generated_test.go +++ b/google-beta/services/apigateway/resource_api_gateway_api_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigateway" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigateway/resource_api_gateway_api_generated_test.go b/google-beta/services/apigateway/resource_api_gateway_api_generated_test.go index b258b570473..441b40c0435 100644 --- a/google-beta/services/apigateway/resource_api_gateway_api_generated_test.go +++ b/google-beta/services/apigateway/resource_api_gateway_api_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigateway" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigateway/resource_api_gateway_gateway_generated_test.go b/google-beta/services/apigateway/resource_api_gateway_gateway_generated_test.go index 528d67212bf..eb2191d4c4e 100644 --- a/google-beta/services/apigateway/resource_api_gateway_gateway_generated_test.go +++ b/google-beta/services/apigateway/resource_api_gateway_gateway_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigateway" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_addons_config_generated_test.go b/google-beta/services/apigee/resource_apigee_addons_config_generated_test.go index 8d7fd7bc56c..ac6eba65023 100644 --- a/google-beta/services/apigee/resource_apigee_addons_config_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_addons_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_api_deployment_generated_test.go b/google-beta/services/apigee/resource_apigee_api_deployment_generated_test.go index 41218675be1..a02b49c0d43 100644 --- a/google-beta/services/apigee/resource_apigee_api_deployment_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_api_deployment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_api_product_generated_test.go b/google-beta/services/apigee/resource_apigee_api_product_generated_test.go index 3661bc6f5f3..6efd4e1cad3 100644 --- a/google-beta/services/apigee/resource_apigee_api_product_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_api_product_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_app_group_generated_test.go b/google-beta/services/apigee/resource_apigee_app_group_generated_test.go index c8dd29bd16d..3ff13943d93 100644 --- a/google-beta/services/apigee/resource_apigee_app_group_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_app_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_control_plane_access_generated_test.go b/google-beta/services/apigee/resource_apigee_control_plane_access_generated_test.go index c4bc7c39d9a..2a75677f826 100644 --- a/google-beta/services/apigee/resource_apigee_control_plane_access_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_control_plane_access_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_data_collector_generated_test.go b/google-beta/services/apigee/resource_apigee_data_collector_generated_test.go index f9969ae2632..83ba39fa930 100644 --- a/google-beta/services/apigee/resource_apigee_data_collector_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_data_collector_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_developer_app_generated_test.go b/google-beta/services/apigee/resource_apigee_developer_app_generated_test.go index 6c5fd7ad2f9..cb97c1951a2 100644 --- a/google-beta/services/apigee/resource_apigee_developer_app_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_developer_app_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_developer_generated_test.go b/google-beta/services/apigee/resource_apigee_developer_generated_test.go index e6777bfe854..aa6d2b8112e 100644 --- a/google-beta/services/apigee/resource_apigee_developer_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_developer_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_dns_zone_generated_test.go b/google-beta/services/apigee/resource_apigee_dns_zone_generated_test.go index f1e06f6cad4..237fdfd6d58 100644 --- a/google-beta/services/apigee/resource_apigee_dns_zone_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_dns_zone_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_env_keystore_generated_test.go b/google-beta/services/apigee/resource_apigee_env_keystore_generated_test.go index 562e6a701ff..09197cb0c8e 100644 --- a/google-beta/services/apigee/resource_apigee_env_keystore_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_env_keystore_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_env_references_generated_test.go b/google-beta/services/apigee/resource_apigee_env_references_generated_test.go index 101a1623b9b..81026ea976d 100644 --- a/google-beta/services/apigee/resource_apigee_env_references_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_env_references_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_envgroup_attachment_generated_test.go b/google-beta/services/apigee/resource_apigee_envgroup_attachment_generated_test.go index 822c2226080..a2817fc39bf 100644 --- a/google-beta/services/apigee/resource_apigee_envgroup_attachment_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_envgroup_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_envgroup_generated_test.go b/google-beta/services/apigee/resource_apigee_envgroup_generated_test.go index bbca94a42d9..146a0d3d4b8 100644 --- a/google-beta/services/apigee/resource_apigee_envgroup_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_envgroup_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_environment_addons_config_generated_test.go b/google-beta/services/apigee/resource_apigee_environment_addons_config_generated_test.go index 671b0b92127..b646e60b545 100644 --- a/google-beta/services/apigee/resource_apigee_environment_addons_config_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_environment_addons_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_environment_generated_test.go b/google-beta/services/apigee/resource_apigee_environment_generated_test.go index 432fa66116b..4e16abcb497 100644 --- a/google-beta/services/apigee/resource_apigee_environment_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_environment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_entries_generated_test.go b/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_entries_generated_test.go index bcae597e8c3..04ac32be492 100644 --- a/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_entries_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_entries_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_generated_test.go b/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_generated_test.go index 694e8e42353..bb6db563eeb 100644 --- a/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_instance_attachment_generated_test.go b/google-beta/services/apigee/resource_apigee_instance_attachment_generated_test.go index 0e8fc009b03..83128bd084a 100644 --- a/google-beta/services/apigee/resource_apigee_instance_attachment_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_instance_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_instance_generated_test.go b/google-beta/services/apigee/resource_apigee_instance_generated_test.go index fccbe153908..2b900b3a6ed 100644 --- a/google-beta/services/apigee/resource_apigee_instance_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go b/google-beta/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go index 1e635edf6dc..1716dffc0d8 100644 --- a/google-beta/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_nat_address_generated_test.go b/google-beta/services/apigee/resource_apigee_nat_address_generated_test.go index 90882aadb3e..09f10a28fd4 100644 --- a/google-beta/services/apigee/resource_apigee_nat_address_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_nat_address_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_organization_generated_test.go b/google-beta/services/apigee/resource_apigee_organization_generated_test.go index a5baa0eaa15..7331d128426 100644 --- a/google-beta/services/apigee/resource_apigee_organization_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_organization_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_security_feedback_generated_test.go b/google-beta/services/apigee/resource_apigee_security_feedback_generated_test.go index 52faa4bd546..af0486739b2 100644 --- a/google-beta/services/apigee/resource_apigee_security_feedback_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_security_feedback_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_security_monitoring_condition_generated_test.go b/google-beta/services/apigee/resource_apigee_security_monitoring_condition_generated_test.go index 8b9632c4134..d587ca934fa 100644 --- a/google-beta/services/apigee/resource_apigee_security_monitoring_condition_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_security_monitoring_condition_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_security_profile_v2_generated_test.go b/google-beta/services/apigee/resource_apigee_security_profile_v2_generated_test.go index a52ee6be4b0..9eb200ef528 100644 --- a/google-beta/services/apigee/resource_apigee_security_profile_v2_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_security_profile_v2_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_space_generated_test.go b/google-beta/services/apigee/resource_apigee_space_generated_test.go index f3ea5a0207a..aec4328e456 100644 --- a/google-beta/services/apigee/resource_apigee_space_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_space_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_sync_authorization_generated_test.go b/google-beta/services/apigee/resource_apigee_sync_authorization_generated_test.go index 93c2baffe03..72ea0e8c686 100644 --- a/google-beta/services/apigee/resource_apigee_sync_authorization_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_sync_authorization_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apigee/resource_apigee_target_server_generated_test.go b/google-beta/services/apigee/resource_apigee_target_server_generated_test.go index abe63e50927..d1ab7f6b487 100644 --- a/google-beta/services/apigee/resource_apigee_target_server_generated_test.go +++ b/google-beta/services/apigee/resource_apigee_target_server_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apihub/resource_apihub_host_project_registration_generated_test.go b/google-beta/services/apihub/resource_apihub_host_project_registration_generated_test.go index 1d388cfcbf4..3a31f9c2a2e 100644 --- a/google-beta/services/apihub/resource_apihub_host_project_registration_generated_test.go +++ b/google-beta/services/apihub/resource_apihub_host_project_registration_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apihub" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/appengine/resource_app_engine_application_url_dispatch_rules_generated_test.go b/google-beta/services/appengine/resource_app_engine_application_url_dispatch_rules_generated_test.go index 79ee522e6a7..25d25dd0437 100644 --- a/google-beta/services/appengine/resource_app_engine_application_url_dispatch_rules_generated_test.go +++ b/google-beta/services/appengine/resource_app_engine_application_url_dispatch_rules_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/appengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/appengine/resource_app_engine_domain_mapping_generated_test.go b/google-beta/services/appengine/resource_app_engine_domain_mapping_generated_test.go index 6d4020387d6..51fcaf2b6e6 100644 --- a/google-beta/services/appengine/resource_app_engine_domain_mapping_generated_test.go +++ b/google-beta/services/appengine/resource_app_engine_domain_mapping_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/appengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/appengine/resource_app_engine_firewall_rule_generated_test.go b/google-beta/services/appengine/resource_app_engine_firewall_rule_generated_test.go index d0f64418d29..891164eb96b 100644 --- a/google-beta/services/appengine/resource_app_engine_firewall_rule_generated_test.go +++ b/google-beta/services/appengine/resource_app_engine_firewall_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/appengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/appengine/resource_app_engine_service_network_settings_generated_test.go b/google-beta/services/appengine/resource_app_engine_service_network_settings_generated_test.go index 5bde630bd4a..34f66709a69 100644 --- a/google-beta/services/appengine/resource_app_engine_service_network_settings_generated_test.go +++ b/google-beta/services/appengine/resource_app_engine_service_network_settings_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/appengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/appengine/resource_app_engine_service_split_traffic_generated_test.go b/google-beta/services/appengine/resource_app_engine_service_split_traffic_generated_test.go index 3338ac6d1b4..8db9f376497 100644 --- a/google-beta/services/appengine/resource_app_engine_service_split_traffic_generated_test.go +++ b/google-beta/services/appengine/resource_app_engine_service_split_traffic_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/appengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/appengine/resource_app_engine_standard_app_version_generated_test.go b/google-beta/services/appengine/resource_app_engine_standard_app_version_generated_test.go index 3ddd0230940..c977a3c0709 100644 --- a/google-beta/services/appengine/resource_app_engine_standard_app_version_generated_test.go +++ b/google-beta/services/appengine/resource_app_engine_standard_app_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/appengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apphub/resource_apphub_application_generated_test.go b/google-beta/services/apphub/resource_apphub_application_generated_test.go index 3b150b95074..35db7bdd5c4 100644 --- a/google-beta/services/apphub/resource_apphub_application_generated_test.go +++ b/google-beta/services/apphub/resource_apphub_application_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apphub" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apphub/resource_apphub_service_generated_test.go b/google-beta/services/apphub/resource_apphub_service_generated_test.go index c1a83d71f54..67654f64ac8 100644 --- a/google-beta/services/apphub/resource_apphub_service_generated_test.go +++ b/google-beta/services/apphub/resource_apphub_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apphub" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apphub/resource_apphub_service_project_attachment_generated_test.go b/google-beta/services/apphub/resource_apphub_service_project_attachment_generated_test.go index a1929ba3952..c73b4f18f76 100644 --- a/google-beta/services/apphub/resource_apphub_service_project_attachment_generated_test.go +++ b/google-beta/services/apphub/resource_apphub_service_project_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apphub" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/apphub/resource_apphub_workload_generated_test.go b/google-beta/services/apphub/resource_apphub_workload_generated_test.go index 5c26ac2ec7a..173365161be 100644 --- a/google-beta/services/apphub/resource_apphub_workload_generated_test.go +++ b/google-beta/services/apphub/resource_apphub_workload_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apphub" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/artifactregistry/resource_artifact_registry_repository_generated_test.go b/google-beta/services/artifactregistry/resource_artifact_registry_repository_generated_test.go index 31fadd31977..c6652d5a256 100644 --- a/google-beta/services/artifactregistry/resource_artifact_registry_repository_generated_test.go +++ b/google-beta/services/artifactregistry/resource_artifact_registry_repository_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/artifactregistry" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/artifactregistry/resource_artifact_registry_rule_generated_test.go b/google-beta/services/artifactregistry/resource_artifact_registry_rule_generated_test.go index a6dfb15e48e..b6c50064b3c 100644 --- a/google-beta/services/artifactregistry/resource_artifact_registry_rule_generated_test.go +++ b/google-beta/services/artifactregistry/resource_artifact_registry_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/artifactregistry" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/backupdr/resource_backup_dr_backup_plan_association_generated_test.go b/google-beta/services/backupdr/resource_backup_dr_backup_plan_association_generated_test.go index 20f138af3c4..1433e535f63 100644 --- a/google-beta/services/backupdr/resource_backup_dr_backup_plan_association_generated_test.go +++ b/google-beta/services/backupdr/resource_backup_dr_backup_plan_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/backupdr" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/backupdr/resource_backup_dr_backup_plan_generated_test.go b/google-beta/services/backupdr/resource_backup_dr_backup_plan_generated_test.go index 6568f4b1b5e..384844dfb26 100644 --- a/google-beta/services/backupdr/resource_backup_dr_backup_plan_generated_test.go +++ b/google-beta/services/backupdr/resource_backup_dr_backup_plan_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/backupdr" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/backupdr/resource_backup_dr_backup_vault_generated_test.go b/google-beta/services/backupdr/resource_backup_dr_backup_vault_generated_test.go index 46ad031e1e2..397011028ba 100644 --- a/google-beta/services/backupdr/resource_backup_dr_backup_vault_generated_test.go +++ b/google-beta/services/backupdr/resource_backup_dr_backup_vault_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/backupdr" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/backupdr/resource_backup_dr_restore_workload_generated_test.go b/google-beta/services/backupdr/resource_backup_dr_restore_workload_generated_test.go index 264441e90c7..0d1873fb40f 100644 --- a/google-beta/services/backupdr/resource_backup_dr_restore_workload_generated_test.go +++ b/google-beta/services/backupdr/resource_backup_dr_restore_workload_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/backupdr" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/backupdr/resource_backup_dr_service_config_generated_test.go b/google-beta/services/backupdr/resource_backup_dr_service_config_generated_test.go index a4d11f7c1f4..ff6313077db 100644 --- a/google-beta/services/backupdr/resource_backup_dr_service_config_generated_test.go +++ b/google-beta/services/backupdr/resource_backup_dr_service_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/backupdr" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/beyondcorp/resource_beyondcorp_app_connection_generated_test.go b/google-beta/services/beyondcorp/resource_beyondcorp_app_connection_generated_test.go index d16a3879e77..e181257338b 100644 --- a/google-beta/services/beyondcorp/resource_beyondcorp_app_connection_generated_test.go +++ b/google-beta/services/beyondcorp/resource_beyondcorp_app_connection_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/beyondcorp" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/beyondcorp/resource_beyondcorp_app_connector_generated_test.go b/google-beta/services/beyondcorp/resource_beyondcorp_app_connector_generated_test.go index 878f035c2d0..8dc508ae0f1 100644 --- a/google-beta/services/beyondcorp/resource_beyondcorp_app_connector_generated_test.go +++ b/google-beta/services/beyondcorp/resource_beyondcorp_app_connector_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/beyondcorp" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/beyondcorp/resource_beyondcorp_app_gateway_generated_test.go b/google-beta/services/beyondcorp/resource_beyondcorp_app_gateway_generated_test.go index af70e6c1034..b359aa6e196 100644 --- a/google-beta/services/beyondcorp/resource_beyondcorp_app_gateway_generated_test.go +++ b/google-beta/services/beyondcorp/resource_beyondcorp_app_gateway_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/beyondcorp" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/beyondcorp/resource_beyondcorp_security_gateway_application_generated_test.go b/google-beta/services/beyondcorp/resource_beyondcorp_security_gateway_application_generated_test.go index 637d3ed3d3e..3ef82c4716d 100644 --- a/google-beta/services/beyondcorp/resource_beyondcorp_security_gateway_application_generated_test.go +++ b/google-beta/services/beyondcorp/resource_beyondcorp_security_gateway_application_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/beyondcorp" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/beyondcorp/resource_beyondcorp_security_gateway_generated_test.go b/google-beta/services/beyondcorp/resource_beyondcorp_security_gateway_generated_test.go index 0c9fd6f2fef..67c4dc62969 100644 --- a/google-beta/services/beyondcorp/resource_beyondcorp_security_gateway_generated_test.go +++ b/google-beta/services/beyondcorp/resource_beyondcorp_security_gateway_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/beyondcorp" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/biglake/resource_biglake_catalog_generated_test.go b/google-beta/services/biglake/resource_biglake_catalog_generated_test.go index 85b622b2463..694ae075353 100644 --- a/google-beta/services/biglake/resource_biglake_catalog_generated_test.go +++ b/google-beta/services/biglake/resource_biglake_catalog_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/biglake" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/biglake/resource_biglake_database_generated_test.go b/google-beta/services/biglake/resource_biglake_database_generated_test.go index d65661c71b3..2b3251d2273 100644 --- a/google-beta/services/biglake/resource_biglake_database_generated_test.go +++ b/google-beta/services/biglake/resource_biglake_database_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/biglake" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/biglake/resource_biglake_table_generated_test.go b/google-beta/services/biglake/resource_biglake_table_generated_test.go index 922927d384b..b569a1fb11d 100644 --- a/google-beta/services/biglake/resource_biglake_table_generated_test.go +++ b/google-beta/services/biglake/resource_biglake_table_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/biglake" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/biglakeiceberg/resource_biglake_iceberg_catalog_generated_test.go b/google-beta/services/biglakeiceberg/resource_biglake_iceberg_catalog_generated_test.go index 60bf643e4e5..49c90d82adb 100644 --- a/google-beta/services/biglakeiceberg/resource_biglake_iceberg_catalog_generated_test.go +++ b/google-beta/services/biglakeiceberg/resource_biglake_iceberg_catalog_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/biglakeiceberg" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/biglakeiceberg/resource_biglake_iceberg_namespace_generated_test.go b/google-beta/services/biglakeiceberg/resource_biglake_iceberg_namespace_generated_test.go index f01464c45d5..cbade1c51d3 100644 --- a/google-beta/services/biglakeiceberg/resource_biglake_iceberg_namespace_generated_test.go +++ b/google-beta/services/biglakeiceberg/resource_biglake_iceberg_namespace_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/biglakeiceberg" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/biglakeiceberg/resource_biglake_iceberg_table_generated_test.go b/google-beta/services/biglakeiceberg/resource_biglake_iceberg_table_generated_test.go index fd191435e7c..50a68223aab 100644 --- a/google-beta/services/biglakeiceberg/resource_biglake_iceberg_table_generated_test.go +++ b/google-beta/services/biglakeiceberg/resource_biglake_iceberg_table_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/biglakeiceberg" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigquery/resource_bigquery_dataset_generated_test.go b/google-beta/services/bigquery/resource_bigquery_dataset_generated_test.go index 8d98674d2c8..24464e92489 100644 --- a/google-beta/services/bigquery/resource_bigquery_dataset_generated_test.go +++ b/google-beta/services/bigquery/resource_bigquery_dataset_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigquery" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigquery/resource_bigquery_job_generated_test.go b/google-beta/services/bigquery/resource_bigquery_job_generated_test.go index 40af15f3f4e..22cc55211d2 100644 --- a/google-beta/services/bigquery/resource_bigquery_job_generated_test.go +++ b/google-beta/services/bigquery/resource_bigquery_job_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigquery" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigquery/resource_bigquery_routine_generated_test.go b/google-beta/services/bigquery/resource_bigquery_routine_generated_test.go index 958f6e7f237..66e9ae16cca 100644 --- a/google-beta/services/bigquery/resource_bigquery_routine_generated_test.go +++ b/google-beta/services/bigquery/resource_bigquery_routine_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigquery" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigquery/resource_bigquery_row_access_policy_generated_test.go b/google-beta/services/bigquery/resource_bigquery_row_access_policy_generated_test.go index 525add8fd39..63a6b3923a0 100644 --- a/google-beta/services/bigquery/resource_bigquery_row_access_policy_generated_test.go +++ b/google-beta/services/bigquery/resource_bigquery_row_access_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigquery" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange_generated_test.go b/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange_generated_test.go index 98546847243..24cf48ad2b8 100644 --- a/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange_generated_test.go +++ b/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigqueryanalyticshub" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange_subscription_generated_test.go b/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange_subscription_generated_test.go index c78a0ce5898..bfab5050b7b 100644 --- a/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange_subscription_generated_test.go +++ b/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange_subscription_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigqueryanalyticshub" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_generated_test.go b/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_generated_test.go index fc87a893f66..3aa675fa882 100644 --- a/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_generated_test.go +++ b/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigqueryanalyticshub" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_subscription_generated_test.go b/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_subscription_generated_test.go index 44e36f71f24..f5b67a4de3d 100644 --- a/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_subscription_generated_test.go +++ b/google-beta/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_subscription_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigqueryanalyticshub" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigqueryconnection/resource_bigquery_connection_generated_test.go b/google-beta/services/bigqueryconnection/resource_bigquery_connection_generated_test.go index f063e11b81c..0e8f1bda5a3 100644 --- a/google-beta/services/bigqueryconnection/resource_bigquery_connection_generated_test.go +++ b/google-beta/services/bigqueryconnection/resource_bigquery_connection_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigqueryconnection" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_generated_test.go b/google-beta/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_generated_test.go index f8ff6977f92..931288b59f9 100644 --- a/google-beta/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_generated_test.go +++ b/google-beta/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigquerydatapolicy" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigquerydatapolicyv2/resource_bigquery_datapolicyv2_data_policy_generated_test.go b/google-beta/services/bigquerydatapolicyv2/resource_bigquery_datapolicyv2_data_policy_generated_test.go index 36d1c2345d4..f0d0724ff0e 100644 --- a/google-beta/services/bigquerydatapolicyv2/resource_bigquery_datapolicyv2_data_policy_generated_test.go +++ b/google-beta/services/bigquerydatapolicyv2/resource_bigquery_datapolicyv2_data_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigquerydatapolicyv2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigqueryreservation/resource_bigquery_bi_reservation_generated_test.go b/google-beta/services/bigqueryreservation/resource_bigquery_bi_reservation_generated_test.go index 4857b89c997..5a3437f2bd6 100644 --- a/google-beta/services/bigqueryreservation/resource_bigquery_bi_reservation_generated_test.go +++ b/google-beta/services/bigqueryreservation/resource_bigquery_bi_reservation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigqueryreservation" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigqueryreservation/resource_bigquery_capacity_commitment_generated_test.go b/google-beta/services/bigqueryreservation/resource_bigquery_capacity_commitment_generated_test.go index 6300eefbfa1..90ecf61072b 100644 --- a/google-beta/services/bigqueryreservation/resource_bigquery_capacity_commitment_generated_test.go +++ b/google-beta/services/bigqueryreservation/resource_bigquery_capacity_commitment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigqueryreservation" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigqueryreservation/resource_bigquery_reservation_assignment_generated_test.go b/google-beta/services/bigqueryreservation/resource_bigquery_reservation_assignment_generated_test.go index a85f9b82051..b8320fe0bd6 100644 --- a/google-beta/services/bigqueryreservation/resource_bigquery_reservation_assignment_generated_test.go +++ b/google-beta/services/bigqueryreservation/resource_bigquery_reservation_assignment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigqueryreservation" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigqueryreservation/resource_bigquery_reservation_generated_test.go b/google-beta/services/bigqueryreservation/resource_bigquery_reservation_generated_test.go index 5c16a280c43..684c42c4c45 100644 --- a/google-beta/services/bigqueryreservation/resource_bigquery_reservation_generated_test.go +++ b/google-beta/services/bigqueryreservation/resource_bigquery_reservation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigqueryreservation" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigqueryreservation/resource_bigquery_reservation_group_generated_test.go b/google-beta/services/bigqueryreservation/resource_bigquery_reservation_group_generated_test.go index 85a1a10074a..276eb62ab9a 100644 --- a/google-beta/services/bigqueryreservation/resource_bigquery_reservation_group_generated_test.go +++ b/google-beta/services/bigqueryreservation/resource_bigquery_reservation_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigqueryreservation" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigtable/resource_bigtable_app_profile_generated_test.go b/google-beta/services/bigtable/resource_bigtable_app_profile_generated_test.go index a9a8e7af214..1aaf0e759e2 100644 --- a/google-beta/services/bigtable/resource_bigtable_app_profile_generated_test.go +++ b/google-beta/services/bigtable/resource_bigtable_app_profile_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigtable" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigtable/resource_bigtable_logical_view_generated_test.go b/google-beta/services/bigtable/resource_bigtable_logical_view_generated_test.go index 0e09c464b51..c05c5b83717 100644 --- a/google-beta/services/bigtable/resource_bigtable_logical_view_generated_test.go +++ b/google-beta/services/bigtable/resource_bigtable_logical_view_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigtable" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigtable/resource_bigtable_materialized_view_generated_test.go b/google-beta/services/bigtable/resource_bigtable_materialized_view_generated_test.go index 7dce524d63e..7429309881b 100644 --- a/google-beta/services/bigtable/resource_bigtable_materialized_view_generated_test.go +++ b/google-beta/services/bigtable/resource_bigtable_materialized_view_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigtable" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/bigtable/resource_bigtable_schema_bundle_generated_test.go b/google-beta/services/bigtable/resource_bigtable_schema_bundle_generated_test.go index 11425cf2ed8..11e0ef6b35a 100644 --- a/google-beta/services/bigtable/resource_bigtable_schema_bundle_generated_test.go +++ b/google-beta/services/bigtable/resource_bigtable_schema_bundle_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigtable" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/billingbudgets/resource_billing_budget_generated_test.go b/google-beta/services/billingbudgets/resource_billing_budget_generated_test.go index b18d2e21bf2..d7b0a2b6bb0 100644 --- a/google-beta/services/billingbudgets/resource_billing_budget_generated_test.go +++ b/google-beta/services/billingbudgets/resource_billing_budget_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/billingbudgets" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/binaryauthorization/resource_binary_authorization_attestor_generated_test.go b/google-beta/services/binaryauthorization/resource_binary_authorization_attestor_generated_test.go index e3ec010b86a..7de8b2aa5ed 100644 --- a/google-beta/services/binaryauthorization/resource_binary_authorization_attestor_generated_test.go +++ b/google-beta/services/binaryauthorization/resource_binary_authorization_attestor_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/binaryauthorization" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/blockchainnodeengine/resource_blockchain_node_engine_blockchain_nodes_generated_test.go b/google-beta/services/blockchainnodeengine/resource_blockchain_node_engine_blockchain_nodes_generated_test.go index 9ceff4922de..cc5cac07be9 100644 --- a/google-beta/services/blockchainnodeengine/resource_blockchain_node_engine_blockchain_nodes_generated_test.go +++ b/google-beta/services/blockchainnodeengine/resource_blockchain_node_engine_blockchain_nodes_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/blockchainnodeengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_generated_test.go b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_generated_test.go index 05a0359ec2b..b3b014edd75 100644 --- a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_generated_test.go +++ b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/certificatemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_issuance_config_generated_test.go b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_issuance_config_generated_test.go index 7a4e8fbb793..cb35cd8ccb8 100644 --- a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_issuance_config_generated_test.go +++ b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_issuance_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/certificatemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_map_entry_generated_test.go b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_map_entry_generated_test.go index dc6157d305e..7bcc6e04416 100644 --- a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_map_entry_generated_test.go +++ b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_map_entry_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/certificatemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_map_generated_test.go b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_map_generated_test.go index 792b9e0045b..a4d26ad3646 100644 --- a/google-beta/services/certificatemanager/resource_certificate_manager_certificate_map_generated_test.go +++ b/google-beta/services/certificatemanager/resource_certificate_manager_certificate_map_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/certificatemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_dns_authorization_generated_test.go b/google-beta/services/certificatemanager/resource_certificate_manager_dns_authorization_generated_test.go index 90c2c5673fd..b8dde219720 100644 --- a/google-beta/services/certificatemanager/resource_certificate_manager_dns_authorization_generated_test.go +++ b/google-beta/services/certificatemanager/resource_certificate_manager_dns_authorization_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/certificatemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_trust_config_generated_test.go b/google-beta/services/certificatemanager/resource_certificate_manager_trust_config_generated_test.go index 9a84b557b04..34420b57d7b 100644 --- a/google-beta/services/certificatemanager/resource_certificate_manager_trust_config_generated_test.go +++ b/google-beta/services/certificatemanager/resource_certificate_manager_trust_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/certificatemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/ces/resource_ces_agent_generated_test.go b/google-beta/services/ces/resource_ces_agent_generated_test.go index 40eb2504c50..eab5b6e553d 100644 --- a/google-beta/services/ces/resource_ces_agent_generated_test.go +++ b/google-beta/services/ces/resource_ces_agent_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/ces" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/ces/resource_ces_app_generated_test.go b/google-beta/services/ces/resource_ces_app_generated_test.go index 43d9a32efbb..832dab766cd 100644 --- a/google-beta/services/ces/resource_ces_app_generated_test.go +++ b/google-beta/services/ces/resource_ces_app_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/ces" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/ces/resource_ces_app_root_agent_association_generated_test.go b/google-beta/services/ces/resource_ces_app_root_agent_association_generated_test.go index 787552f3a3d..8caa18b39c0 100644 --- a/google-beta/services/ces/resource_ces_app_root_agent_association_generated_test.go +++ b/google-beta/services/ces/resource_ces_app_root_agent_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/ces" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/ces/resource_ces_app_version_generated_test.go b/google-beta/services/ces/resource_ces_app_version_generated_test.go index a6e34aca8b3..c46cb35d24f 100644 --- a/google-beta/services/ces/resource_ces_app_version_generated_test.go +++ b/google-beta/services/ces/resource_ces_app_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/ces" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/ces/resource_ces_deployment_generated_test.go b/google-beta/services/ces/resource_ces_deployment_generated_test.go index 9565451e4b1..c8fb29e70fb 100644 --- a/google-beta/services/ces/resource_ces_deployment_generated_test.go +++ b/google-beta/services/ces/resource_ces_deployment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/ces" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/ces/resource_ces_evaluation_generated_test.go b/google-beta/services/ces/resource_ces_evaluation_generated_test.go index 6c5aeb0d52c..5bb1f339b95 100644 --- a/google-beta/services/ces/resource_ces_evaluation_generated_test.go +++ b/google-beta/services/ces/resource_ces_evaluation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/ces" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/ces/resource_ces_example_generated_test.go b/google-beta/services/ces/resource_ces_example_generated_test.go index 4ece2e60acd..e6521362bf6 100644 --- a/google-beta/services/ces/resource_ces_example_generated_test.go +++ b/google-beta/services/ces/resource_ces_example_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/ces" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/ces/resource_ces_guardrail_generated_test.go b/google-beta/services/ces/resource_ces_guardrail_generated_test.go index d2e383e2bec..5fce7c6a9e8 100644 --- a/google-beta/services/ces/resource_ces_guardrail_generated_test.go +++ b/google-beta/services/ces/resource_ces_guardrail_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/ces" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/ces/resource_ces_tool_generated_test.go b/google-beta/services/ces/resource_ces_tool_generated_test.go index 1b82fd6d09a..b4ee02e376d 100644 --- a/google-beta/services/ces/resource_ces_tool_generated_test.go +++ b/google-beta/services/ces/resource_ces_tool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/ces" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/ces/resource_ces_toolset_generated_test.go b/google-beta/services/ces/resource_ces_toolset_generated_test.go index f8da3f2bbd8..d4853eff887 100644 --- a/google-beta/services/ces/resource_ces_toolset_generated_test.go +++ b/google-beta/services/ces/resource_ces_toolset_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/ces" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/chronicle/resource_chronicle_dashboard_chart_generated_test.go b/google-beta/services/chronicle/resource_chronicle_dashboard_chart_generated_test.go index e45898b1d76..3f48d66af01 100644 --- a/google-beta/services/chronicle/resource_chronicle_dashboard_chart_generated_test.go +++ b/google-beta/services/chronicle/resource_chronicle_dashboard_chart_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/chronicle" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/chronicle/resource_chronicle_data_access_label_generated_test.go b/google-beta/services/chronicle/resource_chronicle_data_access_label_generated_test.go index 38f0537489e..bbc886d1a15 100644 --- a/google-beta/services/chronicle/resource_chronicle_data_access_label_generated_test.go +++ b/google-beta/services/chronicle/resource_chronicle_data_access_label_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/chronicle" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/chronicle/resource_chronicle_data_access_scope_generated_test.go b/google-beta/services/chronicle/resource_chronicle_data_access_scope_generated_test.go index f16217fadef..a7e292a1ddd 100644 --- a/google-beta/services/chronicle/resource_chronicle_data_access_scope_generated_test.go +++ b/google-beta/services/chronicle/resource_chronicle_data_access_scope_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/chronicle" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/chronicle/resource_chronicle_data_table_generated_test.go b/google-beta/services/chronicle/resource_chronicle_data_table_generated_test.go index f99ed2c67a1..920762725d1 100644 --- a/google-beta/services/chronicle/resource_chronicle_data_table_generated_test.go +++ b/google-beta/services/chronicle/resource_chronicle_data_table_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/chronicle" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/chronicle/resource_chronicle_data_table_row_generated_test.go b/google-beta/services/chronicle/resource_chronicle_data_table_row_generated_test.go index 4999adee949..dd1556097e6 100644 --- a/google-beta/services/chronicle/resource_chronicle_data_table_row_generated_test.go +++ b/google-beta/services/chronicle/resource_chronicle_data_table_row_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/chronicle" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/chronicle/resource_chronicle_feed_generated_test.go b/google-beta/services/chronicle/resource_chronicle_feed_generated_test.go index b928f9f11a5..21079cb80fa 100644 --- a/google-beta/services/chronicle/resource_chronicle_feed_generated_test.go +++ b/google-beta/services/chronicle/resource_chronicle_feed_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/chronicle" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/chronicle/resource_chronicle_native_dashboard_generated_test.go b/google-beta/services/chronicle/resource_chronicle_native_dashboard_generated_test.go index ea5e6ac3959..3bd73db424c 100644 --- a/google-beta/services/chronicle/resource_chronicle_native_dashboard_generated_test.go +++ b/google-beta/services/chronicle/resource_chronicle_native_dashboard_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/chronicle" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/chronicle/resource_chronicle_reference_list_generated_test.go b/google-beta/services/chronicle/resource_chronicle_reference_list_generated_test.go index 2a43311f8d6..9bca6409c82 100644 --- a/google-beta/services/chronicle/resource_chronicle_reference_list_generated_test.go +++ b/google-beta/services/chronicle/resource_chronicle_reference_list_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/chronicle" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/chronicle/resource_chronicle_retrohunt_generated_test.go b/google-beta/services/chronicle/resource_chronicle_retrohunt_generated_test.go index 4223cd9ef34..dd8e1720619 100644 --- a/google-beta/services/chronicle/resource_chronicle_retrohunt_generated_test.go +++ b/google-beta/services/chronicle/resource_chronicle_retrohunt_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/chronicle" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/chronicle/resource_chronicle_rule_deployment_generated_test.go b/google-beta/services/chronicle/resource_chronicle_rule_deployment_generated_test.go index f026ac08b3f..f4f5b79f9ef 100644 --- a/google-beta/services/chronicle/resource_chronicle_rule_deployment_generated_test.go +++ b/google-beta/services/chronicle/resource_chronicle_rule_deployment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/chronicle" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/chronicle/resource_chronicle_rule_generated_test.go b/google-beta/services/chronicle/resource_chronicle_rule_generated_test.go index af66d2f8a4f..b38e878f771 100644 --- a/google-beta/services/chronicle/resource_chronicle_rule_generated_test.go +++ b/google-beta/services/chronicle/resource_chronicle_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/chronicle" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/chronicle/resource_chronicle_watchlist_generated_test.go b/google-beta/services/chronicle/resource_chronicle_watchlist_generated_test.go index 866b4645bf2..9ba5d8ef3d3 100644 --- a/google-beta/services/chronicle/resource_chronicle_watchlist_generated_test.go +++ b/google-beta/services/chronicle/resource_chronicle_watchlist_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/chronicle" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudasset/resource_cloud_asset_folder_feed_generated_test.go b/google-beta/services/cloudasset/resource_cloud_asset_folder_feed_generated_test.go index a6a8b66ac8d..455842b3c14 100644 --- a/google-beta/services/cloudasset/resource_cloud_asset_folder_feed_generated_test.go +++ b/google-beta/services/cloudasset/resource_cloud_asset_folder_feed_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudasset" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudasset/resource_cloud_asset_organization_feed_generated_test.go b/google-beta/services/cloudasset/resource_cloud_asset_organization_feed_generated_test.go index a70eeaf7e95..6863339c479 100644 --- a/google-beta/services/cloudasset/resource_cloud_asset_organization_feed_generated_test.go +++ b/google-beta/services/cloudasset/resource_cloud_asset_organization_feed_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudasset" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudasset/resource_cloud_asset_project_feed_generated_test.go b/google-beta/services/cloudasset/resource_cloud_asset_project_feed_generated_test.go index 1f52c0008b9..9506e51f304 100644 --- a/google-beta/services/cloudasset/resource_cloud_asset_project_feed_generated_test.go +++ b/google-beta/services/cloudasset/resource_cloud_asset_project_feed_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudasset" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudbilling/resource_billing_project_info_generated_test.go b/google-beta/services/cloudbilling/resource_billing_project_info_generated_test.go index b424230c5a6..0265e1a6020 100644 --- a/google-beta/services/cloudbilling/resource_billing_project_info_generated_test.go +++ b/google-beta/services/cloudbilling/resource_billing_project_info_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudbilling" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudbuild/resource_cloudbuild_bitbucket_server_config_generated_test.go b/google-beta/services/cloudbuild/resource_cloudbuild_bitbucket_server_config_generated_test.go index 572bde4ba17..cc76dfad3d5 100644 --- a/google-beta/services/cloudbuild/resource_cloudbuild_bitbucket_server_config_generated_test.go +++ b/google-beta/services/cloudbuild/resource_cloudbuild_bitbucket_server_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudbuild" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudbuild/resource_cloudbuild_trigger_generated_test.go b/google-beta/services/cloudbuild/resource_cloudbuild_trigger_generated_test.go index fe343821a2a..7c6985954af 100644 --- a/google-beta/services/cloudbuild/resource_cloudbuild_trigger_generated_test.go +++ b/google-beta/services/cloudbuild/resource_cloudbuild_trigger_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudbuild" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudbuildv2/resource_cloudbuildv2_connection_generated_test.go b/google-beta/services/cloudbuildv2/resource_cloudbuildv2_connection_generated_test.go index 7ed180366a8..d1d62f23b65 100644 --- a/google-beta/services/cloudbuildv2/resource_cloudbuildv2_connection_generated_test.go +++ b/google-beta/services/cloudbuildv2/resource_cloudbuildv2_connection_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudbuildv2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudbuildv2/resource_cloudbuildv2_repository_generated_test.go b/google-beta/services/cloudbuildv2/resource_cloudbuildv2_repository_generated_test.go index 3675991443f..db32f56ce3b 100644 --- a/google-beta/services/cloudbuildv2/resource_cloudbuildv2_repository_generated_test.go +++ b/google-beta/services/cloudbuildv2/resource_cloudbuildv2_repository_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudbuildv2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/clouddeploy/resource_clouddeploy_automation_generated_test.go b/google-beta/services/clouddeploy/resource_clouddeploy_automation_generated_test.go index cb6b66471e0..6189e30fb90 100644 --- a/google-beta/services/clouddeploy/resource_clouddeploy_automation_generated_test.go +++ b/google-beta/services/clouddeploy/resource_clouddeploy_automation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/clouddeploy" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/clouddeploy/resource_clouddeploy_custom_target_type_generated_test.go b/google-beta/services/clouddeploy/resource_clouddeploy_custom_target_type_generated_test.go index da9dd5ac86b..9ddd9f2f367 100644 --- a/google-beta/services/clouddeploy/resource_clouddeploy_custom_target_type_generated_test.go +++ b/google-beta/services/clouddeploy/resource_clouddeploy_custom_target_type_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/clouddeploy" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/clouddeploy/resource_clouddeploy_deploy_policy_generated_test.go b/google-beta/services/clouddeploy/resource_clouddeploy_deploy_policy_generated_test.go index ecf3997fcee..a45343048b9 100644 --- a/google-beta/services/clouddeploy/resource_clouddeploy_deploy_policy_generated_test.go +++ b/google-beta/services/clouddeploy/resource_clouddeploy_deploy_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/clouddeploy" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudfunctions/resource_cloudfunctions_function_test.go b/google-beta/services/cloudfunctions/resource_cloudfunctions_function_test.go index ec705e78361..d8bd92f7efe 100644 --- a/google-beta/services/cloudfunctions/resource_cloudfunctions_function_test.go +++ b/google-beta/services/cloudfunctions/resource_cloudfunctions_function_test.go @@ -27,6 +27,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" tpgcloudfunctions "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudfunctions" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go b/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go index b0410fccff3..3d8e4339d4c 100644 --- a/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go +++ b/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudfunctions2" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/cloudfunctions2/resource_cloudfunctions2_function_test.go b/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function_test.go index 4553265bd75..e98190d50b0 100644 --- a/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/cloudrun/resource_cloud_run_domain_mapping_generated_test.go b/google-beta/services/cloudrun/resource_cloud_run_domain_mapping_generated_test.go index 4fbfd644391..07f5476e218 100644 --- a/google-beta/services/cloudrun/resource_cloud_run_domain_mapping_generated_test.go +++ b/google-beta/services/cloudrun/resource_cloud_run_domain_mapping_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudrun" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudrun/resource_cloud_run_service_generated_test.go b/google-beta/services/cloudrun/resource_cloud_run_service_generated_test.go index 174718c4413..e70078057f8 100644 --- a/google-beta/services/cloudrun/resource_cloud_run_service_generated_test.go +++ b/google-beta/services/cloudrun/resource_cloud_run_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudrun" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go b/google-beta/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go index a9ae8dfaaaa..d418793fd9a 100644 --- a/google-beta/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go +++ b/google-beta/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudrunv2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudrunv2/resource_cloud_run_v2_service_generated_test.go b/google-beta/services/cloudrunv2/resource_cloud_run_v2_service_generated_test.go index 8ce880a798f..b300bcebb5d 100644 --- a/google-beta/services/cloudrunv2/resource_cloud_run_v2_service_generated_test.go +++ b/google-beta/services/cloudrunv2/resource_cloud_run_v2_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudrunv2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudrunv2/resource_cloud_run_v2_worker_pool_generated_test.go b/google-beta/services/cloudrunv2/resource_cloud_run_v2_worker_pool_generated_test.go index 58e09eec80e..906cfb63e11 100644 --- a/google-beta/services/cloudrunv2/resource_cloud_run_v2_worker_pool_generated_test.go +++ b/google-beta/services/cloudrunv2/resource_cloud_run_v2_worker_pool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudrunv2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudscheduler/resource_cloud_scheduler_job_generated_test.go b/google-beta/services/cloudscheduler/resource_cloud_scheduler_job_generated_test.go index 9895360259c..9fb87c58b23 100644 --- a/google-beta/services/cloudscheduler/resource_cloud_scheduler_job_generated_test.go +++ b/google-beta/services/cloudscheduler/resource_cloud_scheduler_job_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudscheduler" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudsecuritycompliance/resource_cloud_security_compliance_cloud_control_generated_test.go b/google-beta/services/cloudsecuritycompliance/resource_cloud_security_compliance_cloud_control_generated_test.go index 69b5a51b4b3..ba2821ac088 100644 --- a/google-beta/services/cloudsecuritycompliance/resource_cloud_security_compliance_cloud_control_generated_test.go +++ b/google-beta/services/cloudsecuritycompliance/resource_cloud_security_compliance_cloud_control_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudsecuritycompliance" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_deployment_generated_test.go b/google-beta/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_deployment_generated_test.go index 0348e6a9df5..6ec6c0e4a0e 100644 --- a/google-beta/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_deployment_generated_test.go +++ b/google-beta/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_deployment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudsecuritycompliance" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_generated_test.go b/google-beta/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_generated_test.go index 97bb4a91355..a2c1382c30c 100644 --- a/google-beta/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_generated_test.go +++ b/google-beta/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudsecuritycompliance" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/cloudtasks/resource_cloud_tasks_queue_generated_test.go b/google-beta/services/cloudtasks/resource_cloud_tasks_queue_generated_test.go index 019f4aa68bd..f5789955f1c 100644 --- a/google-beta/services/cloudtasks/resource_cloud_tasks_queue_generated_test.go +++ b/google-beta/services/cloudtasks/resource_cloud_tasks_queue_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudtasks" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/colab/resource_colab_notebook_execution_generated_test.go b/google-beta/services/colab/resource_colab_notebook_execution_generated_test.go index ad7f8f0bbee..7a0924a1d4b 100644 --- a/google-beta/services/colab/resource_colab_notebook_execution_generated_test.go +++ b/google-beta/services/colab/resource_colab_notebook_execution_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/colab" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" @@ -444,7 +447,7 @@ resource "google_colab_notebook_execution" "notebook-execution" { func TestAccColabNotebookExecution_colabNotebookExecutionDataformExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-dataform.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google-beta/services/colab/resource_colab_runtime_generated_test.go b/google-beta/services/colab/resource_colab_runtime_generated_test.go index 802b3d5e441..fe0c3b06fb3 100644 --- a/google-beta/services/colab/resource_colab_runtime_generated_test.go +++ b/google-beta/services/colab/resource_colab_runtime_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/colab" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/colab/resource_colab_runtime_template_generated_test.go b/google-beta/services/colab/resource_colab_runtime_template_generated_test.go index ab4254dd5b6..654cfba0f4c 100644 --- a/google-beta/services/colab/resource_colab_runtime_template_generated_test.go +++ b/google-beta/services/colab/resource_colab_runtime_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/colab" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/colab/resource_colab_schedule_generated_test.go b/google-beta/services/colab/resource_colab_schedule_generated_test.go index a9bc1c4d26c..393243c157e 100644 --- a/google-beta/services/colab/resource_colab_schedule_generated_test.go +++ b/google-beta/services/colab/resource_colab_schedule_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/colab" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" @@ -324,7 +327,7 @@ resource "google_colab_schedule" "schedule" { func TestAccColabSchedule_colabScheduleFullExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-dataform.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google-beta/services/composer/resource_composer_environment_test.go b/google-beta/services/composer/resource_composer_environment_test.go index 9c3a7d20796..49082834db2 100644 --- a/google-beta/services/composer/resource_composer_environment_test.go +++ b/google-beta/services/composer/resource_composer_environment_test.go @@ -29,6 +29,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/composer" tpgcompute "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/composer/resource_composer_user_workloads_config_map_generated_test.go b/google-beta/services/composer/resource_composer_user_workloads_config_map_generated_test.go index 79812de3b99..ca99a0a0add 100644 --- a/google-beta/services/composer/resource_composer_user_workloads_config_map_generated_test.go +++ b/google-beta/services/composer/resource_composer_user_workloads_config_map_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/composer" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_address_generated_test.go b/google-beta/services/compute/resource_compute_address_generated_test.go index 71beb34b30f..e76ff7dcd58 100644 --- a/google-beta/services/compute/resource_compute_address_generated_test.go +++ b/google-beta/services/compute/resource_compute_address_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_autoscaler_generated_test.go b/google-beta/services/compute/resource_compute_autoscaler_generated_test.go index da4ef6d3abf..e890e83b66c 100644 --- a/google-beta/services/compute/resource_compute_autoscaler_generated_test.go +++ b/google-beta/services/compute/resource_compute_autoscaler_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_backend_bucket_generated_test.go b/google-beta/services/compute/resource_compute_backend_bucket_generated_test.go index 835ddd4526a..fba20d2f74c 100644 --- a/google-beta/services/compute/resource_compute_backend_bucket_generated_test.go +++ b/google-beta/services/compute/resource_compute_backend_bucket_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_backend_service_generated_test.go b/google-beta/services/compute/resource_compute_backend_service_generated_test.go index 494ccc1c660..e656116e910 100644 --- a/google-beta/services/compute/resource_compute_backend_service_generated_test.go +++ b/google-beta/services/compute/resource_compute_backend_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_cross_site_network_generated_test.go b/google-beta/services/compute/resource_compute_cross_site_network_generated_test.go index f3771a4985a..df6fd9aea9e 100644 --- a/google-beta/services/compute/resource_compute_cross_site_network_generated_test.go +++ b/google-beta/services/compute/resource_compute_cross_site_network_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_disk_generated_test.go b/google-beta/services/compute/resource_compute_disk_generated_test.go index 23c2c2e05db..547a36b32d8 100644 --- a/google-beta/services/compute/resource_compute_disk_generated_test.go +++ b/google-beta/services/compute/resource_compute_disk_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_disk_resource_policy_attachment_generated_test.go b/google-beta/services/compute/resource_compute_disk_resource_policy_attachment_generated_test.go index 0ec22b15773..e1a53c7b7b7 100644 --- a/google-beta/services/compute/resource_compute_disk_resource_policy_attachment_generated_test.go +++ b/google-beta/services/compute/resource_compute_disk_resource_policy_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_disk_test.go b/google-beta/services/compute/resource_compute_disk_test.go index 6d1c38aab61..0137da53d80 100644 --- a/google-beta/services/compute/resource_compute_disk_test.go +++ b/google-beta/services/compute/resource_compute_disk_test.go @@ -29,6 +29,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" tpgcompute "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/compute/resource_compute_external_vpn_gateway_generated_test.go b/google-beta/services/compute/resource_compute_external_vpn_gateway_generated_test.go index 6673667b7a2..6f4e2143545 100644 --- a/google-beta/services/compute/resource_compute_external_vpn_gateway_generated_test.go +++ b/google-beta/services/compute/resource_compute_external_vpn_gateway_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_firewall_generated_test.go b/google-beta/services/compute/resource_compute_firewall_generated_test.go index 13fc080c749..2b03bba6c75 100644 --- a/google-beta/services/compute/resource_compute_firewall_generated_test.go +++ b/google-beta/services/compute/resource_compute_firewall_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_firewall_policy_generated_test.go b/google-beta/services/compute/resource_compute_firewall_policy_generated_test.go index 28961f6e557..80f373632a0 100644 --- a/google-beta/services/compute/resource_compute_firewall_policy_generated_test.go +++ b/google-beta/services/compute/resource_compute_firewall_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_firewall_policy_rule_generated_test.go b/google-beta/services/compute/resource_compute_firewall_policy_rule_generated_test.go index 6a265c7cafd..32baf26a2b0 100644 --- a/google-beta/services/compute/resource_compute_firewall_policy_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_firewall_policy_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_firewall_policy_with_rules_generated_test.go b/google-beta/services/compute/resource_compute_firewall_policy_with_rules_generated_test.go index 31adcb4870f..6d28f6216fa 100644 --- a/google-beta/services/compute/resource_compute_firewall_policy_with_rules_generated_test.go +++ b/google-beta/services/compute/resource_compute_firewall_policy_with_rules_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_forwarding_rule_generated_test.go b/google-beta/services/compute/resource_compute_forwarding_rule_generated_test.go index 3c078e927ba..6a5d0ec3ef8 100644 --- a/google-beta/services/compute/resource_compute_forwarding_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_forwarding_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_future_reservation_generated_test.go b/google-beta/services/compute/resource_compute_future_reservation_generated_test.go index d520c8e1abc..350b44e937a 100644 --- a/google-beta/services/compute/resource_compute_future_reservation_generated_test.go +++ b/google-beta/services/compute/resource_compute_future_reservation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_global_address_generated_test.go b/google-beta/services/compute/resource_compute_global_address_generated_test.go index bfdf382a511..45e958f844c 100644 --- a/google-beta/services/compute/resource_compute_global_address_generated_test.go +++ b/google-beta/services/compute/resource_compute_global_address_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_global_forwarding_rule_generated_test.go b/google-beta/services/compute/resource_compute_global_forwarding_rule_generated_test.go index e092c001c72..33c618c48cd 100644 --- a/google-beta/services/compute/resource_compute_global_forwarding_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_global_forwarding_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_global_network_endpoint_group_generated_test.go b/google-beta/services/compute/resource_compute_global_network_endpoint_group_generated_test.go index 0150c8c6433..23829c03b9e 100644 --- a/google-beta/services/compute/resource_compute_global_network_endpoint_group_generated_test.go +++ b/google-beta/services/compute/resource_compute_global_network_endpoint_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_ha_vpn_gateway_generated_test.go b/google-beta/services/compute/resource_compute_ha_vpn_gateway_generated_test.go index 888040fd229..16b9a13e9ec 100644 --- a/google-beta/services/compute/resource_compute_ha_vpn_gateway_generated_test.go +++ b/google-beta/services/compute/resource_compute_ha_vpn_gateway_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_health_check_generated_test.go b/google-beta/services/compute/resource_compute_health_check_generated_test.go index d5897bb4965..e5dd24eb64e 100644 --- a/google-beta/services/compute/resource_compute_health_check_generated_test.go +++ b/google-beta/services/compute/resource_compute_health_check_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_http_health_check_generated_test.go b/google-beta/services/compute/resource_compute_http_health_check_generated_test.go index a491bf72b84..3b2ef541870 100644 --- a/google-beta/services/compute/resource_compute_http_health_check_generated_test.go +++ b/google-beta/services/compute/resource_compute_http_health_check_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_https_health_check_generated_test.go b/google-beta/services/compute/resource_compute_https_health_check_generated_test.go index e3f6f78f5a3..2d33da1d74e 100644 --- a/google-beta/services/compute/resource_compute_https_health_check_generated_test.go +++ b/google-beta/services/compute/resource_compute_https_health_check_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_image_generated_test.go b/google-beta/services/compute/resource_compute_image_generated_test.go index f43a9a96ddf..14f385bdda1 100644 --- a/google-beta/services/compute/resource_compute_image_generated_test.go +++ b/google-beta/services/compute/resource_compute_image_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_instance_group_named_port_generated_test.go b/google-beta/services/compute/resource_compute_instance_group_named_port_generated_test.go index 0ac83bd42a5..95d617a2500 100644 --- a/google-beta/services/compute/resource_compute_instance_group_named_port_generated_test.go +++ b/google-beta/services/compute/resource_compute_instance_group_named_port_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_instance_settings_generated_test.go b/google-beta/services/compute/resource_compute_instance_settings_generated_test.go index d85a6eb5812..18bbadbbcac 100644 --- a/google-beta/services/compute/resource_compute_instance_settings_generated_test.go +++ b/google-beta/services/compute/resource_compute_instance_settings_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_instance_test.go b/google-beta/services/compute/resource_compute_instance_test.go index b92330e878b..eaad3decfc8 100644 --- a/google-beta/services/compute/resource_compute_instance_test.go +++ b/google-beta/services/compute/resource_compute_instance_test.go @@ -36,6 +36,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" tpgcompute "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" "github.com/stretchr/testify/assert" @@ -910,7 +911,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", @@ -982,7 +983,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-beta/services/compute/resource_compute_instant_snapshot_generated_test.go b/google-beta/services/compute/resource_compute_instant_snapshot_generated_test.go index d59ba46a75b..d6e655c11e6 100644 --- a/google-beta/services/compute/resource_compute_instant_snapshot_generated_test.go +++ b/google-beta/services/compute/resource_compute_instant_snapshot_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_interconnect_attachment_generated_test.go b/google-beta/services/compute/resource_compute_interconnect_attachment_generated_test.go index dc8212a8852..a21b1d0235a 100644 --- a/google-beta/services/compute/resource_compute_interconnect_attachment_generated_test.go +++ b/google-beta/services/compute/resource_compute_interconnect_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_interconnect_attachment_group_generated_test.go b/google-beta/services/compute/resource_compute_interconnect_attachment_group_generated_test.go index e0f9b5cc2fc..f7cd24ee022 100644 --- a/google-beta/services/compute/resource_compute_interconnect_attachment_group_generated_test.go +++ b/google-beta/services/compute/resource_compute_interconnect_attachment_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_interconnect_generated_test.go b/google-beta/services/compute/resource_compute_interconnect_generated_test.go index 7561bd2bf2f..02b0304d91a 100644 --- a/google-beta/services/compute/resource_compute_interconnect_generated_test.go +++ b/google-beta/services/compute/resource_compute_interconnect_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_interconnect_group_generated_test.go b/google-beta/services/compute/resource_compute_interconnect_group_generated_test.go index 7237263e140..f558e1ac865 100644 --- a/google-beta/services/compute/resource_compute_interconnect_group_generated_test.go +++ b/google-beta/services/compute/resource_compute_interconnect_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_machine_image_generated_test.go b/google-beta/services/compute/resource_compute_machine_image_generated_test.go index d5dd6cb94a2..493c1c3916c 100644 --- a/google-beta/services/compute/resource_compute_machine_image_generated_test.go +++ b/google-beta/services/compute/resource_compute_machine_image_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" @@ -115,7 +118,7 @@ resource "google_compute_machine_image" "image" { func TestAccComputeMachineImage_computeMachineImageKmsExample(t *testing.T) { t.Parallel() - 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-beta/services/compute/resource_compute_managed_ssl_certificate_generated_test.go b/google-beta/services/compute/resource_compute_managed_ssl_certificate_generated_test.go index f613d3d5936..a51f3c820c9 100644 --- a/google-beta/services/compute/resource_compute_managed_ssl_certificate_generated_test.go +++ b/google-beta/services/compute/resource_compute_managed_ssl_certificate_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_network_attachment_generated_test.go b/google-beta/services/compute/resource_compute_network_attachment_generated_test.go index 029d2fca2bd..f13f89c45bd 100644 --- a/google-beta/services/compute/resource_compute_network_attachment_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_network_edge_security_service_generated_test.go b/google-beta/services/compute/resource_compute_network_edge_security_service_generated_test.go index b9178a9e013..535239f78bb 100644 --- a/google-beta/services/compute/resource_compute_network_edge_security_service_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_edge_security_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_network_endpoint_group_generated_test.go b/google-beta/services/compute/resource_compute_network_endpoint_group_generated_test.go index 95f372bcd02..87f478b4c4d 100644 --- a/google-beta/services/compute/resource_compute_network_endpoint_group_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_endpoint_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_network_firewall_policy_association_generated_test.go b/google-beta/services/compute/resource_compute_network_firewall_policy_association_generated_test.go index 1248730f48f..48606bf8731 100644 --- a/google-beta/services/compute/resource_compute_network_firewall_policy_association_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_firewall_policy_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_network_firewall_policy_generated_test.go b/google-beta/services/compute/resource_compute_network_firewall_policy_generated_test.go index 0d072023237..891473367b7 100644 --- a/google-beta/services/compute/resource_compute_network_firewall_policy_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_firewall_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_network_firewall_policy_packet_mirroring_rule_generated_test.go b/google-beta/services/compute/resource_compute_network_firewall_policy_packet_mirroring_rule_generated_test.go index 752cd330ebd..9ed1cfc0128 100644 --- a/google-beta/services/compute/resource_compute_network_firewall_policy_packet_mirroring_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_firewall_policy_packet_mirroring_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_network_firewall_policy_rule_generated_test.go b/google-beta/services/compute/resource_compute_network_firewall_policy_rule_generated_test.go index 7aae68edeb0..dc14bbb3ba3 100644 --- a/google-beta/services/compute/resource_compute_network_firewall_policy_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_firewall_policy_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_network_firewall_policy_with_rules_generated_test.go b/google-beta/services/compute/resource_compute_network_firewall_policy_with_rules_generated_test.go index 0852e42ddc2..ceeeec18783 100644 --- a/google-beta/services/compute/resource_compute_network_firewall_policy_with_rules_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_firewall_policy_with_rules_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_network_generated_test.go b/google-beta/services/compute/resource_compute_network_generated_test.go index 08541977370..bc133bfdae3 100644 --- a/google-beta/services/compute/resource_compute_network_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_network_peering_routes_config_generated_test.go b/google-beta/services/compute/resource_compute_network_peering_routes_config_generated_test.go index 0d2a5ca93ed..c1105c18206 100644 --- a/google-beta/services/compute/resource_compute_network_peering_routes_config_generated_test.go +++ b/google-beta/services/compute/resource_compute_network_peering_routes_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_node_group_generated_test.go b/google-beta/services/compute/resource_compute_node_group_generated_test.go index 1b81dad060f..e0a9ae7ede1 100644 --- a/google-beta/services/compute/resource_compute_node_group_generated_test.go +++ b/google-beta/services/compute/resource_compute_node_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_node_template_generated_test.go b/google-beta/services/compute/resource_compute_node_template_generated_test.go index 49becebf9c0..ca49e55c100 100644 --- a/google-beta/services/compute/resource_compute_node_template_generated_test.go +++ b/google-beta/services/compute/resource_compute_node_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_organization_security_policy_association_generated_test.go b/google-beta/services/compute/resource_compute_organization_security_policy_association_generated_test.go index 123f8d4d8a1..e947872f2cc 100644 --- a/google-beta/services/compute/resource_compute_organization_security_policy_association_generated_test.go +++ b/google-beta/services/compute/resource_compute_organization_security_policy_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_organization_security_policy_generated_test.go b/google-beta/services/compute/resource_compute_organization_security_policy_generated_test.go index b892a4d700e..c6af6cb7f1a 100644 --- a/google-beta/services/compute/resource_compute_organization_security_policy_generated_test.go +++ b/google-beta/services/compute/resource_compute_organization_security_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_organization_security_policy_rule_generated_test.go b/google-beta/services/compute/resource_compute_organization_security_policy_rule_generated_test.go index f260620dc77..ce22c1c8ea8 100644 --- a/google-beta/services/compute/resource_compute_organization_security_policy_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_organization_security_policy_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_packet_mirroring_generated_test.go b/google-beta/services/compute/resource_compute_packet_mirroring_generated_test.go index 0a1902fac9b..666e2962591 100644 --- a/google-beta/services/compute/resource_compute_packet_mirroring_generated_test.go +++ b/google-beta/services/compute/resource_compute_packet_mirroring_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_preview_feature_generated_test.go b/google-beta/services/compute/resource_compute_preview_feature_generated_test.go index ce4ddc2c71f..66d51cdee51 100644 --- a/google-beta/services/compute/resource_compute_preview_feature_generated_test.go +++ b/google-beta/services/compute/resource_compute_preview_feature_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_autoscaler_generated_test.go b/google-beta/services/compute/resource_compute_region_autoscaler_generated_test.go index 7e0f4a6dc37..be385b258f5 100644 --- a/google-beta/services/compute/resource_compute_region_autoscaler_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_autoscaler_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_backend_bucket_generated_test.go b/google-beta/services/compute/resource_compute_region_backend_bucket_generated_test.go index fdf8c30072e..869d94db6de 100644 --- a/google-beta/services/compute/resource_compute_region_backend_bucket_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_backend_bucket_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_backend_service_generated_test.go b/google-beta/services/compute/resource_compute_region_backend_service_generated_test.go index 91aedfb7a7e..5f5ad2b0d4a 100644 --- a/google-beta/services/compute/resource_compute_region_backend_service_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_backend_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_composite_health_check_generated_test.go b/google-beta/services/compute/resource_compute_region_composite_health_check_generated_test.go index bab856048c7..f23ef2513ae 100644 --- a/google-beta/services/compute/resource_compute_region_composite_health_check_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_composite_health_check_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_disk_generated_test.go b/google-beta/services/compute/resource_compute_region_disk_generated_test.go index 0e4e1bbe68a..19169c8aa68 100644 --- a/google-beta/services/compute/resource_compute_region_disk_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_disk_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_disk_resource_policy_attachment_generated_test.go b/google-beta/services/compute/resource_compute_region_disk_resource_policy_attachment_generated_test.go index 04b791837ef..dcfd0917fe2 100644 --- a/google-beta/services/compute/resource_compute_region_disk_resource_policy_attachment_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_disk_resource_policy_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_disk_test.go b/google-beta/services/compute/resource_compute_region_disk_test.go index fbeb2155639..707a212b4a4 100644 --- a/google-beta/services/compute/resource_compute_region_disk_test.go +++ b/google-beta/services/compute/resource_compute_region_disk_test.go @@ -32,6 +32,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" tpgcompute "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" compute "google.golang.org/api/compute/v0.beta" ) @@ -923,7 +924,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", @@ -1119,7 +1120,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-beta/services/compute/resource_compute_region_health_aggregation_policy_generated_test.go b/google-beta/services/compute/resource_compute_region_health_aggregation_policy_generated_test.go index 23a3e948c2a..a5916e2b4b5 100644 --- a/google-beta/services/compute/resource_compute_region_health_aggregation_policy_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_health_aggregation_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_health_check_generated_test.go b/google-beta/services/compute/resource_compute_region_health_check_generated_test.go index dbe4cd19662..931a1c5d963 100644 --- a/google-beta/services/compute/resource_compute_region_health_check_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_health_check_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_health_source_generated_test.go b/google-beta/services/compute/resource_compute_region_health_source_generated_test.go index 2d489c87c4b..a969fbf5a53 100644 --- a/google-beta/services/compute/resource_compute_region_health_source_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_health_source_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_instant_snapshot_generated_test.go b/google-beta/services/compute/resource_compute_region_instant_snapshot_generated_test.go index 8f001d01c9c..047bf5ffe75 100644 --- a/google-beta/services/compute/resource_compute_region_instant_snapshot_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_instant_snapshot_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_network_endpoint_generated_test.go b/google-beta/services/compute/resource_compute_region_network_endpoint_generated_test.go index 2745bd6bfad..dbb2a5a9971 100644 --- a/google-beta/services/compute/resource_compute_region_network_endpoint_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_network_endpoint_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_network_endpoint_group_generated_test.go b/google-beta/services/compute/resource_compute_region_network_endpoint_group_generated_test.go index 8701b54fbe6..6dbf0a2406e 100644 --- a/google-beta/services/compute/resource_compute_region_network_endpoint_group_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_network_endpoint_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_network_firewall_policy_association_generated_test.go b/google-beta/services/compute/resource_compute_region_network_firewall_policy_association_generated_test.go index 7fd989c7bd9..5040c4a7800 100644 --- a/google-beta/services/compute/resource_compute_region_network_firewall_policy_association_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_network_firewall_policy_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_network_firewall_policy_generated_test.go b/google-beta/services/compute/resource_compute_region_network_firewall_policy_generated_test.go index 19ed15aae2c..b6435aede6d 100644 --- a/google-beta/services/compute/resource_compute_region_network_firewall_policy_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_network_firewall_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_network_firewall_policy_rule_generated_test.go b/google-beta/services/compute/resource_compute_region_network_firewall_policy_rule_generated_test.go index f012878eb55..02fce0fe1fb 100644 --- a/google-beta/services/compute/resource_compute_region_network_firewall_policy_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_network_firewall_policy_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_network_firewall_policy_with_rules_generated_test.go b/google-beta/services/compute/resource_compute_region_network_firewall_policy_with_rules_generated_test.go index 6f5ad16898d..1596dc7f2d5 100644 --- a/google-beta/services/compute/resource_compute_region_network_firewall_policy_with_rules_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_network_firewall_policy_with_rules_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_resize_request_generated_test.go b/google-beta/services/compute/resource_compute_region_resize_request_generated_test.go index 5ad687ef5c3..e7d50e795d2 100644 --- a/google-beta/services/compute/resource_compute_region_resize_request_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_resize_request_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_security_policy_generated_test.go b/google-beta/services/compute/resource_compute_region_security_policy_generated_test.go index 519f7a87509..717d50f755b 100644 --- a/google-beta/services/compute/resource_compute_region_security_policy_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_security_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_security_policy_rule_generated_test.go b/google-beta/services/compute/resource_compute_region_security_policy_rule_generated_test.go index 9ca337a3709..574cc3871b6 100644 --- a/google-beta/services/compute/resource_compute_region_security_policy_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_security_policy_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_ssl_certificate_generated_test.go b/google-beta/services/compute/resource_compute_region_ssl_certificate_generated_test.go index b0d9fb3a8e6..b76af529881 100644 --- a/google-beta/services/compute/resource_compute_region_ssl_certificate_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_ssl_certificate_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_target_http_proxy_generated_test.go b/google-beta/services/compute/resource_compute_region_target_http_proxy_generated_test.go index 7846828356f..23c7d560f27 100644 --- a/google-beta/services/compute/resource_compute_region_target_http_proxy_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_target_http_proxy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_target_https_proxy_generated_test.go b/google-beta/services/compute/resource_compute_region_target_https_proxy_generated_test.go index 9f639551040..1d88c66a86f 100644 --- a/google-beta/services/compute/resource_compute_region_target_https_proxy_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_target_https_proxy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_target_tcp_proxy_generated_test.go b/google-beta/services/compute/resource_compute_region_target_tcp_proxy_generated_test.go index 13a58cb84f3..64d2ee0e411 100644 --- a/google-beta/services/compute/resource_compute_region_target_tcp_proxy_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_target_tcp_proxy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_region_url_map_generated_test.go b/google-beta/services/compute/resource_compute_region_url_map_generated_test.go index 9f74678d11d..42c9ed9e733 100644 --- a/google-beta/services/compute/resource_compute_region_url_map_generated_test.go +++ b/google-beta/services/compute/resource_compute_region_url_map_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_reservation_generated_test.go b/google-beta/services/compute/resource_compute_reservation_generated_test.go index fe8eaed135b..6b7c74e3255 100644 --- a/google-beta/services/compute/resource_compute_reservation_generated_test.go +++ b/google-beta/services/compute/resource_compute_reservation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_resize_request_generated_test.go b/google-beta/services/compute/resource_compute_resize_request_generated_test.go index ff12323d55f..0f1c152a73a 100644 --- a/google-beta/services/compute/resource_compute_resize_request_generated_test.go +++ b/google-beta/services/compute/resource_compute_resize_request_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_resource_policy_attachment_generated_test.go b/google-beta/services/compute/resource_compute_resource_policy_attachment_generated_test.go index 0c6b1b6f049..3f72a450c04 100644 --- a/google-beta/services/compute/resource_compute_resource_policy_attachment_generated_test.go +++ b/google-beta/services/compute/resource_compute_resource_policy_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_resource_policy_generated_test.go b/google-beta/services/compute/resource_compute_resource_policy_generated_test.go index 7f9222593d4..829279129c7 100644 --- a/google-beta/services/compute/resource_compute_resource_policy_generated_test.go +++ b/google-beta/services/compute/resource_compute_resource_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_rollout_plan_generated_test.go b/google-beta/services/compute/resource_compute_rollout_plan_generated_test.go index 5ee0aadb91e..e07682381c5 100644 --- a/google-beta/services/compute/resource_compute_rollout_plan_generated_test.go +++ b/google-beta/services/compute/resource_compute_rollout_plan_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_route_generated_test.go b/google-beta/services/compute/resource_compute_route_generated_test.go index 0259489bba4..f218549d32e 100644 --- a/google-beta/services/compute/resource_compute_route_generated_test.go +++ b/google-beta/services/compute/resource_compute_route_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_router_generated_test.go b/google-beta/services/compute/resource_compute_router_generated_test.go index e8d530cbaca..173b3a76011 100644 --- a/google-beta/services/compute/resource_compute_router_generated_test.go +++ b/google-beta/services/compute/resource_compute_router_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_router_named_set_generated_test.go b/google-beta/services/compute/resource_compute_router_named_set_generated_test.go index 3738340842a..7d72497a91b 100644 --- a/google-beta/services/compute/resource_compute_router_named_set_generated_test.go +++ b/google-beta/services/compute/resource_compute_router_named_set_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_router_route_policy_generated_test.go b/google-beta/services/compute/resource_compute_router_route_policy_generated_test.go index 7b477a8da34..6de9cfbdd34 100644 --- a/google-beta/services/compute/resource_compute_router_route_policy_generated_test.go +++ b/google-beta/services/compute/resource_compute_router_route_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_security_policy_rule_generated_test.go b/google-beta/services/compute/resource_compute_security_policy_rule_generated_test.go index 7876297e245..7e57e938534 100644 --- a/google-beta/services/compute/resource_compute_security_policy_rule_generated_test.go +++ b/google-beta/services/compute/resource_compute_security_policy_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_service_attachment_generated_test.go b/google-beta/services/compute/resource_compute_service_attachment_generated_test.go index eeeb60d248e..3164b6ed93a 100644 --- a/google-beta/services/compute/resource_compute_service_attachment_generated_test.go +++ b/google-beta/services/compute/resource_compute_service_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_snapshot_generated_test.go b/google-beta/services/compute/resource_compute_snapshot_generated_test.go index ddaac6afe3f..2f284fb05a9 100644 --- a/google-beta/services/compute/resource_compute_snapshot_generated_test.go +++ b/google-beta/services/compute/resource_compute_snapshot_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_ssl_certificate_generated_test.go b/google-beta/services/compute/resource_compute_ssl_certificate_generated_test.go index 95d5ffaace5..d8e85003c6e 100644 --- a/google-beta/services/compute/resource_compute_ssl_certificate_generated_test.go +++ b/google-beta/services/compute/resource_compute_ssl_certificate_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_ssl_policy_generated_test.go b/google-beta/services/compute/resource_compute_ssl_policy_generated_test.go index 236babd3e66..6f042689103 100644 --- a/google-beta/services/compute/resource_compute_ssl_policy_generated_test.go +++ b/google-beta/services/compute/resource_compute_ssl_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_subnetwork_generated_test.go b/google-beta/services/compute/resource_compute_subnetwork_generated_test.go index 10abf92f8d3..20cf06db283 100644 --- a/google-beta/services/compute/resource_compute_subnetwork_generated_test.go +++ b/google-beta/services/compute/resource_compute_subnetwork_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_target_grpc_proxy_generated_test.go b/google-beta/services/compute/resource_compute_target_grpc_proxy_generated_test.go index 9a1d42df4a7..f42b5042572 100644 --- a/google-beta/services/compute/resource_compute_target_grpc_proxy_generated_test.go +++ b/google-beta/services/compute/resource_compute_target_grpc_proxy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_target_http_proxy_generated_test.go b/google-beta/services/compute/resource_compute_target_http_proxy_generated_test.go index 3267b6eb40a..e4cacedb5ee 100644 --- a/google-beta/services/compute/resource_compute_target_http_proxy_generated_test.go +++ b/google-beta/services/compute/resource_compute_target_http_proxy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_target_https_proxy_generated_test.go b/google-beta/services/compute/resource_compute_target_https_proxy_generated_test.go index 2a3376efcc9..e7a527d981d 100644 --- a/google-beta/services/compute/resource_compute_target_https_proxy_generated_test.go +++ b/google-beta/services/compute/resource_compute_target_https_proxy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_target_instance_generated_test.go b/google-beta/services/compute/resource_compute_target_instance_generated_test.go index aa150ea17f3..5c60d8381a2 100644 --- a/google-beta/services/compute/resource_compute_target_instance_generated_test.go +++ b/google-beta/services/compute/resource_compute_target_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_target_ssl_proxy_generated_test.go b/google-beta/services/compute/resource_compute_target_ssl_proxy_generated_test.go index 506e1ccf0b2..6f6b7f5a946 100644 --- a/google-beta/services/compute/resource_compute_target_ssl_proxy_generated_test.go +++ b/google-beta/services/compute/resource_compute_target_ssl_proxy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_target_tcp_proxy_generated_test.go b/google-beta/services/compute/resource_compute_target_tcp_proxy_generated_test.go index 8db14283986..4b9f8492f10 100644 --- a/google-beta/services/compute/resource_compute_target_tcp_proxy_generated_test.go +++ b/google-beta/services/compute/resource_compute_target_tcp_proxy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_url_map_generated_test.go b/google-beta/services/compute/resource_compute_url_map_generated_test.go index 299d8acbc3c..f26ce7a4807 100644 --- a/google-beta/services/compute/resource_compute_url_map_generated_test.go +++ b/google-beta/services/compute/resource_compute_url_map_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_vpn_gateway_generated_test.go b/google-beta/services/compute/resource_compute_vpn_gateway_generated_test.go index dd55b5b35cf..1adae3a5f19 100644 --- a/google-beta/services/compute/resource_compute_vpn_gateway_generated_test.go +++ b/google-beta/services/compute/resource_compute_vpn_gateway_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_vpn_tunnel_generated_test.go b/google-beta/services/compute/resource_compute_vpn_tunnel_generated_test.go index 2daf25d2583..681e2a71ddf 100644 --- a/google-beta/services/compute/resource_compute_vpn_tunnel_generated_test.go +++ b/google-beta/services/compute/resource_compute_vpn_tunnel_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/compute/resource_compute_wire_group_generated_test.go b/google-beta/services/compute/resource_compute_wire_group_generated_test.go index 1e2a2dce162..fbdafcc7061 100644 --- a/google-beta/services/compute/resource_compute_wire_group_generated_test.go +++ b/google-beta/services/compute/resource_compute_wire_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/contactcenterinsights/resource_contact_center_insights_analysis_rule_generated_test.go b/google-beta/services/contactcenterinsights/resource_contact_center_insights_analysis_rule_generated_test.go index 1d25a2d0c77..b66142d008c 100644 --- a/google-beta/services/contactcenterinsights/resource_contact_center_insights_analysis_rule_generated_test.go +++ b/google-beta/services/contactcenterinsights/resource_contact_center_insights_analysis_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/contactcenterinsights" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/contactcenterinsights/resource_contact_center_insights_assessment_rule_generated_test.go b/google-beta/services/contactcenterinsights/resource_contact_center_insights_assessment_rule_generated_test.go index 78c3f38ca34..f43170be69a 100644 --- a/google-beta/services/contactcenterinsights/resource_contact_center_insights_assessment_rule_generated_test.go +++ b/google-beta/services/contactcenterinsights/resource_contact_center_insights_assessment_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/contactcenterinsights" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/contactcenterinsights/resource_contact_center_insights_auto_labeling_rule_generated_test.go b/google-beta/services/contactcenterinsights/resource_contact_center_insights_auto_labeling_rule_generated_test.go index a83f640d0d8..1e876dd1726 100644 --- a/google-beta/services/contactcenterinsights/resource_contact_center_insights_auto_labeling_rule_generated_test.go +++ b/google-beta/services/contactcenterinsights/resource_contact_center_insights_auto_labeling_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/contactcenterinsights" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/contactcenterinsights/resource_contact_center_insights_encryption_spec_generated_test.go b/google-beta/services/contactcenterinsights/resource_contact_center_insights_encryption_spec_generated_test.go index 0eabf9031cb..cb4f1d97dd0 100644 --- a/google-beta/services/contactcenterinsights/resource_contact_center_insights_encryption_spec_generated_test.go +++ b/google-beta/services/contactcenterinsights/resource_contact_center_insights_encryption_spec_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/contactcenterinsights" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/contactcenterinsights/resource_contact_center_insights_qa_question_generated_test.go b/google-beta/services/contactcenterinsights/resource_contact_center_insights_qa_question_generated_test.go index 8abac7a4034..a1d246e6745 100644 --- a/google-beta/services/contactcenterinsights/resource_contact_center_insights_qa_question_generated_test.go +++ b/google-beta/services/contactcenterinsights/resource_contact_center_insights_qa_question_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/contactcenterinsights" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/contactcenterinsights/resource_contact_center_insights_qa_scorecard_generated_test.go b/google-beta/services/contactcenterinsights/resource_contact_center_insights_qa_scorecard_generated_test.go index 42ca06165c5..480a066c550 100644 --- a/google-beta/services/contactcenterinsights/resource_contact_center_insights_qa_scorecard_generated_test.go +++ b/google-beta/services/contactcenterinsights/resource_contact_center_insights_qa_scorecard_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/contactcenterinsights" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/contactcenterinsights/resource_contact_center_insights_qa_scorecard_revision_generated_test.go b/google-beta/services/contactcenterinsights/resource_contact_center_insights_qa_scorecard_revision_generated_test.go index 969422adfca..f6c1eb978dc 100644 --- a/google-beta/services/contactcenterinsights/resource_contact_center_insights_qa_scorecard_revision_generated_test.go +++ b/google-beta/services/contactcenterinsights/resource_contact_center_insights_qa_scorecard_revision_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/contactcenterinsights" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/contactcenterinsights/resource_contact_center_insights_view_generated_test.go b/google-beta/services/contactcenterinsights/resource_contact_center_insights_view_generated_test.go index af0752f5380..9768bdbe43d 100644 --- a/google-beta/services/contactcenterinsights/resource_contact_center_insights_view_generated_test.go +++ b/google-beta/services/contactcenterinsights/resource_contact_center_insights_view_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/contactcenterinsights" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/container/resource_container_cluster_test.go b/google-beta/services/container/resource_container_cluster_test.go index a17548b0f76..c093cc0d2ce 100644 --- a/google-beta/services/container/resource_container_cluster_test.go +++ b/google-beta/services/container/resource_container_cluster_test.go @@ -31,11 +31,12 @@ import ( tpgcompute "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/container" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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", @@ -3227,7 +3228,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", @@ -5826,7 +5827,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", @@ -7022,7 +7023,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", @@ -14040,7 +14041,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", @@ -14106,7 +14107,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", @@ -16930,7 +16931,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-beta/services/container/resource_container_node_pool_test.go b/google-beta/services/container/resource_container_node_pool_test.go index 8903da50a36..a528dc52efa 100644 --- a/google-beta/services/container/resource_container_node_pool_test.go +++ b/google-beta/services/container/resource_container_node_pool_test.go @@ -29,6 +29,7 @@ import ( tpgcompute "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/container" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/tags" ) @@ -1432,7 +1433,7 @@ func TestAccContainerNodePool_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", @@ -5572,7 +5573,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-beta/services/containeranalysis/resource_container_analysis_note_generated_test.go b/google-beta/services/containeranalysis/resource_container_analysis_note_generated_test.go index 1ea8ef1d227..dd1f587f0ae 100644 --- a/google-beta/services/containeranalysis/resource_container_analysis_note_generated_test.go +++ b/google-beta/services/containeranalysis/resource_container_analysis_note_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/containeranalysis" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/containerattached/resource_container_attached_cluster_generated_test.go b/google-beta/services/containerattached/resource_container_attached_cluster_generated_test.go index cee951fcf0c..6edca65860e 100644 --- a/google-beta/services/containerattached/resource_container_attached_cluster_generated_test.go +++ b/google-beta/services/containerattached/resource_container_attached_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/containerattached" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/databasemigrationservice/resource_database_migration_service_connection_profile_generated_test.go b/google-beta/services/databasemigrationservice/resource_database_migration_service_connection_profile_generated_test.go index 321bcaae1dd..a4fc34cc20b 100644 --- a/google-beta/services/databasemigrationservice/resource_database_migration_service_connection_profile_generated_test.go +++ b/google-beta/services/databasemigrationservice/resource_database_migration_service_connection_profile_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/databasemigrationservice" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/databasemigrationservice/resource_database_migration_service_migration_job_generated_test.go b/google-beta/services/databasemigrationservice/resource_database_migration_service_migration_job_generated_test.go index b4f589fcae4..2e5fa84216a 100644 --- a/google-beta/services/databasemigrationservice/resource_database_migration_service_migration_job_generated_test.go +++ b/google-beta/services/databasemigrationservice/resource_database_migration_service_migration_job_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/databasemigrationservice" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/databasemigrationservice/resource_database_migration_service_private_connection_generated_test.go b/google-beta/services/databasemigrationservice/resource_database_migration_service_private_connection_generated_test.go index 64b8237d06e..8f33447aba0 100644 --- a/google-beta/services/databasemigrationservice/resource_database_migration_service_private_connection_generated_test.go +++ b/google-beta/services/databasemigrationservice/resource_database_migration_service_private_connection_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/databasemigrationservice" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datacatalog/resource_data_catalog_entry_generated_test.go b/google-beta/services/datacatalog/resource_data_catalog_entry_generated_test.go index c7a3656f87b..d392d49de4b 100644 --- a/google-beta/services/datacatalog/resource_data_catalog_entry_generated_test.go +++ b/google-beta/services/datacatalog/resource_data_catalog_entry_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datacatalog" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datacatalog/resource_data_catalog_entry_group_generated_test.go b/google-beta/services/datacatalog/resource_data_catalog_entry_group_generated_test.go index fa5f1d62443..7f08b4d52bd 100644 --- a/google-beta/services/datacatalog/resource_data_catalog_entry_group_generated_test.go +++ b/google-beta/services/datacatalog/resource_data_catalog_entry_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datacatalog" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datacatalog/resource_data_catalog_policy_tag_generated_test.go b/google-beta/services/datacatalog/resource_data_catalog_policy_tag_generated_test.go index 9cd9d345343..84e48c83072 100644 --- a/google-beta/services/datacatalog/resource_data_catalog_policy_tag_generated_test.go +++ b/google-beta/services/datacatalog/resource_data_catalog_policy_tag_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datacatalog" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datacatalog/resource_data_catalog_tag_generated_test.go b/google-beta/services/datacatalog/resource_data_catalog_tag_generated_test.go index c47efd0573d..8e83f44c716 100644 --- a/google-beta/services/datacatalog/resource_data_catalog_tag_generated_test.go +++ b/google-beta/services/datacatalog/resource_data_catalog_tag_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datacatalog" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datacatalog/resource_data_catalog_tag_template_generated_test.go b/google-beta/services/datacatalog/resource_data_catalog_tag_template_generated_test.go index b3da969808e..2e18d2dd8c4 100644 --- a/google-beta/services/datacatalog/resource_data_catalog_tag_template_generated_test.go +++ b/google-beta/services/datacatalog/resource_data_catalog_tag_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datacatalog" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datacatalog/resource_data_catalog_taxonomy_generated_test.go b/google-beta/services/datacatalog/resource_data_catalog_taxonomy_generated_test.go index f14a7490b5a..46661b2764d 100644 --- a/google-beta/services/datacatalog/resource_data_catalog_taxonomy_generated_test.go +++ b/google-beta/services/datacatalog/resource_data_catalog_taxonomy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datacatalog" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataflow/resource_dataflow_flex_template_job_test.go b/google-beta/services/dataflow/resource_dataflow_flex_template_job_test.go index 7dd85b84049..f23a2f45e0f 100644 --- a/google-beta/services/dataflow/resource_dataflow_flex_template_job_test.go +++ b/google-beta/services/dataflow/resource_dataflow_flex_template_job_test.go @@ -29,6 +29,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataflow" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" compute_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" @@ -325,7 +326,7 @@ func TestAccDataflowFlexTemplateJob_withKmsKey(t *testing.T) { bucket := "tf-test-dataflow-bucket-" + randStr topic := "tf-test-topic" + 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-beta/services/dataflow/resource_dataflow_job_test.go b/google-beta/services/dataflow/resource_dataflow_job_test.go index f75a7df7266..d52cf689760 100644 --- a/google-beta/services/dataflow/resource_dataflow_job_test.go +++ b/google-beta/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-beta/google-beta/services/compute" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataflow" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" dataflowapi "google.golang.org/api/dataflow/v1b3" "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/dataform/resource_dataform_config_generated_test.go b/google-beta/services/dataform/resource_dataform_config_generated_test.go index 7ae1f65c418..faa03f437d9 100644 --- a/google-beta/services/dataform/resource_dataform_config_generated_test.go +++ b/google-beta/services/dataform/resource_dataform_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataform" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataform/resource_dataform_folder_generated_test.go b/google-beta/services/dataform/resource_dataform_folder_generated_test.go index 62ffea9e9fd..526a74a77c7 100644 --- a/google-beta/services/dataform/resource_dataform_folder_generated_test.go +++ b/google-beta/services/dataform/resource_dataform_folder_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataform" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataform/resource_dataform_repository_generated_test.go b/google-beta/services/dataform/resource_dataform_repository_generated_test.go index b85886bada0..35aa61b8399 100644 --- a/google-beta/services/dataform/resource_dataform_repository_generated_test.go +++ b/google-beta/services/dataform/resource_dataform_repository_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataform" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataform/resource_dataform_repository_release_config_generated_test.go b/google-beta/services/dataform/resource_dataform_repository_release_config_generated_test.go index 47eb0842081..7fe53e2c137 100644 --- a/google-beta/services/dataform/resource_dataform_repository_release_config_generated_test.go +++ b/google-beta/services/dataform/resource_dataform_repository_release_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataform" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataform/resource_dataform_repository_workflow_config_generated_test.go b/google-beta/services/dataform/resource_dataform_repository_workflow_config_generated_test.go index 0b0e52d238e..70918ef323b 100644 --- a/google-beta/services/dataform/resource_dataform_repository_workflow_config_generated_test.go +++ b/google-beta/services/dataform/resource_dataform_repository_workflow_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataform" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataform/resource_dataform_team_folder_generated_test.go b/google-beta/services/dataform/resource_dataform_team_folder_generated_test.go index e17ce3d0dfd..c3ae3863f5f 100644 --- a/google-beta/services/dataform/resource_dataform_team_folder_generated_test.go +++ b/google-beta/services/dataform/resource_dataform_team_folder_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataform" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datafusion/resource_data_fusion_instance_generated_test.go b/google-beta/services/datafusion/resource_data_fusion_instance_generated_test.go index c28e46f9772..6801dbab353 100644 --- a/google-beta/services/datafusion/resource_data_fusion_instance_generated_test.go +++ b/google-beta/services/datafusion/resource_data_fusion_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datafusion" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datalineage/resource_data_lineage_config_generated_test.go b/google-beta/services/datalineage/resource_data_lineage_config_generated_test.go index f529d58d959..5cca5e745ad 100644 --- a/google-beta/services/datalineage/resource_data_lineage_config_generated_test.go +++ b/google-beta/services/datalineage/resource_data_lineage_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datalineage" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datalossprevention/resource_data_loss_prevention_deidentify_template_generated_test.go b/google-beta/services/datalossprevention/resource_data_loss_prevention_deidentify_template_generated_test.go index 22fb5f0fff2..271d00cf1a8 100644 --- a/google-beta/services/datalossprevention/resource_data_loss_prevention_deidentify_template_generated_test.go +++ b/google-beta/services/datalossprevention/resource_data_loss_prevention_deidentify_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datalossprevention" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datalossprevention/resource_data_loss_prevention_discovery_config_generated_test.go b/google-beta/services/datalossprevention/resource_data_loss_prevention_discovery_config_generated_test.go index 063aa212dda..3e6571675b8 100644 --- a/google-beta/services/datalossprevention/resource_data_loss_prevention_discovery_config_generated_test.go +++ b/google-beta/services/datalossprevention/resource_data_loss_prevention_discovery_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datalossprevention" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datalossprevention/resource_data_loss_prevention_inspect_template_generated_test.go b/google-beta/services/datalossprevention/resource_data_loss_prevention_inspect_template_generated_test.go index 84620b62034..d89b4f5177c 100644 --- a/google-beta/services/datalossprevention/resource_data_loss_prevention_inspect_template_generated_test.go +++ b/google-beta/services/datalossprevention/resource_data_loss_prevention_inspect_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datalossprevention" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datalossprevention/resource_data_loss_prevention_job_trigger_generated_test.go b/google-beta/services/datalossprevention/resource_data_loss_prevention_job_trigger_generated_test.go index e0e23ffad3e..42ec4ac9d4d 100644 --- a/google-beta/services/datalossprevention/resource_data_loss_prevention_job_trigger_generated_test.go +++ b/google-beta/services/datalossprevention/resource_data_loss_prevention_job_trigger_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datalossprevention" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datalossprevention/resource_data_loss_prevention_stored_info_type_generated_test.go b/google-beta/services/datalossprevention/resource_data_loss_prevention_stored_info_type_generated_test.go index 3cd8c2f90ff..ab6ab7af070 100644 --- a/google-beta/services/datalossprevention/resource_data_loss_prevention_stored_info_type_generated_test.go +++ b/google-beta/services/datalossprevention/resource_data_loss_prevention_stored_info_type_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datalossprevention" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datapipeline/resource_data_pipeline_pipeline_generated_test.go b/google-beta/services/datapipeline/resource_data_pipeline_pipeline_generated_test.go index 3d4f8825424..cdb5fef661a 100644 --- a/google-beta/services/datapipeline/resource_data_pipeline_pipeline_generated_test.go +++ b/google-beta/services/datapipeline/resource_data_pipeline_pipeline_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datapipeline" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataplex/resource_dataplex_aspect_type_generated_test.go b/google-beta/services/dataplex/resource_dataplex_aspect_type_generated_test.go index 049adfdfc5a..7d7db08acc0 100644 --- a/google-beta/services/dataplex/resource_dataplex_aspect_type_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_aspect_type_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataplex" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataplex/resource_dataplex_data_asset_generated_test.go b/google-beta/services/dataplex/resource_dataplex_data_asset_generated_test.go index f79f1b9a95b..346dcc560da 100644 --- a/google-beta/services/dataplex/resource_dataplex_data_asset_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_data_asset_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataplex" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataplex/resource_dataplex_data_product_data_asset_generated_test.go b/google-beta/services/dataplex/resource_dataplex_data_product_data_asset_generated_test.go index 21d5318b38f..4e1a47f3208 100644 --- a/google-beta/services/dataplex/resource_dataplex_data_product_data_asset_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_data_product_data_asset_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataplex" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataplex/resource_dataplex_data_product_generated_test.go b/google-beta/services/dataplex/resource_dataplex_data_product_generated_test.go index a74c770cc61..aae4d8df755 100644 --- a/google-beta/services/dataplex/resource_dataplex_data_product_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_data_product_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataplex" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataplex/resource_dataplex_datascan_generated_test.go b/google-beta/services/dataplex/resource_dataplex_datascan_generated_test.go index 39af6acfab1..48e0dac33b7 100644 --- a/google-beta/services/dataplex/resource_dataplex_datascan_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_datascan_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataplex" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataplex/resource_dataplex_entry_generated_test.go b/google-beta/services/dataplex/resource_dataplex_entry_generated_test.go index 22e8f938cc5..b7ce901ddcc 100644 --- a/google-beta/services/dataplex/resource_dataplex_entry_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_entry_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataplex" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataplex/resource_dataplex_entry_group_generated_test.go b/google-beta/services/dataplex/resource_dataplex_entry_group_generated_test.go index f381cfe786b..b367eb67e4c 100644 --- a/google-beta/services/dataplex/resource_dataplex_entry_group_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_entry_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataplex" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataplex/resource_dataplex_entry_link_generated_test.go b/google-beta/services/dataplex/resource_dataplex_entry_link_generated_test.go index d7f239f21de..38922c0b845 100644 --- a/google-beta/services/dataplex/resource_dataplex_entry_link_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_entry_link_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataplex" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataplex/resource_dataplex_entry_type_generated_test.go b/google-beta/services/dataplex/resource_dataplex_entry_type_generated_test.go index eaedf74d71f..84796f8bce5 100644 --- a/google-beta/services/dataplex/resource_dataplex_entry_type_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_entry_type_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataplex" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataplex/resource_dataplex_glossary_category_generated_test.go b/google-beta/services/dataplex/resource_dataplex_glossary_category_generated_test.go index 535c7c97c9a..e2367b19391 100644 --- a/google-beta/services/dataplex/resource_dataplex_glossary_category_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_glossary_category_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataplex" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataplex/resource_dataplex_glossary_generated_test.go b/google-beta/services/dataplex/resource_dataplex_glossary_generated_test.go index 5e7a5873d26..1ecef048111 100644 --- a/google-beta/services/dataplex/resource_dataplex_glossary_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_glossary_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataplex" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataplex/resource_dataplex_glossary_term_generated_test.go b/google-beta/services/dataplex/resource_dataplex_glossary_term_generated_test.go index 9aad9c49373..251d8709c68 100644 --- a/google-beta/services/dataplex/resource_dataplex_glossary_term_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_glossary_term_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataplex" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataplex/resource_dataplex_task_generated_test.go b/google-beta/services/dataplex/resource_dataplex_task_generated_test.go index d79b7498419..846eba63c9d 100644 --- a/google-beta/services/dataplex/resource_dataplex_task_generated_test.go +++ b/google-beta/services/dataplex/resource_dataplex_task_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataplex" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataproc/resource_dataproc_autoscaling_policy_generated_test.go b/google-beta/services/dataproc/resource_dataproc_autoscaling_policy_generated_test.go index 405cca542bf..fa3b0d56848 100644 --- a/google-beta/services/dataproc/resource_dataproc_autoscaling_policy_generated_test.go +++ b/google-beta/services/dataproc/resource_dataproc_autoscaling_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataproc" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataproc/resource_dataproc_batch_generated_test.go b/google-beta/services/dataproc/resource_dataproc_batch_generated_test.go index 034df531dae..6d39caa165d 100644 --- a/google-beta/services/dataproc/resource_dataproc_batch_generated_test.go +++ b/google-beta/services/dataproc/resource_dataproc_batch_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataproc" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataproc/resource_dataproc_cluster_test.go b/google-beta/services/dataproc/resource_dataproc_cluster_test.go index 866eb709b3b..e001584fb7d 100644 --- a/google-beta/services/dataproc/resource_dataproc_cluster_test.go +++ b/google-beta/services/dataproc/resource_dataproc_cluster_test.go @@ -34,6 +34,7 @@ import ( tpgcompute "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute" dataproc_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataproc" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storage" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/dataproc/resource_dataproc_session_template_generated_test.go b/google-beta/services/dataproc/resource_dataproc_session_template_generated_test.go index 17e18220cf8..668af6387a9 100644 --- a/google-beta/services/dataproc/resource_dataproc_session_template_generated_test.go +++ b/google-beta/services/dataproc/resource_dataproc_session_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataproc" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataproc/resource_dataproc_session_template_test.go b/google-beta/services/dataproc/resource_dataproc_session_template_test.go index 5a1798d9046..f45dc9d0abf 100644 --- a/google-beta/services/dataproc/resource_dataproc_session_template_test.go +++ b/google-beta/services/dataproc/resource_dataproc_session_template_test.go @@ -25,12 +25,13 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/dataprocgdc/resource_dataproc_gdc_application_environment_generated_test.go b/google-beta/services/dataprocgdc/resource_dataproc_gdc_application_environment_generated_test.go index 60930fcfc9a..2c75ba34e78 100644 --- a/google-beta/services/dataprocgdc/resource_dataproc_gdc_application_environment_generated_test.go +++ b/google-beta/services/dataprocgdc/resource_dataproc_gdc_application_environment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataprocgdc" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataprocgdc/resource_dataproc_gdc_service_instance_generated_test.go b/google-beta/services/dataprocgdc/resource_dataproc_gdc_service_instance_generated_test.go index fef4f556979..9e3bd5c99df 100644 --- a/google-beta/services/dataprocgdc/resource_dataproc_gdc_service_instance_generated_test.go +++ b/google-beta/services/dataprocgdc/resource_dataproc_gdc_service_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataprocgdc" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataprocgdc/resource_dataproc_gdc_spark_application_generated_test.go b/google-beta/services/dataprocgdc/resource_dataproc_gdc_spark_application_generated_test.go index 278305482ca..a9c6628b409 100644 --- a/google-beta/services/dataprocgdc/resource_dataproc_gdc_spark_application_generated_test.go +++ b/google-beta/services/dataprocgdc/resource_dataproc_gdc_spark_application_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataprocgdc" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataprocmetastore/resource_dataproc_metastore_federation_generated_test.go b/google-beta/services/dataprocmetastore/resource_dataproc_metastore_federation_generated_test.go index 784b6fd8a1b..aa484759e06 100644 --- a/google-beta/services/dataprocmetastore/resource_dataproc_metastore_federation_generated_test.go +++ b/google-beta/services/dataprocmetastore/resource_dataproc_metastore_federation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataprocmetastore" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dataprocmetastore/resource_dataproc_metastore_service_generated_test.go b/google-beta/services/dataprocmetastore/resource_dataproc_metastore_service_generated_test.go index e0c7d5299a5..413ffc8a1a0 100644 --- a/google-beta/services/dataprocmetastore/resource_dataproc_metastore_service_generated_test.go +++ b/google-beta/services/dataprocmetastore/resource_dataproc_metastore_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataprocmetastore" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datastream/resource_datastream_connection_profile_generated_test.go b/google-beta/services/datastream/resource_datastream_connection_profile_generated_test.go index ea7d7902b7b..bb2489b58d3 100644 --- a/google-beta/services/datastream/resource_datastream_connection_profile_generated_test.go +++ b/google-beta/services/datastream/resource_datastream_connection_profile_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datastream" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datastream/resource_datastream_private_connection_generated_test.go b/google-beta/services/datastream/resource_datastream_private_connection_generated_test.go index 34a3b036834..ba6c3bca75a 100644 --- a/google-beta/services/datastream/resource_datastream_private_connection_generated_test.go +++ b/google-beta/services/datastream/resource_datastream_private_connection_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datastream" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/datastream/resource_datastream_stream_generated_test.go b/google-beta/services/datastream/resource_datastream_stream_generated_test.go index 06014902895..8317817b30a 100644 --- a/google-beta/services/datastream/resource_datastream_stream_generated_test.go +++ b/google-beta/services/datastream/resource_datastream_stream_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datastream" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/developerconnect/resource_developer_connect_account_connector_generated_test.go b/google-beta/services/developerconnect/resource_developer_connect_account_connector_generated_test.go index 3b60738374d..68227d8fc2d 100644 --- a/google-beta/services/developerconnect/resource_developer_connect_account_connector_generated_test.go +++ b/google-beta/services/developerconnect/resource_developer_connect_account_connector_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/developerconnect" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/developerconnect/resource_developer_connect_connection_generated_test.go b/google-beta/services/developerconnect/resource_developer_connect_connection_generated_test.go index 2bd989e1ca7..115a20a320e 100644 --- a/google-beta/services/developerconnect/resource_developer_connect_connection_generated_test.go +++ b/google-beta/services/developerconnect/resource_developer_connect_connection_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/developerconnect" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/developerconnect/resource_developer_connect_git_repository_link_generated_test.go b/google-beta/services/developerconnect/resource_developer_connect_git_repository_link_generated_test.go index f12ecec813e..f586b0eebc2 100644 --- a/google-beta/services/developerconnect/resource_developer_connect_git_repository_link_generated_test.go +++ b/google-beta/services/developerconnect/resource_developer_connect_git_repository_link_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/developerconnect" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/developerconnect/resource_developer_connect_insights_config_generated_test.go b/google-beta/services/developerconnect/resource_developer_connect_insights_config_generated_test.go index 46e8c3ee3b3..8f63c410370 100644 --- a/google-beta/services/developerconnect/resource_developer_connect_insights_config_generated_test.go +++ b/google-beta/services/developerconnect/resource_developer_connect_insights_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/developerconnect" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflow/resource_dialogflow_agent_generated_test.go b/google-beta/services/dialogflow/resource_dialogflow_agent_generated_test.go index 99e5befe70d..432521e370e 100644 --- a/google-beta/services/dialogflow/resource_dialogflow_agent_generated_test.go +++ b/google-beta/services/dialogflow/resource_dialogflow_agent_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflow" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflow/resource_dialogflow_conversation_profile_generated_test.go b/google-beta/services/dialogflow/resource_dialogflow_conversation_profile_generated_test.go index db783040282..9981527c152 100644 --- a/google-beta/services/dialogflow/resource_dialogflow_conversation_profile_generated_test.go +++ b/google-beta/services/dialogflow/resource_dialogflow_conversation_profile_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflow" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflow/resource_dialogflow_environment_generated_test.go b/google-beta/services/dialogflow/resource_dialogflow_environment_generated_test.go index 85655d344a5..08b50db19fd 100644 --- a/google-beta/services/dialogflow/resource_dialogflow_environment_generated_test.go +++ b/google-beta/services/dialogflow/resource_dialogflow_environment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflow" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflow/resource_dialogflow_generator_generated_test.go b/google-beta/services/dialogflow/resource_dialogflow_generator_generated_test.go index 0f1aa20115f..aa113b256bc 100644 --- a/google-beta/services/dialogflow/resource_dialogflow_generator_generated_test.go +++ b/google-beta/services/dialogflow/resource_dialogflow_generator_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflow" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflow/resource_dialogflow_intent_generated_test.go b/google-beta/services/dialogflow/resource_dialogflow_intent_generated_test.go index c61f89a4c2f..c4e09675112 100644 --- a/google-beta/services/dialogflow/resource_dialogflow_intent_generated_test.go +++ b/google-beta/services/dialogflow/resource_dialogflow_intent_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflow" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflow/resource_dialogflow_version_generated_test.go b/google-beta/services/dialogflow/resource_dialogflow_version_generated_test.go index 2c9b7a43ad8..ec5d19a6e68 100644 --- a/google-beta/services/dialogflow/resource_dialogflow_version_generated_test.go +++ b/google-beta/services/dialogflow/resource_dialogflow_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflow" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_agent_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_agent_generated_test.go index 54a4ceb9692..35a073ee29a 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_agent_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_agent_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_entity_type_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_entity_type_generated_test.go index fc16a3901db..f580277c9a0 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_entity_type_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_entity_type_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_environment_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_environment_generated_test.go index 4e74090aed2..a6b9077c7e8 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_environment_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_environment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_flow_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_flow_generated_test.go index 689c107b5bd..8ff983591f1 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_flow_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_flow_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_generative_settings_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_generative_settings_generated_test.go index b9bfde3ac45..db05528cbd3 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_generative_settings_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_generative_settings_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_generator_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_generator_generated_test.go index ceb2df634e5..93f26ce5a7e 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_generator_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_generator_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_intent_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_intent_generated_test.go index a4dd6675692..0b2c3c16e27 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_intent_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_intent_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_page_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_page_generated_test.go index 7150d9482b7..0a09926ee12 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_page_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_page_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_playbook_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_playbook_generated_test.go index a2cd567a9b1..c281a160c4c 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_playbook_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_playbook_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_security_settings_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_security_settings_generated_test.go index 078b93c2765..39b4236f19d 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_security_settings_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_security_settings_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_test_case_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_test_case_generated_test.go index e38227b3354..536309de1b5 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_test_case_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_test_case_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_tool_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_tool_generated_test.go index d380a454f09..715492bb120 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_tool_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_tool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_tool_version_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_tool_version_generated_test.go index b497a547351..0c7c996eb22 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_tool_version_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_tool_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_version_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_version_generated_test.go index 9a1d27c51f6..0f1583cbf54 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_version_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dialogflowcx/resource_dialogflow_cx_webhook_generated_test.go b/google-beta/services/dialogflowcx/resource_dialogflow_cx_webhook_generated_test.go index b893fef2901..9ce82bb0fda 100644 --- a/google-beta/services/dialogflowcx/resource_dialogflow_cx_webhook_generated_test.go +++ b/google-beta/services/dialogflowcx/resource_dialogflow_cx_webhook_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflowcx" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_acl_config_generated_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_acl_config_generated_test.go index 096a9ac2526..f7a08e2aa9c 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_acl_config_generated_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_acl_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_assistant_generated_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_assistant_generated_test.go index 0ed352f72c5..72d47b13826 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_assistant_generated_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_assistant_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_chat_engine_generated_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_chat_engine_generated_test.go index e63bea9d5f6..e3dd69f0a5b 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_chat_engine_generated_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_chat_engine_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_control_generated_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_control_generated_test.go index 8d9f2c9f2df..4018341d9c9 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_control_generated_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_control_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_data_connector_generated_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_data_connector_generated_test.go index f198377d742..3435a1a875b 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_data_connector_generated_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_data_connector_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_data_store_generated_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_data_store_generated_test.go index 82adc15cf51..6a603e368b8 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_data_store_generated_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_data_store_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_recommendation_engine_generated_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_recommendation_engine_generated_test.go index 17df09ca638..946fc357323 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_recommendation_engine_generated_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_recommendation_engine_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_schema_generated_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_schema_generated_test.go index d9794915b53..bcc080af116 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_schema_generated_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_schema_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_search_engine_generated_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_search_engine_generated_test.go index 989b6bebdca..523db2429f6 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_search_engine_generated_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_search_engine_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_sitemap_generated_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_sitemap_generated_test.go index d33615708db..450a4cb34fe 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_sitemap_generated_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_sitemap_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_target_site_generated_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_target_site_generated_test.go index e3413aea8a7..007a7070fb9 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_target_site_generated_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_target_site_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/discoveryengine/resource_discovery_engine_widget_config_generated_test.go b/google-beta/services/discoveryengine/resource_discovery_engine_widget_config_generated_test.go index 4462880498b..ebfec6cce74 100644 --- a/google-beta/services/discoveryengine/resource_discovery_engine_widget_config_generated_test.go +++ b/google-beta/services/discoveryengine/resource_discovery_engine_widget_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/discoveryengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dns/resource_dns_managed_zone_generated_test.go b/google-beta/services/dns/resource_dns_managed_zone_generated_test.go index 2388eeb3b90..9737f09115a 100644 --- a/google-beta/services/dns/resource_dns_managed_zone_generated_test.go +++ b/google-beta/services/dns/resource_dns_managed_zone_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dns" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dns/resource_dns_policy_generated_test.go b/google-beta/services/dns/resource_dns_policy_generated_test.go index 1025e3f41d9..3eda5a10da5 100644 --- a/google-beta/services/dns/resource_dns_policy_generated_test.go +++ b/google-beta/services/dns/resource_dns_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dns" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dns/resource_dns_response_policy_generated_test.go b/google-beta/services/dns/resource_dns_response_policy_generated_test.go index 523bc281341..855c127d3d1 100644 --- a/google-beta/services/dns/resource_dns_response_policy_generated_test.go +++ b/google-beta/services/dns/resource_dns_response_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dns" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/dns/resource_dns_response_policy_rule_generated_test.go b/google-beta/services/dns/resource_dns_response_policy_rule_generated_test.go index b453df57af1..05d3f83ba11 100644 --- a/google-beta/services/dns/resource_dns_response_policy_rule_generated_test.go +++ b/google-beta/services/dns/resource_dns_response_policy_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dns" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/documentai/resource_document_ai_processor_default_version_generated_test.go b/google-beta/services/documentai/resource_document_ai_processor_default_version_generated_test.go index d24293268d9..c05114b089d 100644 --- a/google-beta/services/documentai/resource_document_ai_processor_default_version_generated_test.go +++ b/google-beta/services/documentai/resource_document_ai_processor_default_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/documentai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/documentai/resource_document_ai_processor_generated_test.go b/google-beta/services/documentai/resource_document_ai_processor_generated_test.go index b0f680f37eb..3ebfda36ac3 100644 --- a/google-beta/services/documentai/resource_document_ai_processor_generated_test.go +++ b/google-beta/services/documentai/resource_document_ai_processor_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/documentai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/documentai/resource_document_ai_schema_generated_test.go b/google-beta/services/documentai/resource_document_ai_schema_generated_test.go index 26c105242c5..b6d1f382904 100644 --- a/google-beta/services/documentai/resource_document_ai_schema_generated_test.go +++ b/google-beta/services/documentai/resource_document_ai_schema_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/documentai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/essentialcontacts/resource_essential_contacts_contact_generated_test.go b/google-beta/services/essentialcontacts/resource_essential_contacts_contact_generated_test.go index aba05bfc827..3ffd0ffb558 100644 --- a/google-beta/services/essentialcontacts/resource_essential_contacts_contact_generated_test.go +++ b/google-beta/services/essentialcontacts/resource_essential_contacts_contact_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/essentialcontacts" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/eventarc/resource_eventarc_channel_generated_test.go b/google-beta/services/eventarc/resource_eventarc_channel_generated_test.go index d35b06a72cb..f1fe05c10b4 100644 --- a/google-beta/services/eventarc/resource_eventarc_channel_generated_test.go +++ b/google-beta/services/eventarc/resource_eventarc_channel_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/eventarc" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/eventarc/resource_eventarc_channel_test.go b/google-beta/services/eventarc/resource_eventarc_channel_test.go index 8975c4f3c22..74ffd491615 100644 --- a/google-beta/services/eventarc/resource_eventarc_channel_test.go +++ b/google-beta/services/eventarc/resource_eventarc_channel_test.go @@ -22,6 +22,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/eventarc/resource_eventarc_google_channel_config_test.go b/google-beta/services/eventarc/resource_eventarc_google_channel_config_test.go index dab47f797ee..52bd69bd528 100644 --- a/google-beta/services/eventarc/resource_eventarc_google_channel_config_test.go +++ b/google-beta/services/eventarc/resource_eventarc_google_channel_config_test.go @@ -22,6 +22,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/eventarc/resource_eventarc_message_bus_test.go b/google-beta/services/eventarc/resource_eventarc_message_bus_test.go index bb3f851b40c..95757e8e809 100644 --- a/google-beta/services/eventarc/resource_eventarc_message_bus_test.go +++ b/google-beta/services/eventarc/resource_eventarc_message_bus_test.go @@ -27,6 +27,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/eventarc/resource_eventarc_pipeline_generated_test.go b/google-beta/services/eventarc/resource_eventarc_pipeline_generated_test.go index f2b95de861a..c3a46119214 100644 --- a/google-beta/services/eventarc/resource_eventarc_pipeline_generated_test.go +++ b/google-beta/services/eventarc/resource_eventarc_pipeline_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/eventarc" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/eventarc/resource_eventarc_pipeline_test.go b/google-beta/services/eventarc/resource_eventarc_pipeline_test.go index 173b96e1a09..24221ea2166 100644 --- a/google-beta/services/eventarc/resource_eventarc_pipeline_test.go +++ b/google-beta/services/eventarc/resource_eventarc_pipeline_test.go @@ -22,6 +22,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/eventarc/resource_eventarc_trigger_generated_test.go b/google-beta/services/eventarc/resource_eventarc_trigger_generated_test.go index d4f83bf8c27..44a273f3a7e 100644 --- a/google-beta/services/eventarc/resource_eventarc_trigger_generated_test.go +++ b/google-beta/services/eventarc/resource_eventarc_trigger_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/eventarc" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/filestore/resource_filestore_backup_generated_test.go b/google-beta/services/filestore/resource_filestore_backup_generated_test.go index 0e0d80ac7a6..ddb270a6d9d 100644 --- a/google-beta/services/filestore/resource_filestore_backup_generated_test.go +++ b/google-beta/services/filestore/resource_filestore_backup_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/filestore" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/filestore/resource_filestore_instance_generated_test.go b/google-beta/services/filestore/resource_filestore_instance_generated_test.go index 3d5bd1ebe30..2c7af7d2dae 100644 --- a/google-beta/services/filestore/resource_filestore_instance_generated_test.go +++ b/google-beta/services/filestore/resource_filestore_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/filestore" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/filestore/resource_filestore_snapshot_generated_test.go b/google-beta/services/filestore/resource_filestore_snapshot_generated_test.go index bd586471f81..a3aa48f58a0 100644 --- a/google-beta/services/filestore/resource_filestore_snapshot_generated_test.go +++ b/google-beta/services/filestore/resource_filestore_snapshot_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/filestore" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebase/resource_firebase_android_app_generated_test.go b/google-beta/services/firebase/resource_firebase_android_app_generated_test.go index c35de448009..78100937895 100644 --- a/google-beta/services/firebase/resource_firebase_android_app_generated_test.go +++ b/google-beta/services/firebase/resource_firebase_android_app_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebase" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebase/resource_firebase_apple_app_generated_test.go b/google-beta/services/firebase/resource_firebase_apple_app_generated_test.go index 1bab8105282..fe280261b52 100644 --- a/google-beta/services/firebase/resource_firebase_apple_app_generated_test.go +++ b/google-beta/services/firebase/resource_firebase_apple_app_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebase" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebase/resource_firebase_project_generated_test.go b/google-beta/services/firebase/resource_firebase_project_generated_test.go index 4bca035b1c8..e5c90d98d75 100644 --- a/google-beta/services/firebase/resource_firebase_project_generated_test.go +++ b/google-beta/services/firebase/resource_firebase_project_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebase" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebase/resource_firebase_web_app_generated_test.go b/google-beta/services/firebase/resource_firebase_web_app_generated_test.go index 3273862117c..f0a1eb4ab27 100644 --- a/google-beta/services/firebase/resource_firebase_web_app_generated_test.go +++ b/google-beta/services/firebase/resource_firebase_web_app_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebase" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseailogic/resource_firebase_ai_logic_config_generated_test.go b/google-beta/services/firebaseailogic/resource_firebase_ai_logic_config_generated_test.go index 9a23fadf4b5..b67019b5279 100644 --- a/google-beta/services/firebaseailogic/resource_firebase_ai_logic_config_generated_test.go +++ b/google-beta/services/firebaseailogic/resource_firebase_ai_logic_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseailogic" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseailogic/resource_firebase_ai_logic_prompt_template_generated_test.go b/google-beta/services/firebaseailogic/resource_firebase_ai_logic_prompt_template_generated_test.go index 0dcf356587c..4852db1d1db 100644 --- a/google-beta/services/firebaseailogic/resource_firebase_ai_logic_prompt_template_generated_test.go +++ b/google-beta/services/firebaseailogic/resource_firebase_ai_logic_prompt_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseailogic" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseailogic/resource_firebase_ai_logic_prompt_template_lock_generated_test.go b/google-beta/services/firebaseailogic/resource_firebase_ai_logic_prompt_template_lock_generated_test.go index 760f237972f..02a1f58a855 100644 --- a/google-beta/services/firebaseailogic/resource_firebase_ai_logic_prompt_template_lock_generated_test.go +++ b/google-beta/services/firebaseailogic/resource_firebase_ai_logic_prompt_template_lock_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseailogic" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_generated_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_generated_test.go index d2376902328..2bed219d869 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_generated_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseappcheck" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_debug_token_generated_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_debug_token_generated_test.go index eedb2168a92..4925adf8004 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_debug_token_generated_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_debug_token_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseappcheck" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_device_check_config_generated_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_device_check_config_generated_test.go index 4781d86adec..5fe580fd774 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_device_check_config_generated_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_device_check_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseappcheck" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_generated_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_generated_test.go index cb3fdefa5c7..50615631895 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_generated_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseappcheck" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_generated_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_generated_test.go index 0f88aabcf23..3439d5b4cf2 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_generated_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseappcheck" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_generated_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_generated_test.go index 069f031db3b..aa746d86480 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_generated_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseappcheck" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_resource_policy_generated_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_resource_policy_generated_test.go index 31fb1083905..e18e7b3adeb 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_resource_policy_generated_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_resource_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseappcheck" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseappcheck/resource_firebase_app_check_service_config_generated_test.go b/google-beta/services/firebaseappcheck/resource_firebase_app_check_service_config_generated_test.go index fdb944a4679..cc67a31f9d0 100644 --- a/google-beta/services/firebaseappcheck/resource_firebase_app_check_service_config_generated_test.go +++ b/google-beta/services/firebaseappcheck/resource_firebase_app_check_service_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseappcheck" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_backend_generated_test.go b/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_backend_generated_test.go index a4c8ff11d9c..256fc92767e 100644 --- a/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_backend_generated_test.go +++ b/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_backend_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseapphosting" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_build_generated_test.go b/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_build_generated_test.go index b7b6d356af9..7422f4fe5f1 100644 --- a/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_build_generated_test.go +++ b/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_build_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseapphosting" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_default_domain_generated_test.go b/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_default_domain_generated_test.go index 78b15b6a190..d3774a71093 100644 --- a/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_default_domain_generated_test.go +++ b/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_default_domain_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseapphosting" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_domain_generated_test.go b/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_domain_generated_test.go index 7c2bd3f28fb..2ec795c4ddb 100644 --- a/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_domain_generated_test.go +++ b/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_domain_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseapphosting" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_traffic_generated_test.go b/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_traffic_generated_test.go index 2494f959b7c..d13399587ba 100644 --- a/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_traffic_generated_test.go +++ b/google-beta/services/firebaseapphosting/resource_firebase_app_hosting_traffic_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseapphosting" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebasedatabase/resource_firebase_database_instance_generated_test.go b/google-beta/services/firebasedatabase/resource_firebase_database_instance_generated_test.go index c7a47760d93..389077b2aa1 100644 --- a/google-beta/services/firebasedatabase/resource_firebase_database_instance_generated_test.go +++ b/google-beta/services/firebasedatabase/resource_firebase_database_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebasedatabase" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebasedataconnect/resource_firebase_data_connect_service_generated_test.go b/google-beta/services/firebasedataconnect/resource_firebase_data_connect_service_generated_test.go index b86bc07b70c..e9737473ad7 100644 --- a/google-beta/services/firebasedataconnect/resource_firebase_data_connect_service_generated_test.go +++ b/google-beta/services/firebasedataconnect/resource_firebase_data_connect_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebasedataconnect" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebaseextensions/resource_firebase_extensions_instance_generated_test.go b/google-beta/services/firebaseextensions/resource_firebase_extensions_instance_generated_test.go index c55dcb308ce..83d71a096f1 100644 --- a/google-beta/services/firebaseextensions/resource_firebase_extensions_instance_generated_test.go +++ b/google-beta/services/firebaseextensions/resource_firebase_extensions_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaseextensions" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebasehosting/resource_firebase_hosting_channel_generated_test.go b/google-beta/services/firebasehosting/resource_firebase_hosting_channel_generated_test.go index d8d00448c7c..4060175ffac 100644 --- a/google-beta/services/firebasehosting/resource_firebase_hosting_channel_generated_test.go +++ b/google-beta/services/firebasehosting/resource_firebase_hosting_channel_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebasehosting" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebasehosting/resource_firebase_hosting_custom_domain_generated_test.go b/google-beta/services/firebasehosting/resource_firebase_hosting_custom_domain_generated_test.go index 8cbf08c5071..44e4d1213b6 100644 --- a/google-beta/services/firebasehosting/resource_firebase_hosting_custom_domain_generated_test.go +++ b/google-beta/services/firebasehosting/resource_firebase_hosting_custom_domain_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebasehosting" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebasehosting/resource_firebase_hosting_release_generated_test.go b/google-beta/services/firebasehosting/resource_firebase_hosting_release_generated_test.go index 8263ea84b45..8f40e5ec7e9 100644 --- a/google-beta/services/firebasehosting/resource_firebase_hosting_release_generated_test.go +++ b/google-beta/services/firebasehosting/resource_firebase_hosting_release_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebasehosting" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebasehosting/resource_firebase_hosting_site_generated_test.go b/google-beta/services/firebasehosting/resource_firebase_hosting_site_generated_test.go index f9f197ca252..3017e2d8ba9 100644 --- a/google-beta/services/firebasehosting/resource_firebase_hosting_site_generated_test.go +++ b/google-beta/services/firebasehosting/resource_firebase_hosting_site_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebasehosting" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebasehosting/resource_firebase_hosting_version_generated_test.go b/google-beta/services/firebasehosting/resource_firebase_hosting_version_generated_test.go index eeca711dda7..2cb133c33bd 100644 --- a/google-beta/services/firebasehosting/resource_firebase_hosting_version_generated_test.go +++ b/google-beta/services/firebasehosting/resource_firebase_hosting_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebasehosting" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebasestorage/resource_firebase_storage_bucket_generated_test.go b/google-beta/services/firebasestorage/resource_firebase_storage_bucket_generated_test.go index fa8a185ff59..5e46866c340 100644 --- a/google-beta/services/firebasestorage/resource_firebase_storage_bucket_generated_test.go +++ b/google-beta/services/firebasestorage/resource_firebase_storage_bucket_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebasestorage" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firebasestorage/resource_firebase_storage_default_bucket_generated_test.go b/google-beta/services/firebasestorage/resource_firebase_storage_default_bucket_generated_test.go index afb108bf8e7..3b2f2f43ba4 100644 --- a/google-beta/services/firebasestorage/resource_firebase_storage_default_bucket_generated_test.go +++ b/google-beta/services/firebasestorage/resource_firebase_storage_default_bucket_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebasestorage" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firestore/resource_firestore_backup_schedule_generated_test.go b/google-beta/services/firestore/resource_firestore_backup_schedule_generated_test.go index a1aac378e08..2aed73cf234 100644 --- a/google-beta/services/firestore/resource_firestore_backup_schedule_generated_test.go +++ b/google-beta/services/firestore/resource_firestore_backup_schedule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firestore" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firestore/resource_firestore_database_generated_test.go b/google-beta/services/firestore/resource_firestore_database_generated_test.go index 72711bba522..2f54f2f1140 100644 --- a/google-beta/services/firestore/resource_firestore_database_generated_test.go +++ b/google-beta/services/firestore/resource_firestore_database_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firestore" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firestore/resource_firestore_document_generated_test.go b/google-beta/services/firestore/resource_firestore_document_generated_test.go index a8679190669..8f37a8d3e96 100644 --- a/google-beta/services/firestore/resource_firestore_document_generated_test.go +++ b/google-beta/services/firestore/resource_firestore_document_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firestore" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firestore/resource_firestore_field_generated_test.go b/google-beta/services/firestore/resource_firestore_field_generated_test.go index 9bbf4ade4a0..9634d21f5fd 100644 --- a/google-beta/services/firestore/resource_firestore_field_generated_test.go +++ b/google-beta/services/firestore/resource_firestore_field_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firestore" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firestore/resource_firestore_index_generated_test.go b/google-beta/services/firestore/resource_firestore_index_generated_test.go index e592d30b735..4812e7fc33e 100644 --- a/google-beta/services/firestore/resource_firestore_index_generated_test.go +++ b/google-beta/services/firestore/resource_firestore_index_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firestore" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/firestore/resource_firestore_user_creds_generated_test.go b/google-beta/services/firestore/resource_firestore_user_creds_generated_test.go index 6796aa25463..9a4ded7cab4 100644 --- a/google-beta/services/firestore/resource_firestore_user_creds_generated_test.go +++ b/google-beta/services/firestore/resource_firestore_user_creds_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firestore" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gemini/resource_gemini_gemini_gcp_enablement_setting_generated_test.go b/google-beta/services/gemini/resource_gemini_gemini_gcp_enablement_setting_generated_test.go index af2778657db..9d7c1d20ad0 100644 --- a/google-beta/services/gemini/resource_gemini_gemini_gcp_enablement_setting_generated_test.go +++ b/google-beta/services/gemini/resource_gemini_gemini_gcp_enablement_setting_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gemini" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gemini/resource_gemini_logging_setting_generated_test.go b/google-beta/services/gemini/resource_gemini_logging_setting_generated_test.go index 8dc9d1cbe29..bbd6c07f347 100644 --- a/google-beta/services/gemini/resource_gemini_logging_setting_generated_test.go +++ b/google-beta/services/gemini/resource_gemini_logging_setting_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gemini" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gemini/resource_gemini_release_channel_setting_generated_test.go b/google-beta/services/gemini/resource_gemini_release_channel_setting_generated_test.go index 69620e104c4..85c35ee570d 100644 --- a/google-beta/services/gemini/resource_gemini_release_channel_setting_generated_test.go +++ b/google-beta/services/gemini/resource_gemini_release_channel_setting_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gemini" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gkebackup/resource_gke_backup_backup_channel_generated_test.go b/google-beta/services/gkebackup/resource_gke_backup_backup_channel_generated_test.go index 31d6a01aaf8..54b3bb350a9 100644 --- a/google-beta/services/gkebackup/resource_gke_backup_backup_channel_generated_test.go +++ b/google-beta/services/gkebackup/resource_gke_backup_backup_channel_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkebackup" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gkebackup/resource_gke_backup_backup_plan_generated_test.go b/google-beta/services/gkebackup/resource_gke_backup_backup_plan_generated_test.go index 0cfe55151e9..4b549e8d89d 100644 --- a/google-beta/services/gkebackup/resource_gke_backup_backup_plan_generated_test.go +++ b/google-beta/services/gkebackup/resource_gke_backup_backup_plan_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkebackup" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gkebackup/resource_gke_backup_restore_channel_generated_test.go b/google-beta/services/gkebackup/resource_gke_backup_restore_channel_generated_test.go index ab630784829..11250fd9ab7 100644 --- a/google-beta/services/gkebackup/resource_gke_backup_restore_channel_generated_test.go +++ b/google-beta/services/gkebackup/resource_gke_backup_restore_channel_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkebackup" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gkebackup/resource_gke_backup_restore_plan_generated_test.go b/google-beta/services/gkebackup/resource_gke_backup_restore_plan_generated_test.go index 06eb5453986..02357dea454 100644 --- a/google-beta/services/gkebackup/resource_gke_backup_restore_plan_generated_test.go +++ b/google-beta/services/gkebackup/resource_gke_backup_restore_plan_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkebackup" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gkehub/resource_gke_hub_membership_generated_test.go b/google-beta/services/gkehub/resource_gke_hub_membership_generated_test.go index 8942509b1c6..ad6a117ae07 100644 --- a/google-beta/services/gkehub/resource_gke_hub_membership_generated_test.go +++ b/google-beta/services/gkehub/resource_gke_hub_membership_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkehub" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go b/google-beta/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go index 81fec3766d9..db93400c300 100644 --- a/google-beta/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go +++ b/google-beta/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkehub2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gkehub2/resource_gke_hub_membership_rbac_role_binding_generated_test.go b/google-beta/services/gkehub2/resource_gke_hub_membership_rbac_role_binding_generated_test.go index c25abd2e1d1..388b424566b 100644 --- a/google-beta/services/gkehub2/resource_gke_hub_membership_rbac_role_binding_generated_test.go +++ b/google-beta/services/gkehub2/resource_gke_hub_membership_rbac_role_binding_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkehub2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gkehub2/resource_gke_hub_namespace_generated_test.go b/google-beta/services/gkehub2/resource_gke_hub_namespace_generated_test.go index 5accab9eef4..e9dec657367 100644 --- a/google-beta/services/gkehub2/resource_gke_hub_namespace_generated_test.go +++ b/google-beta/services/gkehub2/resource_gke_hub_namespace_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkehub2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gkehub2/resource_gke_hub_scope_generated_test.go b/google-beta/services/gkehub2/resource_gke_hub_scope_generated_test.go index 13017e64ec2..89e544294d4 100644 --- a/google-beta/services/gkehub2/resource_gke_hub_scope_generated_test.go +++ b/google-beta/services/gkehub2/resource_gke_hub_scope_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkehub2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_generated_test.go b/google-beta/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_generated_test.go index 60229937a7d..a6da19ab96f 100644 --- a/google-beta/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_generated_test.go +++ b/google-beta/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkehub2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_admin_cluster_generated_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_admin_cluster_generated_test.go index 784b614a7ad..40888a8a81e 100644 --- a/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_admin_cluster_generated_test.go +++ b/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_admin_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkeonprem" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_generated_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_generated_test.go index a186ae0cbdc..0e0d546e72a 100644 --- a/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_generated_test.go +++ b/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkeonprem" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_generated_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_generated_test.go index 698efe0c242..c58a06ea04f 100644 --- a/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_generated_test.go +++ b/google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkeonprem" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_admin_cluster_generated_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_admin_cluster_generated_test.go index ab0caee4451..265e9704123 100644 --- a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_admin_cluster_generated_test.go +++ b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_admin_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkeonprem" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster_generated_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster_generated_test.go index 522a7e7220e..242f76b5999 100644 --- a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster_generated_test.go +++ b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkeonprem" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_node_pool_generated_test.go b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_node_pool_generated_test.go index 6ea87df3f7d..c9be4d4ff6b 100644 --- a/google-beta/services/gkeonprem/resource_gkeonprem_vmware_node_pool_generated_test.go +++ b/google-beta/services/gkeonprem/resource_gkeonprem_vmware_node_pool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkeonprem" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/healthcare/resource_healthcare_consent_store_generated_test.go b/google-beta/services/healthcare/resource_healthcare_consent_store_generated_test.go index d192c5ae3f5..85c270ea33a 100644 --- a/google-beta/services/healthcare/resource_healthcare_consent_store_generated_test.go +++ b/google-beta/services/healthcare/resource_healthcare_consent_store_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/healthcare" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/healthcare/resource_healthcare_dataset_generated_test.go b/google-beta/services/healthcare/resource_healthcare_dataset_generated_test.go index e9e478ed184..74189fafddc 100644 --- a/google-beta/services/healthcare/resource_healthcare_dataset_generated_test.go +++ b/google-beta/services/healthcare/resource_healthcare_dataset_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/healthcare" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/healthcare/resource_healthcare_dicom_store_generated_test.go b/google-beta/services/healthcare/resource_healthcare_dicom_store_generated_test.go index 7805d013b92..6a72eae02a5 100644 --- a/google-beta/services/healthcare/resource_healthcare_dicom_store_generated_test.go +++ b/google-beta/services/healthcare/resource_healthcare_dicom_store_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/healthcare" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" @@ -116,7 +119,7 @@ resource "google_healthcare_dataset" "dataset" { func TestAccHealthcareDicomStore_healthcareDicomStoreBqStreamExample(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-beta/services/healthcare/resource_healthcare_fhir_store_generated_test.go b/google-beta/services/healthcare/resource_healthcare_fhir_store_generated_test.go index 085abfe5e43..0d12140f5f0 100644 --- a/google-beta/services/healthcare/resource_healthcare_fhir_store_generated_test.go +++ b/google-beta/services/healthcare/resource_healthcare_fhir_store_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/healthcare" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/healthcare/resource_healthcare_hl7_v2_store_generated_test.go b/google-beta/services/healthcare/resource_healthcare_hl7_v2_store_generated_test.go index 7f27623d13f..f3c39c11be3 100644 --- a/google-beta/services/healthcare/resource_healthcare_hl7_v2_store_generated_test.go +++ b/google-beta/services/healthcare/resource_healthcare_hl7_v2_store_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/healthcare" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/healthcare/resource_healthcare_pipeline_job_generated_test.go b/google-beta/services/healthcare/resource_healthcare_pipeline_job_generated_test.go index 30f433699eb..04cba7a1465 100644 --- a/google-beta/services/healthcare/resource_healthcare_pipeline_job_generated_test.go +++ b/google-beta/services/healthcare/resource_healthcare_pipeline_job_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/healthcare" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/healthcare/resource_healthcare_workspace_generated_test.go b/google-beta/services/healthcare/resource_healthcare_workspace_generated_test.go index 4510c6dc67a..e7502420416 100644 --- a/google-beta/services/healthcare/resource_healthcare_workspace_generated_test.go +++ b/google-beta/services/healthcare/resource_healthcare_workspace_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/healthcare" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/hypercomputecluster/resource_hypercomputecluster_cluster_generated_test.go b/google-beta/services/hypercomputecluster/resource_hypercomputecluster_cluster_generated_test.go index 72fcb698afa..ffb892a5611 100644 --- a/google-beta/services/hypercomputecluster/resource_hypercomputecluster_cluster_generated_test.go +++ b/google-beta/services/hypercomputecluster/resource_hypercomputecluster_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/hypercomputecluster" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iam2/resource_iam_deny_policy_generated_test.go b/google-beta/services/iam2/resource_iam_deny_policy_generated_test.go index 0ec262d9ea7..fa8fbb6a97a 100644 --- a/google-beta/services/iam2/resource_iam_deny_policy_generated_test.go +++ b/google-beta/services/iam2/resource_iam_deny_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iam2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iam3/resource_iam_folders_policy_binding_generated_test.go b/google-beta/services/iam3/resource_iam_folders_policy_binding_generated_test.go index 0c8659ebc34..0b323e4b6cf 100644 --- a/google-beta/services/iam3/resource_iam_folders_policy_binding_generated_test.go +++ b/google-beta/services/iam3/resource_iam_folders_policy_binding_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iam3" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iam3/resource_iam_organizations_policy_binding_generated_test.go b/google-beta/services/iam3/resource_iam_organizations_policy_binding_generated_test.go index ca390c16cb2..2c5f332007d 100644 --- a/google-beta/services/iam3/resource_iam_organizations_policy_binding_generated_test.go +++ b/google-beta/services/iam3/resource_iam_organizations_policy_binding_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iam3" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iam3/resource_iam_principal_access_boundary_policy_generated_test.go b/google-beta/services/iam3/resource_iam_principal_access_boundary_policy_generated_test.go index 5d19484ebd6..1a3b4c80b26 100644 --- a/google-beta/services/iam3/resource_iam_principal_access_boundary_policy_generated_test.go +++ b/google-beta/services/iam3/resource_iam_principal_access_boundary_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iam3" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iam3/resource_iam_projects_policy_binding_generated_test.go b/google-beta/services/iam3/resource_iam_projects_policy_binding_generated_test.go index ad71a59ad2b..a26d3399fe3 100644 --- a/google-beta/services/iam3/resource_iam_projects_policy_binding_generated_test.go +++ b/google-beta/services/iam3/resource_iam_projects_policy_binding_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iam3" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iambeta/bootstrap_test_utils.go b/google-beta/services/iambeta/bootstrap_test_utils.go new file mode 100644 index 00000000000..8c6bee6979f --- /dev/null +++ b/google-beta/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-beta/google-beta/envvar" + transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/iambeta/resource_iam_workload_identity_pool_generated_test.go b/google-beta/services/iambeta/resource_iam_workload_identity_pool_generated_test.go index d93eab49524..0e51b3d9152 100644 --- a/google-beta/services/iambeta/resource_iam_workload_identity_pool_generated_test.go +++ b/google-beta/services/iambeta/resource_iam_workload_identity_pool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iambeta" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iambeta/resource_iam_workload_identity_pool_managed_identity_generated_test.go b/google-beta/services/iambeta/resource_iam_workload_identity_pool_managed_identity_generated_test.go index ba0db89003d..adf137fcdae 100644 --- a/google-beta/services/iambeta/resource_iam_workload_identity_pool_managed_identity_generated_test.go +++ b/google-beta/services/iambeta/resource_iam_workload_identity_pool_managed_identity_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iambeta" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iambeta/resource_iam_workload_identity_pool_namespace_generated_test.go b/google-beta/services/iambeta/resource_iam_workload_identity_pool_namespace_generated_test.go index f27fb22b009..3f854aa66a5 100644 --- a/google-beta/services/iambeta/resource_iam_workload_identity_pool_namespace_generated_test.go +++ b/google-beta/services/iambeta/resource_iam_workload_identity_pool_namespace_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iambeta" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iambeta/resource_iam_workload_identity_pool_provider_generated_test.go b/google-beta/services/iambeta/resource_iam_workload_identity_pool_provider_generated_test.go index 4a5f8c2f052..7abc2bc409f 100644 --- a/google-beta/services/iambeta/resource_iam_workload_identity_pool_provider_generated_test.go +++ b/google-beta/services/iambeta/resource_iam_workload_identity_pool_provider_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iambeta" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iamworkforcepool/resource_iam_oauth_client_credential_generated_test.go b/google-beta/services/iamworkforcepool/resource_iam_oauth_client_credential_generated_test.go index f31c181a7ef..6be7eaa7bb6 100644 --- a/google-beta/services/iamworkforcepool/resource_iam_oauth_client_credential_generated_test.go +++ b/google-beta/services/iamworkforcepool/resource_iam_oauth_client_credential_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iamworkforcepool" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iamworkforcepool/resource_iam_oauth_client_generated_test.go b/google-beta/services/iamworkforcepool/resource_iam_oauth_client_generated_test.go index b58d80a0834..df2815f6874 100644 --- a/google-beta/services/iamworkforcepool/resource_iam_oauth_client_generated_test.go +++ b/google-beta/services/iamworkforcepool/resource_iam_oauth_client_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iamworkforcepool" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_generated_test.go b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_generated_test.go index 659c512188b..bbe2346fa9f 100644 --- a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_generated_test.go +++ b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iamworkforcepool" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_generated_test.go b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_generated_test.go index 887ae646b0f..92ad890c46b 100644 --- a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_generated_test.go +++ b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iamworkforcepool" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_key_generated_test.go b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_key_generated_test.go index 6edf1df9688..67f73f05ac4 100644 --- a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_key_generated_test.go +++ b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_key_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iamworkforcepool" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_scim_tenant_generated_test.go b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_scim_tenant_generated_test.go index 365d9ff49f0..f18a9a4e0ea 100644 --- a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_scim_tenant_generated_test.go +++ b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_scim_tenant_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iamworkforcepool" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_scim_token_generated_test.go b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_scim_token_generated_test.go index 498242962b2..99d208acaa2 100644 --- a/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_scim_token_generated_test.go +++ b/google-beta/services/iamworkforcepool/resource_iam_workforce_pool_provider_scim_token_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iamworkforcepool" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iap/resource_iap_client_generated_test.go b/google-beta/services/iap/resource_iap_client_generated_test.go index 1d727c250c0..5e57f4b2aa7 100644 --- a/google-beta/services/iap/resource_iap_client_generated_test.go +++ b/google-beta/services/iap/resource_iap_client_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iap" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iap/resource_iap_settings_generated_test.go b/google-beta/services/iap/resource_iap_settings_generated_test.go index 1eae6e63217..380c534b9c5 100644 --- a/google-beta/services/iap/resource_iap_settings_generated_test.go +++ b/google-beta/services/iap/resource_iap_settings_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iap" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/iap/resource_iap_tunnel_dest_group_generated_test.go b/google-beta/services/iap/resource_iap_tunnel_dest_group_generated_test.go index 48000804b53..5e516fb6edc 100644 --- a/google-beta/services/iap/resource_iap_tunnel_dest_group_generated_test.go +++ b/google-beta/services/iap/resource_iap_tunnel_dest_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iap" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/identityplatform/resource_identity_platform_config_generated_test.go b/google-beta/services/identityplatform/resource_identity_platform_config_generated_test.go index 134ef66688f..5c0a03ac801 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_config_generated_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/identityplatform" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/identityplatform/resource_identity_platform_inbound_saml_config_generated_test.go b/google-beta/services/identityplatform/resource_identity_platform_inbound_saml_config_generated_test.go index 88ad58e43e5..52f4a074f9b 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_inbound_saml_config_generated_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_inbound_saml_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/identityplatform" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/identityplatform/resource_identity_platform_oauth_idp_config_generated_test.go b/google-beta/services/identityplatform/resource_identity_platform_oauth_idp_config_generated_test.go index c61d9cfaea5..d13c7ca7083 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_oauth_idp_config_generated_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_oauth_idp_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/identityplatform" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_generated_test.go b/google-beta/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_generated_test.go index c1fdb1fb697..fbc820007b8 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_generated_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/identityplatform" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/identityplatform/resource_identity_platform_tenant_generated_test.go b/google-beta/services/identityplatform/resource_identity_platform_tenant_generated_test.go index ad008ab846d..f75ddf399af 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_tenant_generated_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_tenant_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/identityplatform" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_generated_test.go b/google-beta/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_generated_test.go index 8256e0be946..689e78aef12 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_generated_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/identityplatform" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_generated_test.go b/google-beta/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_generated_test.go index 34ddc31ca5b..bd967181b0f 100644 --- a/google-beta/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_generated_test.go +++ b/google-beta/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/identityplatform" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_generated_test.go b/google-beta/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_generated_test.go index 6256ed54637..66e6a9b3310 100644 --- a/google-beta/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_generated_test.go +++ b/google-beta/services/integrationconnectors/resource_integration_connectors_endpoint_attachment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/integrationconnectors" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/integrationconnectors/resource_integration_connectors_managed_zone_generated_test.go b/google-beta/services/integrationconnectors/resource_integration_connectors_managed_zone_generated_test.go index 5873577db19..b70747e3051 100644 --- a/google-beta/services/integrationconnectors/resource_integration_connectors_managed_zone_generated_test.go +++ b/google-beta/services/integrationconnectors/resource_integration_connectors_managed_zone_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/integrationconnectors" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/integrations/resource_integrations_auth_config_generated_test.go b/google-beta/services/integrations/resource_integrations_auth_config_generated_test.go index 6ab5778ad0e..1fd54d6a7ee 100644 --- a/google-beta/services/integrations/resource_integrations_auth_config_generated_test.go +++ b/google-beta/services/integrations/resource_integrations_auth_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/integrations" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/integrations/resource_integrations_client_generated_test.go b/google-beta/services/integrations/resource_integrations_client_generated_test.go index 2ef56a82817..8449ee1d616 100644 --- a/google-beta/services/integrations/resource_integrations_client_generated_test.go +++ b/google-beta/services/integrations/resource_integrations_client_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/integrations" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/kms/data_source_google_kms_auotokey_config_test.go b/google-beta/services/kms/data_source_google_kms_auotokey_config_test.go index c93cb33203d..5b18fecead3 100644 --- a/google-beta/services/kms/data_source_google_kms_auotokey_config_test.go +++ b/google-beta/services/kms/data_source_google_kms_auotokey_config_test.go @@ -29,6 +29,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanagerv3" tpgserviceusage "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/serviceusage" "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/kms/resource_kms_autokey_config_generated_test.go b/google-beta/services/kms/resource_kms_autokey_config_generated_test.go index c80aff78a16..eea6c5f014d 100644 --- a/google-beta/services/kms/resource_kms_autokey_config_generated_test.go +++ b/google-beta/services/kms/resource_kms_autokey_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/kms/resource_kms_folder_kaj_policy_config_generated_test.go b/google-beta/services/kms/resource_kms_folder_kaj_policy_config_generated_test.go index bd754f7863b..5c3a010171b 100644 --- a/google-beta/services/kms/resource_kms_folder_kaj_policy_config_generated_test.go +++ b/google-beta/services/kms/resource_kms_folder_kaj_policy_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/kms/resource_kms_key_handle_generated_test.go b/google-beta/services/kms/resource_kms_key_handle_generated_test.go index f242d440489..b865c7cd6e1 100644 --- a/google-beta/services/kms/resource_kms_key_handle_generated_test.go +++ b/google-beta/services/kms/resource_kms_key_handle_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/kms/resource_kms_organization_kaj_policy_config_generated_test.go b/google-beta/services/kms/resource_kms_organization_kaj_policy_config_generated_test.go index d974ab66795..702c43cf4a5 100644 --- a/google-beta/services/kms/resource_kms_organization_kaj_policy_config_generated_test.go +++ b/google-beta/services/kms/resource_kms_organization_kaj_policy_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/kms/resource_kms_project_autokey_config_generated_test.go b/google-beta/services/kms/resource_kms_project_autokey_config_generated_test.go index 73c7e6089d4..b427b39ea96 100644 --- a/google-beta/services/kms/resource_kms_project_autokey_config_generated_test.go +++ b/google-beta/services/kms/resource_kms_project_autokey_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/kms/resource_kms_project_kaj_policy_config_generated_test.go b/google-beta/services/kms/resource_kms_project_kaj_policy_config_generated_test.go index 3040ef8993d..0d205e3f1b5 100644 --- a/google-beta/services/kms/resource_kms_project_kaj_policy_config_generated_test.go +++ b/google-beta/services/kms/resource_kms_project_kaj_policy_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/logging/resource_logging_folder_settings_generated_test.go b/google-beta/services/logging/resource_logging_folder_settings_generated_test.go index 7cd4758c8dc..6dd49d14e83 100644 --- a/google-beta/services/logging/resource_logging_folder_settings_generated_test.go +++ b/google-beta/services/logging/resource_logging_folder_settings_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/logging/resource_logging_linked_dataset_generated_test.go b/google-beta/services/logging/resource_logging_linked_dataset_generated_test.go index a380a4dac4f..e1faa00bee2 100644 --- a/google-beta/services/logging/resource_logging_linked_dataset_generated_test.go +++ b/google-beta/services/logging/resource_logging_linked_dataset_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/logging/resource_logging_log_scope_generated_test.go b/google-beta/services/logging/resource_logging_log_scope_generated_test.go index f7d1ebab3f6..fcb1ec3ded7 100644 --- a/google-beta/services/logging/resource_logging_log_scope_generated_test.go +++ b/google-beta/services/logging/resource_logging_log_scope_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/logging/resource_logging_log_view_generated_test.go b/google-beta/services/logging/resource_logging_log_view_generated_test.go index 0586db57b87..9b744017e85 100644 --- a/google-beta/services/logging/resource_logging_log_view_generated_test.go +++ b/google-beta/services/logging/resource_logging_log_view_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/logging/resource_logging_metric_generated_test.go b/google-beta/services/logging/resource_logging_metric_generated_test.go index edac9d1bbea..42b421e4a49 100644 --- a/google-beta/services/logging/resource_logging_metric_generated_test.go +++ b/google-beta/services/logging/resource_logging_metric_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/logging/resource_logging_saved_query_generated_test.go b/google-beta/services/logging/resource_logging_saved_query_generated_test.go index 09d6b8b6fcb..393dce5cc9e 100644 --- a/google-beta/services/logging/resource_logging_saved_query_generated_test.go +++ b/google-beta/services/logging/resource_logging_saved_query_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/looker/resource_looker_instance_generated_test.go b/google-beta/services/looker/resource_looker_instance_generated_test.go index a276fe47296..0ccd6fafe62 100644 --- a/google-beta/services/looker/resource_looker_instance_generated_test.go +++ b/google-beta/services/looker/resource_looker_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/looker" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/looker/resource_looker_instance_test.go b/google-beta/services/looker/resource_looker_instance_test.go index 7699bcca543..197245ff918 100644 --- a/google-beta/services/looker/resource_looker_instance_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/lustre/resource_lustre_instance_generated_test.go b/google-beta/services/lustre/resource_lustre_instance_generated_test.go index 96aa12b4b18..b5372945368 100644 --- a/google-beta/services/lustre/resource_lustre_instance_generated_test.go +++ b/google-beta/services/lustre/resource_lustre_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/lustre" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/managedkafka/resource_managed_kafka_acl_generated_test.go b/google-beta/services/managedkafka/resource_managed_kafka_acl_generated_test.go index 9155a263abf..6cde92c4f77 100644 --- a/google-beta/services/managedkafka/resource_managed_kafka_acl_generated_test.go +++ b/google-beta/services/managedkafka/resource_managed_kafka_acl_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/managedkafka" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/managedkafka/resource_managed_kafka_cluster_generated_test.go b/google-beta/services/managedkafka/resource_managed_kafka_cluster_generated_test.go index ea503617e59..5b6a6a36181 100644 --- a/google-beta/services/managedkafka/resource_managed_kafka_cluster_generated_test.go +++ b/google-beta/services/managedkafka/resource_managed_kafka_cluster_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/managedkafka" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" @@ -201,7 +204,7 @@ data "google_project" "project" { func TestAccManagedKafkaCluster_managedkafkaClusterCmekExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-managedkafka.iam.gserviceaccount.com", Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", diff --git a/google-beta/services/managedkafka/resource_managed_kafka_connect_cluster_generated_test.go b/google-beta/services/managedkafka/resource_managed_kafka_connect_cluster_generated_test.go index c442d138cca..f6eec4d2144 100644 --- a/google-beta/services/managedkafka/resource_managed_kafka_connect_cluster_generated_test.go +++ b/google-beta/services/managedkafka/resource_managed_kafka_connect_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/managedkafka" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/managedkafka/resource_managed_kafka_connector_generated_test.go b/google-beta/services/managedkafka/resource_managed_kafka_connector_generated_test.go index af4c699e097..b6bacc9695c 100644 --- a/google-beta/services/managedkafka/resource_managed_kafka_connector_generated_test.go +++ b/google-beta/services/managedkafka/resource_managed_kafka_connector_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/managedkafka" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/managedkafka/resource_managed_kafka_topic_generated_test.go b/google-beta/services/managedkafka/resource_managed_kafka_topic_generated_test.go index 879bd8a657e..ee655392a90 100644 --- a/google-beta/services/managedkafka/resource_managed_kafka_topic_generated_test.go +++ b/google-beta/services/managedkafka/resource_managed_kafka_topic_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/managedkafka" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/memcache/resource_memcache_instance_generated_test.go b/google-beta/services/memcache/resource_memcache_instance_generated_test.go index 7d696d9fd98..d947825c98e 100644 --- a/google-beta/services/memcache/resource_memcache_instance_generated_test.go +++ b/google-beta/services/memcache/resource_memcache_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/memcache" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/memorystore/resource_memorystore_instance_desired_user_created_endpoints_generated_test.go b/google-beta/services/memorystore/resource_memorystore_instance_desired_user_created_endpoints_generated_test.go index edba1502bc9..28d5b9817bb 100644 --- a/google-beta/services/memorystore/resource_memorystore_instance_desired_user_created_endpoints_generated_test.go +++ b/google-beta/services/memorystore/resource_memorystore_instance_desired_user_created_endpoints_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/memorystore" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/memorystore/resource_memorystore_instance_generated_test.go b/google-beta/services/memorystore/resource_memorystore_instance_generated_test.go index c2ccc600dc5..5a536231c8a 100644 --- a/google-beta/services/memorystore/resource_memorystore_instance_generated_test.go +++ b/google-beta/services/memorystore/resource_memorystore_instance_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/memorystore" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/migrationcenter/resource_migration_center_group_generated_test.go b/google-beta/services/migrationcenter/resource_migration_center_group_generated_test.go index e50d0acb581..a376f284c43 100644 --- a/google-beta/services/migrationcenter/resource_migration_center_group_generated_test.go +++ b/google-beta/services/migrationcenter/resource_migration_center_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/migrationcenter" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/migrationcenter/resource_migration_center_preference_set_generated_test.go b/google-beta/services/migrationcenter/resource_migration_center_preference_set_generated_test.go index 6c6a7f4e8bd..c3204f6796e 100644 --- a/google-beta/services/migrationcenter/resource_migration_center_preference_set_generated_test.go +++ b/google-beta/services/migrationcenter/resource_migration_center_preference_set_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/migrationcenter" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/modelarmor/resource_model_armor_template_generated_test.go b/google-beta/services/modelarmor/resource_model_armor_template_generated_test.go index d4cff8fb913..bed0892beb8 100644 --- a/google-beta/services/modelarmor/resource_model_armor_template_generated_test.go +++ b/google-beta/services/modelarmor/resource_model_armor_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/modelarmor" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/modelarmorglobal/resource_model_armor_floorsetting_test.go b/google-beta/services/modelarmorglobal/resource_model_armor_floorsetting_test.go index a7ca8fc0b62..df853959e48 100644 --- a/google-beta/services/modelarmorglobal/resource_model_armor_floorsetting_test.go +++ b/google-beta/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-beta/google-beta/acctest" - "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/monitoring/resource_monitoring_custom_service_generated_test.go b/google-beta/services/monitoring/resource_monitoring_custom_service_generated_test.go index db0ca0818a2..ff7f4c2890b 100644 --- a/google-beta/services/monitoring/resource_monitoring_custom_service_generated_test.go +++ b/google-beta/services/monitoring/resource_monitoring_custom_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/monitoring" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/monitoring/resource_monitoring_group_generated_test.go b/google-beta/services/monitoring/resource_monitoring_group_generated_test.go index 7628db2b7b0..e557c5443a7 100644 --- a/google-beta/services/monitoring/resource_monitoring_group_generated_test.go +++ b/google-beta/services/monitoring/resource_monitoring_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/monitoring" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/monitoring/resource_monitoring_metric_descriptor_generated_test.go b/google-beta/services/monitoring/resource_monitoring_metric_descriptor_generated_test.go index 9297173bdbd..dad73ca55d2 100644 --- a/google-beta/services/monitoring/resource_monitoring_metric_descriptor_generated_test.go +++ b/google-beta/services/monitoring/resource_monitoring_metric_descriptor_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/monitoring" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/monitoring/resource_monitoring_monitored_project_generated_test.go b/google-beta/services/monitoring/resource_monitoring_monitored_project_generated_test.go index 4baeaa0ba21..0631eca92a4 100644 --- a/google-beta/services/monitoring/resource_monitoring_monitored_project_generated_test.go +++ b/google-beta/services/monitoring/resource_monitoring_monitored_project_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/monitoring" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/monitoring/resource_monitoring_notification_channel_generated_test.go b/google-beta/services/monitoring/resource_monitoring_notification_channel_generated_test.go index 5d7ae695c4f..2a2bdd104f2 100644 --- a/google-beta/services/monitoring/resource_monitoring_notification_channel_generated_test.go +++ b/google-beta/services/monitoring/resource_monitoring_notification_channel_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/monitoring" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/monitoring/resource_monitoring_service_generated_test.go b/google-beta/services/monitoring/resource_monitoring_service_generated_test.go index 723e83e4c17..c0268610d5a 100644 --- a/google-beta/services/monitoring/resource_monitoring_service_generated_test.go +++ b/google-beta/services/monitoring/resource_monitoring_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/monitoring" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/monitoring/resource_monitoring_slo_generated_test.go b/google-beta/services/monitoring/resource_monitoring_slo_generated_test.go index a0ab08ff077..316d5c80957 100644 --- a/google-beta/services/monitoring/resource_monitoring_slo_generated_test.go +++ b/google-beta/services/monitoring/resource_monitoring_slo_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/monitoring" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/monitoring/resource_monitoring_uptime_check_config_generated_test.go b/google-beta/services/monitoring/resource_monitoring_uptime_check_config_generated_test.go index c5b2bb2d9a1..c71e5576d91 100644 --- a/google-beta/services/monitoring/resource_monitoring_uptime_check_config_generated_test.go +++ b/google-beta/services/monitoring/resource_monitoring_uptime_check_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/monitoring" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/netapp/resource_netapp_active_directory_generated_test.go b/google-beta/services/netapp/resource_netapp_active_directory_generated_test.go index e3122f10f54..749399a28c9 100644 --- a/google-beta/services/netapp/resource_netapp_active_directory_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_active_directory_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/netapp" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/netapp/resource_netapp_backup_generated_test.go b/google-beta/services/netapp/resource_netapp_backup_generated_test.go index b7cdae9e563..d0e1193b8b2 100644 --- a/google-beta/services/netapp/resource_netapp_backup_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_backup_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/netapp" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/netapp/resource_netapp_backup_policy_generated_test.go b/google-beta/services/netapp/resource_netapp_backup_policy_generated_test.go index 5513cf58910..5a849115c05 100644 --- a/google-beta/services/netapp/resource_netapp_backup_policy_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_backup_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/netapp" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/netapp/resource_netapp_host_group_generated_test.go b/google-beta/services/netapp/resource_netapp_host_group_generated_test.go index e3a6792d9d4..a64e4056213 100644 --- a/google-beta/services/netapp/resource_netapp_host_group_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_host_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/netapp" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/netapp/resource_netapp_kmsconfig_generated_test.go b/google-beta/services/netapp/resource_netapp_kmsconfig_generated_test.go index 629c07ff443..7758b20af98 100644 --- a/google-beta/services/netapp/resource_netapp_kmsconfig_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_kmsconfig_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/netapp" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/netapp/resource_netapp_storage_pool_generated_test.go b/google-beta/services/netapp/resource_netapp_storage_pool_generated_test.go index 97863b0748f..68537ae1360 100644 --- a/google-beta/services/netapp/resource_netapp_storage_pool_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_storage_pool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/netapp" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/netapp/resource_netapp_volume_generated_test.go b/google-beta/services/netapp/resource_netapp_volume_generated_test.go index dce73d54812..c38925e913e 100644 --- a/google-beta/services/netapp/resource_netapp_volume_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_volume_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/netapp" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/netapp/resource_netapp_volume_quota_rule_generated_test.go b/google-beta/services/netapp/resource_netapp_volume_quota_rule_generated_test.go index ff395576f2e..4c2396f3214 100644 --- a/google-beta/services/netapp/resource_netapp_volume_quota_rule_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_volume_quota_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/netapp" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/netapp/resource_netapp_volume_replication_generated_test.go b/google-beta/services/netapp/resource_netapp_volume_replication_generated_test.go index 97141ba7f2f..2daed5e6883 100644 --- a/google-beta/services/netapp/resource_netapp_volume_replication_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_volume_replication_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/netapp" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/netapp/resource_netapp_volume_snapshot_generated_test.go b/google-beta/services/netapp/resource_netapp_volume_snapshot_generated_test.go index 15bb3b3de19..caa93334f69 100644 --- a/google-beta/services/netapp/resource_netapp_volume_snapshot_generated_test.go +++ b/google-beta/services/netapp/resource_netapp_volume_snapshot_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/netapp" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_destination_generated_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_destination_generated_test.go index 3c838d75fc3..849e4452ee7 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_destination_generated_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_destination_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkconnectivity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_gateway_advertised_route_generated_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_gateway_advertised_route_generated_test.go index 89e0b72a5b8..8de06c29ef3 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_gateway_advertised_route_generated_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_gateway_advertised_route_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkconnectivity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_group_generated_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_group_generated_test.go index 71592b079d4..3720e3afa6b 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_group_generated_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkconnectivity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_hub_generated_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_hub_generated_test.go index 70e5ac8414d..7e046e48297 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_hub_generated_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_hub_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkconnectivity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_multicloud_data_transfer_config_generated_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_multicloud_data_transfer_config_generated_test.go index 2e669c42bda..7be191562a5 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_multicloud_data_transfer_config_generated_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_multicloud_data_transfer_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkconnectivity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_policy_based_route_generated_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_policy_based_route_generated_test.go index 3228e0bf838..ac04b0455e8 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_policy_based_route_generated_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_policy_based_route_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkconnectivity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_regional_endpoint_generated_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_regional_endpoint_generated_test.go index 9fc16efa279..8ea94e99ab4 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_regional_endpoint_generated_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_regional_endpoint_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkconnectivity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_spoke_generated_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_spoke_generated_test.go index 508e2388217..e7bf2db699c 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_spoke_generated_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_spoke_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkconnectivity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkconnectivity/resource_network_connectivity_transport_generated_test.go b/google-beta/services/networkconnectivity/resource_network_connectivity_transport_generated_test.go index a6716fd26ae..c81e616222d 100644 --- a/google-beta/services/networkconnectivity/resource_network_connectivity_transport_generated_test.go +++ b/google-beta/services/networkconnectivity/resource_network_connectivity_transport_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkconnectivity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkconnectivityv1/resource_network_connectivity_internal_range_generated_test.go b/google-beta/services/networkconnectivityv1/resource_network_connectivity_internal_range_generated_test.go index 2478e5882c2..84a1a2975fd 100644 --- a/google-beta/services/networkconnectivityv1/resource_network_connectivity_internal_range_generated_test.go +++ b/google-beta/services/networkconnectivityv1/resource_network_connectivity_internal_range_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkconnectivityv1" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkconnectivityv1/resource_network_connectivity_service_connection_policy_generated_test.go b/google-beta/services/networkconnectivityv1/resource_network_connectivity_service_connection_policy_generated_test.go index e12cb7505e0..b203c6e7591 100644 --- a/google-beta/services/networkconnectivityv1/resource_network_connectivity_service_connection_policy_generated_test.go +++ b/google-beta/services/networkconnectivityv1/resource_network_connectivity_service_connection_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkconnectivityv1" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkmanagement/resource_network_management_connectivity_test_resource_generated_test.go b/google-beta/services/networkmanagement/resource_network_management_connectivity_test_resource_generated_test.go index 2de149fa97b..c9c4a1aecfe 100644 --- a/google-beta/services/networkmanagement/resource_network_management_connectivity_test_resource_generated_test.go +++ b/google-beta/services/networkmanagement/resource_network_management_connectivity_test_resource_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkmanagement" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkmanagement/resource_network_management_organization_vpc_flow_logs_config_generated_test.go b/google-beta/services/networkmanagement/resource_network_management_organization_vpc_flow_logs_config_generated_test.go index abff7c19964..87a7f030b06 100644 --- a/google-beta/services/networkmanagement/resource_network_management_organization_vpc_flow_logs_config_generated_test.go +++ b/google-beta/services/networkmanagement/resource_network_management_organization_vpc_flow_logs_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkmanagement" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkmanagement/resource_network_management_vpc_flow_logs_config_generated_test.go b/google-beta/services/networkmanagement/resource_network_management_vpc_flow_logs_config_generated_test.go index 658cd49521d..253775bb110 100644 --- a/google-beta/services/networkmanagement/resource_network_management_vpc_flow_logs_config_generated_test.go +++ b/google-beta/services/networkmanagement/resource_network_management_vpc_flow_logs_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkmanagement" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_address_group_generated_test.go b/google-beta/services/networksecurity/resource_network_security_address_group_generated_test.go index 9a2c0ec07c0..e58972e35e5 100644 --- a/google-beta/services/networksecurity/resource_network_security_address_group_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_address_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_authorization_policy_generated_test.go b/google-beta/services/networksecurity/resource_network_security_authorization_policy_generated_test.go index 393c35b9261..faa20e44fd5 100644 --- a/google-beta/services/networksecurity/resource_network_security_authorization_policy_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_authorization_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_authz_policy_generated_test.go b/google-beta/services/networksecurity/resource_network_security_authz_policy_generated_test.go index 8db6414f105..8328d5f518c 100644 --- a/google-beta/services/networksecurity/resource_network_security_authz_policy_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_authz_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_backend_authentication_config_generated_test.go b/google-beta/services/networksecurity/resource_network_security_backend_authentication_config_generated_test.go index 13e600fb5d4..80ba9e6f976 100644 --- a/google-beta/services/networksecurity/resource_network_security_backend_authentication_config_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_backend_authentication_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_client_tls_policy_generated_test.go b/google-beta/services/networksecurity/resource_network_security_client_tls_policy_generated_test.go index 61e66cf2712..e14320eeaf7 100644 --- a/google-beta/services/networksecurity/resource_network_security_client_tls_policy_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_client_tls_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_generated_test.go b/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_generated_test.go index 97e78a98835..f3fea1c3195 100644 --- a/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_rule_generated_test.go b/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_rule_generated_test.go index e57d97ba921..3e169cd0054 100644 --- a/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_rule_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_gateway_security_policy_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_intercept_deployment_generated_test.go b/google-beta/services/networksecurity/resource_network_security_intercept_deployment_generated_test.go index d4c40a1d653..933dc437ca4 100644 --- a/google-beta/services/networksecurity/resource_network_security_intercept_deployment_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_intercept_deployment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_intercept_deployment_group_generated_test.go b/google-beta/services/networksecurity/resource_network_security_intercept_deployment_group_generated_test.go index 737d3ec0944..d299dc96c32 100644 --- a/google-beta/services/networksecurity/resource_network_security_intercept_deployment_group_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_intercept_deployment_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_intercept_endpoint_group_association_generated_test.go b/google-beta/services/networksecurity/resource_network_security_intercept_endpoint_group_association_generated_test.go index ae6709b2a23..618b850bce8 100644 --- a/google-beta/services/networksecurity/resource_network_security_intercept_endpoint_group_association_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_intercept_endpoint_group_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_intercept_endpoint_group_generated_test.go b/google-beta/services/networksecurity/resource_network_security_intercept_endpoint_group_generated_test.go index 5e0ad2158bd..2f35748c7b4 100644 --- a/google-beta/services/networksecurity/resource_network_security_intercept_endpoint_group_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_intercept_endpoint_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_mirroring_deployment_generated_test.go b/google-beta/services/networksecurity/resource_network_security_mirroring_deployment_generated_test.go index 12edccb1645..9114342ea81 100644 --- a/google-beta/services/networksecurity/resource_network_security_mirroring_deployment_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_mirroring_deployment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_mirroring_deployment_group_generated_test.go b/google-beta/services/networksecurity/resource_network_security_mirroring_deployment_group_generated_test.go index 8286df8ef6d..9c313563f71 100644 --- a/google-beta/services/networksecurity/resource_network_security_mirroring_deployment_group_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_mirroring_deployment_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_mirroring_endpoint_generated_test.go b/google-beta/services/networksecurity/resource_network_security_mirroring_endpoint_generated_test.go index c233ec33ab2..bf9c8dcd6c5 100644 --- a/google-beta/services/networksecurity/resource_network_security_mirroring_endpoint_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_mirroring_endpoint_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_mirroring_endpoint_group_association_generated_test.go b/google-beta/services/networksecurity/resource_network_security_mirroring_endpoint_group_association_generated_test.go index f7fb968307c..1662f176144 100644 --- a/google-beta/services/networksecurity/resource_network_security_mirroring_endpoint_group_association_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_mirroring_endpoint_group_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_mirroring_endpoint_group_generated_test.go b/google-beta/services/networksecurity/resource_network_security_mirroring_endpoint_group_generated_test.go index 000a9e13c37..4a3d8865988 100644 --- a/google-beta/services/networksecurity/resource_network_security_mirroring_endpoint_group_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_mirroring_endpoint_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_sac_realm_generated_test.go b/google-beta/services/networksecurity/resource_network_security_sac_realm_generated_test.go index 9103e9d6dd3..78712037e3c 100644 --- a/google-beta/services/networksecurity/resource_network_security_sac_realm_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_sac_realm_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_security_profile_generated_test.go b/google-beta/services/networksecurity/resource_network_security_security_profile_generated_test.go index a7549c3492b..a9006878457 100644 --- a/google-beta/services/networksecurity/resource_network_security_security_profile_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_security_profile_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_security_profile_group_generated_test.go b/google-beta/services/networksecurity/resource_network_security_security_profile_group_generated_test.go index c42e2876542..a12cce4cce9 100644 --- a/google-beta/services/networksecurity/resource_network_security_security_profile_group_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_security_profile_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_server_tls_policy_generated_test.go b/google-beta/services/networksecurity/resource_network_security_server_tls_policy_generated_test.go index a711d9a1945..e13de5078fa 100644 --- a/google-beta/services/networksecurity/resource_network_security_server_tls_policy_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_server_tls_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_tls_inspection_policy_generated_test.go b/google-beta/services/networksecurity/resource_network_security_tls_inspection_policy_generated_test.go index b06eb5ced6e..aaf24dc2789 100644 --- a/google-beta/services/networksecurity/resource_network_security_tls_inspection_policy_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_tls_inspection_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networksecurity/resource_network_security_url_lists_generated_test.go b/google-beta/services/networksecurity/resource_network_security_url_lists_generated_test.go index a92f6630ab3..11fc512d891 100644 --- a/google-beta/services/networksecurity/resource_network_security_url_lists_generated_test.go +++ b/google-beta/services/networksecurity/resource_network_security_url_lists_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_agent_gateway_generated_test.go b/google-beta/services/networkservices/resource_network_services_agent_gateway_generated_test.go index c4bb64c13ed..3f005e885c1 100644 --- a/google-beta/services/networkservices/resource_network_services_agent_gateway_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_agent_gateway_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_authz_extension_generated_test.go b/google-beta/services/networkservices/resource_network_services_authz_extension_generated_test.go index d4e16368324..0c7e8f5c5e8 100644 --- a/google-beta/services/networkservices/resource_network_services_authz_extension_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_authz_extension_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_edge_cache_keyset_generated_test.go b/google-beta/services/networkservices/resource_network_services_edge_cache_keyset_generated_test.go index 79cc46792b1..653788d6dee 100644 --- a/google-beta/services/networkservices/resource_network_services_edge_cache_keyset_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_edge_cache_keyset_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_edge_cache_origin_generated_test.go b/google-beta/services/networkservices/resource_network_services_edge_cache_origin_generated_test.go index fafafd5a54e..e6d2d9731d4 100644 --- a/google-beta/services/networkservices/resource_network_services_edge_cache_origin_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_edge_cache_origin_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_edge_cache_service_generated_test.go b/google-beta/services/networkservices/resource_network_services_edge_cache_service_generated_test.go index a2860e555a1..901bb95632f 100644 --- a/google-beta/services/networkservices/resource_network_services_edge_cache_service_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_edge_cache_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_endpoint_policy_generated_test.go b/google-beta/services/networkservices/resource_network_services_endpoint_policy_generated_test.go index dcb24ec9eef..3e62a3d73ba 100644 --- a/google-beta/services/networkservices/resource_network_services_endpoint_policy_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_endpoint_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_gateway_generated_test.go b/google-beta/services/networkservices/resource_network_services_gateway_generated_test.go index 7e9bf73afee..c001a52b985 100644 --- a/google-beta/services/networkservices/resource_network_services_gateway_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_gateway_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_grpc_route_generated_test.go b/google-beta/services/networkservices/resource_network_services_grpc_route_generated_test.go index 575997a3a00..5a64f362f86 100644 --- a/google-beta/services/networkservices/resource_network_services_grpc_route_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_grpc_route_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_http_route_generated_test.go b/google-beta/services/networkservices/resource_network_services_http_route_generated_test.go index e9cf559702e..94a4ca6b44b 100644 --- a/google-beta/services/networkservices/resource_network_services_http_route_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_http_route_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_lb_route_extension_generated_test.go b/google-beta/services/networkservices/resource_network_services_lb_route_extension_generated_test.go index 30dc75ed362..e4d095c74fd 100644 --- a/google-beta/services/networkservices/resource_network_services_lb_route_extension_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_lb_route_extension_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_lb_traffic_extension_generated_test.go b/google-beta/services/networkservices/resource_network_services_lb_traffic_extension_generated_test.go index aebb4582485..fc21b4cfa23 100644 --- a/google-beta/services/networkservices/resource_network_services_lb_traffic_extension_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_lb_traffic_extension_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_mesh_generated_test.go b/google-beta/services/networkservices/resource_network_services_mesh_generated_test.go index 65ad3d51cdc..e40d0fac5a9 100644 --- a/google-beta/services/networkservices/resource_network_services_mesh_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_mesh_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_multicast_consumer_association_generated_test.go b/google-beta/services/networkservices/resource_network_services_multicast_consumer_association_generated_test.go index eb114d08f52..1dc6a281fea 100644 --- a/google-beta/services/networkservices/resource_network_services_multicast_consumer_association_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_multicast_consumer_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_multicast_domain_activation_generated_test.go b/google-beta/services/networkservices/resource_network_services_multicast_domain_activation_generated_test.go index 9bd7d7480ed..599d60f421f 100644 --- a/google-beta/services/networkservices/resource_network_services_multicast_domain_activation_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_multicast_domain_activation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_multicast_domain_generated_test.go b/google-beta/services/networkservices/resource_network_services_multicast_domain_generated_test.go index 49cbc27d2fe..bfd8427731e 100644 --- a/google-beta/services/networkservices/resource_network_services_multicast_domain_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_multicast_domain_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_multicast_domain_group_generated_test.go b/google-beta/services/networkservices/resource_network_services_multicast_domain_group_generated_test.go index bcaf7c84f9d..a4cff7e5348 100644 --- a/google-beta/services/networkservices/resource_network_services_multicast_domain_group_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_multicast_domain_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_multicast_group_consumer_activation_generated_test.go b/google-beta/services/networkservices/resource_network_services_multicast_group_consumer_activation_generated_test.go index 264ef1da094..d6edbc85022 100644 --- a/google-beta/services/networkservices/resource_network_services_multicast_group_consumer_activation_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_multicast_group_consumer_activation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_multicast_group_producer_activation_generated_test.go b/google-beta/services/networkservices/resource_network_services_multicast_group_producer_activation_generated_test.go index e72a60708ad..92a01e99f26 100644 --- a/google-beta/services/networkservices/resource_network_services_multicast_group_producer_activation_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_multicast_group_producer_activation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_multicast_group_range_activation_generated_test.go b/google-beta/services/networkservices/resource_network_services_multicast_group_range_activation_generated_test.go index 49011984467..1861f6ea355 100644 --- a/google-beta/services/networkservices/resource_network_services_multicast_group_range_activation_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_multicast_group_range_activation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_multicast_group_range_generated_test.go b/google-beta/services/networkservices/resource_network_services_multicast_group_range_generated_test.go index fe3fb7117f5..1c61fbd6582 100644 --- a/google-beta/services/networkservices/resource_network_services_multicast_group_range_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_multicast_group_range_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_multicast_producer_association_generated_test.go b/google-beta/services/networkservices/resource_network_services_multicast_producer_association_generated_test.go index a9896f2c11a..2f269101185 100644 --- a/google-beta/services/networkservices/resource_network_services_multicast_producer_association_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_multicast_producer_association_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_service_lb_policies_generated_test.go b/google-beta/services/networkservices/resource_network_services_service_lb_policies_generated_test.go index 43cf352c4e9..d9d4fddaabc 100644 --- a/google-beta/services/networkservices/resource_network_services_service_lb_policies_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_service_lb_policies_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_tcp_route_generated_test.go b/google-beta/services/networkservices/resource_network_services_tcp_route_generated_test.go index 14e23125477..8848df82413 100644 --- a/google-beta/services/networkservices/resource_network_services_tcp_route_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_tcp_route_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/networkservices/resource_network_services_tls_route_generated_test.go b/google-beta/services/networkservices/resource_network_services_tls_route_generated_test.go index c586b3616ce..0801bb71f72 100644 --- a/google-beta/services/networkservices/resource_network_services_tls_route_generated_test.go +++ b/google-beta/services/networkservices/resource_network_services_tls_route_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/notebooks/resource_notebooks_environment_generated_test.go b/google-beta/services/notebooks/resource_notebooks_environment_generated_test.go index f4475109763..8fa479a4266 100644 --- a/google-beta/services/notebooks/resource_notebooks_environment_generated_test.go +++ b/google-beta/services/notebooks/resource_notebooks_environment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/notebooks" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/notebooks/resource_notebooks_instance_generated_test.go b/google-beta/services/notebooks/resource_notebooks_instance_generated_test.go index e42feebd8d7..e2a86b9096b 100644 --- a/google-beta/services/notebooks/resource_notebooks_instance_generated_test.go +++ b/google-beta/services/notebooks/resource_notebooks_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/notebooks" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/notebooks/resource_notebooks_runtime_generated_test.go b/google-beta/services/notebooks/resource_notebooks_runtime_generated_test.go index 39bc8f4f120..19eda1e9d60 100644 --- a/google-beta/services/notebooks/resource_notebooks_runtime_generated_test.go +++ b/google-beta/services/notebooks/resource_notebooks_runtime_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/notebooks" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/observability/resource_observability_folder_settings_generated_test.go b/google-beta/services/observability/resource_observability_folder_settings_generated_test.go index c0f1d6dcb21..0e662f668e4 100644 --- a/google-beta/services/observability/resource_observability_folder_settings_generated_test.go +++ b/google-beta/services/observability/resource_observability_folder_settings_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/observability" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/observability/resource_observability_organization_settings_generated_test.go b/google-beta/services/observability/resource_observability_organization_settings_generated_test.go index 9f1b5f0b67f..bc023f94627 100644 --- a/google-beta/services/observability/resource_observability_organization_settings_generated_test.go +++ b/google-beta/services/observability/resource_observability_organization_settings_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/observability" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/observability/resource_observability_project_settings_generated_test.go b/google-beta/services/observability/resource_observability_project_settings_generated_test.go index 7e79d347004..c9ebdda961d 100644 --- a/google-beta/services/observability/resource_observability_project_settings_generated_test.go +++ b/google-beta/services/observability/resource_observability_project_settings_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/observability" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/observability/resource_observability_trace_scope_generated_test.go b/google-beta/services/observability/resource_observability_trace_scope_generated_test.go index ad4f86c3f02..637c8143a22 100644 --- a/google-beta/services/observability/resource_observability_trace_scope_generated_test.go +++ b/google-beta/services/observability/resource_observability_trace_scope_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/observability" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/oracledatabase/resource_oracle_database_autonomous_database_generated_test.go b/google-beta/services/oracledatabase/resource_oracle_database_autonomous_database_generated_test.go index 472f966f178..b1e8aba46d0 100644 --- a/google-beta/services/oracledatabase/resource_oracle_database_autonomous_database_generated_test.go +++ b/google-beta/services/oracledatabase/resource_oracle_database_autonomous_database_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/oracledatabase" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/oracledatabase/resource_oracle_database_cloud_exadata_infrastructure_generated_test.go b/google-beta/services/oracledatabase/resource_oracle_database_cloud_exadata_infrastructure_generated_test.go index 65ac75aec04..906022107b1 100644 --- a/google-beta/services/oracledatabase/resource_oracle_database_cloud_exadata_infrastructure_generated_test.go +++ b/google-beta/services/oracledatabase/resource_oracle_database_cloud_exadata_infrastructure_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/oracledatabase" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/oracledatabase/resource_oracle_database_cloud_vm_cluster_generated_test.go b/google-beta/services/oracledatabase/resource_oracle_database_cloud_vm_cluster_generated_test.go index 485ec3fae18..2b64744bf9c 100644 --- a/google-beta/services/oracledatabase/resource_oracle_database_cloud_vm_cluster_generated_test.go +++ b/google-beta/services/oracledatabase/resource_oracle_database_cloud_vm_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/oracledatabase" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/oracledatabase/resource_oracle_database_db_system_generated_test.go b/google-beta/services/oracledatabase/resource_oracle_database_db_system_generated_test.go index c19e90e269c..59d6071481d 100644 --- a/google-beta/services/oracledatabase/resource_oracle_database_db_system_generated_test.go +++ b/google-beta/services/oracledatabase/resource_oracle_database_db_system_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/oracledatabase" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/oracledatabase/resource_oracle_database_exadb_vm_cluster_generated_test.go b/google-beta/services/oracledatabase/resource_oracle_database_exadb_vm_cluster_generated_test.go index aecb545a7f7..fe3aae4fb74 100644 --- a/google-beta/services/oracledatabase/resource_oracle_database_exadb_vm_cluster_generated_test.go +++ b/google-beta/services/oracledatabase/resource_oracle_database_exadb_vm_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/oracledatabase" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/oracledatabase/resource_oracle_database_exascale_db_storage_vault_generated_test.go b/google-beta/services/oracledatabase/resource_oracle_database_exascale_db_storage_vault_generated_test.go index a18f442985a..154aa29c135 100644 --- a/google-beta/services/oracledatabase/resource_oracle_database_exascale_db_storage_vault_generated_test.go +++ b/google-beta/services/oracledatabase/resource_oracle_database_exascale_db_storage_vault_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/oracledatabase" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/oracledatabase/resource_oracle_database_odb_network_generated_test.go b/google-beta/services/oracledatabase/resource_oracle_database_odb_network_generated_test.go index 209fb15076b..d0c74af3485 100644 --- a/google-beta/services/oracledatabase/resource_oracle_database_odb_network_generated_test.go +++ b/google-beta/services/oracledatabase/resource_oracle_database_odb_network_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/oracledatabase" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/oracledatabase/resource_oracle_database_odb_subnet_generated_test.go b/google-beta/services/oracledatabase/resource_oracle_database_odb_subnet_generated_test.go index 18d52dd53d5..9fbe74fad54 100644 --- a/google-beta/services/oracledatabase/resource_oracle_database_odb_subnet_generated_test.go +++ b/google-beta/services/oracledatabase/resource_oracle_database_odb_subnet_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/oracledatabase" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/orgpolicy/resource_org_policy_custom_constraint_generated_test.go b/google-beta/services/orgpolicy/resource_org_policy_custom_constraint_generated_test.go index d006dae9d98..6c6773bab8e 100644 --- a/google-beta/services/orgpolicy/resource_org_policy_custom_constraint_generated_test.go +++ b/google-beta/services/orgpolicy/resource_org_policy_custom_constraint_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/orgpolicy" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/osconfig/resource_os_config_guest_policies_generated_test.go b/google-beta/services/osconfig/resource_os_config_guest_policies_generated_test.go index 2d99b2d43a5..7a30de20a27 100644 --- a/google-beta/services/osconfig/resource_os_config_guest_policies_generated_test.go +++ b/google-beta/services/osconfig/resource_os_config_guest_policies_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/osconfig" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/osconfig/resource_os_config_patch_deployment_generated_test.go b/google-beta/services/osconfig/resource_os_config_patch_deployment_generated_test.go index 3db19134dc4..61e20406ebe 100644 --- a/google-beta/services/osconfig/resource_os_config_patch_deployment_generated_test.go +++ b/google-beta/services/osconfig/resource_os_config_patch_deployment_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/osconfig" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_folder_generated_test.go b/google-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_folder_generated_test.go index c360f9731c5..58743da9777 100644 --- a/google-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_folder_generated_test.go +++ b/google-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_folder_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/osconfigv2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_generated_test.go b/google-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_generated_test.go index ca70e655589..8a9c904e7c9 100644 --- a/google-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_generated_test.go +++ b/google-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/osconfigv2" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_test.go b/google-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_test.go index 3253ecc09ea..19338c03418 100644 --- a/google-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_generated_test.go b/google-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_generated_test.go index 55adea53dda..079feff87ff 100644 --- a/google-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_generated_test.go +++ b/google-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/osconfigv2" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_test.go b/google-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_test.go index 7b432e8bf10..dd60e48c348 100644 --- a/google-beta/services/osconfigv2/resource_os_config_v2_policy_orchestrator_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/oslogin/resource_os_login_ssh_public_key_generated_test.go b/google-beta/services/oslogin/resource_os_login_ssh_public_key_generated_test.go index 1a0a9e7bf6a..4e05422e7fb 100644 --- a/google-beta/services/oslogin/resource_os_login_ssh_public_key_generated_test.go +++ b/google-beta/services/oslogin/resource_os_login_ssh_public_key_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/oslogin" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/parallelstore/resource_parallelstore_instance_generated_test.go b/google-beta/services/parallelstore/resource_parallelstore_instance_generated_test.go index 7662543d2ce..735733895f5 100644 --- a/google-beta/services/parallelstore/resource_parallelstore_instance_generated_test.go +++ b/google-beta/services/parallelstore/resource_parallelstore_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/parallelstore" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/parametermanager/data_source_parameter_manager_parameter_version_test.go b/google-beta/services/parametermanager/data_source_parameter_manager_parameter_version_test.go index 22a722b2eb9..ab8e5e55e82 100644 --- a/google-beta/services/parametermanager/data_source_parameter_manager_parameter_version_test.go +++ b/google-beta/services/parametermanager/data_source_parameter_manager_parameter_version_test.go @@ -26,6 +26,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/parametermanager/resource_parameter_manager_parameter_generated_test.go b/google-beta/services/parametermanager/resource_parameter_manager_parameter_generated_test.go index c07e90057cc..1e8a36d6976 100644 --- a/google-beta/services/parametermanager/resource_parameter_manager_parameter_generated_test.go +++ b/google-beta/services/parametermanager/resource_parameter_manager_parameter_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/parametermanager" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/parametermanager/resource_parameter_manager_parameter_test.go b/google-beta/services/parametermanager/resource_parameter_manager_parameter_test.go index e59b7bbbe2a..0ef380ae529 100644 --- a/google-beta/services/parametermanager/resource_parameter_manager_parameter_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/parametermanager/resource_parameter_manager_parameter_version_generated_test.go b/google-beta/services/parametermanager/resource_parameter_manager_parameter_version_generated_test.go index 48bd0c0f994..49ff8e040be 100644 --- a/google-beta/services/parametermanager/resource_parameter_manager_parameter_version_generated_test.go +++ b/google-beta/services/parametermanager/resource_parameter_manager_parameter_version_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/parametermanager" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_test.go b/google-beta/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_test.go index 6e61fe26054..57cd4573857 100644 --- a/google-beta/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_test.go +++ b/google-beta/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_test.go @@ -26,6 +26,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/parametermanagerregional/resource_parameter_manager_regional_parameter_generated_test.go b/google-beta/services/parametermanagerregional/resource_parameter_manager_regional_parameter_generated_test.go index 30c8240f511..c0029bfac7e 100644 --- a/google-beta/services/parametermanagerregional/resource_parameter_manager_regional_parameter_generated_test.go +++ b/google-beta/services/parametermanagerregional/resource_parameter_manager_regional_parameter_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/parametermanagerregional" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/parametermanagerregional/resource_parameter_manager_regional_parameter_test.go b/google-beta/services/parametermanagerregional/resource_parameter_manager_regional_parameter_test.go index 3c693a60b93..35f33147f61 100644 --- a/google-beta/services/parametermanagerregional/resource_parameter_manager_regional_parameter_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/parametermanagerregional/resource_parameter_manager_regional_parameter_version_generated_test.go b/google-beta/services/parametermanagerregional/resource_parameter_manager_regional_parameter_version_generated_test.go index dfacc11c54e..81cbc2c6c5a 100644 --- a/google-beta/services/parametermanagerregional/resource_parameter_manager_regional_parameter_version_generated_test.go +++ b/google-beta/services/parametermanagerregional/resource_parameter_manager_regional_parameter_version_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/parametermanagerregional" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/privateca/resource_privateca_ca_pool_generated_test.go b/google-beta/services/privateca/resource_privateca_ca_pool_generated_test.go index a25abdadd04..b67ec2f4c8b 100644 --- a/google-beta/services/privateca/resource_privateca_ca_pool_generated_test.go +++ b/google-beta/services/privateca/resource_privateca_ca_pool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/privateca" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/privateca/resource_privateca_ca_pool_test.go b/google-beta/services/privateca/resource_privateca_ca_pool_test.go index f0bde2279e3..e53b7fef0bf 100644 --- a/google-beta/services/privateca/resource_privateca_ca_pool_test.go +++ b/google-beta/services/privateca/resource_privateca_ca_pool_test.go @@ -28,6 +28,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/privateca" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/privateca/resource_privateca_certificate_authority_generated_test.go b/google-beta/services/privateca/resource_privateca_certificate_authority_generated_test.go index f8b678963d5..9bb6c1b41c8 100644 --- a/google-beta/services/privateca/resource_privateca_certificate_authority_generated_test.go +++ b/google-beta/services/privateca/resource_privateca_certificate_authority_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/privateca" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/privateca/resource_privateca_certificate_generated_test.go b/google-beta/services/privateca/resource_privateca_certificate_generated_test.go index c68869572d2..d65f20f4976 100644 --- a/google-beta/services/privateca/resource_privateca_certificate_generated_test.go +++ b/google-beta/services/privateca/resource_privateca_certificate_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/privateca" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/privateca/resource_privateca_certificate_template_generated_test.go b/google-beta/services/privateca/resource_privateca_certificate_template_generated_test.go index 64c7c01ccb0..039b35c2b35 100644 --- a/google-beta/services/privateca/resource_privateca_certificate_template_generated_test.go +++ b/google-beta/services/privateca/resource_privateca_certificate_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/privateca" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_generated_test.go b/google-beta/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_generated_test.go index 8e04b53e12c..3444aee9431 100644 --- a/google-beta/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_generated_test.go +++ b/google-beta/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/privilegedaccessmanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/pubsub/resource_pubsub_schema_generated_test.go b/google-beta/services/pubsub/resource_pubsub_schema_generated_test.go index 4751dd877f0..5dd6c157c09 100644 --- a/google-beta/services/pubsub/resource_pubsub_schema_generated_test.go +++ b/google-beta/services/pubsub/resource_pubsub_schema_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/pubsub" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/pubsub/resource_pubsub_subscription_generated_test.go b/google-beta/services/pubsub/resource_pubsub_subscription_generated_test.go index 4b732abe906..7c44b38a0e4 100644 --- a/google-beta/services/pubsub/resource_pubsub_subscription_generated_test.go +++ b/google-beta/services/pubsub/resource_pubsub_subscription_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/pubsub" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/pubsub/resource_pubsub_subscription_test.go b/google-beta/services/pubsub/resource_pubsub_subscription_test.go index 3ae064e43a7..6e46f028ca2 100644 --- a/google-beta/services/pubsub/resource_pubsub_subscription_test.go +++ b/google-beta/services/pubsub/resource_pubsub_subscription_test.go @@ -25,6 +25,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/pubsub" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/tags" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/pubsub/resource_pubsub_topic_generated_test.go b/google-beta/services/pubsub/resource_pubsub_topic_generated_test.go index c56e40a6171..9466fdafd02 100644 --- a/google-beta/services/pubsub/resource_pubsub_topic_generated_test.go +++ b/google-beta/services/pubsub/resource_pubsub_topic_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/pubsub" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/pubsub/resource_pubsub_topic_test.go b/google-beta/services/pubsub/resource_pubsub_topic_test.go index 929c9d5df6b..3834b1707d3 100644 --- a/google-beta/services/pubsub/resource_pubsub_topic_test.go +++ b/google-beta/services/pubsub/resource_pubsub_topic_test.go @@ -24,6 +24,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/pubsublite/resource_pubsub_lite_reservation_generated_test.go b/google-beta/services/pubsublite/resource_pubsub_lite_reservation_generated_test.go index 0bf46de0db3..a1a6b246576 100644 --- a/google-beta/services/pubsublite/resource_pubsub_lite_reservation_generated_test.go +++ b/google-beta/services/pubsublite/resource_pubsub_lite_reservation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/pubsublite" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/pubsublite/resource_pubsub_lite_subscription_generated_test.go b/google-beta/services/pubsublite/resource_pubsub_lite_subscription_generated_test.go index a9dcc5ce75f..cdd82e17b36 100644 --- a/google-beta/services/pubsublite/resource_pubsub_lite_subscription_generated_test.go +++ b/google-beta/services/pubsublite/resource_pubsub_lite_subscription_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/pubsublite" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/pubsublite/resource_pubsub_lite_topic_generated_test.go b/google-beta/services/pubsublite/resource_pubsub_lite_topic_generated_test.go index e6b88427225..a26e01fe66f 100644 --- a/google-beta/services/pubsublite/resource_pubsub_lite_topic_generated_test.go +++ b/google-beta/services/pubsublite/resource_pubsub_lite_topic_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/pubsublite" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/redis/resource_redis_cluster_generated_test.go b/google-beta/services/redis/resource_redis_cluster_generated_test.go index 19360060ffe..9f775207d18 100644 --- a/google-beta/services/redis/resource_redis_cluster_generated_test.go +++ b/google-beta/services/redis/resource_redis_cluster_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/redis" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/redis/resource_redis_cluster_user_created_connections_generated_test.go b/google-beta/services/redis/resource_redis_cluster_user_created_connections_generated_test.go index 4be9a958b91..6465c1eef5b 100644 --- a/google-beta/services/redis/resource_redis_cluster_user_created_connections_generated_test.go +++ b/google-beta/services/redis/resource_redis_cluster_user_created_connections_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/redis" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/redis/resource_redis_instance_generated_test.go b/google-beta/services/redis/resource_redis_instance_generated_test.go index 5e73ef65517..1a50201f893 100644 --- a/google-beta/services/redis/resource_redis_instance_generated_test.go +++ b/google-beta/services/redis/resource_redis_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/redis" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/acctest/bootstrap_iam_test_utils.go b/google-beta/services/resourcemanager/bootstrap_iam_test_utils.go similarity index 98% rename from google-beta/acctest/bootstrap_iam_test_utils.go rename to google-beta/services/resourcemanager/bootstrap_iam_test_utils.go index 122335971ff..e9d345f99ce 100644 --- a/google-beta/acctest/bootstrap_iam_test_utils.go +++ b/google-beta/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-beta/services/resourcemanager/bootstrap_test_utils.go b/google-beta/services/resourcemanager/bootstrap_test_utils.go new file mode 100644 index 00000000000..0ebbdbc49e1 --- /dev/null +++ b/google-beta/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-beta/google-beta/envvar" + tpgcloudbilling "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudbilling" + rmClient "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager/client" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" + transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/resourcemanager/data_source_google_service_account_access_token_test.go b/google-beta/services/resourcemanager/data_source_google_service_account_access_token_test.go index f53acb52856..a66d9f2035f 100644 --- a/google-beta/services/resourcemanager/data_source_google_service_account_access_token_test.go +++ b/google-beta/services/resourcemanager/data_source_google_service_account_access_token_test.go @@ -23,6 +23,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/resourcemanager/data_source_google_service_account_id_token_test.go b/google-beta/services/resourcemanager/data_source_google_service_account_id_token_test.go index 5ace972768c..9ca35ea1413 100644 --- a/google-beta/services/resourcemanager/data_source_google_service_account_id_token_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/resourcemanager/data_source_google_service_account_jwt_test.go b/google-beta/services/resourcemanager/data_source_google_service_account_jwt_test.go index 05ca68415db..3c2b4c91cad 100644 --- a/google-beta/services/resourcemanager/data_source_google_service_account_jwt_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iambeta" "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/resourcemanager/ephemeral_google_service_account_access_token_test.go b/google-beta/services/resourcemanager/ephemeral_google_service_account_access_token_test.go index ac6389cd74a..d64e7f1ef44 100644 --- a/google-beta/services/resourcemanager/ephemeral_google_service_account_access_token_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/resourcemanager/ephemeral_google_service_account_id_token_test.go b/google-beta/services/resourcemanager/ephemeral_google_service_account_id_token_test.go index 5ad2540d6e4..2f900b0c374 100644 --- a/google-beta/services/resourcemanager/ephemeral_google_service_account_id_token_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/resourcemanager/ephemeral_google_service_account_jwt_test.go b/google-beta/services/resourcemanager/ephemeral_google_service_account_jwt_test.go index 199a045eaa3..159272dad52 100644 --- a/google-beta/services/resourcemanager/ephemeral_google_service_account_jwt_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/resourcemanager/ephemeral_google_service_account_key_test.go b/google-beta/services/resourcemanager/ephemeral_google_service_account_key_test.go index c3670177c58..2ea0d430026 100644 --- a/google-beta/services/resourcemanager/ephemeral_google_service_account_key_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/saasruntime/resource_saas_runtime_release_generated_test.go b/google-beta/services/saasruntime/resource_saas_runtime_release_generated_test.go index 6f0e193c133..6029488921e 100644 --- a/google-beta/services/saasruntime/resource_saas_runtime_release_generated_test.go +++ b/google-beta/services/saasruntime/resource_saas_runtime_release_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/saasruntime" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" @@ -54,7 +57,7 @@ var ( func TestAccSaasRuntimeRelease_saasRuntimeReleaseBasicExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-saasservicemgmt.iam.gserviceaccount.com", Role: "roles/saasservicemgmt.serviceAgent", diff --git a/google-beta/services/saasruntime/resource_saas_runtime_release_test.go b/google-beta/services/saasruntime/resource_saas_runtime_release_test.go index 09ea8356ac7..100a0426d60 100644 --- a/google-beta/services/saasruntime/resource_saas_runtime_release_test.go +++ b/google-beta/services/saasruntime/resource_saas_runtime_release_test.go @@ -24,11 +24,12 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" ) func TestAccSaasRuntimeRelease_update(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-saasservicemgmt.iam.gserviceaccount.com", Role: "roles/saasservicemgmt.serviceAgent", diff --git a/google-beta/services/saasruntime/resource_saas_runtime_rollout_kind_generated_test.go b/google-beta/services/saasruntime/resource_saas_runtime_rollout_kind_generated_test.go index 4540831c1fb..da84ceab0ec 100644 --- a/google-beta/services/saasruntime/resource_saas_runtime_rollout_kind_generated_test.go +++ b/google-beta/services/saasruntime/resource_saas_runtime_rollout_kind_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/saasruntime" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" @@ -54,7 +57,7 @@ var ( func TestAccSaasRuntimeRolloutKind_saasRuntimeRolloutKindBasicExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-saasservicemgmt.iam.gserviceaccount.com", Role: "roles/saasservicemgmt.serviceAgent", diff --git a/google-beta/services/saasruntime/resource_saas_runtime_rollout_kind_test.go b/google-beta/services/saasruntime/resource_saas_runtime_rollout_kind_test.go index c3ad789434b..634da9c8e3c 100644 --- a/google-beta/services/saasruntime/resource_saas_runtime_rollout_kind_test.go +++ b/google-beta/services/saasruntime/resource_saas_runtime_rollout_kind_test.go @@ -23,11 +23,12 @@ import ( "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" ) func TestAccSaasRuntimeRolloutKind_update(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-saasservicemgmt.iam.gserviceaccount.com", Role: "roles/saasservicemgmt.serviceAgent", diff --git a/google-beta/services/saasruntime/resource_saas_runtime_saas_generated_test.go b/google-beta/services/saasruntime/resource_saas_runtime_saas_generated_test.go index e6fd08b40b1..e1738e1a0bf 100644 --- a/google-beta/services/saasruntime/resource_saas_runtime_saas_generated_test.go +++ b/google-beta/services/saasruntime/resource_saas_runtime_saas_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/saasruntime" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" @@ -54,7 +57,7 @@ var ( func TestAccSaasRuntimeSaas_saasRuntimeSaasBasicExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-saasservicemgmt.iam.gserviceaccount.com", Role: "roles/saasservicemgmt.serviceAgent", diff --git a/google-beta/services/saasruntime/resource_saas_runtime_saas_test.go b/google-beta/services/saasruntime/resource_saas_runtime_saas_test.go index c68febc44e0..cb40e3262e0 100644 --- a/google-beta/services/saasruntime/resource_saas_runtime_saas_test.go +++ b/google-beta/services/saasruntime/resource_saas_runtime_saas_test.go @@ -23,11 +23,12 @@ import ( "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" ) func TestAccSaasRuntimeSaas_update(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-saasservicemgmt.iam.gserviceaccount.com", Role: "roles/saasservicemgmt.serviceAgent", diff --git a/google-beta/services/saasruntime/resource_saas_runtime_tenant_generated_test.go b/google-beta/services/saasruntime/resource_saas_runtime_tenant_generated_test.go index 2fdba87c88a..14587b0e361 100644 --- a/google-beta/services/saasruntime/resource_saas_runtime_tenant_generated_test.go +++ b/google-beta/services/saasruntime/resource_saas_runtime_tenant_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/saasruntime" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" @@ -54,7 +57,7 @@ var ( func TestAccSaasRuntimeTenant_saasRuntimeTenantBasicExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-saasservicemgmt.iam.gserviceaccount.com", Role: "roles/saasservicemgmt.serviceAgent", diff --git a/google-beta/services/saasruntime/resource_saas_runtime_tenant_test.go b/google-beta/services/saasruntime/resource_saas_runtime_tenant_test.go index cb318a1c98e..db1b143b417 100644 --- a/google-beta/services/saasruntime/resource_saas_runtime_tenant_test.go +++ b/google-beta/services/saasruntime/resource_saas_runtime_tenant_test.go @@ -24,11 +24,12 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" ) func TestAccSaasRuntimeTenant_update(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-saasservicemgmt.iam.gserviceaccount.com", Role: "roles/saasservicemgmt.serviceAgent", diff --git a/google-beta/services/saasruntime/resource_saas_runtime_unit_generated_test.go b/google-beta/services/saasruntime/resource_saas_runtime_unit_generated_test.go index ad19f9211ad..49e965fd82d 100644 --- a/google-beta/services/saasruntime/resource_saas_runtime_unit_generated_test.go +++ b/google-beta/services/saasruntime/resource_saas_runtime_unit_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/saasruntime" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" @@ -54,7 +57,7 @@ var ( func TestAccSaasRuntimeUnit_saasRuntimeUnitBasicExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-saasservicemgmt.iam.gserviceaccount.com", Role: "roles/saasservicemgmt.serviceAgent", diff --git a/google-beta/services/saasruntime/resource_saas_runtime_unit_kind_generated_test.go b/google-beta/services/saasruntime/resource_saas_runtime_unit_kind_generated_test.go index d5e2273bbcf..cdf646bde8e 100644 --- a/google-beta/services/saasruntime/resource_saas_runtime_unit_kind_generated_test.go +++ b/google-beta/services/saasruntime/resource_saas_runtime_unit_kind_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/saasruntime" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" @@ -54,7 +57,7 @@ var ( func TestAccSaasRuntimeUnitKind_saasRuntimeUnitKindBasicExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-saasservicemgmt.iam.gserviceaccount.com", Role: "roles/saasservicemgmt.serviceAgent", diff --git a/google-beta/services/saasruntime/resource_saas_runtime_unit_kind_test.go b/google-beta/services/saasruntime/resource_saas_runtime_unit_kind_test.go index 57ccf4e12a8..7b76e982f35 100644 --- a/google-beta/services/saasruntime/resource_saas_runtime_unit_kind_test.go +++ b/google-beta/services/saasruntime/resource_saas_runtime_unit_kind_test.go @@ -24,11 +24,12 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" ) func TestAccSaasRuntimeUnitKind_update(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-saasservicemgmt.iam.gserviceaccount.com", Role: "roles/saasservicemgmt.serviceAgent", diff --git a/google-beta/services/saasruntime/resource_saas_runtime_unit_operation_generated_test.go b/google-beta/services/saasruntime/resource_saas_runtime_unit_operation_generated_test.go index 664ec621b14..7ecdfd15bcc 100644 --- a/google-beta/services/saasruntime/resource_saas_runtime_unit_operation_generated_test.go +++ b/google-beta/services/saasruntime/resource_saas_runtime_unit_operation_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/saasruntime" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" @@ -54,7 +57,7 @@ var ( func TestAccSaasRuntimeUnitOperation_saasRuntimeUnitOperationBasicExample(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-saasservicemgmt.iam.gserviceaccount.com", Role: "roles/saasservicemgmt.serviceAgent", diff --git a/google-beta/services/saasruntime/resource_saas_runtime_unit_test.go b/google-beta/services/saasruntime/resource_saas_runtime_unit_test.go index 0c7e0847178..416b22adf29 100644 --- a/google-beta/services/saasruntime/resource_saas_runtime_unit_test.go +++ b/google-beta/services/saasruntime/resource_saas_runtime_unit_test.go @@ -24,11 +24,12 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" ) func TestAccSaasRuntimeUnit_update(t *testing.T) { t.Parallel() - acctest.BootstrapIamMembers(t, []acctest.IamMember{ + resourcemanager.BootstrapIamMembers(t, []resourcemanager.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-saasservicemgmt.iam.gserviceaccount.com", Role: "roles/saasservicemgmt.serviceAgent", diff --git a/google-beta/services/secretmanager/resource_secret_manager_secret_generated_test.go b/google-beta/services/secretmanager/resource_secret_manager_secret_generated_test.go index fd454e4fa65..7fd28b712e1 100644 --- a/google-beta/services/secretmanager/resource_secret_manager_secret_generated_test.go +++ b/google-beta/services/secretmanager/resource_secret_manager_secret_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/secretmanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/secretmanager/resource_secret_manager_secret_version_generated_test.go b/google-beta/services/secretmanager/resource_secret_manager_secret_version_generated_test.go index e4dac00c812..012f5a9af1b 100644 --- a/google-beta/services/secretmanager/resource_secret_manager_secret_version_generated_test.go +++ b/google-beta/services/secretmanager/resource_secret_manager_secret_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/secretmanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/secretmanagerregional/resource_secret_manager_regional_secret_generated_test.go b/google-beta/services/secretmanagerregional/resource_secret_manager_regional_secret_generated_test.go index 870e2793286..e4e7cf7b036 100644 --- a/google-beta/services/secretmanagerregional/resource_secret_manager_regional_secret_generated_test.go +++ b/google-beta/services/secretmanagerregional/resource_secret_manager_regional_secret_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/secretmanagerregional" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/secretmanagerregional/resource_secret_manager_regional_secret_version_generated_test.go b/google-beta/services/secretmanagerregional/resource_secret_manager_regional_secret_version_generated_test.go index 3318e5cbfad..5bb98f8e91d 100644 --- a/google-beta/services/secretmanagerregional/resource_secret_manager_regional_secret_version_generated_test.go +++ b/google-beta/services/secretmanagerregional/resource_secret_manager_regional_secret_version_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/secretmanagerregional" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/securesourcemanager/resource_secure_source_manager_branch_rule_generated_test.go b/google-beta/services/securesourcemanager/resource_secure_source_manager_branch_rule_generated_test.go index dd4d4a13dd6..86e81c0e785 100644 --- a/google-beta/services/securesourcemanager/resource_secure_source_manager_branch_rule_generated_test.go +++ b/google-beta/services/securesourcemanager/resource_secure_source_manager_branch_rule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/securesourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/securesourcemanager/resource_secure_source_manager_hook_generated_test.go b/google-beta/services/securesourcemanager/resource_secure_source_manager_hook_generated_test.go index 28c151cdb4a..b13ab348c22 100644 --- a/google-beta/services/securesourcemanager/resource_secure_source_manager_hook_generated_test.go +++ b/google-beta/services/securesourcemanager/resource_secure_source_manager_hook_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/securesourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/securesourcemanager/resource_secure_source_manager_instance_generated_test.go b/google-beta/services/securesourcemanager/resource_secure_source_manager_instance_generated_test.go index c4a332e1537..e3f80d260f4 100644 --- a/google-beta/services/securesourcemanager/resource_secure_source_manager_instance_generated_test.go +++ b/google-beta/services/securesourcemanager/resource_secure_source_manager_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/securesourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/securesourcemanager/resource_secure_source_manager_repository_generated_test.go b/google-beta/services/securesourcemanager/resource_secure_source_manager_repository_generated_test.go index 809e5a4e0be..ea488c10f28 100644 --- a/google-beta/services/securesourcemanager/resource_secure_source_manager_repository_generated_test.go +++ b/google-beta/services/securesourcemanager/resource_secure_source_manager_repository_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/securesourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/securitycenter/resource_scc_mute_config_generated_test.go b/google-beta/services/securitycenter/resource_scc_mute_config_generated_test.go index 95526e8684d..690eb92cbce 100644 --- a/google-beta/services/securitycenter/resource_scc_mute_config_generated_test.go +++ b/google-beta/services/securitycenter/resource_scc_mute_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/securitycenter" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/securitycenter/resource_scc_notification_config_generated_test.go b/google-beta/services/securitycenter/resource_scc_notification_config_generated_test.go index a4998f534d9..a4341d9d418 100644 --- a/google-beta/services/securitycenter/resource_scc_notification_config_generated_test.go +++ b/google-beta/services/securitycenter/resource_scc_notification_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/securitycenter" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/securitycenter/resource_scc_project_notification_config_generated_test.go b/google-beta/services/securitycenter/resource_scc_project_notification_config_generated_test.go index 115ff4859c8..75554a1034f 100644 --- a/google-beta/services/securitycenter/resource_scc_project_notification_config_generated_test.go +++ b/google-beta/services/securitycenter/resource_scc_project_notification_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/securitycenter" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/securitycenterv2/resource_scc_v2_organization_mute_config_generated_test.go b/google-beta/services/securitycenterv2/resource_scc_v2_organization_mute_config_generated_test.go index 70be23f640b..272193b41ad 100644 --- a/google-beta/services/securitycenterv2/resource_scc_v2_organization_mute_config_generated_test.go +++ b/google-beta/services/securitycenterv2/resource_scc_v2_organization_mute_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/securitycenterv2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/securitycenterv2/resource_scc_v2_organization_notification_config_generated_test.go b/google-beta/services/securitycenterv2/resource_scc_v2_organization_notification_config_generated_test.go index 305d338d15b..5bd609d7da9 100644 --- a/google-beta/services/securitycenterv2/resource_scc_v2_organization_notification_config_generated_test.go +++ b/google-beta/services/securitycenterv2/resource_scc_v2_organization_notification_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/securitycenterv2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/securitycenterv2/resource_scc_v2_project_notification_config_generated_test.go b/google-beta/services/securitycenterv2/resource_scc_v2_project_notification_config_generated_test.go index 0976d8c11a4..5b313c136d2 100644 --- a/google-beta/services/securitycenterv2/resource_scc_v2_project_notification_config_generated_test.go +++ b/google-beta/services/securitycenterv2/resource_scc_v2_project_notification_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/securitycenterv2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/securityposture/resource_securityposture_posture_generated_test.go b/google-beta/services/securityposture/resource_securityposture_posture_generated_test.go index a5f169b7195..1646d7a6ddc 100644 --- a/google-beta/services/securityposture/resource_securityposture_posture_generated_test.go +++ b/google-beta/services/securityposture/resource_securityposture_posture_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/securityposture" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/securityscanner/resource_security_scanner_scan_config_generated_test.go b/google-beta/services/securityscanner/resource_security_scanner_scan_config_generated_test.go index bfed051b3d2..5be02bd7c0f 100644 --- a/google-beta/services/securityscanner/resource_security_scanner_scan_config_generated_test.go +++ b/google-beta/services/securityscanner/resource_security_scanner_scan_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/securityscanner" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/servicedirectory/resource_service_directory_endpoint_generated_test.go b/google-beta/services/servicedirectory/resource_service_directory_endpoint_generated_test.go index 7db3f0d9860..19984518a85 100644 --- a/google-beta/services/servicedirectory/resource_service_directory_endpoint_generated_test.go +++ b/google-beta/services/servicedirectory/resource_service_directory_endpoint_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/servicedirectory" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/servicedirectory/resource_service_directory_namespace_generated_test.go b/google-beta/services/servicedirectory/resource_service_directory_namespace_generated_test.go index dd2f8886c43..aa6bf168103 100644 --- a/google-beta/services/servicedirectory/resource_service_directory_namespace_generated_test.go +++ b/google-beta/services/servicedirectory/resource_service_directory_namespace_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/servicedirectory" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/servicedirectory/resource_service_directory_service_generated_test.go b/google-beta/services/servicedirectory/resource_service_directory_service_generated_test.go index a5698e952db..84791494f15 100644 --- a/google-beta/services/servicedirectory/resource_service_directory_service_generated_test.go +++ b/google-beta/services/servicedirectory/resource_service_directory_service_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/servicedirectory" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/servicenetworking/resource_service_networking_vpc_service_controls_generated_test.go b/google-beta/services/servicenetworking/resource_service_networking_vpc_service_controls_generated_test.go index 52df1ab1c89..3fc39115a1a 100644 --- a/google-beta/services/servicenetworking/resource_service_networking_vpc_service_controls_generated_test.go +++ b/google-beta/services/servicenetworking/resource_service_networking_vpc_service_controls_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/servicenetworking" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/serviceusage/resource_service_usage_consumer_quota_override_generated_test.go b/google-beta/services/serviceusage/resource_service_usage_consumer_quota_override_generated_test.go index 8d3504b0a39..647f4366909 100644 --- a/google-beta/services/serviceusage/resource_service_usage_consumer_quota_override_generated_test.go +++ b/google-beta/services/serviceusage/resource_service_usage_consumer_quota_override_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/serviceusage" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/sourcerepo/resource_sourcerepo_repository_generated_test.go b/google-beta/services/sourcerepo/resource_sourcerepo_repository_generated_test.go index a2f8d77a523..4a88dafbec7 100644 --- a/google-beta/services/sourcerepo/resource_sourcerepo_repository_generated_test.go +++ b/google-beta/services/sourcerepo/resource_sourcerepo_repository_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/sourcerepo" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/spanner/resource_spanner_backup_schedule_generated_test.go b/google-beta/services/spanner/resource_spanner_backup_schedule_generated_test.go index 2b486867840..04b0af5d8e8 100644 --- a/google-beta/services/spanner/resource_spanner_backup_schedule_generated_test.go +++ b/google-beta/services/spanner/resource_spanner_backup_schedule_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/spanner" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/spanner/resource_spanner_database_generated_test.go b/google-beta/services/spanner/resource_spanner_database_generated_test.go index bbf5a5d5031..daa3327959e 100644 --- a/google-beta/services/spanner/resource_spanner_database_generated_test.go +++ b/google-beta/services/spanner/resource_spanner_database_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/spanner" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/spanner/resource_spanner_database_test.go b/google-beta/services/spanner/resource_spanner_database_test.go index 619ebb0fa36..e2f31adecdc 100644 --- a/google-beta/services/spanner/resource_spanner_database_test.go +++ b/google-beta/services/spanner/resource_spanner_database_test.go @@ -25,6 +25,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/spanner/resource_spanner_instance_config_generated_test.go b/google-beta/services/spanner/resource_spanner_instance_config_generated_test.go index 7b2449c6615..d840d0bb74b 100644 --- a/google-beta/services/spanner/resource_spanner_instance_config_generated_test.go +++ b/google-beta/services/spanner/resource_spanner_instance_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/spanner" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/spanner/resource_spanner_instance_generated_test.go b/google-beta/services/spanner/resource_spanner_instance_generated_test.go index 42dbd513067..c1a52e06c46 100644 --- a/google-beta/services/spanner/resource_spanner_instance_generated_test.go +++ b/google-beta/services/spanner/resource_spanner_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/spanner" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/spanner/resource_spanner_instance_partition_generated_test.go b/google-beta/services/spanner/resource_spanner_instance_partition_generated_test.go index 47a51a781a2..764fdb190e7 100644 --- a/google-beta/services/spanner/resource_spanner_instance_partition_generated_test.go +++ b/google-beta/services/spanner/resource_spanner_instance_partition_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/spanner" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/sql/resource_sql_database_generated_test.go b/google-beta/services/sql/resource_sql_database_generated_test.go index 67e4e0b2964..6b7318f94c2 100644 --- a/google-beta/services/sql/resource_sql_database_generated_test.go +++ b/google-beta/services/sql/resource_sql_database_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/sql" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/sql/resource_sql_source_representation_instance_generated_test.go b/google-beta/services/sql/resource_sql_source_representation_instance_generated_test.go index bcb55a51328..a2413e74909 100644 --- a/google-beta/services/sql/resource_sql_source_representation_instance_generated_test.go +++ b/google-beta/services/sql/resource_sql_source_representation_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/sql" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/storage/resource_storage_anywhere_cache_generated_test.go b/google-beta/services/storage/resource_storage_anywhere_cache_generated_test.go index 3e936b94b2e..004356fb2a3 100644 --- a/google-beta/services/storage/resource_storage_anywhere_cache_generated_test.go +++ b/google-beta/services/storage/resource_storage_anywhere_cache_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storage" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/storage/resource_storage_bucket_access_control_generated_test.go b/google-beta/services/storage/resource_storage_bucket_access_control_generated_test.go index f9b18fac87e..cc394ddd9fc 100644 --- a/google-beta/services/storage/resource_storage_bucket_access_control_generated_test.go +++ b/google-beta/services/storage/resource_storage_bucket_access_control_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storage" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/storage/resource_storage_default_object_access_control_generated_test.go b/google-beta/services/storage/resource_storage_default_object_access_control_generated_test.go index f28cc47d404..a2bd85f0d8c 100644 --- a/google-beta/services/storage/resource_storage_default_object_access_control_generated_test.go +++ b/google-beta/services/storage/resource_storage_default_object_access_control_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storage" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/storage/resource_storage_folder_generated_test.go b/google-beta/services/storage/resource_storage_folder_generated_test.go index 30a77136f3e..e69ddc98456 100644 --- a/google-beta/services/storage/resource_storage_folder_generated_test.go +++ b/google-beta/services/storage/resource_storage_folder_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storage" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/storage/resource_storage_hmac_key_generated_test.go b/google-beta/services/storage/resource_storage_hmac_key_generated_test.go index 5403a35cbc6..b309842bc69 100644 --- a/google-beta/services/storage/resource_storage_hmac_key_generated_test.go +++ b/google-beta/services/storage/resource_storage_hmac_key_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storage" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/storage/resource_storage_managed_folder_generated_test.go b/google-beta/services/storage/resource_storage_managed_folder_generated_test.go index c000b607c1d..33b97c266eb 100644 --- a/google-beta/services/storage/resource_storage_managed_folder_generated_test.go +++ b/google-beta/services/storage/resource_storage_managed_folder_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storage" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/storage/resource_storage_object_access_control_generated_test.go b/google-beta/services/storage/resource_storage_object_access_control_generated_test.go index 3124dc320ad..7ea9a21b193 100644 --- a/google-beta/services/storage/resource_storage_object_access_control_generated_test.go +++ b/google-beta/services/storage/resource_storage_object_access_control_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storage" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/storagebatchoperations/resource_storage_batch_operations_job_generated_test.go b/google-beta/services/storagebatchoperations/resource_storage_batch_operations_job_generated_test.go index 75740404470..1ba3e17c1e1 100644 --- a/google-beta/services/storagebatchoperations/resource_storage_batch_operations_job_generated_test.go +++ b/google-beta/services/storagebatchoperations/resource_storage_batch_operations_job_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storagebatchoperations" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/storagecontrol/data_source_storage_control_project_intelligence_config_test.go b/google-beta/services/storagecontrol/data_source_storage_control_project_intelligence_config_test.go index c0feeafd382..8bc1fa8748d 100644 --- a/google-beta/services/storagecontrol/data_source_storage_control_project_intelligence_config_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/storagecontrol/resource_storage_control_project_intelligence_config_test.go b/google-beta/services/storagecontrol/resource_storage_control_project_intelligence_config_test.go index f2a2fd4601b..dc56253a2c0 100644 --- a/google-beta/services/storagecontrol/resource_storage_control_project_intelligence_config_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/storageinsights/resource_storage_insights_dataset_config_generated_test.go b/google-beta/services/storageinsights/resource_storage_insights_dataset_config_generated_test.go index 6c1f4dba448..767612467f9 100644 --- a/google-beta/services/storageinsights/resource_storage_insights_dataset_config_generated_test.go +++ b/google-beta/services/storageinsights/resource_storage_insights_dataset_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storageinsights" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/storageinsights/resource_storage_insights_report_config_generated_test.go b/google-beta/services/storageinsights/resource_storage_insights_report_config_generated_test.go index 0386cc49d76..6319ddcf2af 100644 --- a/google-beta/services/storageinsights/resource_storage_insights_report_config_generated_test.go +++ b/google-beta/services/storageinsights/resource_storage_insights_report_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storageinsights" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/storagetransfer/resource_storage_transfer_job_test.go b/google-beta/services/storagetransfer/resource_storage_transfer_job_test.go index 4d2a85c276b..a743fc3bb63 100644 --- a/google-beta/services/storagetransfer/resource_storage_transfer_job_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/tpuv2/resource_tpu_v2_queued_resource_generated_test.go b/google-beta/services/tpuv2/resource_tpu_v2_queued_resource_generated_test.go index 00c3f23ff7c..285598001ae 100644 --- a/google-beta/services/tpuv2/resource_tpu_v2_queued_resource_generated_test.go +++ b/google-beta/services/tpuv2/resource_tpu_v2_queued_resource_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/tpuv2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/tpuv2/resource_tpu_v2_vm_generated_test.go b/google-beta/services/tpuv2/resource_tpu_v2_vm_generated_test.go index b3d52795635..1b1b05d485d 100644 --- a/google-beta/services/tpuv2/resource_tpu_v2_vm_generated_test.go +++ b/google-beta/services/tpuv2/resource_tpu_v2_vm_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/tpuv2" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/transcoder/resource_transcoder_job_generated_test.go b/google-beta/services/transcoder/resource_transcoder_job_generated_test.go index 12300e3aed9..7af30cbd1a6 100644 --- a/google-beta/services/transcoder/resource_transcoder_job_generated_test.go +++ b/google-beta/services/transcoder/resource_transcoder_job_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/transcoder" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/transcoder/resource_transcoder_job_template_generated_test.go b/google-beta/services/transcoder/resource_transcoder_job_template_generated_test.go index 94cd913f003..b98eaec09cd 100644 --- a/google-beta/services/transcoder/resource_transcoder_job_template_generated_test.go +++ b/google-beta/services/transcoder/resource_transcoder_job_template_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/transcoder" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vectorsearch/resource_vector_search_collection_generated_test.go b/google-beta/services/vectorsearch/resource_vector_search_collection_generated_test.go index a867775f05e..2098f0aa5c7 100644 --- a/google-beta/services/vectorsearch/resource_vector_search_collection_generated_test.go +++ b/google-beta/services/vectorsearch/resource_vector_search_collection_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vectorsearch" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vertexai/resource_vertex_ai_cache_config_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_cache_config_generated_test.go index 17927d0defe..1d942a01ed5 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_cache_config_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_cache_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vertexai/resource_vertex_ai_dataset_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_dataset_generated_test.go index 9326f8446e1..7f7fea914bd 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_dataset_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_dataset_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vertexai/resource_vertex_ai_deployment_resource_pool_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_deployment_resource_pool_generated_test.go index 6ed7def02e5..1fb12733e95 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_deployment_resource_pool_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_deployment_resource_pool_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vertexai/resource_vertex_ai_endpoint_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_endpoint_generated_test.go index 7ac9eb9f953..2a481bf70c3 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_endpoint_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_endpoint_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vertexai/resource_vertex_ai_feature_group_feature_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_feature_group_feature_generated_test.go index 65d1ff02233..6c54b7b561c 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_feature_group_feature_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_feature_group_feature_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vertexai/resource_vertex_ai_feature_group_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_feature_group_generated_test.go index 22de3cdb338..0b3ebf5b927 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_feature_group_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_feature_group_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_featureview_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_featureview_generated_test.go index a36ea40eeca..dc130a7e903 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_featureview_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_featureview_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_generated_test.go index aa07dd34252..739160a41e1 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_feature_online_store_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vertexai/resource_vertex_ai_featurestore_entitytype_feature_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_featurestore_entitytype_feature_generated_test.go index 253dce2c3bf..96e53f0d020 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_featurestore_entitytype_feature_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_featurestore_entitytype_feature_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vertexai/resource_vertex_ai_featurestore_entitytype_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_featurestore_entitytype_generated_test.go index c491083ead8..76f9a688dfe 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_featurestore_entitytype_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_featurestore_entitytype_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vertexai/resource_vertex_ai_featurestore_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_featurestore_generated_test.go index 2b6ca26495d..e07b89d5fff 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_featurestore_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_featurestore_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vertexai/resource_vertex_ai_index_endpoint_deployed_index_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_index_endpoint_deployed_index_generated_test.go index b5ab27c1679..0e22909ee14 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_index_endpoint_deployed_index_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_index_endpoint_deployed_index_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vertexai/resource_vertex_ai_index_endpoint_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_index_endpoint_generated_test.go index 5c62e1784bb..89c00d4abad 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_index_endpoint_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_index_endpoint_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vertexai/resource_vertex_ai_index_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_index_generated_test.go index 030cef62294..f201179af9d 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_index_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_index_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vertexai/resource_vertex_ai_reasoning_engine_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_reasoning_engine_generated_test.go index 2c3e487ed25..4545a598f8a 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_reasoning_engine_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_reasoning_engine_generated_test.go @@ -31,6 +31,9 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai" + + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/vertexai/resource_vertex_ai_reasoning_engine_test.go b/google-beta/services/vertexai/resource_vertex_ai_reasoning_engine_test.go index f795a56d5ad..a57bb89d179 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_reasoning_engine_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/vertexai/resource_vertex_ai_tensorboard_generated_test.go b/google-beta/services/vertexai/resource_vertex_ai_tensorboard_generated_test.go index 9ef847ff734..40e616df5ed 100644 --- a/google-beta/services/vertexai/resource_vertex_ai_tensorboard_generated_test.go +++ b/google-beta/services/vertexai/resource_vertex_ai_tensorboard_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vmwareengine/resource_vmwareengine_cluster_test.go b/google-beta/services/vmwareengine/resource_vmwareengine_cluster_test.go index f68fc419e9c..797312925fa 100644 --- a/google-beta/services/vmwareengine/resource_vmwareengine_cluster_test.go +++ b/google-beta/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-beta/google-beta/services/resourcemanager" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/servicenetworking" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vmwareengine" "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/vmwareengine/resource_vmwareengine_datastore_test.go b/google-beta/services/vmwareengine/resource_vmwareengine_datastore_test.go index 0d9ff64ea01..13741a43792 100644 --- a/google-beta/services/vmwareengine/resource_vmwareengine_datastore_test.go +++ b/google-beta/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-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/servicenetworking" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/vmwareengine/resource_vmwareengine_network_generated_test.go b/google-beta/services/vmwareengine/resource_vmwareengine_network_generated_test.go index 802a14fddae..d2dea47018e 100644 --- a/google-beta/services/vmwareengine/resource_vmwareengine_network_generated_test.go +++ b/google-beta/services/vmwareengine/resource_vmwareengine_network_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vmwareengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vmwareengine/resource_vmwareengine_network_peering_generated_test.go b/google-beta/services/vmwareengine/resource_vmwareengine_network_peering_generated_test.go index f2ad7d411c1..a43ffde0515 100644 --- a/google-beta/services/vmwareengine/resource_vmwareengine_network_peering_generated_test.go +++ b/google-beta/services/vmwareengine/resource_vmwareengine_network_peering_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vmwareengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vmwareengine/resource_vmwareengine_network_policy_generated_test.go b/google-beta/services/vmwareengine/resource_vmwareengine_network_policy_generated_test.go index 84fe2959e2f..d1edbbc1390 100644 --- a/google-beta/services/vmwareengine/resource_vmwareengine_network_policy_generated_test.go +++ b/google-beta/services/vmwareengine/resource_vmwareengine_network_policy_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vmwareengine" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/vpcaccess/resource_vpc_access_connector_generated_test.go b/google-beta/services/vpcaccess/resource_vpc_access_connector_generated_test.go index f41d440b51b..39ffab518b6 100644 --- a/google-beta/services/vpcaccess/resource_vpc_access_connector_generated_test.go +++ b/google-beta/services/vpcaccess/resource_vpc_access_connector_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vpcaccess" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/workbench/resource_workbench_instance_generated_test.go b/google-beta/services/workbench/resource_workbench_instance_generated_test.go index a275a0c0384..403937352ab 100644 --- a/google-beta/services/workbench/resource_workbench_instance_generated_test.go +++ b/google-beta/services/workbench/resource_workbench_instance_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/workbench" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/workflows/resource_workflows_workflow_generated_test.go b/google-beta/services/workflows/resource_workflows_workflow_generated_test.go index baa502d74bc..f267e3738e0 100644 --- a/google-beta/services/workflows/resource_workflows_workflow_generated_test.go +++ b/google-beta/services/workflows/resource_workflows_workflow_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/workflows" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/workflows/resource_workflows_workflow_test.go b/google-beta/services/workflows/resource_workflows_workflow_test.go index 6e21b102b99..bf8ed09f545 100644 --- a/google-beta/services/workflows/resource_workflows_workflow_test.go +++ b/google-beta/services/workflows/resource_workflows_workflow_test.go @@ -25,6 +25,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/workflows" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/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-beta/services/workloadidentity/resource_workload_identity_service_agent_generated_test.go b/google-beta/services/workloadidentity/resource_workload_identity_service_agent_generated_test.go index e00089f622e..dbb927ebd60 100644 --- a/google-beta/services/workloadidentity/resource_workload_identity_service_agent_generated_test.go +++ b/google-beta/services/workloadidentity/resource_workload_identity_service_agent_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/workloadidentity" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/workstations/resource_workstations_workstation_cluster_generated_test.go b/google-beta/services/workstations/resource_workstations_workstation_cluster_generated_test.go index eec223d180a..35927f7009d 100644 --- a/google-beta/services/workstations/resource_workstations_workstation_cluster_generated_test.go +++ b/google-beta/services/workstations/resource_workstations_workstation_cluster_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/workstations" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/workstations/resource_workstations_workstation_config_generated_test.go b/google-beta/services/workstations/resource_workstations_workstation_config_generated_test.go index e2f3c68437a..ff9aa0c80e4 100644 --- a/google-beta/services/workstations/resource_workstations_workstation_config_generated_test.go +++ b/google-beta/services/workstations/resource_workstations_workstation_config_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/workstations" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" diff --git a/google-beta/services/workstations/resource_workstations_workstation_generated_test.go b/google-beta/services/workstations/resource_workstations_workstation_generated_test.go index 89cdce49456..7e2c726a49e 100644 --- a/google-beta/services/workstations/resource_workstations_workstation_generated_test.go +++ b/google-beta/services/workstations/resource_workstations_workstation_generated_test.go @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/workstations" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"