Revert "Fix google_dns_managed_zone update" (#12976)

Author: shuyama1

mmv1/templates/terraform/custom_expand/sd_full_url.tmpl

@@ -4,8 +4,7 @@ func expand{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d tpgresource.T
   } else if strings.HasPrefix(v.(string), "https://") {
     return v, nil
   }
-  // v1 is the only version in use 
-  url, err := tpgresource.ReplaceVars(d, config, "https://servicedirectory.googleapis.com/v1/" + v.(string))
+  url, err := tpgresource.ReplaceVars(d, config, "{{"{{"}}ServiceDirectoryBasePath{{"}}"}}" + v.(string))
   if err != nil {
     return "", err
   }

mmv1/third_party/terraform/services/dns/resource_dns_managed_zone_test.go.tmpl

@@ -661,113 +661,3 @@ resource "google_dns_managed_zone" "foobar" {
 }
 `, suffix, suffix, description, project)
 }
-
-{{ if not (or (eq $.TargetVersionName ``) (eq $.TargetVersionName `ga`)) }}
-func TestAccDNSManagedZone_dnsManagedZoneUpdateWithServiceDirectory(t *testing.T) {
-	t.Parallel()
-
-	context := map[string]interface{}{
-		"random_suffix": acctest.RandString(t, 10),
-	}
-
-	acctest.VcrTest(t, resource.TestCase{
-		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
-		CheckDestroy:             testAccCheckDNSManagedZoneDestroyProducer(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccDNSManagedZone_dnsManagedZoneWithServiceDirectory(context),
-			},
-			{
-				ResourceName:            "google_dns_managed_zone.sd-zone",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"labels", "terraform_labels"},
-			},
-			{
-				Config: testAccDNSManagedZone_dnsManagedZoneWithServiceDirectoryUpdate(context),
-			},
-			{
-				ResourceName:            "google_dns_managed_zone.sd-zone",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"labels", "terraform_labels"},
-			},
-		},
-	})
-}
-
-func testAccDNSManagedZone_dnsManagedZoneWithServiceDirectory(context map[string]interface{}) string {
-	return acctest.Nprintf(`
-resource "google_dns_managed_zone" "sd-zone" {
-  provider = google-beta
-
-  name        = "tf-test-peering-zone%{random_suffix}"
-  dns_name    = "services.example.com."
-  description = "Example private DNS Service Directory zone"
-
-  visibility = "private"
-
-  service_directory_config {
-    namespace {
-      namespace_url = google_service_directory_namespace.example.id
-    }
-  }
-}
-
-resource "google_service_directory_namespace" "example" {
-  provider = google-beta
-
-  namespace_id = "tf-test-example%{random_suffix}"
-  location     = "us-central1"
-}
-
-resource "google_compute_network" "network" {
-  provider = google-beta
-
-  name                    = "tf-test-network%{random_suffix}"
-  auto_create_subnetworks = false
-}
-`, context)
-}
-
-func testAccDNSManagedZone_dnsManagedZoneWithServiceDirectoryUpdate(context map[string]interface{}) string {
-	return acctest.Nprintf(`
-resource "google_dns_managed_zone" "sd-zone" {
-  provider = google-beta
-
-  name        = "tf-test-peering-zone%{random_suffix}"
-  dns_name    = "services.example.com."
-  description = "Example private DNS Service Directory zone"
-
-  visibility = "private"
-
-  private_visibility_config {
-    networks {
-      network_url = google_compute_network.network.id
-    }
-  }
-
-  service_directory_config {
-    namespace {
-      namespace_url = google_service_directory_namespace.example.id
-    }
-  }
-}
-
-resource "google_service_directory_namespace" "example" {
-  provider = google-beta
-
-  namespace_id = "tf-test-example%{random_suffix}"
-  location     = "us-central1"
-}
-
-resource "google_compute_network" "network" {
-  provider = google-beta
-
-  name                    = "tf-test-network%{random_suffix}"
-  auto_create_subnetworks = false
-}
-`, context)
-}
-{{- end }}