enable google_dns_managed_zone to accept network id for two attributes (

#3602)

* 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>

products/dns/terraform.yaml

@@ -89,7 +89,12 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           and apply an incorrect update to the resource. If you encounter this issue, remove all `networks`
           blocks in an update and then apply another update adding all of them back simultaneously.
       privateVisibilityConfig.networks.networkUrl: !ruby/object:Overrides::Terraform::PropertyOverride
+        custom_expand: 'templates/terraform/custom_expand/network_full_url.erb'
         diff_suppress_func: 'compareSelfLinkOrResourceName'
+        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}`
       forwardingConfig.targetNameServers: !ruby/object:Overrides::Terraform::PropertyOverride
         is_set: true
         set_hash_func: |-
@@ -114,6 +119,13 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       visibility: !ruby/object:Overrides::Terraform::PropertyOverride
         diff_suppress_func: 'caseDiffSuppress'
         custom_flatten: templates/terraform/custom_flatten/default_if_empty.erb
+      peeringConfig.targetNetwork.networkUrl: !ruby/object:Overrides::Terraform::PropertyOverride
+        custom_expand: templates/terraform/custom_expand/network_full_url.erb
+        diff_suppress_func: '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}`
       reverseLookup: !ruby/object:Overrides::Terraform::PropertyOverride
         custom_flatten: templates/terraform/custom_flatten/object_to_bool.go.erb
         custom_expand: templates/terraform/custom_expand/bool_to_object.go.erb

templates/terraform/custom_expand/network_full_url.erb

@@ -0,0 +1,12 @@
+func expand<%= prefix -%><%= titlelize_property(property) -%>(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
+  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
+}

templates/terraform/examples/dns_managed_zone_private.tf.erb

@@ -10,10 +10,10 @@ resource "google_dns_managed_zone" "<%= ctx[:primary_resource_id] %>" {
 
   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
     }
   }
 }

templates/terraform/examples/dns_managed_zone_private_peering.tf.erb

@@ -7,13 +7,13 @@ resource "google_dns_managed_zone" "<%= ctx[:primary_resource_id] %>" {
 
   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
     }
   }
 }