Merge pull request #90 from akamai/dns_maint

Add parsing for CERT and TSLA records. Remove parsing for MX records.…

configdns-v2/errors.go

@@ -36,12 +36,12 @@ func (e *ZoneError) Network() bool {
 func (e *ZoneError) NotFound() bool {
 	if e.err == nil && e.httpErrorMessage == "" && e.apiErrorMessage == "" {
 		return true
-        } else if e.err != nil {
-                _, ok := e.err.(client.APIError)
-                if ok && e.err.(client.APIError).Response.StatusCode == 404 {
-                        return true
-                }
-        }
+	} else if e.err != nil {
+		_, ok := e.err.(client.APIError)
+		if ok && e.err.(client.APIError).Response.StatusCode == 404 {
+			return true
+		}
+	}
 	return false
 }
 
@@ -57,14 +57,13 @@ func (e *ZoneError) ValidationFailed() bool {
 }
 
 func (e *ZoneError) ConcurrencyConflict() bool {
-        _, ok := e.err.(client.APIError)
-        if ok && e.err.(client.APIError).Response.StatusCode == 409 {
-                return true
-        }
-        return false
+	_, ok := e.err.(client.APIError)
+	if ok && e.err.(client.APIError).Response.StatusCode == 409 {
+		return true
+	}
+	return false
 }
 
-
 func (e *ZoneError) Error() string {
 	if e.Network() {
 		return fmt.Sprintf("Zone \"%s\" network error: [%s]", e.zoneName, e.httpErrorMessage)
@@ -74,9 +73,9 @@ func (e *ZoneError) Error() string {
 		return fmt.Sprintf("Zone \"%s\" not found.", e.zoneName)
 	}
 
-        if e.ConcurrencyConflict() {
-                return fmt.Sprintf("Modification Confict: [%s]", e.apiErrorMessage)
-        }
+	if e.ConcurrencyConflict() {
+		return fmt.Sprintf("Modification Confict: [%s]", e.apiErrorMessage)
+	}
 
 	if e.FailedToSave() {
 		return fmt.Sprintf("Zone \"%s\" failed to save: [%s]", e.zoneName, e.err.Error())

configdns-v2/record_lookup.go

@@ -7,7 +7,7 @@ import (
 	"github.com/akamai/AkamaiOPEN-edgegrid-golang/client-v1"
 	edge "github.com/akamai/AkamaiOPEN-edgegrid-golang/edgegrid"
 	"net"
-	"sort"
+	//"sort"
 	"strconv"
 	"strings"
 )
@@ -382,21 +382,23 @@ func ParseRData(rtype string, rdata []string) map[string]interface{} {
 			fieldMap["software"] = parts[1]
 			break
 		}
-
-	case "MX":
-		sort.Strings(rdata)
-		parts := strings.Split(rdata[0], " ")
-		fieldMap["priority"], _ = strconv.Atoi(parts[0])
-		if len(rdata) > 1 {
-			parts = strings.Split(rdata[1], " ")
-			tpri, _ := strconv.Atoi(parts[0])
-			fieldMap["priority_increment"] = tpri - fieldMap["priority"].(int)
-		}
-		for _, rcontent := range rdata {
-			parts := strings.Split(rcontent, " ")
-			newrdata = append(newrdata, parts[1])
-		}
-		fieldMap["target"] = newrdata
+	/*
+		// too many variations to calculate pri and increment
+		case "MX":
+			sort.Strings(rdata)
+			parts := strings.Split(rdata[0], " ")
+			fieldMap["priority"], _ = strconv.Atoi(parts[0])
+			if len(rdata) > 1 {
+				parts = strings.Split(rdata[1], " ")
+				tpri, _ := strconv.Atoi(parts[0])
+				fieldMap["priority_increment"] = tpri - fieldMap["priority"].(int)
+			}
+			for _, rcontent := range rdata {
+				parts := strings.Split(rcontent, " ")
+				newrdata = append(newrdata, parts[1])
+			}
+			fieldMap["target"] = newrdata
+	*/
 
 	case "NAPTR":
 		for _, rcontent := range rdata {
@@ -536,6 +538,31 @@ func ParseRData(rtype string, rdata []string) map[string]interface{} {
 		}
 		fieldMap["target"] = newrdata
 
+	case "CERT":
+		for _, rcontent := range rdata {
+			parts := strings.Split(rcontent, " ")
+			val, err := strconv.Atoi(parts[0])
+			if err == nil {
+				fieldMap["type_value"] = val
+			} else {
+				fieldMap["type_mnemonic"] = parts[0]
+			}
+			fieldMap["keytag"], _ = strconv.Atoi(parts[1])
+			fieldMap["algorithm"], _ = strconv.Atoi(parts[2])
+			fieldMap["certificate"] = parts[3]
+			break
+		}
+
+	case "TLSA":
+		for _, rcontent := range rdata {
+			parts := strings.Split(rcontent, " ")
+			fieldMap["usage"], _ = strconv.Atoi(parts[0])
+			fieldMap["selector"], _ = strconv.Atoi(parts[1])
+			fieldMap["match_type"], _ = strconv.Atoi(parts[2])
+			fieldMap["certificate"] = parts[3]
+			break
+		}
+
 	default:
 		for _, rcontent := range rdata {
 			newrdata = append(newrdata, rcontent)

configdns-v2/zone.go

@@ -7,8 +7,8 @@ import (
 	"io/ioutil"
 	"log"
 	"reflect"
-	"sync"
 	"strings"
+	"sync"
 )
 
 var (