Merge remote-tracking branch 'origin/main' into 1.33-releases

Author: gribnoysup

package-lock.json

@@ -28,8 +28,11 @@ const root = path.resolve(__dirname, '..', '..', '..');
 
 async function checkAssetsExist(paths) {
   await Promise.all(
-    paths.map((assetPath) => {
-      return fs.stat(assetPath);
+    paths.map(async(assetPath) => {
+      const stats = await fs.stat(assetPath);
+      if (!stats.isFile()) {
+        throw new TypeError(`Not a file at path ${assetPath}`);
+      }
     })
   );
   return true;

packages/hadron-build/commands/upload.js

@@ -1,5 +1,6 @@
 /* eslint-disable valid-jsdoc */
 const fs = require('fs');
+const path = require('path');
 const { DownloadCenter } = require('@mongodb-js/dl-center');
 const download = require('download');
 
@@ -50,15 +51,21 @@ const uploadManifest = async(manifest) => {
   return dlCenter.uploadConfig(MANIFEST_OBJECT_KEY, manifest);
 };
 
-const downloadAssetFromEvergreen = async({ name, path: dest }) => {
-  requireEnvironmentVariables([
-    'EVERGREEN_BUCKET_NAME',
-    'EVERGREEN_BUCKET_KEY_PREFIX'
-  ]);
-  const bucket = process.env.EVERGREEN_BUCKET_NAME;
-  const key = `${process.env.EVERGREEN_BUCKET_KEY_PREFIX}/${name}`;
-  const url = `https://${bucket}.s3.amazonaws.com/${key}`;
-  return await download(url, dest);
+const downloadAssetFromEvergreen = ({ name, path: dest }) => {
+  return new Promise(async(resolve, reject) => {
+    requireEnvironmentVariables([
+      'EVERGREEN_BUCKET_NAME',
+      'EVERGREEN_BUCKET_KEY_PREFIX'
+    ]);
+    const bucket = process.env.EVERGREEN_BUCKET_NAME;
+    const key = `${process.env.EVERGREEN_BUCKET_KEY_PREFIX}/${name}`;
+    const url = `https://${bucket}.s3.amazonaws.com/${key}`;
+    const stream = download(url);
+    await fs.promises.mkdir(path.dirname(dest), { recursive: true });
+    stream.pipe(fs.createWriteStream(dest));
+    stream.on('end', resolve);
+    stream.on('error', reject);
+  });
 };
 
 module.exports = {