Merge pull request #7 from nrkno/fix-ptr-diff

fix #5 - handle diff on ptr

Author: sjurtf

go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/masterzen/winrm v0.0.0-20220917170901-b07f6cb0598d
 	github.com/melbahja/goph v1.3.1
 	golang.org/x/crypto v0.7.0
+	golang.org/x/exp v0.0.0-20230321023759-10a507213a29
 	golang.org/x/vuln v0.0.0-20230325131008-9550759f8614
 	honnef.co/go/tools v0.4.3
 	mvdan.cc/gofumpt v0.4.0

go.sum

@@ -242,6 +242,8 @@ golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/exp/typeparams v0.0.0-20230321023759-10a507213a29 h1:e7LhZmJ631l59keHP9ssC3sgSn3/oiEHKHKXDkimURY=
 golang.org/x/exp/typeparams v0.0.0-20230321023759-10a507213a29/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=

internal/provider/resource_win_dns_record.go

@@ -2,8 +2,11 @@ package provider
 
 import (
 	"context"
+	"fmt"
 	"strings"
 
+	"golang.org/x/exp/slices"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -41,9 +44,10 @@ func resourceDNSRecord() *schema.Resource {
 				Description:      "The type of the dns records.",
 			},
 			"records": {
-				Type:        schema.TypeSet,
-				Required:    true,
-				Description: "A list of records.",
+				Type:             schema.TypeSet,
+				Required:         true,
+				Description:      "A list of records.",
+				DiffSuppressFunc: suppressRecordDiff,
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},
@@ -131,8 +135,40 @@ func resourceDNSRecordDelete(ctx context.Context, d *schema.ResourceData, meta i
 	return nil
 }
 
-func suppressCaseDiff(k, old, new string, d *schema.ResourceData) bool {
+func suppressCaseDiff(key, old, new string, d *schema.ResourceData) bool {
 	// k is ignored here, but wee need to include it in the function's
 	// signature in order to match the one defined for DiffSuppressFunc
 	return strings.EqualFold(old, new)
 }
+
+func suppressRecordDiff(key, old, new string, d *schema.ResourceData) bool {
+	if d.Get("type") == dnshelper.RecordTypePTR {
+		var (
+			oldRecords []string
+			newRecords []string
+		)
+
+		// For a list, the key is path to the element, rather than the list.
+		// E.g. "windns_record.2.records.0"
+		lastDotIndex := strings.LastIndex(key, ".")
+		if lastDotIndex != -1 {
+			key = key[:lastDotIndex]
+		}
+
+		oldData, newData := d.GetChange(key)
+		if oldData == nil || newData == nil {
+			return false
+		}
+
+		for _, v := range oldData.(*schema.Set).List() {
+			oldRecords = append(oldRecords, fmt.Sprintf("%s", v))
+		}
+		// Get-DNSResourceRecord always adds a `.` after the PTR record.
+		// to avoid change if the user did not add it, we need to add it before we compare.
+		for _, v := range newData.(*schema.Set).List() {
+			newRecords = append(newRecords, fmt.Sprintf("%s.", v))
+		}
+		return slices.Equal(oldRecords, newRecords)
+	}
+	return strings.EqualFold(old, new)
+}

internal/provider/resource_win_dns_record_test.go

@@ -31,6 +31,15 @@ resource "windns_record" "r1" {
 }
 `
 
+const testAccResourceDNSRecordConfigBasicPTRwithoutDot = `
+resource "windns_record" "r1" {
+  name      = "12.113"
+  zone_name = "10.10.in-addr.arpa"
+  type      = "PTR"
+  records   = ["example-host.example.com"]
+}
+`
+
 const testAccResourceDNSRecordConfigBasicA = `
 variable "windns_record_name" {}
 
@@ -139,6 +148,31 @@ func TestAccResourceDNSRecord_BasicPTR(t *testing.T) {
 	})
 }
 
+func TestAccResourceDNSRecord_BasicPTRwithoutDot(t *testing.T) {
+	envVars := []string{"TF_VAR_windns_record_name"}
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t, envVars) },
+		ProviderFactories: testAccProviderFactories,
+		CheckDestroy: resource.ComposeTestCheckFunc(
+			testAccResourceDNSRecordExists("windns_record.r1", "example-host.example.com.", dnshelper.RecordTypePTR, false),
+		),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccResourceDNSRecordConfigBasicPTRwithoutDot,
+				Check: resource.ComposeTestCheckFunc(
+					testAccResourceDNSRecordExists("windns_record.r1", "example-host.example.com.", dnshelper.RecordTypePTR, true),
+				),
+			},
+			{
+				ResourceName:      "windns_record.r1",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func TestAccResourceDNSRecord_BasicA(t *testing.T) {
 	envVars := []string{"TF_VAR_windns_record_name"}