node-lambda 0.21.0 → 0.22.0

package/.github/workflows/workflow.yml

@@ -3,14 +3,13 @@ name: Node CI
 on: [push, pull_request]
 
 jobs:
-  test:
-    name: Test on node ${{ matrix.node-version }} and ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+  ubuntu-test:
+    name: Test on node ${{ matrix.node-version }} and Ubuntu
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        node-version: [12.x, 14.x, 16.x, 17.x]
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version: [14.x, 16.x, 17.x]
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
@@ -22,3 +21,22 @@ jobs:
     - run: npm -v
     - run: npm ci
     - run: npm test
+
+  mac-and-windows-test:
+    name: Test on node latest and ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest, macos-latest]
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: 16.x
+        cache: 'npm'
+    - run: npm i -g npm
+    - run: node -v
+    - run: npm -v
+    - run: npm ci
+    - run: npm test

package/CHANGELOG.md

@@ -444,3 +444,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [0.21.0] - 2021-11-10
 ### Features
 - feat: support for yarn [#581](https://github.com/motdotla/node-lambda/pull/581)
+
+## [0.22.0] - 2022-02-17
+### Features
+- Support for Architectures parameter [#591](https://github.com/motdotla/node-lambda/pull/591)
+### Bugfixes
+- fix: skip installing the package, when there is no `package.json` [#589](https://github.com/motdotla/node-lambda/pull/589)

package/README.md

@@ -81,6 +81,7 @@ AWS_ROLE_ARN || AWS_ROLE   // (default: 'missing')
 AWS_MEMORY_SIZE            // (default: 128)
 AWS_TIMEOUT                // (default: 60)
 AWS_RUN_TIMEOUT            // (default: 3)
+AWS_ARCHITECTURE           // (default: 'x86_64')
 AWS_DESCRIPTION            // (default: package.json.description or '')
 AWS_RUNTIME                // (default: 'nodejs14.x')
 AWS_PUBLISH                // (default: false)
@@ -179,6 +180,7 @@ Options:
   -o, --role [AWS_ROLE]                                 Amazon Role ARN (default: "missing")
   -m, --memorySize [AWS_MEMORY_SIZE]                    Lambda Memory Size (default: 128)
   -t, --timeout [AWS_TIMEOUT]                           Lambda Timeout (default: 60)
+  --architecture [AWS_ARCHITECTURE]                     The instruction set architecture that the function supports.  (x86_64|arm64) (default: "x86_64")
   -d, --description [AWS_DESCRIPTION]                   Lambda Description (default: "Command line tool for locally running and remotely deploying your node.js applications to Amazon Lambda.")
   -u, --runtime [AWS_RUNTIME]                           Lambda Runtime (default: "nodejs14.x")
   -p, --publish [AWS_PUBLISH]                           Lambda Publish (default: false)
@@ -221,6 +223,31 @@ AWS Lambda will let you set environment variables for your function. Use the sam
 
 AWS Lambda now supports Node.js14 and Node.js 12. Please also check the [Lambda runtimes](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html) page.
 
+## Use S3 to deploy
+
+Use the command line argument `--deployUseS3` or `-B`.  (This option is true/false.)
+Example: `% node-lambda deploy -B`
+
+You can also set the environment variable `DEPLOY_USE_S3`.
+Example: `DEPLOY_USE_S3=true`
+
+Use the environment variable to set the bucket name or S3 key prefix.
+The environment variable name is different for each region. Please set it to the environment variable you want to deploy.
+It can be set in `.env`.
+
+Example:
+
+```sh
+# S3_<region>_BUCKET
+S3_US_WEST_1_BUCKET=test_aaa
+
+# S3_<region>_PREFIX
+S3_US_WEST_1_PREFIX=bbb
+```
+
+In this case, the S3 key:
+`test_aaa/bbb/deploy-package-${FunctionName}.zip`
+
 ## To deploy a container image to Lambda
 
 1. [Pushing a Docker image to ECR](https://docs.aws.amazon.com/AmazonECR/latest/userguide/docker-push-ecr-image.html)

package/bin/node-lambda

@@ -3,6 +3,7 @@
 'use strict'
 
 require('dotenv').config()
+const process = require('process')
 const path = require('path')
 
 const lambda = require(path.join(__dirname, '..', 'lib', 'main.js'))
@@ -28,6 +29,7 @@ const AWS_ROLE = process.env.AWS_ROLE_ARN || process.env.AWS_ROLE || 'missing'
 const AWS_MEMORY_SIZE = process.env.AWS_MEMORY_SIZE || 128
 const AWS_TIMEOUT = process.env.AWS_TIMEOUT || 60
 const AWS_RUN_TIMEOUT = process.env.AWS_RUN_TIMEOUT || 3
+const AWS_ARCHITECTURE = process.env.AWS_ARCHITECTURE || 'x86_64'
 const AWS_DESCRIPTION = process.env.AWS_DESCRIPTION || packageJson.description || ''
 const AWS_RUNTIME = process.env.AWS_RUNTIME || 'nodejs14.x'
 const AWS_PUBLISH = process.env.AWS_PUBLISH || false
@@ -62,8 +64,6 @@ const DOCKER_VOLUMES = process.env.DOCKER_VOLUMES || ''
 const AWS_TAGS = process.env.AWS_TAGS || ''
 const IMAGE_URI = process.env.IMAGE_URI || ''
 
-program.showSuggestionAfterError()
-
 program
   .command('deploy')
   .description('Deploy your application to Amazon Lambda')
@@ -82,6 +82,7 @@ program
   .option('-o, --role [AWS_ROLE]', 'Amazon Role ARN', AWS_ROLE)
   .option('-m, --memorySize [AWS_MEMORY_SIZE]', 'Lambda Memory Size', AWS_MEMORY_SIZE)
   .option('-t, --timeout [AWS_TIMEOUT]', 'Lambda Timeout', AWS_TIMEOUT)
+  .option('--architecture [AWS_ARCHITECTURE]', 'The instruction set architecture that the function supports. (x86_64|arm64)', AWS_ARCHITECTURE)
   .option('-d, --description [AWS_DESCRIPTION]', 'Lambda Description', AWS_DESCRIPTION)
   .option('-u, --runtime [AWS_RUNTIME]', 'Lambda Runtime', AWS_RUNTIME)
   .option('-p, --publish [AWS_PUBLISH]', 'Lambda Publish', AWS_PUBLISH)

package/lib/main.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const process = require('process')
 const path = require('path')
 const os = require('os')
 const aws = require(path.join(__dirname, 'aws'))
@@ -215,6 +216,7 @@ Emulate only the body of the API Gateway event.
       Description: program.description,
       MemorySize: program.memorySize,
       Timeout: program.timeout,
+      Architectures: program.architecture ? [program.architecture] : ['x86_64'],
       Publish: (() => {
         if (typeof program.publish === 'boolean') {
           return program.publish
@@ -429,6 +431,11 @@ Emulate only the body of the API Gateway event.
   }
 
   _packageInstall (program, codeDirectory) {
+    if (!fs.existsSync(path.join(codeDirectory, 'package.json'))) {
+      console.log('Skip the installation of the package. (Because package.json is not found.)')
+      return
+    }
+
     // Run on windows:
     // https://nodejs.org/api/child_process.html#child_process_spawning_bat_and_cmd_files_on_windows
 
@@ -605,7 +612,8 @@ Emulate only the body of the API Gateway event.
   async _uploadExisting (lambda, params) {
     const functionCodeParams = Object.assign({
       FunctionName: params.FunctionName,
-      Publish: params.Publish
+      Publish: params.Publish,
+      Architectures: params.Architectures
     }, params.Code)
 
     const functionConfigParams = {
@@ -729,7 +737,9 @@ they may not work as expected in the Lambda environment.
     if (!program.keepNodeModules) {
       console.log('=> Running package install')
       const usedPackageManager = await this._packageInstall(program, codeDirectory)
-      console.log(`(Package manager used was '${usedPackageManager}'.)`)
+      if (usedPackageManager) {
+        console.log(`(Package manager used was '${usedPackageManager}'.)`)
+      }
     }
     await this._postInstallScript(program, codeDirectory)
     console.log('=> Zipping deployment package')

package/lib/s3_deploy.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const process = require('process')
 const crypto = require('crypto')
 // https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#createBucket-property
 const S3_LOCATION_POSSIBLE_VALUES = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-lambda",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Command line tool for locally running and remotely deploying your node.js applications to Amazon Lambda.",
   "main": "lib/main.js",
   "directories": {
@@ -31,26 +31,26 @@
   "readmeFilename": "README.md",
   "author": "motdotla",
   "license": "BSD-2-Clause",
-  "devDependencies": {
-    "aws-sdk-mock": "^5.2.1",
-    "chai": "^4.3.4",
-    "mocha": "^9.0.1",
-    "node-zip": "^1.1.1",
-    "standard": "^16.0.3"
-  },
   "engines": {
     "node": ">= 10.0.0"
   },
   "dependencies": {
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.936.0",
-    "aws-xray-sdk-core": "^3.3.3",
-    "commander": "^8.2.0",
+    "aws-sdk": "^2.1074.0",
+    "aws-xray-sdk-core": "^3.3.4",
+    "commander": "^9.0.0",
     "continuation-local-storage": "^3.2.1",
-    "dotenv": "^10.0.0",
+    "dotenv": "^16.0.0",
     "fs-extra": "^10.0.0",
-    "klaw": "^3.0.0",
-    "minimatch": "^3.0.4",
+    "klaw": "^4.0.1",
+    "minimatch": "^5.0.0",
     "proxy-agent": "^5.0.0"
+  },
+  "devDependencies": {
+    "aws-sdk-mock": "^5.6.2",
+    "chai": "^4.3.6",
+    "mocha": "^9.2.0",
+    "node-zip": "^1.1.1",
+    "standard": "^16.0.4"
   }
 }

package/test/main.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const process = require('process')
 const path = require('path')
 const os = require('os')
 const fs = require('fs-extra')
@@ -133,8 +134,8 @@ const _awsRestore = () => {
 describe('lib/main', function () {
   if (['win32', 'darwin'].includes(process.platform)) {
     // It seems that it takes time for file operation in Windows and Mac.
-    // So set `timeout(60000)` for the whole test.
-    this.timeout(60000)
+    // So set `timeout(120000)` for the whole test.
+    this.timeout(120000)
   }
 
   let aws = null // mock
@@ -150,7 +151,7 @@ describe('lib/main', function () {
   })
 
   it('version should be set', () => {
-    assert.equal(lambda.version, '0.21.0')
+    assert.equal(lambda.version, '0.22.0')
   })
 
   describe('_codeDirectory', () => {
@@ -740,6 +741,9 @@ describe('lib/main', function () {
       const packageJson = require(packageJsonPath)
       packageJson.optionalDependencies = { npm: '*' }
       fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson))
+
+      // Remove package-lock.json because it does not match the package.json to which optionalDependencies was added.
+      fs.removeSync(path.join(codeDirectory, 'package-lock.json'))
     }
 
     const testOptionalDependenciesIsInstalled = async (packageManager) => {

package/test/node-lambda.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const assert = require('chai').assert
+const process = require('process')
 const path = require('path')
 const fs = require('fs-extra')
 const spawn = require('child_process').spawn

package/test/s3_deploy.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const { assert } = require('chai')
+const process = require('process')
 const path = require('path')
 const aws = require('aws-sdk-mock')
 aws.setSDK(path.resolve('node_modules/aws-sdk'))