From cb8a951bb81097ab482034c5b71e68825a7b8a57 Mon Sep 17 00:00:00 2001
From: Evan Hazlett <ejhazlett@gmail.com>
Date: Fri, 12 Dec 2014 17:48:49 -0500
Subject: [PATCH] added better error reporting

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
---
 drivers/amazonec2/amz/ec2.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/amazonec2/amz/ec2.go b/drivers/amazonec2/amz/ec2.go
index 0d4f87f9e3..33cd34b3d6 100644
--- a/drivers/amazonec2/amz/ec2.go
+++ b/drivers/amazonec2/amz/ec2.go
@@ -108,7 +108,15 @@ type (
 )
 
 func newAwsApiResponseError(r http.Response) error {
-	return fmt.Errorf("Non-200 API response: %d", r.StatusCode)
+	var errorResponse ErrorResponse
+	if err := getDecodedResponse(r, &errorResponse); err != nil {
+		return fmt.Errorf("Error decoding error response: %s", err)
+	}
+	msg := ""
+	for _, e := range errorResponse.Errors {
+		msg += fmt.Sprintf("%s\n", e.Message)
+	}
+	return fmt.Errorf("Non-200 API response: code=%d message=%s", r.StatusCode, msg)
 }
 
 func newAwsApiCallError(err error) error {