m Merge pull request #4 from tonysurfly/caa

Add CAA records support

Author: jsnjack

README.md

@@ -31,7 +31,7 @@ functionality can easily be extended to support other Constellix resources.
    - [x] A
    - [x] AAAA
    - [x] ANAME
-   - [ ] CAA
+   - [x] CAA
    - [ ] CERT
    - [x] CNAME
    - [ ] HINFO

cmd/dns_domain_record_test.go

@@ -655,3 +655,60 @@ notes: ""
 	Compare(objJ, expectedValue, t)
 	Compare(objY, expectedValue, t)
 }
+
+func TestExpectedDNSRecord_CAA_Unmarshal(t *testing.T) {
+	dataY := `
+name: ""
+type: CAA
+ttl: 18
+mode: standard
+region: default
+enabled: true
+value:
+  - tag: issue
+    data: letsencrypt.org
+    flags: 0
+    enabled: true
+  - tag: issue
+    data: pki.goog; cansignhttpexchanges=yes
+    flags: 0
+    enabled: true
+`
+	dataJ := `{"id":58345378,"name":"","type":"CAA","ttl":18,"mode":"standard","region":"default","enabled":true,"value":[{"tag":"issue","data":"letsencrypt.org","flags":0,"enabled":true},{"tag":"issue","data":"pki.goog; cansignhttpexchanges=yes","flags":0,"enabled":true}]}`
+
+	expectedValue := []*DNSCAAStandardItemValue{
+		{Tag: "issue", Data: "letsencrypt.org", Flags: 0, Enabled: true},
+		{Tag: "issue", Data: "pki.goog; cansignhttpexchanges=yes", Flags: 0, Enabled: true},
+	}
+
+	var objY ExpectedDNSRecord
+	err := yaml.Unmarshal([]byte(dataY), &objY)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var objJ ExpectedDNSRecord
+	err = json.Unmarshal([]byte(dataJ), &objJ)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if objJ.Type != "CAA" {
+		t.Errorf("expected %q, got %q", "CAA", objJ.Type)
+	}
+
+	res, ok := objJ.Value.([]*DNSCAAStandardItemValue)
+	if !ok {
+		t.Fatalf("unexpected type %T", objJ.Value)
+	}
+
+	if len(res) != len(expectedValue) {
+		t.Errorf("expected %d items, got %d", len(expectedValue), len(res))
+	}
+
+	for i, v := range res {
+		if !reflect.DeepEqual(v, expectedValue[i]) {
+			t.Errorf("item %d: expected %+v, got %+v", i, expectedValue[i], v)
+		}
+	}
+}

cmd/dns_domain_record_value.go

@@ -29,6 +29,13 @@ type DNSMXStandardItemValue struct {
 	Enabled  bool   `json:"enabled" yaml:"enabled"`
 }
 
+type DNSCAAStandardItemValue struct {
+	Tag     string `json:"tag" yaml:"tag"`
+	Data    string `json:"data" yaml:"data"`
+	Flags   int    `json:"flags" yaml:"flags"`
+	Enabled bool   `json:"enabled" yaml:"enabled"`
+}
+
 type DNSHTTPStandardItemValue struct {
 	Hard         bool   `json:"hard" yaml:"hard"`
 	RedirectType string `json:"redirectType" yaml:"redirectType"`
@@ -202,6 +209,29 @@ func populateDNSRecordValue(record interface{}) error {
 		valueObj.Keywords, _ = m["keywords"].(string)
 		valueObj.Description, _ = m["description"].(string)
 		s.Value = valueObj
+	case "CAA":
+		if s.Mode != "standard" {
+			return fmt.Errorf("unsupported mode %q for CAA record", s.Mode)
+		}
+		m, ok := s.Value.([]interface{})
+		if !ok {
+			return fmt.Errorf("unable to parse value for CAA record in standard mode, expected an array")
+		}
+		valueObj := make([]*DNSCAAStandardItemValue, 0)
+		for _, el := range m {
+			elMap, ok := el.(map[string]interface{})
+			if !ok {
+				return fmt.Errorf("unable to parse value for CAA record in standard mode, expected a map")
+			}
+			valueEl := DNSCAAStandardItemValue{
+				Tag:     elMap["tag"].(string),
+				Data:    elMap["data"].(string),
+				Flags:   toInt(elMap["flags"]),
+				Enabled: elMap["enabled"].(bool),
+			}
+			valueObj = append(valueObj, &valueEl)
+		}
+		s.Value = valueObj
 	default:
 		return fmt.Errorf("unsupported record type %q", s.Type)
 	}