Merge pull request serverless#187 from adambrgmn/fix-apig-error-respo…

…nses Fix API Gateway error responses
reineke-fox · Sep 15, 2017 · 991db05 · 991db05
2 parents 1da8de6 + a94f629
commit 991db05
Show file tree

Hide file tree

Showing 16 changed files with 813 additions and 143 deletions.
diff --git a/aws-node-github-webhook-listener/handler.js b/aws-node-github-webhook-listener/handler.js
@@ -14,28 +14,48 @@ module.exports.githubWebhookListener = (event, context, callback) => {
   const calculatedSig = signRequestBody(token, event.body);
 
   if (typeof token !== 'string') {
-    errMsg = '[401] must provide a \'GITHUB_WEBHOOK_SECRET\' env variable';
-    return callback(new Error(errMsg));
+    errMsg = 'Must provide a \'GITHUB_WEBHOOK_SECRET\' env variable';
+    return callback(null, {
+      statusCode: 401,
+      headers: { 'Content-Type': 'text/plain' },
+      body: errMsg,
+    });
   }
 
   if (!sig) {
-    errMsg = '[401] No X-Hub-Signature found on request';
-    return callback(new Error(errMsg));
+    errMsg = 'No X-Hub-Signature found on request';
+    return callback(null, {
+      statusCode: 401,
+      headers: { 'Content-Type': 'text/plain' },
+      body: errMsg,
+    });
   }
 
   if (!githubEvent) {
-    errMsg = '[422] No X-Github-Event found on request';
-    return callback(new Error(errMsg));
+    errMsg = 'No X-Github-Event found on request';
+    return callback(null, {
+      statusCode: 422,
+      headers: { 'Content-Type': 'text/plain' },
+      body: errMsg,
+    });
   }
 
   if (!id) {
-    errMsg = '[401] No X-Github-Delivery found on request';
-    return callback(new Error(errMsg));
+    errMsg = 'No X-Github-Delivery found on request';
+    return callback(null, {
+      statusCode: 401,
+      headers: { 'Content-Type': 'text/plain' },
+      body: errMsg,
+    });
   }
 
   if (sig !== calculatedSig) {
-    errMsg = '[401] X-Hub-Signature incorrect. Github webhook token doesn\'t match';
-    return callback(new Error(errMsg));
+    errMsg = 'X-Hub-Signature incorrect. Github webhook token doesn\'t match';
+    return callback(null, {
+      statusCode: 401,
+      headers: { 'Content-Type': 'text/plain' },
+      body: errMsg,
+    });
   }
 
   /* eslint-disable */

diff --git a/aws-node-rekognition-analysis-s3-image/handler.js b/aws-node-rekognition-analysis-s3-image/handler.js
@@ -23,6 +23,10 @@ module.exports.imageAnalysis = (event, context, callback) => {
       callback(null, response);
     })
     .catch((error) => {
-      callback(error, null);
+      callback(null, {
+        statusCode: error.statusCode || 501,
+        headers: { 'Content-Type': 'text/plain' },
+        body: error.message || 'Internal server error',
+      });
     });
 };
diff --git a/aws-node-rest-api-mongodb/handler.js b/aws-node-rest-api-mongodb/handler.js
@@ -7,11 +7,21 @@ mongoose.Promise = bluebird;
 
 const mongoString = ''; // MongoDB Url
 
+const createErrorResponse = (statusCode, message) => ({
+  statusCode: statusCode || 501,
+  headers: { 'Content-Type': 'text/plain' },
+  body: message || 'Incorrect id',
+});
+
 module.exports.user = (event, context, callback) => {
   const db = mongoose.connect(mongoString).connection;
   const id = event.pathParameters.id;
 
-  if (!validator.isAlphanumeric(id)) throw Error('Incorrect id');
+  if (!validator.isAlphanumeric(id)) {
+    callback(null, createErrorResponse(400, 'Incorrect id'));
+    db.close();
+    return;
+  }
 
   db.once('open', () => {
     UserModel
@@ -20,7 +30,7 @@ module.exports.user = (event, context, callback) => {
         callback(null, { statusCode: 200, body: JSON.stringify(user) });
       })
       .catch((err) => {
-        callback(err);
+        callback(null, createErrorResponse(err.statusCode, err.message));
       })
       .finally(() => {
         // Close db connection or node event loop won't exit , and lambda will timeout
@@ -51,7 +61,9 @@ module.exports.createUser = (event, context, callback) => {
 
   if (errs) {
     console.log(errs);
-    throw Error('Incorrect user data');
+    callback(null, createErrorResponse(400, 'Incorrect user data'));
+    db.close();
+    return;
   }
 
 
@@ -62,7 +74,7 @@ module.exports.createUser = (event, context, callback) => {
         callback(null, { statusCode: 200, body: JSON.stringify({ id: user[mongooseId] }) });
       })
       .catch((err) => {
-        callback(err);
+        callback(null, createErrorResponse(err.statusCode, err.message));
       })
       .finally(() => {
         db.close();
@@ -74,7 +86,11 @@ module.exports.deleteUser = (event, context, callback) => {
   const db = mongoose.connect(mongoString).connection;
   const id = event.pathParameters.id;
 
-  if (!validator.isAlphanumeric(id)) throw Error('Incorrect id');
+  if (!validator.isAlphanumeric(id)) {
+    callback(null, createErrorResponse(400, 'Incorrect id'));
+    db.close();
+    return;
+  }
 
   db.once('open', () => {
     UserModel
@@ -83,7 +99,7 @@ module.exports.deleteUser = (event, context, callback) => {
         callback(null, { statusCode: 200, body: JSON.stringify('Ok') });
       })
       .catch((err) => {
-        callback(err);
+        callback(null, createErrorResponse(err.statusCode, err.message));
       })
       .finally(() => {
         db.close();
@@ -98,7 +114,11 @@ module.exports.updateUser = (event, context, callback) => {
   let errs = {};
   let user = {};
 
-  if (!validator.isAlphanumeric(id)) throw Error('Incorrect id');
+  if (!validator.isAlphanumeric(id)) {
+    callback(null, createErrorResponse(400, 'Incorrect id'));
+    db.close();
+    return;
+  }
 
   user = new UserModel({ _id: id,
     name: data.name,
@@ -109,15 +129,20 @@ module.exports.updateUser = (event, context, callback) => {
 
   errs = user.validateSync();
 
-  if (errs) throw Error('Incorrect parameter');
+  if (errs) {
+    callback(null, createErrorResponse(400, 'Incorrect parameter'));
+    db.close();
+    return;
+  }
+
   db.once('open', () => {
     // UserModel.save() could be used too
     UserModel.findByIdAndUpdate(id, user)
       .then(() => {
         callback(null, { statusCode: 200, body: JSON.stringify('Ok') });
       })
       .catch((err) => {
-        callback(err);
+        callback(err, createErrorResponse(err.statusCode, err.message));
       })
       .finally(() => {
         db.close();

diff --git a/aws-node-rest-api-with-dynamodb-and-offline/todos/create.js b/aws-node-rest-api-with-dynamodb-and-offline/todos/create.js
@@ -8,7 +8,11 @@ module.exports.create = (event, context, callback) => {
   const data = JSON.parse(event.body);
   if (typeof data.text !== 'string') {
     console.error('Validation Failed');
-    callback(new Error('Couldn\'t create the todo item.'));
+    callback(null, {
+      statusCode: 400,
+      headers: { 'Content-Type': 'text/plain' },
+      body: 'Couldn\'t create the todo item.',
+    });
     return;
   }
 
@@ -28,7 +32,11 @@ module.exports.create = (event, context, callback) => {
     // handle potential errors
     if (error) {
       console.error(error);
-      callback(new Error('Couldn\'t create the todo item.'));
+      callback(null, {
+        statusCode: error.statusCode || 501,
+        headers: { 'Content-Type': 'text/plain' },
+        body: 'Couldn\'t create the todo item.',
+      });
       return;
     }
 

diff --git a/aws-node-rest-api-with-dynamodb-and-offline/todos/delete.js b/aws-node-rest-api-with-dynamodb-and-offline/todos/delete.js
@@ -15,7 +15,11 @@ module.exports.delete = (event, context, callback) => {
     // handle potential errors
     if (error) {
       console.error(error);
-      callback(new Error('Couldn\'t remove the todo item.'));
+      callback(null, {
+        statusCode: error.statusCode || 501,
+        headers: { 'Content-Type': 'text/plain' },
+        body: 'Couldn\'t remove the todo item.',
+      });
       return;
     }
 

diff --git a/aws-node-rest-api-with-dynamodb-and-offline/todos/get.js b/aws-node-rest-api-with-dynamodb-and-offline/todos/get.js
@@ -15,7 +15,11 @@ module.exports.get = (event, context, callback) => {
     // handle potential errors
     if (error) {
       console.error(error);
-      callback(new Error('Couldn\'t fetch the todo item.'));
+      callback(null, {
+        statusCode: error.statusCode || 501,
+        headers: { 'Content-Type': 'text/plain' },
+        body: 'Couldn\'t fetch the todo item.',
+      });
       return;
     }
 

diff --git a/aws-node-rest-api-with-dynamodb-and-offline/todos/list.js b/aws-node-rest-api-with-dynamodb-and-offline/todos/list.js
@@ -12,7 +12,11 @@ module.exports.list = (event, context, callback) => {
     // handle potential errors
     if (error) {
       console.error(error);
-      callback(new Error('Couldn\'t fetch the todos.'));
+      callback(null, {
+        statusCode: error.statusCode || 501,
+        headers: { 'Content-Type': 'text/plain' },
+        body: 'Couldn\'t fetch the todo item.',
+      });
       return;
     }
 

diff --git a/aws-node-rest-api-with-dynamodb-and-offline/todos/update.js b/aws-node-rest-api-with-dynamodb-and-offline/todos/update.js
@@ -9,7 +9,11 @@ module.exports.update = (event, context, callback) => {
   // validation
   if (typeof data.text !== 'string' || typeof data.checked !== 'boolean') {
     console.error('Validation Failed');
-    callback(new Error('Couldn\'t update the todo item.'));
+    callback(null, {
+      statusCode: 400,
+      headers: { 'Content-Type': 'text/plain' },
+      body: 'Couldn\'t update the todo item.',
+    });
     return;
   }
 
@@ -35,7 +39,11 @@ module.exports.update = (event, context, callback) => {
     // handle potential errors
     if (error) {
       console.error(error);
-      callback(new Error('Couldn\'t update the todo item.'));
+      callback(null, {
+        statusCode: error.statusCode || 501,
+        headers: { 'Content-Type': 'text/plain' },
+        body: 'Couldn\'t update the todo item.',
+      });
       return;
     }
 

diff --git a/aws-node-rest-api-with-dynamodb/todos/create.js b/aws-node-rest-api-with-dynamodb/todos/create.js
@@ -10,7 +10,11 @@ module.exports.create = (event, context, callback) => {
   const data = JSON.parse(event.body);
   if (typeof data.text !== 'string') {
     console.error('Validation Failed');
-    callback(new Error('Couldn\'t create the todo item.'));
+    callback(null, {
+      statusCode: 400,
+      headers: { 'Content-Type': 'text/plain' },
+      body: 'Couldn\'t create the todo item.',
+    });
     return;
   }
 
@@ -30,7 +34,11 @@ module.exports.create = (event, context, callback) => {
     // handle potential errors
     if (error) {
       console.error(error);
-      callback(new Error('Couldn\'t create the todo item.'));
+      callback(null, {
+        statusCode: error.statusCode || 501,
+        headers: { 'Content-Type': 'text/plain' },
+        body: 'Couldn\'t create the todo item.',
+      });
       return;
     }
 

diff --git a/aws-node-rest-api-with-dynamodb/todos/delete.js b/aws-node-rest-api-with-dynamodb/todos/delete.js
@@ -17,7 +17,11 @@ module.exports.delete = (event, context, callback) => {
     // handle potential errors
     if (error) {
       console.error(error);
-      callback(new Error('Couldn\'t remove the todo item.'));
+      callback(null, {
+        statusCode: error.statusCode || 501,
+        headers: { 'Content-Type': 'text/plain' },
+        body: 'Couldn\'t remove the todo item.',
+      });
       return;
     }
 

diff --git a/aws-node-rest-api-with-dynamodb/todos/get.js b/aws-node-rest-api-with-dynamodb/todos/get.js
@@ -17,7 +17,11 @@ module.exports.get = (event, context, callback) => {
     // handle potential errors
     if (error) {
       console.error(error);
-      callback(new Error('Couldn\'t fetch the todo item.'));
+      callback(null, {
+        statusCode: error.statusCode || 501,
+        headers: { 'Content-Type': 'text/plain' },
+        body: 'Couldn\'t fetch the todo item.',
+      });
       return;
     }
 

diff --git a/aws-node-rest-api-with-dynamodb/todos/list.js b/aws-node-rest-api-with-dynamodb/todos/list.js
@@ -13,7 +13,11 @@ module.exports.list = (event, context, callback) => {
     // handle potential errors
     if (error) {
       console.error(error);
-      callback(new Error('Couldn\'t fetch the todos.'));
+      callback(null, {
+        statusCode: error.statusCode || 501,
+        headers: { 'Content-Type': 'text/plain' },
+        body: 'Couldn\'t fetch the todos.',
+      });
       return;
     }
 

diff --git a/aws-node-rest-api-with-dynamodb/todos/update.js b/aws-node-rest-api-with-dynamodb/todos/update.js
@@ -11,7 +11,11 @@ module.exports.update = (event, context, callback) => {
   // validation
   if (typeof data.text !== 'string' || typeof data.checked !== 'boolean') {
     console.error('Validation Failed');
-    callback(new Error('Couldn\'t update the todo item.'));
+    callback(null, {
+      statusCode: 400,
+      headers: { 'Content-Type': 'text/plain' },
+      body: 'Couldn\'t update the todo item.',
+    });
     return;
   }
 
@@ -37,7 +41,11 @@ module.exports.update = (event, context, callback) => {
     // handle potential errors
     if (error) {
       console.error(error);
-      callback(new Error('Couldn\'t update the todo item.'));
+      callback(null, {
+        statusCode: error.statusCode || 501,
+        headers: { 'Content-Type': 'text/plain' },
+        body: 'Couldn\'t fetch the todo item.',
+      });
       return;
     }
 

diff --git a/aws-node-stripe-integration/handler.js b/aws-node-stripe-integration/handler.js
@@ -41,6 +41,10 @@ module.exports.incoming = (event, context, callback) => {
       callback(null, response);
     });
   } catch (err) {
-    context.fail(err);
+    callback(null, {
+      statusCode: err.statusCode || 501,
+      headers: { 'Content-Type': 'text/plain' },
+      body: err.message || 'Internal server error',
+    });
   }
 };