node-lambda 1.2.1 → 2.0.0-alpha.0

package/.github/workflows/codeql-analysis.yml

@@ -29,7 +29,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -40,7 +40,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -54,4 +54,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

package/.github/workflows/workflow.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [16.x, 18.x, 20.x]
+        node-version: [20.x, 22.x]
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -32,7 +32,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: 20.x
+        node-version: 22.x
         cache: 'npm'
     - run: node -v
     - run: npm -v

package/CHANGELOG.md

@@ -480,3 +480,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Improve testing
 - Update dependencies
 - Update README
+
+## [1.3.0] - 2024-01-04
+### Features
+- Support .mjs [#701](https://github.com/motdotla/node-lambda/pull/701)
+- Update lambda runtime list [#702](https://github.com/motdotla/node-lambda/pull/702)
+
+### Minor changes
+- Update dependencies

package/README.md

@@ -1,4 +1,4 @@
-If you found this useful, consider also checking out [dotenv-vault](https://github.com/dotenv-org/dotenv-vault). Thank you! 😇
+> If you found this useful, consider also checking out [dotenvx](https://github.com/dotenvx/dotenvx). Thank you! 😇
 
 # node-lambda
 
@@ -230,7 +230,7 @@ AWS Lambda will let you set environment variables for your function. Use the sam
 
 ## Node.js Runtime Configuration
 
-AWS Lambda now supports Node.js 18, Node.js 16 and Node.js 14. Please also check the [Lambda runtimes](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html) page.
+AWS Lambda now supports Node.js 20, Node.js 18 and Node.js 16. Please also check the [Lambda runtimes](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html) page.
 
 ## Use S3 to deploy
 

package/bin/node-lambda

@@ -2,7 +2,7 @@
 
 'use strict'
 
-require('dotenv').config()
+require('@dotenvx/dotenvx').config()
 const process = require('process')
 const path = require('path')
 

package/index_mjs.mjs

@@ -0,0 +1,9 @@
+// For development/testing purposes
+export const handler = (event, context, callback) => {
+  console.log('Running index.handler (mjs)')
+  console.log('==================================')
+  console.log('event', event)
+  console.log('==================================')
+  console.log('Stopping index.handler (mjs)')
+  callback(null)
+}

package/lib/.env.example

@@ -10,10 +10,11 @@ AWS_HANDLER=index.handler
 AWS_MEMORY_SIZE=128
 AWS_TIMEOUT=3
 AWS_DESCRIPTION=
-AWS_RUNTIME=nodejs18.x
+AWS_RUNTIME=nodejs20.x
 AWS_VPC_SUBNETS=
 AWS_VPC_SECURITY_GROUPS=
 AWS_TRACING_CONFIG=
 AWS_LOGS_RETENTION_IN_DAYS=
 EXCLUDE_GLOBS="event.json build/"
+CONFIG_FILE="deploy.env"
 PACKAGE_DIRECTORY=build

package/lib/aws.js

@@ -1,38 +1,41 @@
-'use strict'
-
-const aws = require('aws-sdk')
-const proxy = require('proxy-agent')
-
-module.exports = {
-  sdk: aws,
-  updateConfig (config, region) {
-    const awsSecurity = { region }
-
-    if (config.profile) {
-      aws.config.credentials = new aws.SharedIniFileCredentials({
-        profile: config.profile
-      })
-    } else {
-      awsSecurity.accessKeyId = config.accessKey
-      awsSecurity.secretAccessKey = config.secretKey
-    }
-
-    if (config.sessionToken) {
-      awsSecurity.sessionToken = config.sessionToken
-    }
-
-    if (config.deployTimeout) {
-      aws.config.httpOptions.timeout = parseInt(config.deployTimeout)
-    }
-
-    if (config.proxy) {
-      aws.config.httpOptions.agent = proxy(config.proxy)
-    }
-
-    if (config.endpoint) {
-      aws.config.endpoint = config.endpoint
-    }
-
-    aws.config.update(awsSecurity)
-  }
-}
+// TODO:
+// Support these option settings in SDK v3
+//
+// 'use strict'
+//
+// const aws = require('aws-sdk')
+// const proxy = require('proxy-agent')
+//
+// module.exports = {
+//   sdk: aws,
+//   updateConfig (config, region) {
+//     const awsSecurity = { region }
+//
+//     if (config.profile) {
+//       aws.config.credentials = new aws.SharedIniFileCredentials({
+//         profile: config.profile
+//       })
+//     } else {
+//       awsSecurity.accessKeyId = config.accessKey
+//       awsSecurity.secretAccessKey = config.secretKey
+//     }
+//
+//     if (config.sessionToken) {
+//       awsSecurity.sessionToken = config.sessionToken
+//     }
+//
+//     if (config.deployTimeout) {
+//       aws.config.httpOptions.timeout = parseInt(config.deployTimeout)
+//     }
+//
+//     if (config.proxy) {
+//       aws.config.httpOptions.agent = proxy(config.proxy)
+//     }
+//
+//     if (config.endpoint) {
+//       aws.config.endpoint = config.endpoint
+//     }
+//
+//     aws.config.update(awsSecurity)
+//   }
+// }

package/lib/cloudwatch_logs.js

@@ -1,15 +1,14 @@
 'use strict'
 
+const {
+  CloudWatchLogsClient,
+  CreateLogGroupCommand,
+  PutRetentionPolicyCommand
+} = require('@aws-sdk/client-cloudwatch-logs')
+
 class CloudWatchLogs {
-  constructor (aws, region) {
-    // Authenticated `aws` object in `lib/main.js`
-    this.lambda = new aws.Lambda({
-      region,
-      apiVersion: '2015-03-31'
-    })
-    this.cloudwatchlogs = new aws.CloudWatchLogs({
-      apiVersion: '2014-03-28'
-    })
+  constructor (config) {
+    this.client = new CloudWatchLogsClient(config)
   }
 
   _logGroupName (params) {
@@ -17,33 +16,24 @@ class CloudWatchLogs {
   }
 
   _createLogGroup (params) {
-    return new Promise((resolve, reject) => {
-      this.cloudwatchlogs.createLogGroup({
+    try {
+      return this.client.send(new CreateLogGroupCommand({
         logGroupName: this._logGroupName(params)
-      }, (err, data) => {
-        if (err) {
-          if (err.code === 'ResourceAlreadyExistsException') {
-            // If it exists it will result in an error but there is no problem.
-            return resolve({})
-          }
-          return reject(err)
-        }
-
-        resolve(data)
-      })
-    })
+      }))
+    } catch (err) {
+      if (err.code === 'ResourceAlreadyExistsException') {
+        // If it exists it will result in an error but there is no problem.
+        return {}
+      }
+      throw err
+    }
   }
 
   _putRetentionPolicy (params) {
-    return new Promise((resolve, reject) => {
-      this.cloudwatchlogs.putRetentionPolicy({
-        logGroupName: this._logGroupName(params),
-        retentionInDays: params.retentionInDays
-      }, (err, data) => {
-        if (err) return reject(err)
-        resolve(data)
-      })
-    })
+    return this.client.send(new PutRetentionPolicyCommand({
+      logGroupName: this._logGroupName(params),
+      retentionInDays: params.retentionInDays
+    }))
   }
 
   setLogsRetentionPolicy (params) {