@leverege/build-tools 2.21.6 → 2.21.8

package/lib/server/overwhelm.js

@@ -4,26 +4,16 @@
 "use strict";
 
 const chalk = require('chalk');
-
-const cliArgs = require('command-line-args'); // const cliHelp = require( 'command-line-usage' )
-
-
+const cliArgs = require('command-line-args');
+// const cliHelp = require( 'command-line-usage' )
 const deepmerge = require('deepmerge');
-
 const exec = require('child_process').execSync;
-
 const fs = require('fs');
-
 const glob = require('glob');
-
 const parse = require('parse-gitignore');
-
 const ask = require('readline-sync');
-
 const YAML = require('js-yaml');
-
-const optionsDefinitions = [
-/* eslint-disable no-multi-spaces */
+const optionsDefinitions = [/* eslint-disable no-multi-spaces */
 {
   name: 'context',
   alias: 'x',
@@ -53,39 +43,41 @@ const optionsDefinitions = [
   alias: 't',
   type: Boolean,
   default: false
-}, // checks overwhelm context
+},
+// checks overwhelm context
 {
   name: 'fetchctx',
   alias: 'f',
   type: Boolean,
   default: false
-}, // fetch and set k8s context
+},
+// fetch and set k8s context
 {
   name: 'matchk8s',
   alias: 'm',
   type: Boolean,
   default: false
-}, // checks k8s context
+},
+// checks k8s context
 {
   name: 'verbose',
   alias: 'v',
   type: Boolean,
   default: false
 }
-/* eslint-enable no-multi-spaces */
-];
-const args = cliArgs(optionsDefinitions); // The kubernetes context is equal to the git branch name.
+/* eslint-enable no-multi-spaces */];
 
+const args = cliArgs(optionsDefinitions);
+
+// The kubernetes context is equal to the git branch name.
 const gitBranch = exec('git rev-parse --abbrev-ref HEAD', {
   stdio: [undefined]
 }).toString().trim();
 const context = args.context || gitBranch;
-
 if (context === 'master') {
   console.log('***ERROR: master context is forbidden; change to a different branch\n\n');
   process.exit(1);
 }
-
 if (!fs.existsSync('overwhelm.yaml')) {
   console.log(chalk.red.bold(`
 
@@ -93,7 +85,9 @@ if (!fs.existsSync('overwhelm.yaml')) {
                       to execute from within a platform-k8s branch
   `));
   process.exit(1);
-} // Load the default values and then overlay with the project specific yaml
+}
+
+// Load the default values and then overlay with the project specific yaml
 // values. This supports the notion of this type of approach in the
 // overwhelm yaml settings:
 //   default:
@@ -106,24 +100,20 @@ if (!fs.existsSync('overwhelm.yaml')) {
 // approach in order to keep us cognizant of exactly where a cluster is
 // being formed.
 //
-
-
 const yaml = YAML.load(fs.readFileSync('overwhelm.yaml', 'utf-8'));
 const over = yaml.default;
-
 if (process.env.OVERWHELM_DEBUG) {
   console.log({
     over,
     yaml
   }, '<==Contents of the over and yaml structs');
 }
+let cfgs = yaml[context];
 
-let cfgs = yaml[context]; // If we just need to check context return 0 if cfgs exists, else error.
-
+// If we just need to check context return 0 if cfgs exists, else error.
 if (args.checkctx) {
   process.exit(!cfgs);
 }
-
 if (!cfgs) {
   console.log(`***ERROR: Unknown context => [${context}]\n`);
   console.log('   Known k8s contexts are:');
@@ -134,9 +124,9 @@ if (!cfgs) {
   });
   console.log(`Add a section into overwhelm.yaml for ${context}\n\n`);
   process.exit(1);
-} // Check to see if we are deriving from another configuration.
-
+}
 
+// Check to see if we are deriving from another configuration.
 if (cfgs['PROJECT_BASE']) {
   const baseName = cfgs['PROJECT_BASE'];
   const tempCfgs = cfgs;
@@ -151,7 +141,9 @@ if (cfgs['PROJECT_BASE']) {
 
 Object.keys(cfgs).forEach(key => {
   over[key] = cfgs[key] || over[key];
-}); // Expand any variables that reference other variable settings. A perfect
+});
+
+// Expand any variables that reference other variable settings. A perfect
 // example of where this is useful is in the setting of a PROJECT_NAME and
 // a PROJECT_ID. Most of the time these values are identical, which is why
 // this setting exists in the default section:
@@ -164,12 +156,11 @@ Object.keys(cfgs).forEach(key => {
 //     PROJECT_NAME : siren-marine
 //     PROJECT_ID   : prod-rt-data
 //
-
 const varErrors = [];
 Object.keys(over).forEach(key => {
   if (!over[key]) return; // no value to work with - skip it
-  // Look for something in the form of "thing-${VAR1}-${VAR2}-${VARn}-stuff"
 
+  // Look for something in the form of "thing-${VAR1}-${VAR2}-${VARn}-stuff"
   const matches = over[key].match(/\$\{\w+\}/g);
   if (!matches) return;
   matches.forEach(replaceThis => {
@@ -177,17 +168,14 @@ Object.keys(over).forEach(key => {
     // the ${} characters before using the VARNAME to map into the
     // overwhelm map containing the desired replacement value.
     const withThat = over[replaceThis.replace(/\W+/g, '')];
-
     if (!withThat) {
       varErrors.push(`${key} : ${over[key]}`);
       return;
-    } // Store the replaced string back in the overwhelm value map.
-
-
+    }
+    // Store the replaced string back in the overwhelm value map.
     over[key] = over[key].replace(replaceThis, withThat);
   });
 });
-
 if (varErrors.length > 0) {
   console.log('***ERROR: unkown variable reference(s) in overwhelm.yaml:\n');
   varErrors.forEach(error => {
@@ -195,27 +183,28 @@ if (varErrors.length > 0) {
   });
   console.log('');
   process.exit(1);
-} // Grab a list of the existing yaml templates.
+}
 
+// Grab a list of the existing yaml templates.
+const yams = glob.sync('values-*.yaml');
 
-const yams = glob.sync('values-*.yaml'); // A function to apply the replacements to all of the matching yaml which
+// A function to apply the replacements to all of the matching yaml which
 // will error out if it runs into an unknown OVH<tag>.
-
 const doReplacements = (yamls, replacements) => {
-  let replYaml = yamls; // wrap special chars with quotes if needed, like "#---incident-alerts---"
+  let replYaml = yamls;
 
+  // wrap special chars with quotes if needed, like "#---incident-alerts---"
   const quoteSpecials = raw => {
     return /[#$?*]/g.test(raw) ? `"${raw}"` : raw;
   };
-
   Object.keys(replacements).forEach(repl => {
     const replaceThis = new RegExp(`OVH:<${repl}>`, 'g');
     const withThat = quoteSpecials(`${replacements[repl]}`);
     replYaml = replYaml.replace(replaceThis, withThat);
-  }); // Verify all replaceables have been handled, or error out.
+  });
 
+  // Verify all replaceables have been handled, or error out.
   const missed = replYaml.match(/OVH:<(.*)>/g);
-
   if (missed) {
     console.log('\n***ERROR: missing replacements in overwhelm.yaml for these tags:\n');
     missed.forEach(miss => {
@@ -224,12 +213,11 @@ const doReplacements = (yamls, replacements) => {
     console.log('');
     process.exit(1);
   }
-
   return replYaml;
-}; // Collect all of the yaml from the yams, and always expect the default and
-// platform yamls to be in that list.
-
+};
 
+// Collect all of the yaml from the yams, and always expect the default and
+// platform yamls to be in that list.
 const buildYaml = (yamls, replacements) => {
   // We always start with default but values-platform is no longer needed.
   const always = ['values-default.yaml'];
@@ -241,7 +229,6 @@ const buildYaml = (yamls, replacements) => {
       console.log(`\n***ERROR: yaml file missing => ${yaml}\n`);
       process.exit(1);
     }
-
     if (!loaded.includes(yaml)) {
       allYamls += `\n# AHOY => ${yaml}\n\n`;
       allYamls += fs.readFileSync(yaml, {
@@ -249,40 +236,40 @@ const buildYaml = (yamls, replacements) => {
       });
       loaded.push(yaml);
     }
-  }); // Now apply all of the replacements from the overwhelm file.
+  });
 
+  // Now apply all of the replacements from the overwhelm file.
   return doReplacements(allYamls, replacements);
-}; // Call buildYaml to replace the OVH strings in the yaml files.
-
+};
 
-const values = buildYaml(yams, over); // Check to see if someone is requesting a value from the yaml.
+// Call buildYaml to replace the OVH strings in the yaml files.
+const values = buildYaml(yams, over);
 
+// Check to see if someone is requesting a value from the yaml.
 if (args.key) {
   const section = args.section || 'default';
   const keys = yaml[section];
-
   if (args.verbose) {
     console.log('replacements');
     console.log(keys);
   }
-
   if (args.export) {
     console.log(`export ${args.key}=${keys[args.key]}`);
   } else {
     console.log(keys[args.key]);
   }
-
   if (!args.continue) process.exit();
-} // Find all of the potential target dirs. Utilize .gitignore to ignore files
-
+}
 
+// Find all of the potential target dirs. Utilize .gitignore to ignore files
 const gitignore = parse(fs.readFileSync('.gitignore'));
 const opt = {
   ignore: gitignore.patterns
 };
-const ahoy = glob.sync('*/', opt); // .noahoy = skips generation of values.yaml but allows helmup to run
-// .nohelm = overwhelm and helmup will skip the deployment entirely
+const ahoy = glob.sync('*/', opt);
 
+// .noahoy = skips generation of values.yaml but allows helmup to run
+// .nohelm = overwhelm and helmup will skip the deployment entirely
 ahoy.forEach(dir => {
   if (fs.existsSync(`${dir}/.noahoy`)) {
     !args.fetchctx && console.log(chalk.yellow(`***WARNING: .noahoy detected, not regenerating ${dir}values.yaml`));
@@ -290,23 +277,21 @@ ahoy.forEach(dir => {
     args.verbose && console.log(`Generating values in ${dir}`); // eslint-disable-line no-unused-expressions
 
     let valuesOut = []; // An accumulator for all of the output values.
-    // Add support for localized values for things like keel (or whatever)
 
+    // Add support for localized values for things like keel (or whatever)
     const valuesLocal = `${dir}values-local.yaml`;
-
     if (fs.existsSync(valuesLocal)) {
       args.verbose && console.log(`     Local values in ${valuesLocal}`); // eslint-disable-line no-unused-expressions
-
       valuesOut += '\n# AHOY => values-local.yaml\n\n';
       valuesOut += fs.readFileSync(valuesLocal, {
         encoding: 'utf-8'
       });
     }
+    valuesOut += `\n${values}`;
 
-    valuesOut += `\n${values}`; // Augment the default service section of the YAML with settings that
+    // Augment the default service section of the YAML with settings that
     // usually come from the top level overwhelm.yaml file.
     //
-
     const valuesAll = YAML.load(valuesOut);
     const valuesSvc = {
       service: {
@@ -319,12 +304,12 @@ ahoy.forEach(dir => {
     const valuesMerged = YAML.dump(deepmerge(valuesSvc, valuesAll), {
       quotingType: '"'
     });
-    valuesOut = doReplacements(valuesMerged, over); // DEPRECATED once siren and manheim are platform 4.0
+    valuesOut = doReplacements(valuesMerged, over);
+
+    // DEPRECATED once siren and manheim are platform 4.0
     // If we are going to override then we need to convert it to YAML and
     // do a deepmerge to combine the values.
-
     const valuesOverride = `${dir}/values-override.yaml`;
-
     if (fs.existsSync(valuesOverride)) {
       console.log(`===>Applying Overrides=> ${valuesOverride}`);
       const overrides = YAML.load(fs.readFileSync(valuesOverride, {
@@ -334,13 +319,14 @@ ahoy.forEach(dir => {
       valuesOut = YAML.dump(deepmerge(allValues, overrides), {
         quotingType: '"'
       });
-    } // DEPRECATED
-
+    }
+    // DEPRECATED
 
     fs.writeFileSync(`${dir}/values.yaml`, valuesOut);
   }
-}); // we can also apply replaceables to any top level .ovh files to support top level config maps
+});
 
+// we can also apply replaceables to any top level .ovh files to support top level config maps
 glob.sync('**/*.ovh').forEach(cfgmap => {
   const target = cfgmap.replace(/.ovh$/, '');
   let valuesOut = fs.readFileSync(cfgmap, {
@@ -348,17 +334,15 @@ glob.sync('**/*.ovh').forEach(cfgmap => {
   });
   valuesOut = doReplacements(valuesOut, over);
   fs.writeFileSync(target, valuesOut);
-}); // Set the GCP context for safety!
+});
 
+// Set the GCP context for safety!
 const clusterName = over.CLUSTER_NAME;
-
 if (over.PROJECT_NAME === 'minikube') {
   process.exit(0);
 }
-
 const projectId = over.PROJECT_ID;
 let zone = over['GCE_REGION'] + (over['GCE_ZONE'] ? `-${over['GCE_ZONE']}` : '');
-
 if (!clusterName) {
   console.log(chalk.yellow(`
 
@@ -377,35 +361,34 @@ if (!clusterName) {
     `));
   process.exit(1);
 }
-
 let kubeout = '_no_current_context_';
-
 try {
   kubeout = exec('kubectl config current-context', {
     stdio: [undefined]
   });
-} catch (err) {// err && console.log( `Caught Error =>[${err}]` )
+} catch (err) {
+  // err && console.log( `Caught Error =>[${err}]` )
 }
-
 const currentCtx = kubeout.toString().trim();
 let desiredCtx = `gke_${projectId}_${zone}_${clusterName}`;
-let cmd = `gcloud container clusters get-credentials ${clusterName} --zone ${zone} --project ${projectId}`; // Check if we are using AWS
+let cmd = `gcloud container clusters get-credentials ${clusterName} --zone ${zone} --project ${projectId}`;
 
+// Check if we are using AWS
 if (cfgs.CLOUD === 'aws') {
   const awsAcctId = cfgs['AWS_ACCT_ID'];
   zone = over['AWS_REGION'];
   desiredCtx = `arn:aws:eks:${zone}:${awsAcctId}:cluster/${clusterName}`;
   cmd = `aws eks --region ${zone} update-kubeconfig --name ${clusterName}`;
-} // TODO - FETCH AWS CLUSTER CREDENTIALS 
+}
 
+// TODO - FETCH AWS CLUSTER CREDENTIALS 
 
 const matchedCtx = currentCtx === desiredCtx;
-
 if (args.matchk8s) {
   process.exit(matchedCtx ? 0 : 1);
-} // just fetch the context and exit if -f is specified
-
+}
 
+// just fetch the context and exit if -f is specified
 if (args.fetchctx) {
   if (!matchedCtx) {
     try {
@@ -419,7 +402,6 @@ if (args.fetchctx) {
 
   process.exit(0);
 }
-
 if (matchedCtx) {
   console.log(`
 
@@ -435,20 +417,16 @@ if (matchedCtx) {
 
   `);
 }
-
 const operation = matchedCtx ? 'refetch the credentials' : 'switch your context';
 const ans = ask.question(`Enter "${chalk.bold.green('yes')}" if you wish to ${operation} => `);
-
 if (ans !== 'yes') {
   if (matchedCtx) {
     console.log(chalk.bold.yellow('\n\nSkipping a refetch of your Kubernetes context and credentials\n\n'));
     process.exit(0);
   }
-
   console.log(chalk.bold.red('\n\nYour Kubernetes context and credentials do NOT match - this could be bad!\n\n'));
   process.exit(1);
 }
-
 console.log(`\n\nExecuting: ${chalk.bold.yellow(cmd)}\n\n`);
 exec(`${cmd}`, (error, out) => {
   if (error) {

package/lib/server/unleash.js

@@ -2,27 +2,22 @@
 "use strict";
 
 const execa = require('execa');
-
 const SimpleGit = require('simple-git');
-
 const git = new SimpleGit();
-
 const getCurrentBranchName = async () => {
-  const branchInfo = await git.branch(); // first check to see if there are no branches - new repo?
+  const branchInfo = await git.branch();
 
+  // first check to see if there are no branches - new repo?
   if (Object.keys(branchInfo.branches).length === 0) {
     return '';
   }
-
   return Object.entries(branchInfo.branches).find(([name, info]) => info.current)[0];
 };
-
 const isProtected = async () => {
   const protectedBranches = ['main', 'master', 'development', ...process.argv.slice(2)];
   const theBranch = await getCurrentBranchName();
   return protectedBranches.includes(theBranch);
 };
-
 const npmRunner = async script => {
   try {
     const results = await execa('npm', ['run', script], {
@@ -32,14 +27,11 @@ const npmRunner = async script => {
   } catch (err) {
     process.exit(1);
   }
-
   return undefined;
 };
-
 (async () => {
   if (await isProtected()) {
     const script = ['test', 'lint'];
-
     for (let i = 0; i < script.length; i++) {
       await npmRunner(script[i]);
     }

package/lib/web/build-tools.js

@@ -2,22 +2,17 @@
 "use strict";
 
 const chalk = require('chalk');
-
 const cliArgs = require('command-line-args');
-
 const cliHelp = require('command-line-usage');
-
 const fs = require('fs');
-
 const npmRegistryFetch = require('npm-registry-fetch');
-
 const path = require('path');
-
 const semverLt = require('semver/functions/lt');
-/* eslint-disable no-console */
 
+/* eslint-disable no-console */
 
-const optionList = [// Use optionList to tie into the Usage statements
+const optionList = [
+// Use optionList to tie into the Usage statements
 {
   name: 'root',
   type: Boolean,
@@ -63,46 +58,36 @@ const args = cliArgs(optionList, {
 });
 const help = cliHelp(sections);
 const repoRoot = path.dirname(__dirname);
-
 const thisPackage = require(`${repoRoot}/package.json`);
-
 const thisVersion = thisPackage.version;
-
 if (args.root) {
   console.log(repoRoot);
   process.exit(0);
 }
-
 if (args.bashfun) {
   console.log(`${repoRoot}/src/bash-funcs`);
   process.exit(0);
 }
-
 const checkForLatest = async (pkg = '@leverege/build-tools') => {
   const getToken = () => {
     const tokenFile = `${process.env.HOME}/.npmrc`;
-
     if (!fs.existsSync(tokenFile)) {
       console.error(`Cannot find token file ${tokenFile}`);
       process.exit(1);
     }
-
     try {
       const tokenLine = fs.readFileSync(tokenFile).toString();
       const tokenRegX = new RegExp('.*registry.npmjs.org\\/:\\w+=+(.*)');
       const tokenStr = tokenLine.match(tokenRegX);
-
       if (!tokenStr) {
         console.error(`\n***ERROR: malformed npm token in ${tokenFile}\n`);
         process.exit(1);
       }
-
       return tokenLine.match(tokenRegX)[1];
     } catch (err) {
       console.error(err);
     }
   };
-
   try {
     const list = await npmRegistryFetch.json(pkg, {
       '//registry.npmjs.org/:_authToken': getToken()
@@ -112,7 +97,6 @@ const checkForLatest = async (pkg = '@leverege/build-tools') => {
     console.log(err);
   }
 };
-
 const checkAndAnnounce = () => {
   checkForLatest().then(latestVersion => {
     if (semverLt(thisVersion, latestVersion)) {
@@ -126,23 +110,19 @@ const checkAndAnnounce = () => {
     }
   }).catch(err => {});
 };
-
 if (args.latest) {
   checkAndAnnounce();
 }
-
 if (args.version) {
   console.log(`build-tools version ${thisVersion}`);
   checkAndAnnounce();
 }
-
 if (args.help) {
   console.log(help);
   process.exit(0);
 }
-/* eslint-disable no-underscore-dangle */
-
 
+/* eslint-disable no-underscore-dangle */
 if (args._unknown) {
   console.log(`\nUnrecognized argument [${args._unknown}] try --help\n`);
   process.exit(1);

package/lib/web/firebaseDeploy.js

@@ -1,19 +1,16 @@
 #!/usr/bin/env node
 // https://github.com/google/zx
-
 /* eslint-disable max-len */
 "use strict";
 
 var _enquirer = _interopRequireDefault(require("enquirer"));
-
 var _zx = require("zx");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const {
   prompt
-} = _enquirer.default; // This will preserve coloration from spawned child processes
+} = _enquirer.default;
 
+// This will preserve coloration from spawned child processes
 process.env.FORCE_COLORS = 3;
 process.env.FORCE_COLOR = '1';
 let TARGET = _zx.argv._[0];
@@ -21,19 +18,15 @@ let exited = false;
 const SECRETS_DIR = 'secrets';
 const EXIT_EVENTS = ['SIGINT', 'exit', 'uncaughException', 'unhandledRejection'];
 const [firebaserc, firebaseJson] = await Promise.all([_zx.fs.exists(_zx.path.join(process.cwd(), '.firebaserc')), _zx.fs.exists(_zx.path.join(process.cwd(), 'firebase.json'))]);
-
 if (!firebaserc) {
   console.log(_zx.chalk.red('No .firebaserc file found. Make sure that you are executing firebaseDeploy from within a firebase project directory.'));
 }
-
 if (!firebaseJson) {
   console.log(_zx.chalk.red('No firebase.json file found. Make sure that you are executing firebaseDeploy from within a firebase project directory.'));
 }
-
 if (!firebaserc || !firebaseJson) {
   process.exit();
 }
-
 const firebasercContent = JSON.parse(await _zx.fs.readFile(_zx.path.join(process.cwd(), '.firebaserc'), {
   encoding: 'utf-8'
 }));
@@ -49,7 +42,6 @@ const targets = Object.entries(firebasercContent.targets).reduce((prev, [project
   });
   return prev;
 }, {});
-
 if (!TARGET) {
   const {
     targetEnv
@@ -66,27 +58,21 @@ if (!TARGET) {
 } else {
   TARGET = targets[TARGET];
 }
-
 if (!TARGET) {
   console.log(_zx.chalk.red('No such target exists in .firebaserc config.'));
   process.exit();
 }
-
 const [aliasFileExists, siteIdFileExists, sharedFileExists] = await Promise.all([_zx.fs.exists(_zx.path.join(process.cwd(), SECRETS_DIR, `${TARGET.alias}.env`)), _zx.fs.exists(_zx.path.join(process.cwd(), SECRETS_DIR, `${TARGET.siteId}.env`)), _zx.fs.exists(_zx.path.join(process.cwd(), SECRETS_DIR, 'shared.env'))]);
-
 if (!aliasFileExists && !siteIdFileExists) {
   console.log(_zx.chalk.red(`No env file for ${TARGET.alias} exists. Check your secrets directory and try again`));
   process.exit();
 }
-
 const exec = [];
-
 if (sharedFileExists) {
   exec.push(_zx.fs.readFile(_zx.path.join(process.cwd(), SECRETS_DIR, 'shared.env'), {
     encoding: 'utf-8'
   }));
 }
-
 if (aliasFileExists) {
   exec.push(_zx.fs.readFile(_zx.path.join(process.cwd(), SECRETS_DIR, `${TARGET.alias}.env`), {
     encoding: 'utf-8'
@@ -96,19 +82,16 @@ if (aliasFileExists) {
     encoding: 'utf-8'
   }));
 }
-
 const envFileContent = (await Promise.all(exec)).join('\n');
 EXIT_EVENTS.forEach(event => {
   process.on(event, () => {
     if (!exited) {
       exited = true;
-
       _zx.fs.removeSync(_zx.path.join(process.cwd(), '.env.temp'));
     }
   });
 });
 await _zx.fs.writeFile(_zx.path.join(process.cwd(), '.env.temp'), envFileContent);
-
 try {
   await (0, _zx.$)`npm run clean && DOTENV_CONFIG_PATH=${_zx.path.join(process.cwd(), '.env.temp')} npm run build && firebase use ${TARGET.projectId} && firebase deploy --only hosting:${TARGET.siteId}`;
 } catch (err) {