Merge pull request #5063 from modular-magician/codegen-pr-2775

Update dns managed zone test
hashicorp · Dec 4, 2019 · cdeca54 · cdeca54
2 parents c08907f + bbc14f2
commit cdeca54
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/google/data_source_dns_managed_zone.go b/google/data_source_dns_managed_zone.go
@@ -27,15 +27,19 @@ func dataSourceDnsManagedZone() *schema.Resource {
 			},
 
 			"name_servers": {
-				Type:     schema.TypeSet,
+				Type:     schema.TypeList,
 				Computed: true,
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},
 			},
 
-			// Google Cloud DNS ManagedZone resources do not have a SelfLink attribute.
+			"visibility": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 
+			// Google Cloud DNS ManagedZone resources do not have a SelfLink attribute.
 			"project": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -65,6 +69,8 @@ func dataSourceDnsManagedZoneRead(d *schema.ResourceData, meta interface{}) erro
 	d.Set("name", zone.Name)
 	d.Set("dns_name", zone.DnsName)
 	d.Set("description", zone.Description)
+	d.Set("visibility", zone.Visibility)
+	d.Set("project", project)
 
 	return nil
 }
diff --git a/google/data_source_dns_managed_zone_test.go b/google/data_source_dns_managed_zone_test.go
@@ -18,7 +18,14 @@ func TestAccDataSourceDnsManagedZone_basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceDnsManagedZone_basic(),
-				Check:  checkDataSourceStateMatchesResourceState("data.google_dns_managed_zone.qa", "google_dns_managed_zone.foo"),
+				Check: checkDataSourceStateMatchesResourceStateWithIgnores(
+					"data.google_dns_managed_zone.qa",
+					"google_dns_managed_zone.foo",
+					map[string]struct{}{
+						"dnssec_config.#":             {},
+						"private_visibility_config.#": {},
+					},
+				),
 			},
 		},
 	})

diff --git a/website/docs/d/dns_managed_zone.html.markdown b/website/docs/d/dns_managed_zone.html.markdown
@@ -48,3 +48,6 @@ The following attributes are exported:
 * `name_servers` - The list of nameservers that will be authoritative for this
     domain. Use NS records to redirect from your DNS provider to these names,
     thus making Google Cloud DNS authoritative for this zone.
+
+* `visibility` - The zone's visibility: public zones are exposed to the Internet,
+    while private zones are visible only to Virtual Private Cloud resources.