Gracefully handle 500s from pivnet. [#133519059]

- the structure of the json body is different and we need to handle that special case.

pivnet.go

@@ -20,11 +20,14 @@ const (
 )
 
 type pivnetErr struct {
-	Status  int      `json:"status"`
 	Message string   `json:"message"`
 	Errors  []string `json:"errors"`
 }
 
+type pivnetInternalServerErr struct {
+	Error string `json:"error"`
+}
+
 type ErrPivnetOther struct {
 	ResponseCode int      `json:"response_code" yaml:"response_code"`
 	Message      string   `json:"message" yaml:"message"`
@@ -210,9 +213,23 @@ func (c Client) MakeRequest(
 
 	if expectedStatusCode > 0 && resp.StatusCode != expectedStatusCode {
 		var pErr pivnetErr
-		err = json.Unmarshal(b, &pErr)
-		if err != nil {
-			return nil, nil, err
+
+		// We have to handle 500 differently because it has a different structure
+		if resp.StatusCode == http.StatusInternalServerError {
+			var internalServerError pivnetInternalServerErr
+			err = json.Unmarshal(b, &internalServerError)
+			if err != nil {
+				return nil, nil, err
+			}
+
+			pErr = pivnetErr{
+				Message: internalServerError.Error,
+			}
+		} else {
+			err = json.Unmarshal(b, &pErr)
+			if err != nil {
+				return nil, nil, err
+			}
 		}
 
 		switch resp.StatusCode {
@@ -222,12 +239,12 @@ func (c Client) MakeRequest(
 			return nil, nil, newErrNotFound(pErr.Message)
 		case http.StatusUnavailableForLegalReasons:
 			return nil, nil, newErrUnavailableForLegalReasons()
-		}
-
-		return nil, nil, ErrPivnetOther{
-			ResponseCode: resp.StatusCode,
-			Message:      pErr.Message,
-			Errors:       pErr.Errors,
+		default:
+			return nil, nil, ErrPivnetOther{
+				ResponseCode: resp.StatusCode,
+				Message:      pErr.Message,
+				Errors:       pErr.Errors,
+			}
 		}
 	}
 

pivnet_test.go

@@ -270,6 +270,71 @@ var _ = Describe("PivnetClient", func() {
 		})
 	})
 
+	Context("when Pivnet returns a 500", func() {
+		var (
+			body []byte
+		)
+
+		BeforeEach(func() {
+			body = []byte(`{"status":"500","error":"foo message"}`)
+		})
+
+		It("returns an error", func() {
+			server.AppendHandlers(
+				ghttp.CombineHandlers(
+					ghttp.VerifyRequest(
+						"GET",
+						fmt.Sprintf("%s/foo", apiPrefix),
+					),
+					ghttp.RespondWith(http.StatusInternalServerError, body),
+				),
+			)
+
+			_, _, err := client.MakeRequest(
+				"GET",
+				"/foo",
+				http.StatusOK,
+				nil,
+				nil,
+			)
+			Expect(err).To(HaveOccurred())
+			Expect(err).To(MatchError(
+				pivnet.ErrPivnetOther{
+					ResponseCode: http.StatusInternalServerError,
+					Message:      "foo message",
+				},
+			))
+		})
+
+		Context("when unmarshalling the response from Pivnet returns an error", func() {
+			BeforeEach(func() {
+				body = []byte(`{"error":1234}`)
+			})
+
+			It("returns an error", func() {
+				server.AppendHandlers(
+					ghttp.CombineHandlers(
+						ghttp.VerifyRequest(
+							"GET",
+							fmt.Sprintf("%s/foo", apiPrefix),
+						),
+						ghttp.RespondWith(http.StatusInternalServerError, body),
+					),
+				)
+
+				_, _, err := client.MakeRequest(
+					"GET",
+					"/foo",
+					http.StatusOK,
+					nil,
+					nil,
+				)
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("json: cannot unmarshal"))
+			})
+		})
+	})
+
 	Context("when an unexpected status code comes back from Pivnet", func() {
 		var (
 			body []byte