Add nodejs16.x runtime (#14)

Author: ofhouse

.github/workflows/CI.yml

@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: '14'
           cache: 'yarn'
 
       - name: Install dependencies
@@ -25,7 +25,7 @@ jobs:
         run: yarn build
 
       - name: Upload build artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: dist
           path: dist/
@@ -46,11 +46,11 @@ jobs:
           brew install aws-sam-cli
           sam --version
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: '14'
           cache: 'yarn'
 
       - name: Install dependencies
@@ -68,14 +68,14 @@ jobs:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 25
 
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
 
       - name: Download build artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: dist
           path: dist

.github/workflows/lint.yml

@@ -12,12 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: '14'
           cache: 'yarn'
 
       - name: Install Dependencies

README.md

@@ -41,7 +41,7 @@ const lambdaSAM = await generateAPISAM({
     first: {
       filename: 'lambda.zip',
       handler: 'handler.handler',
-      runtime: 'nodejs14.x',
+      runtime: 'nodejs16.x',
       route: '/test',
       method: 'get',
     },

lib/SAMTemplate.ts

@@ -22,7 +22,7 @@ const defaultFunctionProperties: Pick<
   PartialServerLessFunctionProps
 > = {
   MemorySize: 128, // in mb
-  Runtime: 'nodejs14.x',
+  Runtime: 'nodejs16.x',
   Timeout: 30, // in seconds
 };
 

lib/generateProxyModel.ts

@@ -1,16 +1,17 @@
-import * as path from 'path';
 import * as fs from 'fs';
-import { dirSync as tmpDir } from 'tmp';
-import { stringify as yaml } from 'yaml';
-import { Lambda as AWSLambda } from 'aws-sdk';
+import { createServer } from 'http';
+import * as path from 'path';
+import { URL } from 'url';
+
 import {
   CloudFrontRequest,
   CloudFrontRequestEvent,
   CloudFrontResultResponse,
 } from 'aws-lambda';
+import { Lambda as AWSLambda } from 'aws-sdk';
 import getPort from 'get-port';
-import http from 'http';
-import { URL } from 'url';
+import { dirSync as tmpDir } from 'tmp';
+import { stringify as yaml } from 'yaml';
 
 import { SAMLocalLambadCLIOptions, SAMTemplate } from './types';
 import { getLocalIpAddressFromHost, unzipToLocation } from './utils';
@@ -26,7 +27,7 @@ const LambdaFunctionName = 'proxy';
 interface Props {
   pathToProxyPackage: string;
   proxyConfig: string;
-  runtime?: 'nodejs12.x' | 'nodejs14.x';
+  runtime?: 'nodejs12.x' | 'nodejs14.x' | 'nodejs16.x';
   onData?: (data: any) => void;
   onError?: (data: any) => void;
   cliOptions?: SAMLocalLambadCLIOptions;
@@ -93,7 +94,7 @@ export async function generateProxySAM({
   let portProxyConfig: number;
   // Simple HTTP server to serve the proxy config
   // https://stackoverflow.com/a/44188852/831465
-  const serverProxyConfig = http.createServer((_req, res) => {
+  const serverProxyConfig = createServer((_req, res) => {
     res.writeHead(200);
     res.end(proxyConfig);
   });

lib/types.ts

@@ -1,3 +1,5 @@
+type LambdaRuntime = 'nodejs12.x' | 'nodejs14.x' | 'nodejs16.x';
+
 export interface ServerLessFunctionAPIEvent {
   Type: 'Api' | 'HttpApi';
   Properties: {
@@ -12,7 +14,7 @@ export interface ServerLessFunction {
   Type: 'AWS::Serverless::Function';
   Properties: {
     Handler: string;
-    Runtime: 'nodejs12.x' | 'nodejs14.x';
+    Runtime: LambdaRuntime;
     MemorySize: number;
     Timeout: number;
     Description?: string;
@@ -34,7 +36,7 @@ export interface SAMTemplate {
 
 export interface ConfigLambda {
   handler: string;
-  runtime: 'nodejs12.x' | 'nodejs14.x';
+  runtime: LambdaRuntime;
   filename: string;
   route?: string;
   routes?: Record<string, string>;

package.json

@@ -14,7 +14,7 @@
     "fix:prettier": "prettier --write ."
   },
   "dependencies": {
-    "aws-sdk": "^2.804.0",
+    "aws-sdk": "^2.1055.0",
     "change-case": "^4.1.2",
     "get-port": "^5.1.1",
     "node-fetch": "^2.6.7",
@@ -23,16 +23,16 @@
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@tsconfig/node12": "^1.0.9",
-    "@types/archiver": "^5.1.1",
+    "@tsconfig/node14": "^1.0.1",
+    "@types/archiver": "^5.3.1",
     "@types/aws-lambda": "^8.10.71",
     "@types/jest": "^27.0.1",
     "@types/node": "^12.0.0",
     "@types/node-fetch": "^2.5.8",
     "@types/rimraf": "^3.0.2",
     "@types/tmp": "^0.2.0",
     "@types/unzipper": "^0.10.3",
-    "archiver": "^5.3.0",
+    "archiver": "^5.3.1",
     "jest": "^27.1.0",
     "prettier": "^2.2.1",
     "rimraf": "^3.0.2",
@@ -43,6 +43,6 @@
     "dist/**/*"
   ],
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=14.0.0"
   }
 }

test/api-gateway.test.ts

@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 
-import rimraf from 'rimraf';
+import { sync as rimrafSync } from 'rimraf';
 
 import { APISAMGenerator } from '../lib/index';
 import { generateAPISAM } from '../lib/index';
@@ -30,7 +30,7 @@ describe('integration:Api-Gateway', () => {
           first: {
             filename: 'first.zip',
             handler: 'handler.handler',
-            runtime: 'nodejs14.x',
+            runtime: 'nodejs16.x',
             route,
             method: 'get',
           },
@@ -48,7 +48,7 @@ describe('integration:Api-Gateway', () => {
 
     afterAll(async () => {
       await lambdaSAM.stop();
-      rimraf.sync(tmpdir);
+      rimrafSync(tmpdir);
     });
 
     test('Invoke through API Gateway', async () => {

test/event.test.ts

@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 
-import rimraf from 'rimraf';
+import { sync as rimrafSync } from 'rimraf';
 
 import { LocalSAMGenerator } from '../lib/index';
 import { generateLocalSAM } from '../lib/index';
@@ -30,7 +30,7 @@ describe('integration:Event', () => {
           [functionName]: {
             filename: 'first.zip',
             handler: 'handler.handler',
-            runtime: 'nodejs14.x',
+            runtime: 'nodejs16.x',
           },
         },
         cwd: tmpdir,
@@ -47,7 +47,7 @@ describe('integration:Event', () => {
 
     afterAll(async () => {
       await lambdaSAM.stop();
-      rimraf.sync(tmpdir);
+      rimrafSync(tmpdir);
     });
 
     test('Invoke through AWS SDK', async () => {

tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "@tsconfig/node12/tsconfig.json",
+  "extends": "@tsconfig/node14/tsconfig.json",
   "compilerOptions": {
     "outDir": "dist",
     "declaration": true

yarn.lock

@@ -506,15 +506,15 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
-"@tsconfig/node12@^1.0.9":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c"
-  integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==
+"@tsconfig/node14@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2"
+  integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==
 
-"@types/archiver@^5.1.1":
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/@types/archiver/-/archiver-5.1.1.tgz#d6d7610de4386b293abd5c1cb1875e0a4f4e1c30"
-  integrity sha512-heuaCk0YH5m274NOLSi66H1zX6GtZoMsdE6TYFcpFFjBjg0FoU4i4/M/a/kNlgNg26Xk3g364mNOYe1JaiEPOQ==
+"@types/archiver@^5.3.1":
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/@types/archiver/-/archiver-5.3.1.tgz#02991e940a03dd1a32678fead4b4ca03d0e387ca"
+  integrity sha512-wKYZaSXaDvTZuInAWjCeGG7BEAgTWG2zZW0/f7IYFcoHB2X2d9lkVFnrOlXl3W6NrvO6Ml3FLLu8Uksyymcpnw==
   dependencies:
     "@types/glob" "*"
 
@@ -753,13 +753,13 @@ archiver-utils@^2.1.0:
     normalize-path "^3.0.0"
     readable-stream "^2.0.0"
 
-archiver@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz#dd3e097624481741df626267564f7dd8640a45ba"
-  integrity sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg==
+archiver@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.1.tgz#21e92811d6f09ecfce649fbefefe8c79e57cbbb6"
+  integrity sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==
   dependencies:
     archiver-utils "^2.1.0"
-    async "^3.2.0"
+    async "^3.2.3"
     buffer-crc32 "^0.2.1"
     readable-stream "^3.6.0"
     readdir-glob "^1.0.0"
@@ -773,25 +773,25 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-async@^3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz#d3274ec66d107a47476a4c49136aacdb00665fc8"
-  integrity sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==
+async@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
+  integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-aws-sdk@^2.804.0:
-  version "2.884.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.884.0.tgz#dd82338bb2c26201c59ac799abec3d6db51cbe21"
-  integrity sha512-+rhzq7zmntsj4VJRUf0v6ri9vw3dYroy9BbRtbxLHILdnSFPkoqMcodr/pwcUSO5kYEYbCG7mxr5/R2a+cfbxQ==
+aws-sdk@^2.1055.0:
+  version "2.1139.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1139.0.tgz#8800d6cff33663f5d226f1cc51cdd83bd46d7ffe"
+  integrity sha512-aLmdIhIQuOdbf6F/QJCHm3xfr+9Esh9vWxZmOi54iEOcfHuO48VEEfa2A6NXb2JmUtWGB5AX80ssp6F90bhA6g==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
     ieee754 "1.1.13"
-    jmespath "0.15.0"
+    jmespath "0.16.0"
     querystring "0.2.0"
     sax "1.2.1"
     url "0.10.3"
@@ -2127,10 +2127,10 @@ jest@^27.1.0:
     import-local "^3.0.2"
     jest-cli "^27.1.0"
 
-jmespath@0.15.0:
-  version "0.15.0"
-  resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
-  integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=
+jmespath@0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076"
+  integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==
 
 js-tokens@^4.0.0:
   version "4.0.0"