Merge branch 'main' into dependabot/npm_and_yarn/development-dependencies-03205ff13a

durran · web-flow · commit 207e63681702 · 2025-10-29T13:32:54.000+01:00
diff --git a/.github/docker/Dockerfile.glibc b/.github/docker/Dockerfile.glibc
@@ -1,4 +1,4 @@
-FROM ubuntu:noble AS build
+FROM redhat/ubi8 AS build
 
 ARG NODE_VERSION=20.19.0
 # Possible values: s390x, arm64, x64
@@ -10,7 +10,7 @@ ENV PATH=$PATH:/nodejs/bin
 WORKDIR /mongodb-client-encryption
 COPY . .
 
-RUN apt-get -qq update && apt-get -qq install -y python3 build-essential git && ldd --version
+RUN yum install -y python39 git make gcc-c++
 
 RUN npm run install:libmongocrypt
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
         os: [macos-latest, windows-2022]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Build ${{ matrix.os }} Prebuild
         run: node .github/scripts/libmongocrypt.mjs ${{ runner.os == 'Windows' && '--build' || '' }}
@@ -42,7 +42,7 @@ jobs:
       matrix:
         linux_arch: [s390x, arm64, amd64]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -77,7 +77,7 @@ jobs:
         linux_arch: [amd64, arm64]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -34,7 +34,7 @@ jobs:
             sourceDirectory: "./src"
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -16,10 +16,10 @@ jobs:
         lint-target: ["c++", "typescript"]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Use Node.js LTS
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v5
       with:
         node-version: 'lts/*'
         cache: 'npm'
diff --git a/.github/workflows/release_6.1.yml b/.github/workflows/release_6.1.yml
@@ -36,20 +36,20 @@ jobs:
     environment: release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install Node and dependencies
-        uses: mongodb-labs/drivers-github-tools/node/setup@v2
+        uses: mongodb-labs/drivers-github-tools/node/setup@v3
         with:
           ignore_install_scripts: true
 
       - name: Load version and package info
-        uses: mongodb-labs/drivers-github-tools/node/get_version_info@v2
+        uses: mongodb-labs/drivers-github-tools/node/get_version_info@v3
         with:
           npm_package_name: mongodb-client-encryption
 
       - name: actions/compress_sign_and_upload
-        uses: mongodb-labs/drivers-github-tools/node/sign_node_package@v2
+        uses: mongodb-labs/drivers-github-tools/node/sign_node_package@v3
         with:
           aws_role_arn: ${{ secrets.AWS_ROLE_ARN }}
           aws_region_name: us-east-1
@@ -66,13 +66,13 @@ jobs:
       # only used for mongodb-client-encryption
       - name: Augment SBOM and copy to release assets
         if: ${{ 'mongodb-client-encryption-6.1' != '' }}
-        uses: mongodb-labs/drivers-github-tools/sbom@v2
+        uses: mongodb-labs/drivers-github-tools/sbom@v3
         with:
           silk_asset_group: 'mongodb-client-encryption-6.1'
           sbom_file_name: sbom.json
 
       - name: Generate authorized pub report
-        uses: mongodb-labs/drivers-github-tools/full-report@v2
+        uses: mongodb-labs/drivers-github-tools/full-report@v3
         with:
           release_version: ${{ env.package_version }}
           product_name: mongodb-client-encryption
@@ -82,7 +82,7 @@ jobs:
           token: ${{ github.token }}
           sbom_file_name: sbom.json
 
-      - uses: mongodb-labs/drivers-github-tools/upload-s3-assets@v2
+      - uses: mongodb-labs/drivers-github-tools/upload-s3-assets@v3
         with:
           version: ${{ env.package_version }}
           product_name: mongodb-client-encryption
@@ -93,14 +93,14 @@ jobs:
     environment: release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install Node and dependencies
-        uses: mongodb-labs/drivers-github-tools/node/setup@v2
+        uses: mongodb-labs/drivers-github-tools/node/setup@v3
         with:
           ignore_install_scripts: true
 
-      - run: npm publish --provenance
+      - run: npm publish --provenance --tag alpha
         if: ${{ needs.release_please.outputs.release_created }}
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,9 +16,9 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version: ${{ matrix.node }}
           cache: "npm"
@@ -40,9 +40,9 @@ jobs:
         node: [20.19.0, 22.x]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version: ${{ matrix.node }}
 
@@ -78,9 +78,9 @@ jobs:
         node: [20.19.0, 22.x]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version: ${{ matrix.node }}
 
diff --git a/.github/workflows/webpack.yml b/.github/workflows/webpack.yml
@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Use Node.js LTS
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v5
       with:
         node-version: 'lts/*'
 
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "6.5.0"
+  ".": "7.0.0-alpha.1"
 }
diff --git a/HISTORY.md b/HISTORY.md
@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [7.0.0-alpha.1](https://github.com/mongodb-js/mongodb-client-encryption/compare/v7.0.0-alpha...v7.0.0-alpha.1) (2025-10-02)
+
+
+### Bug Fixes
+
+* **NODE-7225:** build glibc prebuilds on platforms with libc 2.28 ([#105](https://github.com/mongodb-js/mongodb-client-encryption/issues/105)) ([503df19](https://github.com/mongodb-js/mongodb-client-encryption/commit/503df1929c94a1768a5f7194338c6c85d8139df4))
+
+## [7.0.0-alpha](https://github.com/mongodb-js/mongodb-client-encryption/compare/v6.5.0...v7.0.0-alpha) (2025-10-01)
+
+
+### ⚠ BREAKING CHANGES
+
+* **NODE-6297:** Remove support for explicitly providing CryptoCallbacks ([#103](https://github.com/mongodb-js/mongodb-client-encryption/issues/103))
+* **NODE-7212:** upgrade macos deployment target to 11 ([#99](https://github.com/mongodb-js/mongodb-client-encryption/issues/99))
+* **NODE-7168:** increase napi version to 9 ([#93](https://github.com/mongodb-js/mongodb-client-encryption/issues/93))
+* **NODE-7170:** drop support for Nodejs <20.19.0 ([#92](https://github.com/mongodb-js/mongodb-client-encryption/issues/92))
+
+### Features
+
+* **NODE-6297:** Remove support for explicitly providing CryptoCallbacks ([#103](https://github.com/mongodb-js/mongodb-client-encryption/issues/103)) ([036d901](https://github.com/mongodb-js/mongodb-client-encryption/commit/036d901bd0a0d1e1b29264b17223021e1975172f))
+* **NODE-7043:** add support for custom error wrapping functions ([#102](https://github.com/mongodb-js/mongodb-client-encryption/issues/102)) ([7f0be63](https://github.com/mongodb-js/mongodb-client-encryption/commit/7f0be6317ca9355bc12fe411eb686ad572cd7fed))
+* **NODE-7168:** increase napi version to 9 ([#93](https://github.com/mongodb-js/mongodb-client-encryption/issues/93)) ([be138a9](https://github.com/mongodb-js/mongodb-client-encryption/commit/be138a9022d8ae0c7fd7b8cb16561fd2f8f9db89))
+* **NODE-7170:** drop support for Nodejs &lt;20.19.0 ([#92](https://github.com/mongodb-js/mongodb-client-encryption/issues/92)) ([c46c1b9](https://github.com/mongodb-js/mongodb-client-encryption/commit/c46c1b944c97ecc8e668f87055a8df7cf533ed54))
+* **NODE-7212:** upgrade macos deployment target to 11 ([#99](https://github.com/mongodb-js/mongodb-client-encryption/issues/99)) ([aa61a35](https://github.com/mongodb-js/mongodb-client-encryption/commit/aa61a35f5e174cd1c1e247e036093e18c88268c6))
+
 ## [6.5.0](https://github.com/mongodb-js/mongodb-client-encryption/compare/v6.4.0...v6.5.0) (2025-08-14)
 
 
diff --git a/README.md b/README.md
@@ -90,7 +90,7 @@ Only suitable for local development:
 Below are the platforms that are available as prebuilds on each github release.
 `prebuild-install` downloads these automatically depending on the platform you are running npm install on.
 
-- Linux GLIBC 2.23 or later
+- Linux GLIBC 2.28 or later
     - s390x
     - arm64
     - x64
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mongodb-client-encryption",
-  "version": "6.5.0",
+  "version": "7.0.0-alpha.1",
   "description": "Official client encryption module for the MongoDB Node.js driver",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -61,7 +61,7 @@
     "prebuild": "^13.0.1",
     "prettier": "^3.6.2",
     "semver": "^7.7.2",
-    "sinon": "^20.0.0",
+    "sinon": "^21.0.0",
     "sinon-chai": "^3.7.0",
     "source-map-support": "^0.5.21",
     "standard-version": "^9.5.0",
diff --git a/release-please-config.json b/release-please-config.json
@@ -7,8 +7,11 @@
       "release-type": "node",
       "bump-minor-pre-major": false,
       "bump-patch-for-minor-pre-major": false,
-      "draft": false
+      "draft": false,
+      "prerelease-type": "alpha",
+      "prerelease": true,
+      "versioning": "prerelease"
     }
   },
   "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
-}
+}
diff --git a/src/bindings.ts b/src/bindings.ts
@@ -64,6 +64,9 @@ export interface IMongoCryptContext {
   get state(): number;
 }
 
+/**
+ * All options that can be provided to a C++ MongoCrypt constructor.
+ */
 export type MongoCryptConstructorOptions = {
   kmsProviders?: Uint8Array;
   schemaMap?: Uint8Array;
@@ -132,7 +135,7 @@ export type ExplicitEncryptionContextOptions = NonNullable<
   Parameters<IMongoCrypt['makeExplicitEncryptionContext']>[1]
 >;
 export type DataKeyContextOptions = NonNullable<Parameters<IMongoCrypt['makeDataKeyContext']>[1]>;
-export type MongoCryptOptions = MongoCryptConstructorOptions;
+export type MongoCryptOptions = Omit<MongoCryptConstructorOptions, 'cryptoCallbacks'>;
 export type MongoCryptErrorWrapper = MongoCryptOptions['errorWrapper'];
 
 // export const
diff --git a/src/index.ts b/src/index.ts
@@ -96,10 +96,7 @@ export class MongoCrypt implements IMongoCrypt {
   constructor(options: MongoCryptOptions) {
     // Pass in JS cryptoCallbacks implementation by default.
     // If the Node.js openssl version is supported this will be ignored.
-    this.mc = new mc.MongoCrypt(
-      // @ts-expect-error: intentionally passing in an argument that will throw to preserve existing behavior
-      options == null || typeof options !== 'object' ? undefined : { cryptoCallbacks, ...options }
-    );
+    this.mc = new mc.MongoCrypt({ cryptoCallbacks, ...options });
 
     this.errorWrapper = options.errorWrapper;
 
diff --git a/test/unit/glibc.test.ts b/test/unit/glibc.test.ts
@@ -0,0 +1,21 @@
+import { expect } from 'chai';
+import { execSync } from 'child_process';
+
+describe('glibc requirements', function () {
+  let lddOutput: string;
+  beforeEach(function () {
+    if (process.platform !== 'linux') return this.skip();
+
+    try {
+      lddOutput = execSync('ldd --version', { encoding: 'utf8' });
+    } catch {
+      this.skip();
+    }
+
+    return;
+  });
+
+  it('glibc is 2.28', function () {
+    expect(lddOutput).to.contain('2.28');
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- ".": "6.5.0"`
	`2`	`+ ".": "7.0.0-alpha.1"`
`3`	`3`	`}`