Merge pull request #14 from jungaretti/fix-comparisons

Fix bug when comparing "" and "0" TTL/priority

Author: jungaretti

pkg/porkbun/record.go

@@ -56,7 +56,13 @@ func ConvertToClientRecord(src PorkbunRecord) (out client.Record, err error) {
 }
 
 func (src PorkbunRecord) HashFuzzy() string {
-	return fmt.Sprint(src.Name, src.Type, src.Content, src.TTL, src.Priority)
+	// Treat "" and "0" as the same value
+	priority := src.Priority
+	if priority == "" {
+		priority = "0"
+	}
+
+	return fmt.Sprint(src.Name, src.Type, src.Content, src.TTL, priority)
 }
 
 // Trims anything.domain.tld to anything

pkg/porkbun/test/record_test.go

@@ -3,18 +3,20 @@ package porkbun
 import (
 	"bacon/pkg/client"
 	"bacon/pkg/porkbun"
+	"encoding/json"
 	"fmt"
 	"testing"
+
+	"gopkg.in/yaml.v3"
 )
 
-func TestConvertToPorkbunRecord(t *testing.T) {
+func TestConvertToPorkbun(t *testing.T) {
 	record := client.Record{
 		Type:    "A",
 		Host:    "www.example.com",
 		Content: "123.456.789.112",
 		TTL:     600,
 	}
-
 	porkRecord := porkbun.ConvertToPorkbunRecord(record)
 
 	if porkRecord.Type != record.Type {
@@ -29,7 +31,6 @@ func TestConvertToPorkbunRecord(t *testing.T) {
 		t.Log("expected", record.Content, "found", porkRecord.Content)
 		t.Fail()
 	}
-
 	if porkRecord.TTL != fmt.Sprint(record.TTL) {
 		t.Log("expected", fmt.Sprint(record.TTL), "found", porkRecord.TTL)
 	}
@@ -38,34 +39,32 @@ func TestConvertToPorkbunRecord(t *testing.T) {
 	}
 }
 
-func TestConvertToClientRecord(t *testing.T) {
+func TestConvertToClientSimple(t *testing.T) {
 	porkRecord := porkbun.PorkbunRecord{
 		Id:      "abcxyz",
 		Name:    "www.example.com",
 		Type:    "A",
 		Content: "123.456.789.112",
 		TTL:     "600",
 	}
-
 	record, err := porkbun.ConvertToClientRecord(porkRecord)
 	if err != nil {
 		t.Log(err)
 		t.FailNow()
 	}
 
-	if record.Host != porkRecord.Name {
-		t.Log("expected", porkRecord.Name, "found", record.Host)
-		t.Fail()
-	}
 	if record.Type != porkRecord.Type {
 		t.Log("expected", porkRecord.Type, "found", record.Type)
 		t.Fail()
 	}
+	if record.Host != porkRecord.Name {
+		t.Log("expected", porkRecord.Name, "found", record.Host)
+		t.Fail()
+	}
 	if record.Content != porkRecord.Content {
 		t.Log("expected", porkRecord.Content, "found", record.Content)
 		t.Fail()
 	}
-
 	if record.TTL != 600 {
 		t.Log("expected", porkRecord.TTL, "found", 600)
 		t.Fail()
@@ -113,3 +112,59 @@ func TestHashFuzzy(t *testing.T) {
 		t.Fail()
 	}
 }
+
+func TestComparePorkbunResponse(t *testing.T) {
+	const config = `type: CNAME
+host: www.jungaretti.com
+content: green-forest-08be42d1e.azurestaticapps.net
+ttl: 600`
+	const response = `{"id": "188254337","name": "www.jungaretti.com","type": "CNAME","content": "green-forest-08be42d1e.azurestaticapps.net","ttl": "600","prio": "0"}`
+
+	record := client.Record{}
+	err := yaml.Unmarshal([]byte(config), &record)
+	if err != nil {
+		t.Log(err)
+		t.FailNow()
+	}
+	porkRecord := porkbun.PorkbunRecord{}
+	err = json.Unmarshal([]byte(response), &porkRecord)
+	if err != nil {
+		t.Log(err)
+		t.FailNow()
+	}
+
+	convertedRecord := porkbun.ConvertToPorkbunRecord(record)
+	if porkRecord.HashFuzzy() != convertedRecord.HashFuzzy() {
+		t.Log(porkRecord.HashFuzzy())
+		t.Log(convertedRecord.HashFuzzy())
+		t.Fail()
+	}
+}
+
+func TestComparePorkbunResponseNullPriority(t *testing.T) {
+	const config = `type: CNAME
+host: www.jungaretti.com
+content: green-forest-08be42d1e.azurestaticapps.net
+ttl: 600`
+	const response = `{"id": "188254337","name": "www.jungaretti.com","type": "CNAME","content": "green-forest-08be42d1e.azurestaticapps.net","ttl": "600","prio": null}`
+
+	record := client.Record{}
+	err := yaml.Unmarshal([]byte(config), &record)
+	if err != nil {
+		t.Log(err)
+		t.FailNow()
+	}
+	porkRecord := porkbun.PorkbunRecord{}
+	err = json.Unmarshal([]byte(response), &porkRecord)
+	if err != nil {
+		t.Log(err)
+		t.FailNow()
+	}
+
+	convertedRecord := porkbun.ConvertToPorkbunRecord(record)
+	if porkRecord.HashFuzzy() != convertedRecord.HashFuzzy() {
+		t.Log("one", porkRecord.HashFuzzy())
+		t.Log("two", convertedRecord.HashFuzzy())
+		t.Error()
+	}
+}