Added port to masters attribute. Closes #64

Author: mbag

CHANGELOG.md

@@ -1,4 +1,8 @@
-## 1.5.0 (Unreleased)
+## 1.4.1 (Unreleased)
+
+FIXES:
+  * **Add support for port along with IP in the masters attribute** [GH-64]
+
 ## 1.4.0 (April 27, 2020)
 
 FEATURES:

docker-compose.yml

@@ -15,7 +15,7 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: secret
   pdns:
-    image: psitrax/powerdns:4.1.10
+    image: psitrax/powerdns:v4.3.1
     command:
     - "--api"
     - "--api-key=secret"

powerdns/resource_powerdns_zone.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"net"
+	"strconv"
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -67,11 +68,28 @@ func resourcePDNSZoneCreate(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	var masters []string
-	for _, masterIP := range d.Get("masters").(*schema.Set).List() {
-		if net.ParseIP(masterIP.(string)) == nil {
+	for _, masterIPPort := range d.Get("masters").(*schema.Set).List() {
+		splitIPPort := strings.Split(masterIPPort.(string), ":")
+		// if there are more elements
+		if len(splitIPPort) > 2 {
+			return fmt.Errorf("more than one colon in <ip>:<port> string")
+		}
+		// when there are exactly 2 elements in list, assume second is port and check the port range
+		if len(splitIPPort) == 2 {
+			port, err := strconv.Atoi(splitIPPort[1])
+			if err != nil {
+				return fmt.Errorf("Error converting port value in masters atribute")
+			}
+			if port < 1 || port > 65535 {
+				return fmt.Errorf("Invalid port value in masters atribute")
+			}
+		}
+		// no matter if string contains just IP or IP:port pair, the first element in split list will be IP
+		masterIP := splitIPPort[0]
+		if net.ParseIP(masterIP) == nil {
 			return fmt.Errorf("values in masters list attribute must be valid IPs")
 		}
-		masters = append(masters, masterIP.(string))
+		masters = append(masters, masterIPPort.(string))
 	}
 
 	zoneInfo := ZoneInfo{

powerdns/resource_powerdns_zone_test.go

@@ -236,6 +236,46 @@ func TestAccPDNSZoneSlaveWithMasters(t *testing.T) {
 	})
 }
 
+func TestAccPDNSZoneSlaveWithMastersWithPort(t *testing.T) {
+	resourceName := "powerdns_zone.test-slave-with-masters-with-port"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		//CheckDestroy: testAccCheckPDNSZoneDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testPDNSZoneConfigSlaveWithMastersWithPort,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckPDNSZoneExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "name", "slave-with-masters-with-port.sysa.abc."),
+					resource.TestCheckResourceAttr(resourceName, "kind", "Slave"),
+					resource.TestCheckResourceAttr(resourceName, "masters.1048647934", "2.2.2.2"),
+					resource.TestCheckResourceAttr(resourceName, "masters.1686215786", "1.1.1.1:1111"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func TestAccPDNSZoneSlaveWithMastersWithInvalidPort(t *testing.T) {
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config:      testPDNSZoneConfigSlaveWithMastersWithInvalidPort,
+				ExpectError: regexp.MustCompile("Invalid port value in masters atribute"),
+			},
+		},
+	})
+}
 func TestAccPDNSZoneSlaveWithInvalidMasters(t *testing.T) {
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -367,6 +407,20 @@ resource "powerdns_zone" "test-slave-with-masters" {
 	masters = ["1.1.1.1", "2.2.2.2"]
 }`
 
+const testPDNSZoneConfigSlaveWithMastersWithPort = `
+resource "powerdns_zone" "test-slave-with-masters-with-port" {
+	name = "slave-with-masters-with-port.sysa.abc."
+	kind = "Slave"
+	masters = ["1.1.1.1:1111", "2.2.2.2"]
+}`
+
+const testPDNSZoneConfigSlaveWithMastersWithInvalidPort = `
+resource "powerdns_zone" "test-slave-with-masters-with-invalid-port" {
+	name = "slave-with-masters-with-invalid-port.sysa.abc."
+	kind = "Slave"
+	masters = ["1.1.1.1:111111", "2.2.2.2"]
+}`
+
 const testPDNSZoneConfigSlaveWithInvalidMasters = `
 resource "powerdns_zone" "test-slave-with-invalid-masters" {
 	name = "slave-with-invalid-masters.sysa.abc."