Launch domainName forwarding target to GA (#14253) (#23265)

[upstream:5a45bd67c793063e1f54500af38b042966e4f307]

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

Author: modular-magician

.changelog/14253.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+dns: added `target_name_servers.domain_name` field to `google_dns_managed_zone` resource (GA)
+```

google/services/dns/resource_dns_managed_zone.go

@@ -369,6 +369,11 @@ This should be formatted like 'projects/{project}/global/networks/{network}' or
 func dnsManagedZoneForwardingConfigTargetNameServersSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
+			"domain_name": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: `Fully qualified domain name for the forwarding target.`,
+			},
 			"forwarding_path": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -1102,6 +1107,7 @@ func flattenDNSManagedZoneForwardingConfigTargetNameServers(v interface{}, d *sc
 		}
 		transformed.Add(map[string]interface{}{
 			"ipv4_address":    flattenDNSManagedZoneForwardingConfigTargetNameServersIpv4Address(original["ipv4Address"], d, config),
+			"domain_name":     flattenDNSManagedZoneForwardingConfigTargetNameServersDomainName(original["domainName"], d, config),
 			"forwarding_path": flattenDNSManagedZoneForwardingConfigTargetNameServersForwardingPath(original["forwardingPath"], d, config),
 		})
 	}
@@ -1111,6 +1117,10 @@ func flattenDNSManagedZoneForwardingConfigTargetNameServersIpv4Address(v interfa
 	return v
 }
 
+func flattenDNSManagedZoneForwardingConfigTargetNameServersDomainName(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenDNSManagedZoneForwardingConfigTargetNameServersForwardingPath(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	return v
 }
@@ -1437,6 +1447,13 @@ func expandDNSManagedZoneForwardingConfigTargetNameServers(v interface{}, d tpgr
 			transformed["ipv4Address"] = transformedIpv4Address
 		}
 
+		transformedDomainName, err := expandDNSManagedZoneForwardingConfigTargetNameServersDomainName(original["domain_name"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedDomainName); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+			transformed["domainName"] = transformedDomainName
+		}
+
 		transformedForwardingPath, err := expandDNSManagedZoneForwardingConfigTargetNameServersForwardingPath(original["forwarding_path"], d, config)
 		if err != nil {
 			return nil, err
@@ -1453,6 +1470,10 @@ func expandDNSManagedZoneForwardingConfigTargetNameServersIpv4Address(v interfac
 	return v, nil
 }
 
+func expandDNSManagedZoneForwardingConfigTargetNameServersDomainName(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandDNSManagedZoneForwardingConfigTargetNameServersForwardingPath(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }

google/services/dns/resource_dns_managed_zone_generated_meta.yaml

@@ -20,6 +20,7 @@ fields:
     provider_only: true
   - field: 'force_destroy'
     provider_only: true
+  - field: 'forwarding_config.target_name_servers.domain_name'
   - field: 'forwarding_config.target_name_servers.forwarding_path'
   - field: 'forwarding_config.target_name_servers.ipv4_address'
   - field: 'labels'

google/services/dns/resource_dns_managed_zone_test.go

@@ -633,3 +633,61 @@ resource "google_dns_managed_zone" "foobar" {
 }
 `, suffix, suffix, description, project)
 }
+
+func TestAccDNSManagedZone_privateForwardingWithDomainNameUpdate(t *testing.T) {
+	t.Parallel()
+
+	zoneSuffix := acctest.RandString(t, 10)
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckDNSManagedZoneDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDnsManagedZone_privateForwardingWithDomainNameUpdate(zoneSuffix, "dns.infra.foo.com.", "private"),
+			},
+			{
+				ResourceName:      "google_dns_managed_zone.private",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccDnsManagedZone_privateForwardingWithDomainNameUpdate(zoneSuffix, "dns.infra.goo.com.", "default"),
+			},
+			{
+				ResourceName:      "google_dns_managed_zone.private",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func testAccDnsManagedZone_privateForwardingWithDomainNameUpdate(suffix, domain_name, forwarding_path string) string {
+	return fmt.Sprintf(`
+resource "google_dns_managed_zone" "private" {
+  name        = "private-zone-%s"
+  dns_name    = "private.example.com."
+  description = "Example private DNS zone"
+  visibility  = "private"
+  private_visibility_config {
+    networks {
+      network_url = google_compute_network.network-1.self_link
+    }
+  }
+
+  forwarding_config {
+    target_name_servers {
+      domain_name = "%s"
+      forwarding_path = "%s"
+    }
+  }
+}
+
+resource "google_compute_network" "network-1" {
+  name                    = "tf-test-net-1-%s"
+  auto_create_subnetworks = false
+}
+`, suffix, domain_name, forwarding_path, suffix)
+}

website/docs/r/dns_managed_zone.html.markdown

@@ -498,7 +498,7 @@ The following arguments are supported:
   IPv4 address of a target name server.
 
 * `domain_name` -
-  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  (Optional)
   Fully qualified domain name for the forwarding target.
 
 * `forwarding_path` -