allow importing dns record sets in any project

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Jun 17, 2019 · c928bb3 · c928bb3
1 parent d54a95d
commit c928bb3
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 12 deletions.
diff --git a/google-beta/resource_dns_record_set.go b/google-beta/resource_dns_record_set.go
@@ -6,9 +6,10 @@ import (
 
 	"strings"
 
+	"net"
+
 	"github.com/hashicorp/terraform/helper/schema"
 	"google.golang.org/api/dns/v1"
-	"net"
 )
 
 func resourceDnsRecordSet() *schema.Resource {
@@ -306,14 +307,20 @@ func resourceDnsRecordSetUpdate(d *schema.ResourceData, meta interface{}) error
 
 func resourceDnsRecordSetImportState(d *schema.ResourceData, _ interface{}) ([]*schema.ResourceData, error) {
 	parts := strings.Split(d.Id(), "/")
-	if len(parts) != 3 {
-		return nil, fmt.Errorf("Invalid dns record specifier. Expecting {zone-name}/{record-name}/{record-type}. The record name must include a trailing '.' at the end.")
+	if len(parts) == 3 {
+		d.Set("managed_zone", parts[0])
+		d.Set("name", parts[1])
+		d.Set("type", parts[2])
+	} else if len(parts) == 4 {
+		d.Set("project", parts[0])
+		d.Set("managed_zone", parts[1])
+		d.Set("name", parts[2])
+		d.Set("type", parts[3])
+		d.SetId(parts[1] + "/" + parts[2] + "/" + parts[3])
+	} else {
+		return nil, fmt.Errorf("Invalid dns record specifier. Expecting {zone-name}/{record-name}/{record-type} or {project}/{zone-name}/{record-name}/{record-type}. The record name must include a trailing '.' at the end.")
 	}
 
-	d.Set("managed_zone", parts[0])
-	d.Set("name", parts[1])
-	d.Set("type", parts[2])
-
 	return []*schema.ResourceData{d}, nil
 }
 

diff --git a/google-beta/resource_dns_record_set_test.go b/google-beta/resource_dns_record_set_test.go
@@ -56,6 +56,13 @@ func TestAccDnsRecordSet_basic(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+			// Check both import formats
+			{
+				ResourceName:      "google_dns_record_set.foobar",
+				ImportStateId:     fmt.Sprintf("%s/%s/test-record.%s.hashicorptest.com./A", getTestProjectFromEnv(), zoneName, zoneName),
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }

diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown
@@ -49,7 +49,7 @@ resource "google_container_node_pool" "primary_preemptible_nodes" {
     preemptible  = true
     machine_type = "n1-standard-1"
 
-    metadata = {
+    metadata {
       disable-legacy-endpoints = "true"
     }
 
@@ -84,7 +84,7 @@ resource "google_container_cluster" "primary" {
       "https://www.googleapis.com/auth/monitoring",
     ]
 
-    metadata = {
+    metadata {
       disable-legacy-endpoints = "true"
     }
 

diff --git a/website/docs/r/container_node_pool.html.markdown b/website/docs/r/container_node_pool.html.markdown
@@ -83,7 +83,7 @@ resource "google_container_cluster" "primary" {
       "https://www.googleapis.com/auth/monitoring",
     ]
 
-    metadata = {
+    metadata {
       disable-legacy-endpoints = "true"
     }
 

diff --git a/website/docs/r/dns_record_set.markdown b/website/docs/r/dns_record_set.markdown
@@ -163,10 +163,11 @@ Only the arguments listed above are exposed as attributes.
 
 ## Import
 
-DNS record set can be imported using the `zone name`, `record name` and record `type`, e.g.
+DNS record sets can be imported using either of these accepted formats:
 
 ```
-$ terraform import google_dns_record_set.frontend prod-zone/frontend.prod.mydomain.com./A
+$ terraform import google_dns_record_set.frontend {{project}}/{{zone}}/{{name}}/{{type}}
+$ terraform import google_dns_record_set.frontend {{zone}}/{{name}}/{{type}}
 ```
 
 Note: The record name must include the trailing dot at the end.