misc fixes

Author: baileympearson

.github/docker/Dockerfile.musl

@@ -6,7 +6,7 @@ FROM ${PLATFORM}/node:${NODE_VERSION}-alpine AS build
 WORKDIR /zstd
 COPY . .
 
-RUN apk --no-cache add make g++ libc-dev curl bash python3 py3-pip vim cmake
+RUN apk --no-cache add make g++ libc-dev curl bash python3 py3-pip vim cmake git
 RUN npm run install:libmongocrypt
 RUN npm run prebuild
 

.github/scripts/libmongocrypt.mjs

@@ -9,7 +9,7 @@ import path from 'node:path';
 import https from 'node:https';
 import stream from 'node:stream/promises';
 import url from 'node:url';
-import { buildLibmongocryptDownloadUrl, getLibmongocryptPackageName, getLibmongocryptPrebuildName, run } from './utils.mjs';
+import { buildLibmongocryptDownloadUrl, getLibmongocryptPrebuildName, run } from './utils.mjs';
 
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 

.github/scripts/utils.mjs

@@ -55,22 +55,25 @@ export function buildLibmongocryptDownloadUrl(ref, platform) {
 }
 
 export function getLibmongocryptPrebuildName() {
-    const platformMatrix = {
-        ['darwin-arm64']: 'macos',
-        ['darwin-x64']: 'macos',
-        ['linux-ppc64']: 'rhel-71-ppc64el',
-        ['linux-s390x']: 'rhel72-zseries-test',
-        ['linux-arm64']: 'ubuntu1804-arm64',
-        ['linux-x64']: 'rhel-70-64-bit',
-        ['win32-x64']: 'windows-test'
-    };
-
-    const detectedPlatform = `${process.platform}-${process.arch}`;
-    const prebuild = platformMatrix[detectedPlatform];
-
-    if (prebuild == null) throw new Error(`Unsupported: ${detectedPlatform}`);
-
-    return prebuild;
+    const prebuildIdentifierFactory = {
+        'darwin': () => 'macos',
+        'win32': () => 'windows-test',
+        'linux': () => {
+            const key = `${getLibc()}-${process.arch}`;
+            return {
+                ['musl-x64']: 'alpine-amd64-earthly',
+                ['musl-arm64']: 'alpine-arm64-earthly',
+                ['glibc-ppc64']: 'rhel-71-ppc64el',
+                ['glibc-s390x']: 'rhel72-zseries-test',
+                ['glibc-arm64']: 'ubuntu1804-arm64',
+                ['glibc-x64']: 'rhel-70-64-bit',
+            }[key]
+        }
+    }[process.platform] ?? (() => {
+        throw new Error(`Unsupported platform`);
+    });
+
+    return prebuildIdentifierFactory();
 }
 
 /** `xtrace` style command runner, uses spawn so that stdio is inherited */
@@ -91,7 +94,7 @@ export async function run(command, args = [], options = {}) {
 /**
  * @returns the libc (`musl` or `glibc`), if the platform is linux, otherwise null.
  */
-export function getLibc() {
+function getLibc() {
     if (process.platform !== 'linux') return null;
 
     /**
@@ -111,29 +114,3 @@ export function getLibc() {
     console.error({ ldd: lddVersion() });
     return lddVersion().includes('musl') ? 'musl' : 'glibc';
 }
-
-/**
- * @returns the name of the package inside the libmognocrypt prebuild tarball for the current platform, arch and libc (if linux).
- */
-export function getLibmongocryptPackageName() {
-    const platformFactory = {
-        'darwin': () => 'macos',
-        'win32': () => 'windows-test',
-        'linux': () => {
-            const key = `${getLibc()}-${process.arch}`;
-            return {
-                ['musl-x64']: 'alpine-amd64-earthly',
-                ['musl-arm64']: 'alpine-arm64-earthly',
-                ['glibc-ppc64']: 'rhel-71-ppc64el',
-                ['glibc-s390x']: 'rhel72-zseries-test',
-                ['glibc-arm64']: 'ubuntu1804-arm64',
-                ['glibc-x64']: 'rhel-70-64-bit',
-            }[key]
-        }
-    }[process.platform] ?? (() => {
-        throw new Error('unexpected platform.')
-    });
-
-    return platformFactory();
-}
-