GoogleCloudPlatform · zli82016 · Jul 21, 2023 · Jul 20, 2023 · Jul 20, 2023 · Jul 20, 2023
diff --git a/mmv1/third_party/terraform/envvar/envvar_utils.go b/mmv1/third_party/terraform/envvar/envvar_utils.go
@@ -1,6 +1,7 @@
 package envvar
 
 import (
+	"fmt"
 	"log"
 	"os"
 	"testing"
@@ -196,3 +197,7 @@ func SkipIfEnvNotSet(t *testing.T, envs ...string) {
 		}
 	}
 }
+
+func ServiceAccountCanonicalEmail(account string) string {
+	return fmt.Sprintf("%s@%s.iam.gserviceaccount.com", account, GetTestProjectFromEnv())
+}
diff --git a/...work_utils/framework_provider_test.go.erb → ...fwprovider/framework_provider_test.go.erb b/...work_utils/framework_provider_test.go.erb → ...fwprovider/framework_provider_test.go.erb
@@ -1,13 +1,19 @@
 <% autogen_exception -%>
-package google
+package fwprovider_test
 
 import (
 	"fmt"
 	"regexp"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+
 	"github.com/hashicorp/terraform-provider-google/google/acctest"
+	"github.com/hashicorp/terraform-provider-google/google/fwtransport"
+	"github.com/hashicorp/terraform-provider-google/google/tpgresource"
+	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
 )
 
 func TestAccFrameworkProviderMeta_setModuleName(t *testing.T) {
@@ -170,3 +176,111 @@ resource "google_dns_managed_zone" "foo" {
 }
 `, endpoint, name, name)
 }
+
+
+// Copy the function from the provider_test package to here
+// as that function is in the _test.go file and not importable
+func testAccProviderBasePath_setBasePath(endpoint, name string) string {
+	return fmt.Sprintf(`
+provider "google" {
+  alias                   = "compute_custom_endpoint"
+  compute_custom_endpoint = "%s"
+}
+
+resource "google_compute_address" "default" {
+  provider = google.compute_custom_endpoint
+  name     = "tf-test-address-%s"
+}`, endpoint, name)
+}
+
+func testAccProviderMeta_setModuleName(key, name string) string {
+	return fmt.Sprintf(`
+terraform {
+  provider_meta "google" {
+    module_name = "%s"
+  }
+}
+
+resource "google_compute_address" "default" {
+	name = "tf-test-address-%s"
+}`, key, name)
+}
+
+// Copy the function testAccCheckComputeAddressDestroyProducer from the dns_test package to here,
+// as that function is in the _test.go file and not importable.
+//
+// testAccCheckDNSManagedZoneDestroyProducerFramework is the framework version of the generated testAccCheckDNSManagedZoneDestroyProducer
+// when we automate this, we'll use the automated version and can get rid of this
+func testAccCheckDNSManagedZoneDestroyProducerFramework(t *testing.T) func(s *terraform.State) error {
+	return func(s *terraform.State) error {
+		for name, rs := range s.RootModule().Resources {
+			if rs.Type != "google_dns_managed_zone" {
+				continue
+			}
+			if strings.HasPrefix(name, "data.") {
+				continue
+			}
+
+			p := acctest.GetFwTestProvider(t)
+
+			url, err := acctest.ReplaceVarsForFrameworkTest(&p.FrameworkProvider.FrameworkProviderConfig, rs, "{{DNSBasePath}}projects/{{project}}/managedZones/{{name}}")
+			if err != nil {
+				return err
+			}
+
+			billingProject := ""
+
+			if !p.BillingProject.IsNull() && p.BillingProject.String() != "" {
+				billingProject = p.BillingProject.String()
+			}
+
+			_, diags := fwtransport.SendFrameworkRequest(&p.FrameworkProvider.FrameworkProviderConfig, "GET", billingProject, url, p.UserAgent, nil)
+			if !diags.HasError() {
+				return fmt.Errorf("DNSManagedZone still exists at %s", url)
+			}
+		}
+
+		return nil
+	}
+}
+
+// Copy the Mmv1 generated function testAccCheckComputeAddressDestroyProducer from the compute_test package to here,
+// as that function is in the _test.go file and not importable.
+func testAccCheckComputeAddressDestroyProducer(t *testing.T) func(s *terraform.State) error {
+	return func(s *terraform.State) error {
+		for name, rs := range s.RootModule().Resources {
+			if rs.Type != "google_compute_address" {
+				continue
+			}
+			if strings.HasPrefix(name, "data.") {
+				continue
+			}
+
+			config := acctest.GoogleProviderConfig(t)
+
+			url, err := tpgresource.ReplaceVarsForTest(config, rs, "{{ComputeBasePath}}projects/{{project}}/regions/{{region}}/addresses/{{name}}")
+			if err != nil {
+				return err
+			}
+
+			billingProject := ""
+
+			if config.BillingProject != "" {
+				billingProject = config.BillingProject
+			}
+
+			_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+				Config:    config,
+				Method:    "GET",
+				Project:   billingProject,
+				RawURL:    url,
+				UserAgent: config.UserAgent,
+			})
+			if err == nil {
+				return fmt.Errorf("ComputeAddress still exists at %s", url)
+			}
+		}
+
+		return nil
+	}
+}
diff --git a/...arty/terraform/utils/provider_test.go.erb → ...y/terraform/provider/provider_test.go.erb b/...arty/terraform/utils/provider_test.go.erb → ...y/terraform/provider/provider_test.go.erb
@@ -1,17 +1,21 @@
 <% autogen_exception -%>
-package google
+package provider_test
 
 import (
 	"fmt"
 	"regexp"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform-provider-google/google/acctest"
 	"github.com/hashicorp/terraform-provider-google/google/envvar"
 	"github.com/hashicorp/terraform-provider-google/google/provider"
+	"github.com/hashicorp/terraform-provider-google/google/tpgresource"
+	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
 func TestProvider(t *testing.T) {
@@ -148,7 +152,7 @@ func TestAccProviderIndirectUserProjectOverride(t *testing.T) {
 	pid := "tf-test-" + acctest.RandString(t, 10)
 
 	config := acctest.BootstrapConfig(t)
-	accessToken, err := setupProjectsAndGetAccessToken(org, billing, pid, "cloudkms", config)
+	accessToken, err := acctest.SetupProjectsAndGetAccessToken(org, billing, pid, "cloudkms", config)
 	if err != nil {
 		t.Error(err)
 	}
@@ -276,4 +280,45 @@ provider "google" {
 	user_project_override = %v
 }
 `, accessToken, override)
+}
+
+// Copy the Mmv1 generated function testAccCheckComputeAddressDestroyProducer from the compute_test package to here,
+// as that function is in the _test.go file and not importable.
+func testAccCheckComputeAddressDestroyProducer(t *testing.T) func(s *terraform.State) error {
+	return func(s *terraform.State) error {
+		for name, rs := range s.RootModule().Resources {
+			if rs.Type != "google_compute_address" {
+				continue
+			}
+			if strings.HasPrefix(name, "data.") {
+				continue
+			}
+
+			config := acctest.GoogleProviderConfig(t)
+
+			url, err := tpgresource.ReplaceVarsForTest(config, rs, "{{ComputeBasePath}}projects/{{project}}/regions/{{region}}/addresses/{{name}}")
+			if err != nil {
+				return err
+			}
+
+			billingProject := ""
+
+			if config.BillingProject != "" {
+				billingProject = config.BillingProject
+			}
+
+			_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+				Config:    config,
+				Method:    "GET",
+				Project:   billingProject,
+				RawURL:    url,
+				UserAgent: config.UserAgent,
+			})
+			if err == nil {
+				return fmt.Errorf("ComputeAddress still exists at %s", url)
+			}
+		}
+
+		return nil
+	}
 }
diff --git a/...s_approval_folder_service_account_test.go → ...s_approval_folder_service_account_test.go b/...s_approval_folder_service_account_test.go → ...s_approval_folder_service_account_test.go
@@ -1,4 +1,4 @@
-package google
+package accessapproval_test
 
 import (
 	"testing"

diff --git a/...oval_organization_service_account_test.go → ...oval_organization_service_account_test.go b/...oval_organization_service_account_test.go → ...oval_organization_service_account_test.go
@@ -1,4 +1,4 @@
-package google
+package accessapproval_test
 
 import (
 	"testing"

diff --git a/..._approval_project_service_account_test.go → ..._approval_project_service_account_test.go b/..._approval_project_service_account_test.go → ..._approval_project_service_account_test.go
@@ -1,4 +1,4 @@
-package google
+package accessapproval_test
 
 import (
 	"testing"

diff --git a/...e_access_approval_folder_settings_test.go → ...e_access_approval_folder_settings_test.go b/...e_access_approval_folder_settings_test.go → ...e_access_approval_folder_settings_test.go
@@ -1,4 +1,4 @@
-package google
+package accessapproval_test
 
 import (
 	"log"

diff --git a/...ss_approval_organization_settings_test.go → ...ss_approval_organization_settings_test.go b/...ss_approval_organization_settings_test.go → ...ss_approval_organization_settings_test.go
@@ -1,4 +1,4 @@
-package google
+package accessapproval_test
 
 import (
 	"log"

diff --git a/..._access_approval_project_settings_test.go → ..._access_approval_project_settings_test.go b/..._access_approval_project_settings_test.go → ..._access_approval_project_settings_test.go
@@ -1,4 +1,4 @@
-package google
+package accessapproval_test
 
 import (
 	"log"

diff --git a/...rce_active_directory_domain_trust_test.go → ...rce_active_directory_domain_trust_test.go b/...rce_active_directory_domain_trust_test.go → ...rce_active_directory_domain_trust_test.go
@@ -1,4 +1,4 @@
-package google
+package activedirectory_test
 
 import (
 	"fmt"

diff --git a/...ce_active_directory_domain_update_test.go → ...ce_active_directory_domain_update_test.go b/...ce_active_directory_domain_update_test.go → ...ce_active_directory_domain_update_test.go
@@ -1,4 +1,4 @@
-package google
+package activedirectory_test
 
 import (
 	"fmt"

diff --git a/..._alloydb_supported_database_flags_test.go → ..._alloydb_supported_database_flags_test.go b/..._alloydb_supported_database_flags_test.go → ..._alloydb_supported_database_flags_test.go
@@ -1,4 +1,4 @@
-package google
+package alloydb_test
 
 import (
 	"errors"

diff --git a/...rm/tests/resource_apigee_instance_test.go → ...s/apigee/resource_apigee_instance_test.go b/...rm/tests/resource_apigee_instance_test.go → ...s/apigee/resource_apigee_instance_test.go
@@ -1,4 +1,4 @@
-package google
+package apigee_test
 
 import (
 	"testing"

diff --git a/...esource_apigee_sync_authorization_test.go → ...esource_apigee_sync_authorization_test.go b/...esource_apigee_sync_authorization_test.go → ...esource_apigee_sync_authorization_test.go
@@ -1,4 +1,4 @@
-package google
+package apigee_test
 
 import (
 	"testing"

diff --git a/...pp_engine_default_service_account_test.go → ...pp_engine_default_service_account_test.go b/...pp_engine_default_service_account_test.go → ...pp_engine_default_service_account_test.go
@@ -1,4 +1,4 @@
-package google
+package appengine_test
 
 import (
 	"testing"

diff --git a/...s/resource_app_engine_application_test.go → ...e/resource_app_engine_application_test.go b/...s/resource_app_engine_application_test.go → ...e/resource_app_engine_application_test.go
@@ -1,4 +1,4 @@
-package google
+package appengine_test
 
 import (
 	"fmt"

diff --git a/..._bigquery_default_service_account_test.go → ..._bigquery_default_service_account_test.go b/..._bigquery_default_service_account_test.go → ..._bigquery_default_service_account_test.go
@@ -1,4 +1,4 @@
-package google
+package bigquery_test
 
 import (
 	"testing"

diff --git a/.../resource_bigquery_dataset_access_test.go → .../resource_bigquery_dataset_access_test.go b/.../resource_bigquery_dataset_access_test.go → .../resource_bigquery_dataset_access_test.go
@@ -1,4 +1,4 @@
-package google
+package bigquery_test
 
 import (
 	"fmt"

diff --git a/...ource_bigquery_dataset_iam_member_test.go → ...ource_bigquery_dataset_iam_member_test.go b/...ource_bigquery_dataset_iam_member_test.go → ...ource_bigquery_dataset_iam_member_test.go
@@ -1,4 +1,4 @@
-package google
+package bigquery_test
 
 import (
 	"fmt"

diff --git a/...sts/resource_bigquery_dataset_iam_test.go → ...ery/resource_bigquery_dataset_iam_test.go b/...sts/resource_bigquery_dataset_iam_test.go → ...ery/resource_bigquery_dataset_iam_test.go
@@ -1,4 +1,4 @@
-package google
+package bigquery_test
 
 import (
 	"fmt"
@@ -62,7 +62,7 @@ func TestAccBigqueryDatasetIamMember(t *testing.T) {
 		envvar.GetTestProjectFromEnv(),
 		dataset,
 		role,
-		serviceAccountCanonicalEmail(account))
+		envvar.ServiceAccountCanonicalEmail(account))
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
@@ -75,7 +75,7 @@ func TestAccBigqueryDatasetIamMember(t *testing.T) {
 					resource.TestCheckResourceAttr(
 						"google_bigquery_dataset_iam_member.member", "role", role),
 					resource.TestCheckResourceAttr(
-						"google_bigquery_dataset_iam_member.member", "member", "serviceAccount:"+serviceAccountCanonicalEmail(account)),
+						"google_bigquery_dataset_iam_member.member", "member", "serviceAccount:"+envvar.ServiceAccountCanonicalEmail(account)),
 				),
 			},
 			{

diff --git a/...aform/tests/resource_bigquery_job_test.go → ...es/bigquery/resource_bigquery_job_test.go b/...aform/tests/resource_bigquery_job_test.go → ...es/bigquery/resource_bigquery_job_test.go
@@ -1,4 +1,4 @@
-package google
+package bigquery_test
 
 import (
 	"fmt"

diff --git a/...rce_bigquery_data_transfer_config_test.go → ...rce_bigquery_data_transfer_config_test.go b/...rce_bigquery_data_transfer_config_test.go → ...rce_bigquery_data_transfer_config_test.go
@@ -1,4 +1,4 @@
-package google
+package bigquerydatatransfer_test
 
 import (
 	"fmt"

diff --git a/...tests/resource_bigtable_gc_policy_test.go → ...table/resource_bigtable_gc_policy_test.go b/...tests/resource_bigtable_gc_policy_test.go → ...table/resource_bigtable_gc_policy_test.go
@@ -1,4 +1,4 @@
-package google
+package bigtable_test
 
 import (
 	"context"

diff --git a/...ts/resource_bigtable_instance_iam_test.go → ...le/resource_bigtable_instance_iam_test.go b/...ts/resource_bigtable_instance_iam_test.go → ...le/resource_bigtable_instance_iam_test.go
@@ -1,4 +1,4 @@
-package google
+package bigtable_test
 
 import (
 	"fmt"
@@ -68,7 +68,7 @@ func TestAccBigtableInstanceIamMember(t *testing.T) {
 		envvar.GetTestProjectFromEnv(),
 		instance,
 		role,
-		serviceAccountCanonicalEmail(account))
+		envvar.ServiceAccountCanonicalEmail(account))
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
@@ -81,7 +81,7 @@ func TestAccBigtableInstanceIamMember(t *testing.T) {
 					resource.TestCheckResourceAttr(
 						"google_bigtable_instance_iam_member.member", "role", role),
 					resource.TestCheckResourceAttr(
-						"google_bigtable_instance_iam_member.member", "member", "serviceAccount:"+serviceAccountCanonicalEmail(account)),
+						"google_bigtable_instance_iam_member.member", "member", "serviceAccount:"+envvar.ServiceAccountCanonicalEmail(account)),
 				),
 			},
 			{

diff --git a/.../tests/resource_bigtable_instance_test.go → ...gtable/resource_bigtable_instance_test.go b/.../tests/resource_bigtable_instance_test.go → ...gtable/resource_bigtable_instance_test.go
@@ -1,4 +1,4 @@
-package google
+package bigtable_test
 
 import (
 	"context"