@leverege/build-tools 2.8.12 → 2.8.14

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.8.12",
+  "version": "2.8.14",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
+    "repository": {
+    "type": "git",
+    "url": "git+ssh://git@bitbucket.org/leverege/build-tools.git"
+  },
   "scripts": {
     "build": "npm run compile",
     "clean": "rm -rf lib",

package/src/anchor

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# Load the standard helper functions
+. `build-tools --bashfun`
+
+if [ -z "$1" ] || [ -z "$2" ];
+then
+  cat<<USAGE
+
+  $(color g "Usage: anchor <service name> <chart version>\n")
+
+USAGE
+  exit 1
+fi
+
+SERVICE=$1
+VERSION=$2
+ANCHOR="${SERVICE}/Chart-${VERSION}"
+
+if compgen -G "${SERVICE}/Chart-*" > /dev/null ;
+then
+  cat<<ALREADY_ANCHORED
+
+$(color r "$SERVICE is already anchored")
+$(color y "Go remove the existing anchor from ${SERVICE} and try again")
+
+`/bin/ls ${SERVICE}/Chart*`
+
+ALREADY_ANCHORED
+exit 1
+fi
+
+printf "Locking $SERVICE chart version at $VERSION\n"
+touch ${ANCHOR}
+
+if [ -f "${ANCHOR}" ];
+then
+  printf "Service locked with creation of ${ANCHOR}\n"
+else
+  printf "***ERROR: failed to create anchor ${ANCHOR}\n"
+fi

package/src/dockreate

@@ -78,7 +78,7 @@ RUN apk --no-cache add openssh-client && \
     apk --update add --no-cache --virtual build-dep g++ gcc libgcc \\
       libstdc++ linux-headers make ${apkadds} && \
     npm install -g npm@8 && \
-    npm ci --only-production --ignore-scripts ${npmlogging} && \
+    npm ci --only=production --ignore-scripts --no-optional ${npmlogging} && \
     rm -f /usr/src/app/.npmrc /root/.ssh/*
  
 # --------------------------------------------------------------

package/lib/server/service-man/Config.js

@@ -1,45 +0,0 @@
-"use strict";
-
-const chalk = require('chalk');
-
-const fs = require('fs');
-
-class Config {
-  constructor() {
-    this.configDir = `${__dirname}/config`;
-    const jsonText = fs.readFileSync(`${this.configDir}/config.json`);
-    this.config = JSON.parse(jsonText);
-    this.verifyConfig(this.config);
-  }
-
-  verifyConfig(config) {
-    /**
-     * Verify reference sources exist.
-     */
-    let errors;
-    config.templates.forEach(template => {
-      if (!template.enabled) return;
-      template.sources.forEach(source => {
-        if (typeof source === 'object') {
-          console.log(source, 'STILL TODO');
-        } else {
-          const fullName = `${this.configDir}/${source}`;
-
-          if (!fs.existsSync(fullName)) {
-            console.log(chalk.red(`***ERROR: missing source ${fullName}`));
-            errors = true;
-          }
-        }
-      });
-    });
-
-    if (errors) {
-      process.exit(1);
-    }
-  }
-
-}
-
-module.exports = {
-  Config
-};

package/lib/server/service-man/ServiceMan.js

@@ -1,42 +0,0 @@
-"use strict";
-
-const chalk = require('chalk');
-
-const cliArgs = require('command-line-args');
-
-const cliHelp = require('command-line-usage');
-
-const execa = require('execa');
-
-const figlet = require('figlet');
-
-const {
-  Config
-} = require('./Config');
-
-const {
-  clear,
-  condir,
-  proceed,
-  Shell,
-  VersionCheck
-} = require('./utils');
-
-const greet = async () => {
-  clear();
-  console.log(chalk.keyword('orange').bold(figlet.textSync('service-man', {
-    horizontalLayout: 'full'
-  })), chalk.green`
-
-  This utility attempts to ease the pain of managing IAM roles and the
-  creation of service accounts for new clusters and services.
-`);
-};
-
-const start = async () => {
-  await greet();
-  await proceed();
-  console.log('Weeeeee....');
-};
-
-exports.start = start;

package/lib/server/service-man/index.js

@@ -1,6 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-
-const ServiceMan = require('./ServiceMan');
-
-ServiceMan.start();

package/lib/server/service-man/utils/Shell.js

@@ -1,102 +0,0 @@
-"use strict";
-
-/**
- * Shell like things can go in here. I mostly created this to make it
- * easier to push and pop around the directory trees for repo-init. It
- * might make sense to add other things in here to make writing node CLI
- * commands a little less painful.
- */
-const fs = require('fs');
-
-const process = require('process');
-
-const dirStack = [];
-/**
- * Simple wrapper functions for debugging.
- */
-
-const cwd = () => {
-  return process.cwd();
-};
-
-const chdir = dir => {
-  return process.chdir(dir);
-};
-
-const dirs = () => {
-  console.log(dirStack);
-};
-
-const pushd = dir => {
-  if (!dir) {
-    throw new Error('pushd: no other directory');
-  }
-
-  dirStack.push(cwd());
-  chdir(dir);
-};
-
-const throwIfEmptyStack = () => {
-  if (dirStack.length === 0) {
-    throw new Error('popd: directory stack empty');
-  }
-};
-
-const popd = all => {
-  throwIfEmptyStack();
-  chdir(dirStack.pop());
-};
-
-const popdAll = () => {
-  throwIfEmptyStack();
-  chdir(dirStack[0]);
-  dirStack.length = 0;
-};
-/**
- * This function will do an upwards traversal of a file tree looking for the
- * specified file. An error will be thrown if the file is not found within
- * maxLevels.
- */
-
-
-const reverseFindFile = (findFile, options) => {
-  pushd(options.startDir || cwd());
-  let maxLevels = options.maxLevels || 5;
-  let fileRoot;
-
-  while (maxLevels > 0) {
-    if (fs.existsSync(findFile)) {
-      fileRoot = cwd();
-      break;
-    }
-
-    pushd('..'); // walk up the tree
-
-    maxLevels -= 1;
-  }
-
-  popdAll();
-
-  if (!fileRoot) {
-    throw new Error(`reverseFindFile: ${findFile} not found`);
-  }
-
-  return fileRoot;
-};
-
-const findRepoRoot = () => {
-  return reverseFindFile('package.json', {
-    startDir: __dirname
-  });
-};
-
-module.exports = {
-  dirs,
-  pushd,
-  popd,
-  popdAll,
-  reverseFindFile,
-  findRepoRoot,
-  cwd,
-  chdir
-};

package/lib/server/service-man/utils/VersionCheck.js

@@ -1,82 +0,0 @@
-"use strict";
-
-const chalk = require('chalk');
-
-const coerce = require('semver/functions/coerce');
-
-const semverLt = require('semver/functions/lt');
-
-const satisfies = require('semver/functions/satisfies');
-/**
- * This function verifies the specified version falls in this range:
- *
- *    minimum >= current < maximum
- *
- * The params will be semver coerced where a version of 12 will be coerced
- * to 12.0.0, a version of 12.18.4-beta.3 will be coerced to 12.18.4.
- *
- * Note that this function still has its references to node, but could be
- * made entirely generic if need be.
- *
- * @param {Object} params
- * @param {String} params.current - version to check
- * @param {String} params.minimum - can be equal or greater to this
- * @param {String} params.maximum - must be less than this
- * @param {String} params.preferred - the most acceptable version
- */
-
-
-function validate(params = {}) {
-  const throwChalk = error => {
-    const errorStr = chalk.red.bold('***ERROR =>');
-    throw new Error(chalk.keyword('orange').bold(`\n${errorStr} ${error}`));
-  };
-
-  if (!params || !params.current || !params.minimum || !params.maximum) {
-    throwChalk('current, minimum and maximum parameters are required by validate');
-  }
-
-  const coercedVersions = sems => {
-    return Object.keys(sems).reduce((obj, key) => {
-      const coerced = obj; // avoid eslint warning
-
-      coerced[key] = coerce(sems[key]).version;
-      return coerced;
-    }, {});
-  };
-
-  const {
-    current,
-    minimum,
-    maximum,
-    preferred
-  } = coercedVersions(params);
-  /**
-   * Verify that the current version falls within the accepted ranges.
-   */
-
-  const rangeStr = `>=${minimum} <${maximum}`;
-
-  if (!satisfies(current, rangeStr)) {
-    throwChalk(`Version ${current} is outside the accepted range of ${rangeStr}`);
-  }
-  /**
-   * Suggest upgrading to the currently recommended version.
-   */
-
-
-  if (preferred && semverLt(current, preferred)) {
-    console.log(chalk.keyword('orange').bold(`
-  ${chalk.yellow.bold('        *** HEADS UP ***')}
-  Running node version => ${chalk.yellow.bold(`v${current}`)} (which should work)
-  Preferred version is => ${chalk.green.bold(`v${preferred}`)}
-
-  Also, a reinstall of the build-tools may be necessary after any node upgrade
-          ${chalk.cyan.bold('npm i -g @leverege/build-tools')}
-`));
-  }
-}
-
-module.exports = {
-  validate
-};

package/lib/server/service-man/utils/index.js

@@ -1,67 +0,0 @@
-"use strict";
-
-const inquirer = require('inquirer');
-
-const Shell = require('./Shell');
-
-const VersionCheck = require('./VersionCheck');
-/**
- * Clears the screen and optionally homes the cursor.
- */
-
-
-const clear = (home = true) => {
-  // console.log( ( home ? '\x1B[0f' : '' ) + '\x1B[2J' )
-  console.log(`${home ? '\x1B[0f' : ''}\x1B[2J`);
-};
-/**
- * A simple object dumping convenience.
- */
-
-
-const condir = (log, thing) => {
-  console.dir({
-    log,
-    thing
-  }, {
-    depth: 8,
-    colors: true
-  }); // eslint-disable-line
-};
-/**
- * General "yes" to proceed function.
- */
-
-
-const proceed = async (query = 'Do you wish to proceed?') => {
-  await inquirer.prompt([{
-    type: 'confirm',
-    name: 'proceed',
-    message: query,
-    default: true
-  }]).then(answer => {
-    if (!answer.proceed) {
-      process.exit(0);
-    }
-  });
-};
-/**
- * A simple mS sleeper.
- */
-
-
-const sleep = (ms = 0) => {
-  return new Promise(resolve => {
-    setTimeout(resolve, ms);
-  });
-};
-
-module.exports = {
-  clear,
-  condir,
-  proceed,
-  sleep,
-  pause: sleep,
-  Shell,
-  VersionCheck
-};

package/lib/web/service-man/Config.js

@@ -1,45 +0,0 @@
-"use strict";
-
-const chalk = require('chalk');
-
-const fs = require('fs');
-
-class Config {
-  constructor() {
-    this.configDir = `${__dirname}/config`;
-    const jsonText = fs.readFileSync(`${this.configDir}/config.json`);
-    this.config = JSON.parse(jsonText);
-    this.verifyConfig(this.config);
-  }
-
-  verifyConfig(config) {
-    /**
-     * Verify reference sources exist.
-     */
-    let errors;
-    config.templates.forEach(template => {
-      if (!template.enabled) return;
-      template.sources.forEach(source => {
-        if (typeof source === 'object') {
-          console.log(source, 'STILL TODO');
-        } else {
-          const fullName = `${this.configDir}/${source}`;
-
-          if (!fs.existsSync(fullName)) {
-            console.log(chalk.red(`***ERROR: missing source ${fullName}`));
-            errors = true;
-          }
-        }
-      });
-    });
-
-    if (errors) {
-      process.exit(1);
-    }
-  }
-
-}
-
-module.exports = {
-  Config
-};

package/lib/web/service-man/ServiceMan.js

@@ -1,42 +0,0 @@
-"use strict";
-
-const chalk = require('chalk');
-
-const cliArgs = require('command-line-args');
-
-const cliHelp = require('command-line-usage');
-
-const execa = require('execa');
-
-const figlet = require('figlet');
-
-const {
-  Config
-} = require('./Config');
-
-const {
-  clear,
-  condir,
-  proceed,
-  Shell,
-  VersionCheck
-} = require('./utils');
-
-const greet = async () => {
-  clear();
-  console.log(chalk.keyword('orange').bold(figlet.textSync('service-man', {
-    horizontalLayout: 'full'
-  })), chalk.green`
-
-  This utility attempts to ease the pain of managing IAM roles and the
-  creation of service accounts for new clusters and services.
-`);
-};
-
-const start = async () => {
-  await greet();
-  await proceed();
-  console.log('Weeeeee....');
-};
-
-exports.start = start;

package/lib/web/service-man/index.js

@@ -1,6 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-
-const ServiceMan = require('./ServiceMan');
-
-ServiceMan.start();

package/lib/web/service-man/utils/Shell.js

@@ -1,102 +0,0 @@
-"use strict";
-
-/**
- * Shell like things can go in here. I mostly created this to make it
- * easier to push and pop around the directory trees for repo-init. It
- * might make sense to add other things in here to make writing node CLI
- * commands a little less painful.
- */
-const fs = require('fs');
-
-const process = require('process');
-
-const dirStack = [];
-/**
- * Simple wrapper functions for debugging.
- */
-
-const cwd = () => {
-  return process.cwd();
-};
-
-const chdir = dir => {
-  return process.chdir(dir);
-};
-
-const dirs = () => {
-  console.log(dirStack);
-};
-
-const pushd = dir => {
-  if (!dir) {
-    throw new Error('pushd: no other directory');
-  }
-
-  dirStack.push(cwd());
-  chdir(dir);
-};
-
-const throwIfEmptyStack = () => {
-  if (dirStack.length === 0) {
-    throw new Error('popd: directory stack empty');
-  }
-};
-
-const popd = all => {
-  throwIfEmptyStack();
-  chdir(dirStack.pop());
-};
-
-const popdAll = () => {
-  throwIfEmptyStack();
-  chdir(dirStack[0]);
-  dirStack.length = 0;
-};
-/**
- * This function will do an upwards traversal of a file tree looking for the
- * specified file. An error will be thrown if the file is not found within
- * maxLevels.
- */
-
-
-const reverseFindFile = (findFile, options) => {
-  pushd(options.startDir || cwd());
-  let maxLevels = options.maxLevels || 5;
-  let fileRoot;
-
-  while (maxLevels > 0) {
-    if (fs.existsSync(findFile)) {
-      fileRoot = cwd();
-      break;
-    }
-
-    pushd('..'); // walk up the tree
-
-    maxLevels -= 1;
-  }
-
-  popdAll();
-
-  if (!fileRoot) {
-    throw new Error(`reverseFindFile: ${findFile} not found`);
-  }
-
-  return fileRoot;
-};
-
-const findRepoRoot = () => {
-  return reverseFindFile('package.json', {
-    startDir: __dirname
-  });
-};
-
-module.exports = {
-  dirs,
-  pushd,
-  popd,
-  popdAll,
-  reverseFindFile,
-  findRepoRoot,
-  cwd,
-  chdir
-};

package/lib/web/service-man/utils/VersionCheck.js

@@ -1,82 +0,0 @@
-"use strict";
-
-const chalk = require('chalk');
-
-const coerce = require('semver/functions/coerce');
-
-const semverLt = require('semver/functions/lt');
-
-const satisfies = require('semver/functions/satisfies');
-/**
- * This function verifies the specified version falls in this range:
- *
- *    minimum >= current < maximum
- *
- * The params will be semver coerced where a version of 12 will be coerced
- * to 12.0.0, a version of 12.18.4-beta.3 will be coerced to 12.18.4.
- *
- * Note that this function still has its references to node, but could be
- * made entirely generic if need be.
- *
- * @param {Object} params
- * @param {String} params.current - version to check
- * @param {String} params.minimum - can be equal or greater to this
- * @param {String} params.maximum - must be less than this
- * @param {String} params.preferred - the most acceptable version
- */
-
-
-function validate(params = {}) {
-  const throwChalk = error => {
-    const errorStr = chalk.red.bold('***ERROR =>');
-    throw new Error(chalk.keyword('orange').bold(`\n${errorStr} ${error}`));
-  };
-
-  if (!params || !params.current || !params.minimum || !params.maximum) {
-    throwChalk('current, minimum and maximum parameters are required by validate');
-  }
-
-  const coercedVersions = sems => {
-    return Object.keys(sems).reduce((obj, key) => {
-      const coerced = obj; // avoid eslint warning
-
-      coerced[key] = coerce(sems[key]).version;
-      return coerced;
-    }, {});
-  };
-
-  const {
-    current,
-    minimum,
-    maximum,
-    preferred
-  } = coercedVersions(params);
-  /**
-   * Verify that the current version falls within the accepted ranges.
-   */
-
-  const rangeStr = `>=${minimum} <${maximum}`;
-
-  if (!satisfies(current, rangeStr)) {
-    throwChalk(`Version ${current} is outside the accepted range of ${rangeStr}`);
-  }
-  /**
-   * Suggest upgrading to the currently recommended version.
-   */
-
-
-  if (preferred && semverLt(current, preferred)) {
-    console.log(chalk.keyword('orange').bold(`
-  ${chalk.yellow.bold('        *** HEADS UP ***')}
-  Running node version => ${chalk.yellow.bold(`v${current}`)} (which should work)
-  Preferred version is => ${chalk.green.bold(`v${preferred}`)}
-
-  Also, a reinstall of the build-tools may be necessary after any node upgrade
-          ${chalk.cyan.bold('npm i -g @leverege/build-tools')}
-`));
-  }
-}
-
-module.exports = {
-  validate
-};