Fix google_dns_managed_zone update (#12978) (#9239)

[upstream:67458071b82d3cf9e5c3bc34707674f188aa1934]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/12978.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+dns: fixed a bug where `google_dns_managed_zone` is unable to update with `service_directory_config` specified (beta)
+```

google-beta/services/dns/resource_dns_managed_zone.go

@@ -1671,7 +1671,9 @@ func expandDNSManagedZoneServiceDirectoryConfigNamespaceNamespaceUrl(v interface
 	if err != nil {
 		return "", err
 	}
-	return url, nil
+
+	// v1 is the only version in use, replace the first occurrence of v1beta with v1 in the URL
+	return strings.Replace(url, "/v1beta1/", "/v1/", 1), nil
 }
 
 func expandDNSManagedZoneCloudLoggingConfig(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {

google-beta/services/dns/resource_dns_managed_zone_test.go

@@ -659,3 +659,111 @@ resource "google_dns_managed_zone" "foobar" {
 }
 `, suffix, suffix, description, project)
 }
+
+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)
+}