feat: Add PowerDNS Zone Account support (#71)

* feat: Add PowerDNS Zone Account support

* upd: vendor modules

Author: jbe-dw

powerdns/client.go

@@ -160,6 +160,7 @@ type ZoneInfo struct {
 	Serial             int64               `json:"serial"`
 	Records            []Record            `json:"records,omitempty"`
 	ResourceRecordSets []ResourceRecordSet `json:"rrsets,omitempty"`
+	Account            string              `json:"account"`
 	Nameservers        []string            `json:"nameservers,omitempty"`
 	Masters            []string            `json:"masters,omitempty"`
 	SoaEditAPI         string              `json:"soa_edit_api"`

powerdns/resource_powerdns_zone.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 )
 
 func resourcePDNSZone() *schema.Resource {
@@ -36,6 +37,14 @@ func resourcePDNSZone() *schema.Resource {
 				},
 			},
 
+			"account": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "admin",
+				ForceNew:     false,
+				ValidateFunc: validation.StringLenBetween(0, 40),
+			},
+
 			"nameservers": {
 				Type:     schema.TypeSet,
 				Elem:     &schema.Schema{Type: schema.TypeString},
@@ -95,6 +104,7 @@ func resourcePDNSZoneCreate(d *schema.ResourceData, meta interface{}) error {
 	zoneInfo := ZoneInfo{
 		Name:        d.Get("name").(string),
 		Kind:        d.Get("kind").(string),
+		Account:     d.Get("account").(string),
 		Nameservers: nameservers,
 		SoaEditAPI:  d.Get("soa_edit_api").(string),
 	}
@@ -128,6 +138,7 @@ func resourcePDNSZoneRead(d *schema.ResourceData, meta interface{}) error {
 
 	d.Set("name", zoneInfo.Name)
 	d.Set("kind", zoneInfo.Kind)
+	d.Set("account", zoneInfo.Account)
 	d.Set("soa_edit_api", zoneInfo.SoaEditAPI)
 
 	if zoneInfo.Kind != "Slave" {

powerdns/resource_powerdns_zone_test.go

@@ -184,6 +184,87 @@ func TestAccPDNSZoneMasterSOAAPIEDITUndefined(t *testing.T) {
 	})
 }
 
+func TestAccPDNSZoneAccount(t *testing.T) {
+	resourceName := "powerdns_zone.test-account"
+	resourceAccount := `test`
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckPDNSZoneDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testPDNSZoneConfigAccount,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckPDNSZoneExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "name", "account.sysa.abc."),
+					resource.TestCheckResourceAttr(resourceName, "kind", "Master"),
+					resource.TestCheckResourceAttr(resourceName, "account", resourceAccount),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func TestAccPDNSZoneAccountEmpty(t *testing.T) {
+	resourceName := "powerdns_zone.test-account-empty"
+	resourceAccount := ``
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckPDNSZoneDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testPDNSZoneConfigAccountEmpty,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckPDNSZoneExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "name", "account-empty.sysa.abc."),
+					resource.TestCheckResourceAttr(resourceName, "kind", "Master"),
+					resource.TestCheckResourceAttr(resourceName, "account", resourceAccount),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func TestAccPDNSZoneAccountUndefined(t *testing.T) {
+	resourceName := "powerdns_zone.test-account-undefined"
+	resourceAccount := `admin`
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckPDNSZoneDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testPDNSZoneConfigAccountUndefined,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckPDNSZoneExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "name", "account-undefined.sysa.abc."),
+					resource.TestCheckResourceAttr(resourceName, "kind", "Master"),
+					resource.TestCheckResourceAttr(resourceName, "account", resourceAccount),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func TestAccPDNSZoneSlave(t *testing.T) {
 	resourceName := "powerdns_zone.test-slave"
 
@@ -393,6 +474,30 @@ resource "powerdns_zone" "test-master-soa-edit-api-undefined" {
 	nameservers = ["ns1.sysa.abc.", "ns2.sysa.abc."]
 }`
 
+const testPDNSZoneConfigAccount = `
+resource "powerdns_zone" "test-account" {
+	name = "account.sysa.abc."
+	kind = "Master"
+	nameservers = ["ns1.sysa.abc.", "ns2.sysa.abc."]
+	account = "test"
+}`
+
+const testPDNSZoneConfigAccountEmpty = `
+resource "powerdns_zone" "test-account-empty" {
+	name = "account-empty.sysa.abc."
+	kind = "Master"
+	nameservers = ["ns1.sysa.abc.", "ns2.sysa.abc."]
+	account = ""
+}`
+
+const testPDNSZoneConfigAccountUndefined = `
+resource "powerdns_zone" "test-account-undefined" {
+	name = "account-undefined.sysa.abc."
+	kind = "Master"
+	nameservers = ["ns1.sysa.abc.", "ns2.sysa.abc."]
+	soa_edit_api = "DEFAULT"
+}`
+
 const testPDNSZoneConfigSlave = `
 resource "powerdns_zone" "test-slave" {
 	name = "slave.sysa.abc."