From 91b4c77185a974602ebf040767cddbd0e7c34735 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Tue, 10 Aug 2021 13:40:48 +0200 Subject: [PATCH 1/2] chore(build): only download mongocryptd for packaging MONGOSH-798 --- package-lock.json | 6 +++--- package.json | 2 +- packages/build/src/packaging/download-mongocryptd.ts | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 99f58e4479..9334d75111 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18438,9 +18438,9 @@ } }, "mongodb-download-url": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/mongodb-download-url/-/mongodb-download-url-1.0.3.tgz", - "integrity": "sha512-NLE0UHPtWf+Ci2mc+IyfTs6bF0hDbB2sOag7RSnbFbCNfz243H8CaUjgceLWUUTu5VnIVFu48RT2pVpyOnjsvQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mongodb-download-url/-/mongodb-download-url-1.1.0.tgz", + "integrity": "sha512-Y298Lb14FEOiudWBNdONNHI75ItyYSy69JidfU4YuFsKLuTroD4ergpyFzxvrmB/8WMQaUzMzOAOWdnik2/A9g==", "dev": true, "requires": { "debug": "^4.1.1", diff --git a/package.json b/package.json index 2db530e92e..a4395776e4 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "lerna": "^4.0.0", "mocha": "^7.1.2", "mongodb": "^4.1.0", - "mongodb-download-url": "^1.0.3", + "mongodb-download-url": "^1.1.0", "mongodb-js-precommit": "^2.0.0", "nock": "^13.0.11", "node-codesign": "^0.3.2", diff --git a/packages/build/src/packaging/download-mongocryptd.ts b/packages/build/src/packaging/download-mongocryptd.ts index c08c42c671..c356a48799 100644 --- a/packages/build/src/packaging/download-mongocryptd.ts +++ b/packages/build/src/packaging/download-mongocryptd.ts @@ -8,6 +8,8 @@ export async function downloadMongocrypt(variant: BuildVariant): Promise const opts: DownloadOptions = {}; opts.arch = getArch(variant); opts.distro = lookupReleaseDistro(variant); + opts.enterprise = true; + opts.cryptd = true; console.info('mongosh: downloading latest mongocryptd for inclusion in package:', JSON.stringify(opts)); const bindir = await downloadMongoDb( From d8af90bbc6a83b010d44bf0622a722b8a47d412a Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Tue, 10 Aug 2021 15:46:27 +0200 Subject: [PATCH 2/2] fixup: bump download-url dependency to include windows workaround --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9334d75111..2c675b1bdc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18438,9 +18438,9 @@ } }, "mongodb-download-url": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mongodb-download-url/-/mongodb-download-url-1.1.0.tgz", - "integrity": "sha512-Y298Lb14FEOiudWBNdONNHI75ItyYSy69JidfU4YuFsKLuTroD4ergpyFzxvrmB/8WMQaUzMzOAOWdnik2/A9g==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/mongodb-download-url/-/mongodb-download-url-1.1.1.tgz", + "integrity": "sha512-LTZcnD1By5G80DFgLEnCZhrl0TFINfcVT/iGgrjCNj7EYZjEvhtlE9Ik19Q5PebrULWqWA8cVwYtDOVBsLcPgw==", "dev": true, "requires": { "debug": "^4.1.1", diff --git a/package.json b/package.json index a4395776e4..9bcf261cef 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "lerna": "^4.0.0", "mocha": "^7.1.2", "mongodb": "^4.1.0", - "mongodb-download-url": "^1.1.0", + "mongodb-download-url": "^1.1.1", "mongodb-js-precommit": "^2.0.0", "nock": "^13.0.11", "node-codesign": "^0.3.2",