Merge branch 'main' into maxday/fix-cve

Author: maxday

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "."
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/test-on-push-and-pr.yml

@@ -7,50 +7,28 @@ on:
     branches: [ '*' ]
 
 jobs:
-  build:
+  unit-test:
     runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Run 'pr' target
-      run: make pr
-
-  alpine:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Run alpine integration tests
-      run: DISTRO=alpine make test-integ
-
-  amazonlinux:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Run amazonlinux integration tests
-      run: DISTRO=amazonlinux make test-integ
-
-  centos:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Run centos integration tests
-      run: DISTRO=centos make test-integ
-
-  debian:
-    runs-on: ubuntu-latest
-
+    strategy:
+      fail-fast: false
+      matrix:
+        node-version: [18, 20, 22]
+    
     steps:
-    - uses: actions/checkout@v2
-    - name: Run debian integration tests
-      run: DISTRO=debian make test-integ
+    - uses: actions/checkout@v4
+    - name: Build and run tests for Node.js ${{ matrix.node-version }}
+      run: |
+        docker build -f test/unit/Dockerfile.nodejs${{ matrix.node-version }}.x -t unit/nodejs.${{ matrix.node-version }}x .
+        docker run unit/nodejs.${{ matrix.node-version }}x
 
-  ubuntu:
+  integration-test:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        distro: [alpine, amazonlinux, centos, debian, ubuntu]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Run ubuntu integration tests
-      run: DISTRO=ubuntu make test-integ
+    - uses: actions/checkout@v4
+    - name: Run ${{ matrix.distro }} integration tests
+      run: DISTRO=${{ matrix.distro }} make test-integ

.gitignore

@@ -52,3 +52,6 @@ dist/
 deps/artifacts/
 deps/aws-lambda-cpp*/
 deps/curl*/
+
+# Local codebuild
+codebuild.*/

test/integration/codebuild/buildspec.os.debian.1.yml

@@ -17,7 +17,6 @@ batch:
             - "buster"
             - "bullseye"
           RUNTIME_VERSION:
-            - "16"
             - "18"
             - "20"
 phases:

test/integration/codebuild/buildspec.os.debian.2.yml

@@ -16,7 +16,6 @@ batch:
           DISTRO_VERSION:
             - "bookworm"
           RUNTIME_VERSION:
-            - "16"
             - "18"
             - "20"
 phases:

test/integration/codebuild/buildspec.os.ubuntu.1.yml

@@ -14,11 +14,10 @@ batch:
       env:
         variables:
           DISTRO_VERSION:
-            - "18.04"
             - "20.04"
             - "22.04"
           RUNTIME_VERSION:
-            - "16"
+            - "18"
 phases:
   pre_build:
     commands:

test/unit/Dockerfile.nodejs18.x

@@ -0,0 +1,7 @@
+FROM node:18
+RUN apt-get update
+RUN apt-get install -y cmake
+WORKDIR /tmp
+COPY . /tmp
+RUN npm install --ci
+CMD ["npm", "run", "test"]

test/unit/Dockerfile.nodejs20.x

@@ -0,0 +1,7 @@
+FROM node:20
+RUN apt-get update
+RUN apt-get install -y cmake
+WORKDIR /tmp
+COPY . /tmp
+RUN npm install --ci
+CMD ["npm", "run", "test"]

test/unit/Dockerfile.nodejs22.x

@@ -0,0 +1,7 @@
+FROM node:22
+RUN apt-get update
+RUN apt-get install -y cmake
+WORKDIR /tmp
+COPY . /tmp
+RUN npm install --ci
+CMD ["npm", "run", "test"]

test/unit/UserFunctionTest.js

@@ -262,7 +262,7 @@ describe('UserFunction.load method', () => {
     response.should.equal('Hello from extensionless CJS');
   });
 
-  it('should fail to load ESM syntax from extensionless file (no package.json)', async () => {
+  xit('should fail to load ESM syntax from extensionless file (no package.json)', async () => {
     await UserFunction.load(
       path.join(HANDLERS_ROOT, 'extensionless'),
       'esm-extensionless.handler',
@@ -280,7 +280,7 @@ describe('UserFunction.load method', () => {
     response.should.equal('Hello from extensionless CJS');
   });
 
-  it('should fail to load ESM handler from extensionless file with type:commonjs', async () => {
+  xit('should fail to load ESM handler from extensionless file with type:commonjs', async () => {
     // package.json is ignored in the case of extensionless
     await UserFunction.load(
       path.join(HANDLERS_ROOT, 'pkg', 'type-cjs'),
@@ -299,7 +299,7 @@ describe('UserFunction.load method', () => {
     response.should.equal('Hello from extensionless CJS');
   });
 
-  it('should fail to load ESM handler from extensionless file with type:module', async () => {
+  xit('should fail to load ESM handler from extensionless file with type:module', async () => {
     // package.json is ignored in the case of extensionless
     await UserFunction.load(
       path.join(HANDLERS_ROOT, 'pkg', 'type-esm'),
@@ -344,7 +344,7 @@ describe('UserFunction.load method', () => {
     );
   });
 
-  it('should fail to load ESM handler from JS file without type context', async () => {
+  xit('should fail to load ESM handler from JS file without type context', async () => {
     await UserFunction.load(
       path.join(HANDLERS_ROOT, 'pkg-less'),
       'esmModule.handler',