Merge pull request #28 from compose/whitelists

We've tidied the more complex error handling to properly populate the error array. This should have no impact on applications, but file an issue if it does.
compose · Nov 9, 2017 · 5b7aced · 5b7aced
2 parents 24f4468 + acb5c33
commit 5b7aced
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 122 deletions.
diff --git a/account.go b/account.go
@@ -16,7 +16,6 @@ package composeapi
 
 import (
 	"encoding/json"
-	"fmt"
 )
 
 // Account structure
@@ -97,15 +96,9 @@ func (c *Client) CreateAccountUserJSON(accountID string, params UserParams) (str
 		End()
 
 	if response.StatusCode != 201 { // Expect Created on success
-		myerrors := Errors{}
-		err := json.Unmarshal([]byte(body), &myerrors)
-		if err != nil {
-			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d - body %s",
-				response.StatusCode, body))
-		} else {
-			errs = append(errs, fmt.Errorf("%v", myerrors.Error))
-		}
+		errs = ProcessErrors(response.StatusCode, body)
 	}
+
 	return body, errs
 }
 
@@ -128,14 +121,7 @@ func (c *Client) DeleteAccountUserJSON(accountID, userID string) (string, []erro
 		End()
 
 	if response.StatusCode != 200 { // Expect OK on success
-		myerrors := Errors{}
-		err := json.Unmarshal([]byte(body), &myerrors)
-		if err != nil {
-			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d - body %s",
-				response.StatusCode, body))
-		} else {
-			errs = append(errs, fmt.Errorf("%v", myerrors.Error))
-		}
+		errs = ProcessErrors(response.StatusCode, body)
 	}
 
 	return body, errs

diff --git a/audit_events.go b/audit_events.go
@@ -87,14 +87,9 @@ func (c *Client) GetAuditEventJSON(id string) (string, []error) {
 		End()
 
 	if response.StatusCode != 200 { // Expect Accepted on success - assume error on anything else
-		myerrors := Errors{}
-		err := json.Unmarshal([]byte(body), &myerrors)
-		if err != nil {
-			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d - body %s", response.StatusCode, response.Body))
-		} else {
-			errs = append(errs, fmt.Errorf("%v", myerrors.Error))
-		}
+		errs = ProcessErrors(response.StatusCode, body)
 	}
+
 	return body, errs
 }
 

diff --git a/backups.go b/backups.go
@@ -16,7 +16,6 @@ package composeapi
 
 import (
 	"encoding/json"
-	"fmt"
 )
 
 // Backup structure
@@ -62,13 +61,7 @@ func (c *Client) StartBackupForDeploymentJSON(deploymentid string) (string, []er
 		End()
 
 	if response.StatusCode != 202 { // Expect Accepted on success - assume error on anything else
-		myerrors := Errors{}
-		err := json.Unmarshal([]byte(body), &myerrors)
-		if err != nil {
-			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d", response.StatusCode))
-		} else {
-			errs = append(errs, fmt.Errorf("%v", myerrors.Error))
-		}
+		errs = ProcessErrors(response.StatusCode, body)
 	}
 
 	return body, errs
@@ -149,13 +142,7 @@ func (c *Client) RestoreBackupJSON(params RestoreBackupParams) (string, []error)
 		End()
 
 	if response.StatusCode != 202 { // Expect Accepted on success - assume error on anything else
-		myerrors := Errors{}
-		err := json.Unmarshal([]byte(body), &myerrors)
-		if err != nil {
-			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d - body %s", response.StatusCode, response.Body))
-		} else {
-			errs = append(errs, fmt.Errorf("%v", myerrors.Error))
-		}
+		errs = ProcessErrors(response.StatusCode, body)
 	}
 
 	return body, errs

diff --git a/composeapi.go b/composeapi.go
@@ -96,6 +96,11 @@ type Errors struct {
 	Error map[string][]string `json:"errors,omitempty"`
 }
 
+//SimpleError struct for parsing simple error returns
+type SimpleError struct {
+	Error string `json:"errors"`
+}
+
 func printJSON(jsontext string) {
 	var tempholder map[string]interface{}
 
@@ -119,13 +124,30 @@ func (c *Client) getJSON(endpoint string) (string, []error) {
 	response, body, errs := c.newRequest("GET", apibase+endpoint).End()
 
 	if response.StatusCode != 200 {
-		myerrors := Errors{}
-		err := json.Unmarshal([]byte(body), &myerrors)
+		errs = ProcessErrors(response.StatusCode, body)
+	}
+
+	return body, errs
+}
+
+//ProcessErrors tries to turn errors into an Errors struct
+func ProcessErrors(statuscode int, body string) []error {
+	errs := []error{}
+	myerrors := Errors{}
+	err := json.Unmarshal([]byte(body), &myerrors)
+	// Did parsing like this break anything
+	if err != nil {
+		mysimpleerror := SimpleError{}
+		err := json.Unmarshal([]byte(body), &mysimpleerror)
 		if err != nil {
-			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d - body %s", response.StatusCode, response.Body))
+			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d - body %s", statuscode, body))
 		} else {
-			errs = append(errs, fmt.Errorf("%v", myerrors.Error))
+			errs = append(errs, fmt.Errorf("%s", mysimpleerror.Error))
 		}
+	} else {
+		// Todo: iterate through and add eachg error.
+		errs = append(errs, fmt.Errorf("%v", myerrors.Error))
 	}
-	return body, errs
+
+	return errs
 }
diff --git a/database.go b/database.go
@@ -16,7 +16,6 @@ package composeapi
 
 import (
 	"encoding/json"
-	"fmt"
 )
 
 //Version structure
@@ -58,14 +57,7 @@ func (c *Client) UpdateVersionJSON(deploymentID string, version string) (string,
 		End()
 
 	if response.StatusCode != 200 { // Expect OK on success - assume error on anything else
-		myErrors := Errors{}
-		err := json.Unmarshal([]byte(body), &myErrors)
-		if err != nil {
-			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d - body %s",
-				response.StatusCode, body))
-		} else {
-			errs = append(errs, fmt.Errorf("%v", myErrors.Error))
-		}
+		errs = ProcessErrors(response.StatusCode, body)
 	}
 
 	return body, errs

diff --git a/deployment.go b/deployment.go
@@ -222,13 +222,7 @@ func (c *Client) DeprovisionDeploymentJSON(deploymentID string) (string, []error
 		End()
 
 	if response.StatusCode != 202 { // Expect Accepted on success - assume error on anything else
-		myerrors := Errors{}
-		err := json.Unmarshal([]byte(body), &myerrors)
-		if err != nil {
-			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d - body %s", response.StatusCode, response.Body))
-		} else {
-			errs = append(errs, fmt.Errorf("%v", myerrors.Error))
-		}
+		errs = ProcessErrors(response.StatusCode, body)
 	}
 
 	return body, errs
@@ -265,13 +259,7 @@ func (c *Client) PatchDeploymentJSON(params PatchDeploymentParams) (string, []er
 		End()
 
 	if response.StatusCode != 200 { // Expect Accepted on success - assume error on anything else
-		myerrors := Errors{}
-		err := json.Unmarshal([]byte(body), &myerrors)
-		if err != nil {
-			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d - body %s", response.StatusCode, response.Body))
-		} else {
-			errs = append(errs, fmt.Errorf("%v", myerrors.Error))
-		}
+		errs = ProcessErrors(response.StatusCode, body)
 	}
 
 	return body, errs

diff --git a/scalings.go b/scalings.go
@@ -16,7 +16,6 @@ package composeapi
 
 import (
 	"encoding/json"
-	"fmt"
 )
 
 // Scalings represents the used, allocated, starting and minimum unit scale
@@ -75,13 +74,7 @@ func (c *Client) SetScalingsJSON(params ScalingsParams) (string, []error) {
 		End()
 
 	if response.StatusCode != 200 { // Expect Accepted on success - assume error on anything else
-		myerrors := Errors{}
-		err := json.Unmarshal([]byte(body), &myerrors)
-		if err != nil {
-			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d - body %s", response.StatusCode, response.Body))
-		} else {
-			errs = append(errs, fmt.Errorf("%v", myerrors.Error))
-		}
+		errs = ProcessErrors(response.StatusCode, body)
 	}
 
 	return body, errs

diff --git a/tags.go b/tags.go
@@ -64,14 +64,7 @@ func (c *Client) updateClusterTagsJSON(clusterID, method string, tags []string)
 		End()
 
 	if response.StatusCode != 200 { // Expect OK on success - assume error on anything else
-		myerrors := Errors{}
-		err := json.Unmarshal([]byte(body), &myerrors)
-		if err != nil {
-			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d - body %s",
-				response.StatusCode, response.Body))
-		} else {
-			errs = append(errs, fmt.Errorf("%v", myerrors.Error))
-		}
+		errs = ProcessErrors(response.StatusCode, body)
 	}
 
 	return body, errs

diff --git a/team_roles.go b/team_roles.go
@@ -100,14 +100,7 @@ func (c *Client) DeleteTeamRoleJSON(deploymentID string, params TeamRoleParams)
 		End()
 
 	if response.StatusCode != 204 { // No response body is returned on success
-		myErrors := Errors{}
-		err := json.Unmarshal([]byte(body), &myErrors)
-		if err != nil {
-			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d - body %s",
-				response.StatusCode, body))
-		} else {
-			errs = append(errs, fmt.Errorf("%v", myErrors.Error))
-		}
+		errs = ProcessErrors(response.StatusCode, body)
 	}
 
 	return errs

diff --git a/teams.go b/teams.go
@@ -58,14 +58,7 @@ func (c *Client) CreateTeamJSON(params TeamParams) (string, []error) {
 		End()
 
 	if response.StatusCode != 201 { // Expect Created on success - assume error on anything else
-		myErrors := Errors{}
-		err := json.Unmarshal([]byte(body), &myErrors)
-		if err != nil {
-			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d - body %s",
-				response.StatusCode, response.Body))
-		} else {
-			errs = append(errs, fmt.Errorf("%v", myErrors.Error))
-		}
+		errs = ProcessErrors(response.StatusCode, body)
 	}
 	return body, errs
 }
@@ -145,14 +138,7 @@ func (c *Client) DeleteTeamJSON(teamID string) (string, []error) {
 		End()
 
 	if response.StatusCode != 200 { // Expect OK on success - assume error on anything else
-		myErrors := Errors{}
-		err := json.Unmarshal([]byte(body), &myErrors)
-		if err != nil {
-			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d - body %s",
-				response.StatusCode, body))
-		} else {
-			errs = append(errs, fmt.Errorf("%v", myErrors.Error))
-		}
+		errs = ProcessErrors(response.StatusCode, body)
 	}
 
 	return body, errs
@@ -180,14 +166,7 @@ func (c *Client) PatchTeamJSON(teamID, teamName string) (string, []error) {
 		End()
 
 	if response.StatusCode != 200 { // Expect OK on success - assume error on anything else
-		myErrors := Errors{}
-		err := json.Unmarshal([]byte(body), &myErrors)
-		if err != nil {
-			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d - body %s",
-				response.StatusCode, body))
-		} else {
-			errs = append(errs, fmt.Errorf("%v", myErrors.Error))
-		}
+		errs = ProcessErrors(response.StatusCode, body)
 	}
 
 	return body, errs
@@ -215,13 +194,7 @@ func (c *Client) PutTeamUsersJSON(teamID string, userIDs []string) (string, []er
 		End()
 
 	if response.StatusCode != 200 { // Expect OK on success - assume error on anything else
-		myErrors := Errors{}
-		err := json.Unmarshal([]byte(body), &myErrors)
-		if err != nil {
-			errs = append(errs, fmt.Errorf("Unable to parse error - status code %d - body %s", response.StatusCode, body))
-		} else {
-			errs = append(errs, fmt.Errorf("%v", myErrors.Error))
-		}
+		errs = ProcessErrors(response.StatusCode, body)
 	}
 
 	return body, errs