Update nodejs express serverless function template

packages/amplify-e2e-tests/src/__tests__/api-express-function.test.ts

@@ -0,0 +1,82 @@
+import {
+  addRestApi,
+  createNewProjectDir,
+  deleteProject,
+  deleteProjectDir,
+  initJSProjectWithProfile,
+  amplifyPushAuth,
+  addFunction,
+  getProjectMeta,
+} from '@aws-amplify/amplify-e2e-core';
+import fetch from 'node-fetch';
+import { v4 as uuid } from 'uuid';
+
+const projName = 'apigwexpresstest';
+const [shortId] = uuid().split('-');
+const apiName = `expressapi${shortId}`;
+
+describe('API Gateway Express e2e test', () => {
+  let projRoot: string;
+  beforeEach(async () => {
+    projRoot = await createNewProjectDir(projName);
+    await initJSProjectWithProfile(projRoot, { name: projName });
+    await addFunction(projRoot, { functionTemplate: 'Serverless ExpressJS function (Integration with API Gateway)' }, 'nodejs');
+    await addRestApi(projRoot, { apiName: apiName, existingLambda: true });
+    await amplifyPushAuth(projRoot);
+  });
+
+  afterEach(async () => {
+    await deleteProject(projRoot);
+    deleteProjectDir(projRoot);
+  });
+
+  it(' curd requests to api gateway ', async () => {
+    const projMeta = getProjectMeta(projRoot);
+    expect(projMeta.api).toBeDefined();
+    const apiPath = projMeta?.api?.[apiName]?.output?.RootUrl;
+    expect(apiPath).toBeDefined();
+    const apiResource = `${apiPath}/items`;
+
+    // GET request
+    const resGet = await fetch(apiResource);
+    expect(resGet.status).toEqual(200);
+    await resGet.json().then((data) => {
+      expect(data.success).toEqual('get call succeed!');
+    });
+
+    // POST request
+    const resPost = await fetch(apiResource, {
+      method: 'POST',
+      body: JSON.stringify({ msg: 'hello' }),
+      headers: { 'Content-Type': 'application/json' },
+    });
+    expect(resPost.status).toEqual(200);
+    await resPost.json().then((data) => {
+      expect(data.success).toEqual('post call succeed!');
+      expect(data.body.msg).toEqual('hello');
+    });
+
+    // PUT request
+    const resPut = await fetch(apiResource, {
+      method: 'PUT',
+      body: JSON.stringify({ msg: 'hello' }),
+      headers: { 'Content-Type': 'application/json' },
+    });
+    expect(resPut.status).toEqual(200);
+    await resPut.json().then((data) => {
+      expect(data.success).toEqual('put call succeed!');
+      expect(data.body.msg).toEqual('hello');
+    });
+
+    // DELETE request
+    const resDelete = await fetch(apiResource, {
+      method: 'DELETE',
+      body: JSON.stringify({ msg: 'hello' }),
+      headers: { 'Content-Type': 'application/json' },
+    });
+    expect(resDelete.status).toEqual(200);
+    await resDelete.json().then((data) => {
+      expect(data.success).toEqual('delete call succeed!');
+    });
+  });
+});

packages/amplify-nodejs-function-template-provider/resources/lambda/serverless/app.js.ejs

@@ -9,14 +9,12 @@ See the License for the specific language governing permissions and limitations
 
 <%= props.topLevelComment %>
 
-const express = require('express')
-const bodyParser = require('body-parser')
-const awsServerlessExpressMiddleware = require('aws-serverless-express/middleware')
+const express = require('express');
+const { getCurrentInvoke } = require("@vendia/serverless-express");
 
 // declare a new express app
 const app = express()
-app.use(bodyParser.json())
-app.use(awsServerlessExpressMiddleware.eventContext())
+app.use(express.json())
 
 // Enable CORS for all methods
 app.use(function(req, res, next) {
@@ -46,12 +44,16 @@ app.get('<%= props.functionTemplate.parameters.expressPath %>/*', function(req,
 
 app.post('<%= props.functionTemplate.parameters.expressPath %>', function(req, res) {
   // Add your code here
-  res.json({success: 'post call succeed!', url: req.url, body: req.body})
+  const { event, context } = getCurrentInvoke();
+  const requestBody = JSON.parse(event.body);
+  res.json({ success: 'post call succeed!', url: req.url, body: requestBody });
 });
 
 app.post('<%= props.functionTemplate.parameters.expressPath %>/*', function(req, res) {
   // Add your code here
-  res.json({success: 'post call succeed!', url: req.url, body: req.body})
+  const { event, context } = getCurrentInvoke();
+  const requestBody = JSON.parse(event.body);
+  res.json({ success: 'post call succeed!', url: req.url, body: requestBody });
 });
 
 /****************************
@@ -60,12 +62,16 @@ app.post('<%= props.functionTemplate.parameters.expressPath %>/*', function(req,
 
 app.put('<%= props.functionTemplate.parameters.expressPath %>', function(req, res) {
   // Add your code here
-  res.json({success: 'put call succeed!', url: req.url, body: req.body})
+  const { event, context } = getCurrentInvoke();
+  const requestBody = JSON.parse(event.body);
+  res.json({ success: 'put call succeed!', url: req.url, body: requestBody });
 });
 
 app.put('<%= props.functionTemplate.parameters.expressPath %>/*', function(req, res) {
   // Add your code here
-  res.json({success: 'put call succeed!', url: req.url, body: req.body})
+  const { event, context } = getCurrentInvoke();
+  const requestBody = JSON.parse(event.body);
+  res.json({ success: 'put call succeed!', url: req.url, body: requestBody });
 });
 
 /****************************

packages/amplify-nodejs-function-template-provider/resources/lambda/serverless/event.json

@@ -1,11 +1,15 @@
 {
   "httpMethod": "POST",
-  "path": "/item",
+  "path": "/items",
   "queryStringParameters": {
     "limit": "10"
   },
   "headers": {
     "Content-Type": "application/json"
   },
-  "body": "{\"msg\":\"Hello from the event.json body\"}"
+  "body": "{'msg':'Hello from the event.json body'}",
+  "requestContext": {
+    "resourcePath": "/item",
+    "httpMethod": "POST"
+  }
 }

packages/amplify-nodejs-function-template-provider/resources/lambda/serverless/index.js

@@ -1,15 +1,10 @@
-const awsServerlessExpress = require('aws-serverless-express');
+const serverlessExpress = require('@vendia/serverless-express');
 const app = require('./app');
 
-/**
- * @type {import('http').Server}
- */
-const server = awsServerlessExpress.createServer(app);
-
 /**
  * @type {import('@types/aws-lambda').APIGatewayProxyHandler}
  */
-exports.handler = (event, context) => {
+exports.handler = async (event, context) => {
   console.log(`EVENT: ${JSON.stringify(event)}`);
-  return awsServerlessExpress.proxy(server, event, context, 'PROMISE').promise;
+  return serverlessExpress({ app })(event, context);
 };

packages/amplify-nodejs-function-template-provider/resources/lambda/serverless/package.json.ejs

@@ -5,8 +5,7 @@
   "main": "index.js",
   "license": "Apache-2.0",
   "dependencies": {
-    "aws-serverless-express": "^3.3.5",
-    "body-parser": "^1.17.1",
+    "@vendia/serverless-express": "^4.10.4",
     "express": "^4.15.2"
   },
   "devDependencies": {

packages/amplify-nodejs-function-template-provider/src/providers/serverlessProvider.ts

@@ -13,8 +13,8 @@ export function provideServerless(): Promise<FunctionTemplateParameters> {
       sourceRoot: pathToTemplateFiles,
       sourceFiles: files,
       parameters: {
-        path: '/item',
-        expressPath: '/item',
+        path: '/items',
+        expressPath: '/items',
       },
       defaultEditorFile: path.join('src', 'app.js'),
       destMap: getDstMap(files),