enable google_dns_managed_zone to accept network id for two attributes (

#3602) (#6533) * enable google_dns_managed_zone to accept network id for two attributes * updated doc to include supporting id along with fully qualified url * enable google_dns_managed_zone to accept network id for two attributes Co-authored-by: Edward Sun <sunedward@google.com> Signed-off-by: Modular Magician <magic-modules@google.com> Co-authored-by: Edward Sun <sunedward@google.com>
hashicorp · Jun 4, 2020 · 0c36aa3 · 0c36aa3
1 parent 70ab548
commit 0c36aa3
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 20 deletions.
diff --git a/.changelog/3602.txt b/.changelog/3602.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+enable google_dns_managed_zone to accept network id for two attributes
+```
diff --git a/google/resource_dns_managed_zone.go b/google/resource_dns_managed_zone.go
@@ -20,6 +20,7 @@ import (
 	"log"
 	"reflect"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
@@ -190,10 +191,11 @@ zone. The value of this field contains the network to peer with.`,
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
 									"network_url": {
-										Type:     schema.TypeString,
-										Required: true,
-										Description: `The fully qualified URL of the VPC network to forward queries to.
-This should be formatted like
+										Type:             schema.TypeString,
+										Required:         true,
+										DiffSuppressFunc: compareSelfLinkOrResourceName,
+										Description: `The id or fully qualified URL of the VPC network to forward queries to.
+This should be formatted like 'projects/{project}/global/networks/{network}' or
 'https://www.googleapis.com/compute/v1/projects/{project}/global/networks/{network}'`,
 									},
 								},
@@ -271,8 +273,8 @@ func dnsManagedZonePrivateVisibilityConfigNetworksSchema() *schema.Resource {
 				Type:             schema.TypeString,
 				Required:         true,
 				DiffSuppressFunc: compareSelfLinkOrResourceName,
-				Description: `The fully qualified URL of the VPC network to bind to.
-This should be formatted like
+				Description: `The id or fully qualified URL of the VPC network to bind to.
+This should be formatted like 'projects/{project}/global/networks/{network}' or
 'https://www.googleapis.com/compute/v1/projects/{project}/global/networks/{network}'`,
 			},
 		},
@@ -960,7 +962,16 @@ func expandDNSManagedZonePrivateVisibilityConfigNetworks(v interface{}, d Terraf
 }
 
 func expandDNSManagedZonePrivateVisibilityConfigNetworksNetworkUrl(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
-	return v, nil
+	if v == nil || v.(string) == "" {
+		return "", nil
+	} else if strings.HasPrefix(v.(string), "https://") {
+		return v, nil
+	}
+	url, err := replaceVars(d, config, "{{ComputeBasePath}}"+v.(string))
+	if err != nil {
+		return "", err
+	}
+	return ConvertSelfLinkToV1(url), nil
 }
 
 func expandDNSManagedZoneForwardingConfig(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
@@ -1059,5 +1070,14 @@ func expandDNSManagedZonePeeringConfigTargetNetwork(v interface{}, d TerraformRe
 }
 
 func expandDNSManagedZonePeeringConfigTargetNetworkNetworkUrl(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
-	return v, nil
+	if v == nil || v.(string) == "" {
+		return "", nil
+	} else if strings.HasPrefix(v.(string), "https://") {
+		return v, nil
+	}
+	url, err := replaceVars(d, config, "{{ComputeBasePath}}"+v.(string))
+	if err != nil {
+		return "", err
+	}
+	return ConvertSelfLinkToV1(url), nil
 }
diff --git a/google/resource_dns_managed_zone_generated_test.go b/google/resource_dns_managed_zone_generated_test.go
@@ -103,10 +103,10 @@ resource "google_dns_managed_zone" "private-zone" {
 
   private_visibility_config {
     networks {
-      network_url = google_compute_network.network-1.self_link
+      network_url = google_compute_network.network-1.id
     }
     networks {
-      network_url = google_compute_network.network-2.self_link
+      network_url = google_compute_network.network-2.id
     }
   }
 }
@@ -158,13 +158,13 @@ resource "google_dns_managed_zone" "peering-zone" {
 
   private_visibility_config {
     networks {
-      network_url = google_compute_network.network-source.self_link
+      network_url = google_compute_network.network-source.id
     }
   }
 
   peering_config {
     target_network {
-      network_url = google_compute_network.network-target.self_link
+      network_url = google_compute_network.network-target.id
     }
   }
 }

diff --git a/website/docs/r/dns_managed_zone.html.markdown b/website/docs/r/dns_managed_zone.html.markdown
@@ -77,10 +77,10 @@ resource "google_dns_managed_zone" "private-zone" {
 
   private_visibility_config {
     networks {
-      network_url = google_compute_network.network-1.self_link
+      network_url = google_compute_network.network-1.id
     }
     networks {
-      network_url = google_compute_network.network-2.self_link
+      network_url = google_compute_network.network-2.id
     }
   }
 }
@@ -156,13 +156,13 @@ resource "google_dns_managed_zone" "peering-zone" {
 
   private_visibility_config {
     networks {
-      network_url = google_compute_network.network-source.self_link
+      network_url = google_compute_network.network-source.id
     }
   }
 
   peering_config {
     target_network {
-      network_url = google_compute_network.network-target.self_link
+      network_url = google_compute_network.network-target.id
     }
   }
 }
@@ -358,8 +358,8 @@ The `networks` block supports:
 
 * `network_url` -
   (Required)
-  The fully qualified URL of the VPC network to bind to.
-  This should be formatted like
+  The id or fully qualified URL of the VPC network to bind to.
+  This should be formatted like `projects/{project}/global/networks/{network}` or
   `https://www.googleapis.com/compute/v1/projects/{project}/global/networks/{network}`
 
 The `forwarding_config` block supports:
@@ -398,8 +398,8 @@ The `target_network` block supports:
 
 * `network_url` -
   (Required)
-  The fully qualified URL of the VPC network to forward queries to.
-  This should be formatted like
+  The id or fully qualified URL of the VPC network to forward queries to.
+  This should be formatted like `projects/{project}/global/networks/{network}` or
   `https://www.googleapis.com/compute/v1/projects/{project}/global/networks/{network}`
 
 ## Attributes Reference