s3: improve upstream internal error logging (#1676)

Closes getodk/central#1469

Author: alxndrsn

lib/util/problem.js

@@ -255,7 +255,7 @@ const problems = {
 
     s3accessDenied: problem(500.4, () => `The S3 account details or permissions are incorret.`),
 
-    s3upstreamError: problem(500.5, () => 'The upstream S3 server had an internal problem.'),
+    s3upstreamError: problem(500.5, ({ amzRequestId, operation }) => `The upstream S3 server had an internal problem performing '${operation}'. Amazon request ID: '${amzRequestId}'.`),
 
     // used to indicate missing odata functionality.
     notImplemented: problem(501.1, ({ feature }) => `The requested feature ${feature} is not supported by this server.`),

test/unit/external/s3.js

@@ -89,7 +89,7 @@ describe('external/s3', () => {
         () => s3.deleteObjsFor([ exampleBlob ]),
         {
           name: 'Error',
-          message: 'The upstream S3 server had an internal problem.',
+          message: `The upstream S3 server had an internal problem performing 'removeObjects'. Amazon request ID: 'tx000000000000000000000-0000000000-000000001-xxxxx'.`,
           problemCode: 500.5,
           problemDetails: {
             amzRequestId,
@@ -132,7 +132,7 @@ describe('external/s3', () => {
         () => s3.getContentFor(exampleBlob),
         {
           name: 'Error',
-          message: 'The upstream S3 server had an internal problem.',
+          message: `The upstream S3 server had an internal problem performing 'getObject'. Amazon request ID: 'tx000000000000000000000-0000000000-000000001-xxxxx'.`,
           problemCode: 500.5,
           problemDetails: {
             amzRequestId,
@@ -175,7 +175,7 @@ describe('external/s3', () => {
         () => s3.uploadFromBlob(exampleBlob),
         {
           name: 'Error',
-          message: 'The upstream S3 server had an internal problem.',
+          message: `The upstream S3 server had an internal problem performing 'putObject'. Amazon request ID: 'tx000000000000000000000-0000000000-000000001-xxxxx'.`,
           problemCode: 500.5,
           problemDetails: {
             amzRequestId,