fix dnssec test (hashicorp#777)

Signed-off-by: Modular Magician <[email protected]>
modular-magician · May 29, 2019 · 2f94236 · 2f94236
1 parent 88ce1ea
commit 2f94236
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 10 deletions.
diff --git a/google-beta/resource_dns_managed_zone.go b/google-beta/resource_dns_managed_zone.go
@@ -69,6 +69,7 @@ func resourceDnsManagedZone() *schema.Resource {
 					Schema: map[string]*schema.Schema{
 						"default_key_specs": {
 							Type:     schema.TypeList,
+							Computed: true,
 							Optional: true,
 							ForceNew: true,
 							Elem: &schema.Resource{
@@ -107,6 +108,7 @@ func resourceDnsManagedZone() *schema.Resource {
 						},
 						"non_existence": {
 							Type:         schema.TypeString,
+							Computed:     true,
 							Optional:     true,
 							ForceNew:     true,
 							ValidateFunc: validation.StringInSlice([]string{"nsec", "nsec3", ""}, false),

diff --git a/google-beta/resource_dns_managed_zone_test.go b/google-beta/resource_dns_managed_zone_test.go
@@ -67,6 +67,51 @@ func TestAccDnsManagedZone_privateUpdate(t *testing.T) {
 		},
 	})
 }
+
+func TestAccDnsManagedZone_dnssec_on(t *testing.T) {
+	t.Parallel()
+
+	zoneSuffix := acctest.RandString(10)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckDnsManagedZoneDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDnsManagedZone_dnssec_on(zoneSuffix),
+			},
+			{
+				ResourceName:      "google_dns_managed_zone.foobar",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func TestAccDnsManagedZone_dnssec_off(t *testing.T) {
+	t.Parallel()
+
+	zoneSuffix := acctest.RandString(10)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckDnsManagedZoneDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDnsManagedZone_dnssec_off(zoneSuffix),
+			},
+			{
+				ResourceName:      "google_dns_managed_zone.foobar",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func TestAccDnsManagedZone_privateForwardingUpdate(t *testing.T) {
 	t.Parallel()
 
@@ -111,6 +156,40 @@ resource "google_dns_managed_zone" "foobar" {
 }`, suffix, suffix, description)
 }
 
+func testAccDnsManagedZone_dnssec_on(suffix string) string {
+	return fmt.Sprintf(`
+resource "google_dns_managed_zone" "foobar" {
+  name     = "mzone-test-%s"
+  dns_name = "tf-acctest-%s.hashicorptest.com."
+
+  dnssec_config {
+    state = "on"
+    default_key_specs {
+      algorithm  = "rsasha256"
+      key_length = "2048"
+      key_type   = "zoneSigning"
+    }
+    default_key_specs {
+      algorithm  = "rsasha256"
+      key_length = "2048"
+      key_type   = "keySigning"
+    }
+  }
+}`, suffix, suffix)
+}
+
+func testAccDnsManagedZone_dnssec_off(suffix string) string {
+	return fmt.Sprintf(`
+resource "google_dns_managed_zone" "foobar" {
+  name     = "mzone-test-%s"
+  dns_name = "tf-acctest-%s.hashicorptest.com."
+
+  dnssec_config {
+    state = "off"
+  }
+}`, suffix, suffix)
+}
+
 func testAccDnsManagedZone_privateUpdate(suffix, first_network, second_network string) string {
 	return fmt.Sprintf(`
 resource "google_dns_managed_zone" "private" {
@@ -125,14 +204,6 @@ resource "google_dns_managed_zone" "private" {
     networks {
       network_url = "${google_compute_network.%s.self_link}"
     }
-    dnssec_config {
-      state             = "on"
-      default_key_specs {
-        algorithm       = "rsasha1"
-        key_length      = "128"
-        key_type        = "zoneSigning"
-      }
-    }
   }
 }
 

diff --git a/website/docs/r/dns_managed_zone.html.markdown b/website/docs/r/dns_managed_zone.html.markdown
@@ -254,7 +254,7 @@ The `dnssec_config` block supports:
 
 * `non_existence` -
   (Optional)
-  Specifies the mechanism used to provide authenticated denial-of-existence responses. Output only while state is not OFF.
+  Specifies the mechanism used to provide authenticated denial-of-existence responses.
 
 * `state` -
   (Optional)
@@ -263,7 +263,8 @@ The `dnssec_config` block supports:
 * `default_key_specs` -
   (Optional)
   Specifies parameters that will be used for generating initial DnsKeys
-  for this ManagedZone. Output only while state is not OFF  Structure is documented below.
+  for this ManagedZone. If you provide a spec for keySigning or zoneSigning,
+  you must also provide one for the other.  Structure is documented below.
 
 
 The `default_key_specs` block supports: