From 01bcdd0421d9bd5beb4b947083aea9b975ae9346 Mon Sep 17 00:00:00 2001
From: Will White <will@mapbox.com>
Date: Fri, 29 Jan 2016 09:41:07 -0500
Subject: [PATCH] Remove amz ids from error messages.

Retain them as properties on error objects.
---
 lib/index.js       |  2 --
 test/error.test.js | 10 +++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 829a191..74a2b5a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -149,12 +149,10 @@ function managedError(err, context, grid) {
     if (!error) return false;
 
     if (error.statusCode >= 500 && err.amzRequestId) {
-        error.message = '[x-amz-request-id:' + err.amzRequestId + '] ' + error.message;
         error.amzRequestId = err.amzRequestId;
     }
 
     if (error.statusCode >= 500 && err.amzId2) {
-        error.message = '[x-amz-id-2:' + err.amzId2 + '] ' + error.message;
         error.amzId2 = err.amzId2;
     }
 
diff --git a/test/error.test.js b/test/error.test.js
index b204ace..3e4c0df 100644
--- a/test/error.test.js
+++ b/test/error.test.js
@@ -437,7 +437,7 @@ test('getTile retry internal error', function(assert) {
         source.startWriting(function(err) {
             if (err) return done(err);
             source.getTile(3, 6, 5, function(err) {
-                assert.equal(err.message, '[x-amz-id-2:01234567] [x-amz-request-id:0000000000000000] unknown error', 'expected message');
+                assert.equal(err.message, 'unknown error', 'expected message');
                 assert.equal(err.statusCode, 500, 'expected statusCode');
                 assert.equal(attempts, 5, 'retried 4 times');
                 assert.end();
@@ -490,7 +490,7 @@ test('putTile retry on PUT internal error', function(assert) {
         source.startWriting(function(err) {
             if (err) return done(err);
             source.putTile(3, 6, 5, png, function(err) {
-                assert.equal(err.message, '[x-amz-id-2:01234567] [x-amz-request-id:0000000000000000] unknown error', 'expected message');
+                assert.equal(err.message, 'unknown error', 'expected message');
                 assert.equal(err.statusCode, 500, 'expected statusCode');
                 assert.equal(attempts, 6, 'retried PUT 4 times');
                 assert.end();
@@ -516,7 +516,7 @@ test('putTile no retry on PUT http error (no body)', function(assert) {
         source.startWriting(function(err) {
             if (err) return done(err);
             source.putTile(3, 6, 5, png, function(err) {
-                assert.equal(err.message, '[x-amz-id-2:01234567] [x-amz-request-id:0000000000000000] 503 Unknown');
+                assert.equal(err.message, '503 Unknown');
                 assert.equal(err.statusCode, 503, 'expected statusCode');
                 assert.equal(attempts, 6, 'retried PUT 4 times');
                 assert.end();
@@ -543,7 +543,7 @@ test('getTile error with no body', function(assert) {
         source.startWriting(function(err) {
             if (err) return done(err);
             source.getTile(3, 6, 5, function(err) {
-                assert.equal(err.message, '[x-amz-id-2:01234567] [x-amz-request-id:0000000000000000] 503 Unknown', 'expected message');
+                assert.equal(err.message, '503 Unknown', 'expected message');
                 assert.equal(err.statusCode, 503, 'expected statusCode');
                 assert.equal(attempts, 5, 'retried 4 times');
                 assert.end();
@@ -571,7 +571,7 @@ test('getTile retry on content-length mismatch', function(assert) {
             if (err) return done(err);
             source.getTile(3, 6, 5, function(err) {
                 assert.equal(err.code, 'TruncatedResponseError', 'expected error code');
-                assert.equal(err.message, '[x-amz-id-2:01234567] [x-amz-request-id:0000000000000000] Content-Length does not match response body length', 'expected message');
+                assert.equal(err.message, 'Content-Length does not match response body length', 'expected message');
                 assert.equal(err.statusCode, 500, 'expected statusCode');
                 assert.equal(attempts, 5, 'retried 4 times');
                 assert.end();