Create RequestError struct and ErrorResponse

- Pass response body of error - Remove 'unknown' error nomenclature [#167050837] Signed-off-by: Joshua Casey <[email protected]> Co-authored-by: Joshua Casey <[email protected]>
cloudfoundry · Aug 23, 2019 · b2b1dd4 · b2b1dd4
1 parent 347645d
commit b2b1dd4
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 21 deletions.
diff --git a/generated_client_test.go b/generated_client_test.go
diff --git a/generated_group_test.go b/generated_group_test.go
diff --git a/generated_identityzone_test.go b/generated_identityzone_test.go
diff --git a/generated_mfaprovider_test.go b/generated_mfaprovider_test.go
diff --git a/generated_user_test.go b/generated_user_test.go
diff --git a/generator/spec.gotemplate b/generator/spec.gotemplate
@@ -75,7 +75,7 @@ func test{{.ModelTypeName}}(t *testing.T, when spec.G, it spec.S) {
 				{{tolower .ModelTypeName}}, err := a.Get{{.ModelTypeName}}("00000000-0000-0000-0000-000000000001")
 				Expect(err).To(HaveOccurred())
 				Expect({{tolower .ModelTypeName}}).To(BeNil())
-				Expect(err.Error()).To(ContainSubstring("An unknown error occurred while calling"))
+				Expect(err.Error()).To(ContainSubstring("An error occurred while calling"))
 			})
 		})
 

diff --git a/groups_test.go b/groups_test.go
@@ -143,7 +143,7 @@ func testGroupsExtra(t *testing.T, when spec.G, it spec.S) {
 
 				_, err := a.GetGroupByName("uaa.admin", "")
 				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring("An unknown error"))
+				Expect(err.Error()).To(ContainSubstring("An error"))
 			})
 
 			it("returns an error when no groups are found", func() {

diff --git a/info_test.go b/info_test.go
@@ -113,7 +113,7 @@ func testInfo(t *testing.T, when spec.G, it spec.S) {
 		it("returns a helpful error", func() {
 			_, err := a.GetInfo()
 			Expect(err).NotTo(BeNil())
-			Expect(err.Error()).To(ContainSubstring("An unknown error occurred while calling"))
+			Expect(err.Error()).To(ContainSubstring("An error occurred while calling"))
 		})
 	})
 

diff --git a/me_test.go b/me_test.go
@@ -85,7 +85,7 @@ func testMe(t *testing.T, when spec.G, it spec.S) {
 		u, err := a.GetMe()
 		Expect(err).To(HaveOccurred())
 		Expect(u).To(BeNil())
-		Expect(err.Error()).To(ContainSubstring("An unknown error occurred while calling"))
+		Expect(err.Error()).To(ContainSubstring("An error occurred while calling"))
 	})
 
 	it("returns helpful error when /userinfo response can't be parsed", func() {

diff --git a/request_errors.go b/request_errors.go
@@ -1,15 +1,27 @@
 package uaa
 
-import "github.com/pkg/errors"
+import (
+	"fmt"
+	"github.com/pkg/errors"
+)
+
+type RequestError struct {
+	Url string
+	ErrorResponse []byte
+}
+
+func (r RequestError) Error() string {
+	return fmt.Sprintf("An error occurred while calling %s", r.Url)
+}
+
+func requestErrorWithBody(url string, body []byte) error {
+	return RequestError{url, body }
+}
 
 func requestError(url string) error {
-	return errors.New("An unknown error occurred while calling " + url)
+	return errors.Errorf("An error occurred while calling %s", url)
 }
 
 func parseError(err error, url string, body []byte) error {
 	return errors.Wrapf(err, "An unknown error occurred while parsing response from %s. Response was %s", url, string(body))
 }
-
-func unknownError() error {
-	return errors.New("An unknown error occurred")
-}
diff --git a/roundtrip.go b/roundtrip.go
@@ -86,10 +86,13 @@ func (a *API) doAndRead(req *http.Request, needsAuthentication bool) ([]byte, er
 		if a.Verbose {
 			fmt.Printf("%v\n\n", err)
 		}
-		return nil, unknownError()
+		return nil, requestError(req.URL.String())
 	}
 
 	if !is2XX(resp.StatusCode) {
+		if len(bytes) > 0 {
+			return nil, requestErrorWithBody(req.URL.String(), bytes)
+		}
 		return nil, requestError(req.URL.String())
 	}
 	return bytes, nil

diff --git a/token_key_test.go b/token_key_test.go
@@ -81,7 +81,7 @@ func testTokenKey(t *testing.T, when spec.G, it spec.S) {
 
 		_, err := a.TokenKey()
 		Expect(err).To(HaveOccurred())
-		Expect(err.Error()).To(ContainSubstring("An unknown error occurred while calling"))
+		Expect(err.Error()).To(ContainSubstring("An error occurred while calling"))
 	})
 
 	it("returns helpful error when /token_key response can't be parsed", func() {

diff --git a/users_test.go b/users_test.go
@@ -156,7 +156,7 @@ func testUsers(t *testing.T, when spec.G, it spec.S) {
 
 				_, err := a.GetUserByUsername("marcus", "uaa", "")
 				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring("An unknown error"))
+				Expect(err.Error()).To(ContainSubstring("An error"))
 			})
 
 			it("returns an error if no results are found", func() {
@@ -214,7 +214,7 @@ func testUsers(t *testing.T, when spec.G, it spec.S) {
 				})
 				_, err := a.GetUserByUsername("marcus", "", "")
 				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring("An unknown error"))
+				Expect(err.Error()).To(ContainSubstring("An error"))
 			})
 
 			it("returns an error when no users are found", func() {
@@ -465,7 +465,7 @@ func testUsers(t *testing.T, when spec.G, it spec.S) {
 			})
 			err := a.ActivateUser("fb5f32e1-5cb3-49e6-93df-6df9c8c8bd7", 0)
 			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring("An unknown error occurred while calling"))
+			Expect(err.Error()).To(ContainSubstring("An error occurred while calling"))
 			Expect(called).To(Equal(1))
 		})
 	})
@@ -508,7 +508,7 @@ func testUsers(t *testing.T, when spec.G, it spec.S) {
 			})
 			err := a.DeactivateUser("fb5f32e1-5cb3-49e6-93df-6df9c8c8bd7", 0)
 			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring("An unknown error occurred while calling"))
+			Expect(err.Error()).To(ContainSubstring("An error occurred while calling"))
 			Expect(called).To(Equal(1))
 		})
 	})