Do s3 uploading via build module

Author: durran

.evergreen.yml

@@ -1,25 +1,7 @@
 # Variables for common functions.
 #
-# upload_file: Saves a file to the Evergreen S3 bucket.
-# upload_download_center: Upload a file to the download center S3 bucket.
 # compile_and_release: Runs the exec compile and release process.
 variables:
-  - &upload_file
-    command: s3.put
-    params:
-      aws_key: ${aws_key}
-      aws_secret: ${aws_secret}
-      bucket: mciuploads
-      permissions: public-read
-      content_type: application/octet-stream
-  - &upload_download_center
-    command: s3.put
-    params:
-      aws_key: ${download_center_aws_key}
-      aws_secret: ${download_center_aws_secret}
-      bucket: info-mongodb-com
-      permissions: public-read
-      content_type: application/octet-stream
   - &compile_and_release
     command: shell.exec
     params:
@@ -29,6 +11,8 @@ variables:
         source .evergreen/.setup_env
         export SEGMENT_API_KEY=${segment_key}
         export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+        export PROJECT=${project}
+        export REVISION=${revision}
         export AWS_KEY=${aws_key}
         export AWS_SECRET=${aws_secret}
         export DOWNLOAD_CENTER_AWS_KEY=${download_center_aws_key}
@@ -100,16 +84,6 @@ functions:
         shell: bash
         script: |
           echo "################# Sign, notarise, and release MacOS artifacts ################"
-    - <<: *upload_file
-      params:
-        local_files_include_filter:
-          - src/dist/*.*
-        remote_file: ${project}/${revision}/
-    - <<: *upload_download_center
-      params:
-        local_files_include_filter:
-          - src/dist/mongosh.json
-        remote_file: com-download-center/
   release_linux:
     - <<: *compile_and_release
     - command: shell.exec
@@ -118,11 +92,6 @@ functions:
         shell: bash
         script: |
           echo "################# Sign and release Linux artifacts ################"
-    - <<: *upload_file
-      params:
-        local_files_include_filter:
-          - src/dist/*.*
-        remote_file: ${project}/${revision}/
   release_win:
     - <<: *compile_and_release
     - command: shell.exec
@@ -132,11 +101,6 @@ functions:
         script: |
           echo "################# Sign and release Windows artifacts ################"
           ls -la dist/
-    - <<: *upload_file
-      params:
-        local_files_include_filter:
-          - src/dist/*.*
-        remote_file: ${project}/${revision}/
 # Tasks will show up as the individual blocks in the Evergreen UI that can
 # pass or fail.
 #

config/build.conf.js

@@ -32,6 +32,8 @@ module.exports = {
   version: CONFIG.version,
   input: INPUT,
   outputDir: OUTPUT_DIR,
+  project: process.env.PROJECT,
+  revision: process.env.REVISION,
   evgAwsKey: process.env.AWS_KEY,
   evgAwsSecret: process.env.AWS_SECRET,
   downloadCenterAwsKey: process.env.DOWNLOAD_CENTER_AWS_KEY,

packages/build/src/download-center.spec.ts

@@ -23,8 +23,4 @@ describe('download center module', () => {
       expect(config).to.include('mongosh-1.2.2-win.zip');
     });
   });
-
-  describe('.uploadDownloadCenterConfig', () => {
-
-  });
 });

packages/build/src/download-center.ts

@@ -7,6 +7,7 @@ import { promises as fs } from 'fs';
 import handlebars from 'handlebars';
 import S3 from 'aws-sdk/clients/s3';
 <<<<<<< HEAD
+<<<<<<< HEAD
 import upload, { PUBLIC_READ } from './s3';
 
 /**
@@ -29,6 +30,9 @@ import handlebars from 'handlebars';
 =======
 import upload from './s3';
 >>>>>>> Adding s3 uploading ability into build
+=======
+import upload, { PUBLIC_READ } from './s3';
+>>>>>>> Do s3 uploading via build module
 
 /**
  * The filename in the download center.
@@ -45,11 +49,6 @@ const BUCKET = 'info-mongodb-com';
  */
 const DIRECTORY = 'com-download-center';
 
-/**
- * The default ACL.
- */
-const PUBLIC_READ = 'public-read';
-
 /**
  * The download center JSON template.
  */

packages/build/src/release.ts

@@ -13,18 +13,14 @@ import S3 from 'aws-sdk/clients/s3';
  */
 const release = async(config: Config) => {
   const platform = os.platform();
-  const evgS3 = new S3({
-    accessKeyId: config.evgAwsKey,
-    secretAccessKey: config.evgAwsSecret
-  });
 
   // 1. Build the executable.
   await compileExec(config.input, config.outputDir, platform);
 
   // 2. Sign the executable for each OS.
 
   // 3. Zip the executable.
-  await zip(config.input, config.outputDir, platform, config.version);
+  const artifact = await zip(config.input, config.outputDir, platform, config.version);
 
   // 4. Create & sign the .deb (only on linux)
   // 5. Create & sign the .rpm (only on linux)
@@ -36,7 +32,15 @@ const release = async(config: Config) => {
   // 2. Publish the .rpm (only on linux)
   // 3. Create PR for Homebrew (only on macos)
 
-  // 4. Upload artifacts to S3 for Evergreen and downloads. (Handled in .evergreen.yml)
+  // 4. Upload artifacts to S3 for Evergreen and downloads.
+  // await uploadArtifactToEvergreen(
+  //   artifact,
+  //   config.evgAwsKey,
+  //   config.evgAwsSecret,
+  //   config.project,
+  //   config.revision
+  // );
+  // await uploadArtifactToDownloads();
 
   // 5. Create Github release.
 

packages/build/src/s3.ts

@@ -1,5 +1,10 @@
 import S3 from 'aws-sdk/clients/s3';
 
+/**
+ * The default ACL.
+ */
+const PUBLIC_READ = 'public-read';
+
 /**
  * Takes a configured S3 instance and uploads its data.
  *
@@ -21,3 +26,4 @@ const upload = (params: any, s3: any): Promise<any> => {
 };
 
 export default upload;
+export { PUBLIC_READ };

packages/build/src/zip.ts

@@ -58,15 +58,18 @@ const zipWindows = async(input: string, filename: string) => {
  * @param {string} outputDir - Where to save the zip.
  * @param {string} platform - The platform.
  * @param {string} version - The version.
+ *
+ * @returns {string} The filename of the zip.
  */
-const zip = async(input: string, outputDir: string, platform: string, version: string) => {
+const zip = async(input: string, outputDir: string, platform: string, version: string): string => {
   const filename = zipPath(outputDir, platform, version);
   console.log('mongosh: zipping:', filename);
   if (platform === Platform.Windows) {
     zipWindows(input, filename);
   } else {
     zipPosix(outputDir, filename);
   }
+  return filename;
 };
 
 export default zip;