Merge pull request #89 from akamai/dns_maint

add addtl conditions to record error checks.
akamai · May 12, 2020 · aac49c7 · aac49c7
2 parents 8db108f + 282cdb0
commit aac49c7
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/configdns-v2/errors.go b/configdns-v2/errors.go
@@ -11,6 +11,7 @@ type ConfigDNSError interface {
 	NotFound() bool
 	FailedToSave() bool
 	ValidationFailed() bool
+	ConcurrencyConflict() bool
 }
 
 func IsConfigDNSError(e error) bool {
@@ -35,7 +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
+                }
+        }
 	return false
 }
 
@@ -50,6 +56,15 @@ func (e *ZoneError) ValidationFailed() bool {
 	return false
 }
 
+func (e *ZoneError) ConcurrencyConflict() bool {
+        _, 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)
@@ -59,6 +74,10 @@ 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.FailedToSave() {
 		return fmt.Sprintf("Zone \"%s\" failed to save: [%s]", e.zoneName, e.err.Error())
 	}
@@ -91,6 +110,11 @@ func (e *RecordError) Network() bool {
 func (e *RecordError) 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
+		}
 	}
 	return false
 }
@@ -111,7 +135,7 @@ func (e *RecordError) ValidationFailed() bool {
 
 func (e *RecordError) ConcurrencyConflict() bool {
 	_, ok := e.err.(client.APIError)
-	if ok && e.err.(client.APIError).Status == 409 {
+	if ok && e.err.(client.APIError).Response.StatusCode == 409 {
 		return true
 	}
 	return false

diff --git a/configdns-v2/record.go b/configdns-v2/record.go
@@ -216,8 +216,10 @@ func (record *RecordBody) Delete(zone string, recLock ...bool) error {
 
 	// API error
 	if client.IsError(res) {
-		err := client.NewAPIError(res)
-		return &RecordError{fieldName: record.Name, apiErrorMessage: err.Detail, err: err}
+		if res.StatusCode != 404 {
+			err := client.NewAPIError(res)
+			return &RecordError{fieldName: record.Name, apiErrorMessage: err.Detail, err: err}
+		}
 	}
 
 	return nil

diff --git a/configdns-v2/zone.go b/configdns-v2/zone.go
@@ -473,8 +473,10 @@ func (zone *ZoneCreate) Delete(zonequerystring ZoneQueryString) error {
 
 	// API error
 	if client.IsError(res) {
-		err := client.NewAPIError(res)
-		return &ZoneError{zoneName: zone.Zone, apiErrorMessage: err.Detail, err: err}
+		if res.StatusCode != 404 {
+			err := client.NewAPIError(res)
+			return &ZoneError{zoneName: zone.Zone, apiErrorMessage: err.Detail, err: err}
+		}
 	}
 
 	return nil