Refactor ignore logic

Author: jungaretti

pkg/providers/porkbun/api/api.go

@@ -46,7 +46,14 @@ func (p Api) RetrieveRecords(domain string) ([]Record, error) {
 		return nil, err
 	}
 
-	records := ignoreRecords(response.Records)
+	records := make([]Record, 0)
+	for _, record := range response.Records {
+		if record.isIgnored() {
+			continue
+		}
+		records = append(records, record)
+	}
+
 	return records, nil
 }
 
@@ -61,7 +68,7 @@ func (p Api) CreateRecord(domain string, toCreate Record) (string, error) {
 		Id int `json:"id"`
 	}
 
-	if isIgnored(toCreate) {
+	if toCreate.isIgnored() {
 		return "", fmt.Errorf("cannot create an ignored record: %s", toCreate)
 	}
 
@@ -92,30 +99,6 @@ func (p Api) DeleteRecord(domain string, id string) error {
 	return nil
 }
 
-func isIgnored(record Record) bool {
-	if record.Type == "NS" {
-		return true
-	}
-	if strings.HasPrefix(record.Name, "_acme-challenge") {
-		return true
-	}
-
-	return false
-}
-
-func ignoreRecords(input []Record) []Record {
-	records := make([]Record, 0)
-	for _, record := range input {
-		if isIgnored(record) {
-			continue
-		}
-
-		records = append(records, record)
-	}
-
-	return records
-}
-
 // Trims a root domain from a longer subdomain. For example, trims
 // host.example.com to host. If the subdomain is example.com, then
 // returns an empty string

pkg/providers/porkbun/api/record.go

@@ -1,6 +1,9 @@
 package api
 
-import "bacon/pkg/dns"
+import (
+	"bacon/pkg/dns"
+	"strings"
+)
 
 type Record struct {
 	Id       string `json:"id"`
@@ -37,3 +40,14 @@ func (r Record) GetPriority() string {
 }
 
 var _ dns.Record = Record{}
+
+func (r Record) isIgnored() bool {
+	if r.Type == "NS" {
+		return true
+	}
+	if strings.HasPrefix(r.Name, "_acme-challenge") {
+		return true
+	}
+
+	return false
+}

pkg/providers/porkbun/api/record_test.go

@@ -32,3 +32,29 @@ func TestRecord(t *testing.T) {
 		t.Error("did not return the expected content")
 	}
 }
+
+func TestIgnoredName(t *testing.T) {
+	ignoredRecord := Record{
+		Name:    "_acme-challenge.bacontest42.com",
+		Type:    "TXT",
+		TTL:     "600",
+		Content: "c_V4WaKPWlisAvnvTZ62BOuLiQDpkC2cOtahW8TDthw",
+	}
+
+	if !ignoredRecord.isIgnored() {
+		t.Error("did not ignore record with _acme-challenge")
+	}
+}
+
+func TestIgnoredType(t *testing.T) {
+	ignoredRecord := Record{
+		Name:    "www.bacontest42.com",
+		Type:    "NS",
+		TTL:     "600",
+		Content: "c_V4WaKPWlisAvnvTZ62BOuLiQDpkC2cOtahW8TDsfs",
+	}
+
+	if !ignoredRecord.isIgnored() {
+		t.Error("did not ignore NS record")
+	}
+}