feat: make crypto default

Author: nbbeeken

.github/scripts/libmongocrypt.mjs

@@ -1,3 +1,4 @@
+// @ts-check
 import util from 'node:util';
 import process from 'node:process';
 import fs from 'node:fs/promises';
@@ -23,7 +24,7 @@ async function parseArguments() {
     libVersion: { short: 'l', type: 'string', default: pkg['mongodb:libmongocrypt'] },
     clean: { short: 'c', type: 'boolean', default: false },
     build: { short: 'b', type: 'boolean', default: false },
-    crypto: { type: 'boolean', default: false }, // Use Node.js builtin crypto
+    'no-crypto': { type: 'boolean', default: false }, // Use Node.js builtin crypto
     fastDownload: { type: 'boolean', default: false }, // Potentially incorrect download, only for the brave and impatient
     help: { short: 'h', type: 'boolean', default: false }
   };
@@ -41,11 +42,9 @@ async function parseArguments() {
   }
 
   return {
-    libmongocrypt: {
-      url: args.values.gitURL,
-      ref: args.values.libVersion,
-      crypto: args.values.crypto
-    },
+    url: args.values.gitURL,
+    ref: args.values.libVersion,
+    crypto: !args.values['no-crypto'],
     fastDownload: args.values.fastDownload,
     clean: args.values.clean,
     build: args.values.build
@@ -142,7 +141,7 @@ export async function buildLibMongoCrypt(libmongocryptRoot, nodeDepsRoot, option
   });
 }
 
-export async function downloadLibMongoCrypt(nodeDepsRoot, { ref, crypto }, fastDownload) {
+export async function downloadLibMongoCrypt(nodeDepsRoot, { ref, crypto, fastDownload }) {
   const downloadURL =
     ref === 'latest'
       ? 'https://mciuploads.s3.amazonaws.com/libmongocrypt/all/master/latest/libmongocrypt-all.tar.gz'
@@ -230,35 +229,36 @@ export async function downloadLibMongoCrypt(nodeDepsRoot, { ref, crypto }, fastD
 }
 
 async function main() {
-  const { libmongocrypt, build, clean, fastDownload } = await parseArguments();
+  const args = await parseArguments();
+  console.log(args);
 
   const nodeDepsDir = resolveRoot('deps');
 
-  if (build) {
+  if (args.build) {
     const libmongocryptCloneDir = resolveRoot('_libmongocrypt');
 
     const currentLibMongoCryptBranch = await fs
       .readFile(path.join(libmongocryptCloneDir, '.git', 'HEAD'), 'utf8')
       .catch(() => '');
     const isClonedAndCheckedOut = currentLibMongoCryptBranch
       .trim()
-      .endsWith(`r-${libmongocrypt.ref}`);
+      .endsWith(`r-${args.ref}`);
 
-    if (clean || !isClonedAndCheckedOut) {
-      await cloneLibMongoCrypt(libmongocryptCloneDir, libmongocrypt);
+    if (args.clean || !isClonedAndCheckedOut) {
+      await cloneLibMongoCrypt(libmongocryptCloneDir, args);
     }
 
     const libmongocryptBuiltVersion = await fs
       .readFile(path.join(libmongocryptCloneDir, 'VERSION_CURRENT'), 'utf8')
       .catch(() => '');
-    const isBuilt = libmongocryptBuiltVersion.trim() === libmongocrypt.ref;
+    const isBuilt = libmongocryptBuiltVersion.trim() === args.ref;
 
-    if (clean || !isBuilt) {
-      await buildLibMongoCrypt(libmongocryptCloneDir, nodeDepsDir, libmongocrypt);
+    if (args.clean || !isBuilt) {
+      await buildLibMongoCrypt(libmongocryptCloneDir, nodeDepsDir, args);
     }
   } else {
     // Download
-    await downloadLibMongoCrypt(nodeDepsDir, libmongocrypt, fastDownload);
+    await downloadLibMongoCrypt(nodeDepsDir, args);
   }
 
   await fs.rm(resolveRoot('build'), { force: true, recursive: true });

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build ${{ matrix.os }} Prebuild
-        run: node .github/scripts/libmongocrypt.mjs ${{ runner.os == 'Windows' && '--build' || '' }}
+        run: npm run install:libmongocrypt ${{ runner.os == 'Windows' && '-- --build' || '' }}
         shell: bash
 
       - name: Test ${{ matrix.os }}
@@ -90,11 +90,11 @@ jobs:
         uses: ./.github/actions/setup
       - name: actions/sign_and_upload_package
         uses: ./.github/actions/sign_and_upload_package
-        with: 
+        with:
           aws_role_arn: ${{ secrets.AWS_ROLE_ARN }}
           aws_region_name: 'us-east-1'
           aws_secret_id: ${{ secrets.AWS_SECRET_ID }}
           npm_package_name: 'mongodb-client-encryption'
       - run: npm publish --provenance
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/codeql.yml

@@ -46,7 +46,7 @@ jobs:
 
     - if: matrix.build-mode == 'manual'
       shell: bash
-      run: node .github/scripts/libmongocrypt.mjs
+      run: npm run install:libmongocrypt
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3