Merge pull request #59 from skerschb/varsha804-DOCSP-7636

Varsha804 docsp 7636

Author: skerschb

worker/.eslintrc.json

@@ -0,0 +1,20 @@
+{
+    "env": {
+        "commonjs": true,
+        "es6": true,
+        "node": true,
+	"jest": true
+    },
+    "extends": "eslint:recommended",
+    "globals": {
+        "Atomics": "readonly",
+        "SharedArrayBuffer": "readonly"
+    },
+    "parserOptions": {
+        "ecmaVersion": 2018
+    },
+    "rules": {
+        "quotes": [2, "single", { "allowTemplateLiterals": true}],	
+        "no-console": "off"
+    }
+}

worker/jest.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-    globalSetup: './tests/mongo/setup.js',
-    globalTeardown: './tests/mongo/teardown.js',
-    testEnvironment: './tests/mongo/mongo-environment.js',
+  globalSetup: './tests/mongo/setup.js',
+  globalTeardown: './tests/mongo/teardown.js',
+  testEnvironment: './tests/mongo/mongo-environment.js'
 };

worker/jobTypes/S3Publish.js

@@ -2,9 +2,9 @@ const fs = require('fs-extra');
 const workerUtils = require('../utils/utils');
 
 class S3PublishClass {
-
   constructor(GitHubJob) {
     this.GitHubJob = GitHubJob;
+    fs.pathExists();
   }
 
   async pushToStage(logger) {
@@ -13,26 +13,35 @@ class S3PublishClass {
       const exec = workerUtils.getExecPromise();
       const command = this.GitHubJob.deployCommands.join(' && ');
       const { stdout, stderr } = await exec(command);
+      console.log(stderr);
       let stdoutMod = '';
       // get only last part of message which includes # of files changes + s3 link
       if (stdout.indexOf('Summary') !== -1) {
         stdoutMod = stdout.substr(stdout.indexOf('Summary'));
-      } 
+      }
       return new Promise(function(resolve, reject) {
         logger.save(`${'(stage)'.padEnd(15)}Finished pushing to staging`);
-        logger.save(`${'(stage)'.padEnd(15)}Staging push details:\n\n${stdoutMod}`);
+        logger.save(
+          `${'(stage)'.padEnd(15)}Staging push details:\n\n${stdoutMod}`
+        );
         resolve({
-          'status': 'success',
-          'stdout': stdoutMod,
+          status: 'success',
+          stdout: stdoutMod
         });
+        reject({
+          status: 'failre',
+          stdout: stderr
+        })
       });
     } catch (errResult) {
       if (
         errResult.hasOwnProperty('code') ||
         errResult.hasOwnProperty('signal') ||
         errResult.hasOwnProperty('killed')
       ) {
-        logger.save(`${'(stage)'.padEnd(15)}failed with code: ${errResult.code}`);
+        logger.save(
+          `${'(stage)'.padEnd(15)}failed with code: ${errResult.code}`
+        );
         logger.save(`${'(stage)'.padEnd(15)}stdErr: ${errResult.stderr}`);
         throw errResult;
       }
@@ -41,10 +50,10 @@ class S3PublishClass {
 
   async pushToProduction(logger) {
     // todo
+    logger.save('')
   }
-
 }
 
 module.exports = {
   S3PublishClass: S3PublishClass
-};
+};

worker/jobTypes/fastlyJob.js

@@ -4,7 +4,6 @@ const simpleGit = require('simple-git/promise');
 const request = require('request');
 
 class GitHubJobClass {
-
   // pass in a job payload to setup class
   constructor(currentJob) {
     this.currentJob = currentJob;
@@ -39,6 +38,7 @@ class GitHubJobClass {
           returnObject['content'] = response;
         }
         resolve(returnObject);
+        reject(error);
       });
     });
   }
@@ -56,6 +56,7 @@ class GitHubJobClass {
     return new Promise(function(resolve, reject) {
       logger.save(`${'(rm)'.padEnd(15)}Finished cleaning repo`);
       resolve(true);
+      reject(false);
     });
   }
 
@@ -65,11 +66,18 @@ class GitHubJobClass {
     logger.save(`${'(GIT)'.padEnd(15)}running fetch`);
     try {
       if (!currentJob.payload.branchName) {
-        logger.save(`${'(CLONE)'.padEnd(15)}failed due to insufficient definition`);
+        logger.save(
+          `${'(CLONE)'.padEnd(15)}failed due to insufficient definition`
+        );
         throw new Error('branch name not indicated');
       }
       const basePath = this.getBasePath();
-      const repoPath = basePath + '/' + currentJob.payload.repoOwner + '/' + currentJob.payload.repoName;
+      const repoPath =
+        basePath +
+        '/' +
+        currentJob.payload.repoOwner +
+        '/' +
+        currentJob.payload.repoName;
       await simpleGit('repos')
         .silent(false)
         .clone(repoPath, `${this.getRepoDirName(currentJob)}`)
@@ -91,6 +99,7 @@ class GitHubJobClass {
     return new Promise(function(resolve, reject) {
       logger.save(`${'(GIT)'.padEnd(15)}Finished git clone`);
       resolve(true);
+      reject(false);
     });
   }
 
@@ -106,13 +115,10 @@ class GitHubJobClass {
 
     try {
       const exec = workerUtils.getExecPromise();
-      const basePath = this.getBasePath();
-      const repoPath = basePath + '/' + currentJob.payload.repoOwner + '/' + currentJob.payload.repoName;
-
       const pullRepoCommands = [
         `cd repos/${this.getRepoDirName(currentJob)}`,
         `git checkout ${currentJob.payload.branchName}`,
-        `git pull origin ${currentJob.payload.branchName}`,
+        `git pull origin ${currentJob.payload.branchName}`
       ];
 
       await exec(pullRepoCommands.join(' && '));
@@ -122,28 +128,37 @@ class GitHubJobClass {
         `. /venv/bin/activate`,
         `cd repos/${this.getRepoDirName(currentJob)}`,
         `rm -f makefile`,
-        `make html`,
+        `make html`
       ];
 
       const deployCommands = [
         `. /venv/bin/activate`,
         `cd repos/${this.getRepoDirName(currentJob)}`,
-        `make stage`,
+        `make stage`
       ];
 
       // the way we now build is to search for a specific function string in worker.sh
       // which then maps to a specific target that we run
-      const workerContents = fs.readFileSync(`repos/${this.getRepoDirName(currentJob)}/worker.sh`, { encoding: 'utf8' });
+      const workerContents = fs.readFileSync(
+        `repos/${this.getRepoDirName(currentJob)}/worker.sh`,
+        { encoding: 'utf8' }
+      );
       const workerLines = workerContents.split(/\r?\n/);
 
       // overwrite repo makefile with the one our team maintains
       const makefileContents = await this.downloadMakefile();
       if (makefileContents && makefileContents.status === 'success') {
-        await fs.writeFileSync(`repos/${this.getRepoDirName(currentJob)}/Makefile`, makefileContents.content, { encoding: 'utf8', flag: 'w' });
+        await fs.writeFileSync(
+          `repos/${this.getRepoDirName(currentJob)}/Makefile`,
+          makefileContents.content,
+          { encoding: 'utf8', flag: 'w' }
+        );
       } else {
-        console.log('ERROR: makefile does not exist in /makefiles directory on meta branch.');
+        console.log(
+          'ERROR: makefile does not exist in /makefiles directory on meta branch.'
+        );
       }
-      
+
       // check if need to build next-gen instead
       for (let i = 0; i < workerLines.length; i++) {
         if (workerLines[i] === '"build-and-stage-next-gen"') {
@@ -162,11 +177,19 @@ class GitHubJobClass {
 
       return new Promise(function(resolve, reject) {
         logger.save(`${'(BUILD)'.padEnd(15)}Finished Build`);
-        logger.save(`${'(BUILD)'.padEnd(15)}worker.sh run details:\n\n${stdout}\n---\n${stderr}`);
+        logger.save(
+          `${'(BUILD)'.padEnd(
+            15
+          )}worker.sh run details:\n\n${stdout}\n---\n${stderr}`
+        );
         resolve({
-          'status': 'success',
-          'stdout': stdout,
-          'stderr': stderr,
+          status: 'success',
+          stdout: stdout,
+          stderr: stderr
+        });
+        reject({
+          status: 'success',
+          stderr: stderr
         });
       });
     } catch (errResult) {
@@ -175,15 +198,16 @@ class GitHubJobClass {
         errResult.hasOwnProperty('signal') ||
         errResult.hasOwnProperty('killed')
       ) {
-        logger.save(`${'(BUILD)'.padEnd(15)}failed with code: ${errResult.code}`);
+        logger.save(
+          `${'(BUILD)'.padEnd(15)}failed with code: ${errResult.code}`
+        );
         logger.save(`${'(BUILD)'.padEnd(15)}stdErr: ${errResult.stderr}`);
         throw errResult;
       }
     }
   }
-
 }
 
 module.exports = {
   GitHubJobClass: GitHubJobClass
-};
+};

worker/jobTypes/githubJob.js

@@ -1,15 +1,15 @@
-const fs = require('fs-extra');
+//const fs = require('fs-extra');
 const workerUtils = require('../utils/utils');
 const GitHubJob = require('../jobTypes/githubJob').GitHubJobClass;
 const S3Publish = require('../jobTypes/S3Publish').S3PublishClass;
-const simpleGit = require('simple-git/promise');
 const validator = require('validator');
 
 const buildTimeout = 60 * 450;
-const uploadToS3Timeout = 20;
 
 const invalidJobDef = new Error('job not valid');
 
+
+
 //anything that is passed to an exec must be validated or sanitized
 //we use the term sanitize here lightly -- in this instance this // ////validates
 function safeString(stringToCheck) {
@@ -60,6 +60,7 @@ async function startGithubBuild(job, logger) {
 
     return new Promise(function(resolve, reject) {
       resolve(true);
+      reject(false);
     });
   }
 }
@@ -76,6 +77,7 @@ async function pushToStage(publisher, logger) {
 
     return new Promise(function(resolve, reject) {
       resolve(true);
+      reject(false);
     });
   }
 }
@@ -89,13 +91,21 @@ async function runGithubPush(currentJob) {
     !currentJob.payload.repoName ||
     !currentJob.payload.branchName
   ) {
-    workerUtils.logInMongo(currentJob,`${'(BUILD)'.padEnd(15)}failed due to insufficient definition`);
+    workerUtils.logInMongo(
+      currentJob,
+      `${'(BUILD)'.padEnd(15)}failed due to insufficient definition`
+    );
     throw invalidJobDef;
   }
 
   // master branch cannot run through staging build
   if (currentJob.payload.branchName === 'master') {
-    workerUtils.logInMongo(currentJob, `${'(BUILD)'.padEnd(15)} failed, master branch not supported on staging builds`);
+    workerUtils.logInMongo(
+      currentJob,
+      `${'(BUILD)'.padEnd(
+        15
+      )} failed, master branch not supported on staging builds`
+    );
     throw new Error('master branches not supported');
   }
 
@@ -107,7 +117,7 @@ async function runGithubPush(currentJob) {
       },
       sendSlackMsg: function(message) {
         workerUtils.populateCommunicationMessageInMongo(currentJob, message);
-      },
+      }
     };
   };
 
@@ -144,5 +154,5 @@ async function runGithubPush(currentJob) {
 
 module.exports = {
   runGithubPush,
-  safeGithubPush,
-};
+  safeGithubPush
+};