@leverege/build-tools 2.5.37 → 2.5.39

package/lib/server/overwhelm.js

@@ -8,6 +8,8 @@ const chalk = require('chalk');
 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');
@@ -270,7 +272,22 @@ ahoy.forEach(dir => {
     }
 
     valuesOut += `\n${values}`;
-    valuesOut = doReplacements(valuesOut, over);
+    valuesOut = doReplacements(valuesOut, over); // 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, {
+        encofind: 'utf-8'
+      }));
+      const allValues = YAML.load(valuesOut);
+      valuesOut = YAML.dump(deepmerge(allValues, overrides), {
+        quotingType: '"'
+      });
+    }
+
     fs.writeFileSync(`${dir}/values.yaml`, valuesOut);
   }
 }); // we can also apply replaceables to any top level .ovh files to support top level config maps

package/lib/server/repo-init/gitter/RepoHosting.js

@@ -60,7 +60,7 @@ const build = async buildSpec => {
   console.log(`${chalk.keyword('orange').bold(`
   Before proceeding you will want to verify that your browser has access to the
   git hosting service you are about to use. The easiest way to do this is to
-  simply open a browser window on bitbuck or github with the desired account.
+  simply open a browser window on bitbucket or github with the desired account.
 
   Once you proceed from this step a browser window will be opened and you will
   enter the relevant information into the repository creation page. Click the

package/lib/server/repo-init/templates/Templates.js

@@ -116,7 +116,7 @@ class Templates {
       type: 'confirm',
       name: 'template.helmify',
       message: 'Run helmify to generate Helm Charts?',
-      default: false,
+      default: true,
       when: answers => {
         const template = this.lookupTemplateByType(answers.template.type);
         return typeof template.helm !== 'undefined';

package/lib/web/overwhelm.js

@@ -8,6 +8,8 @@ const chalk = require('chalk');
 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');
@@ -270,7 +272,22 @@ ahoy.forEach(dir => {
     }
 
     valuesOut += `\n${values}`;
-    valuesOut = doReplacements(valuesOut, over);
+    valuesOut = doReplacements(valuesOut, over); // 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, {
+        encofind: 'utf-8'
+      }));
+      const allValues = YAML.load(valuesOut);
+      valuesOut = YAML.dump(deepmerge(allValues, overrides), {
+        quotingType: '"'
+      });
+    }
+
     fs.writeFileSync(`${dir}/values.yaml`, valuesOut);
   }
 }); // we can also apply replaceables to any top level .ovh files to support top level config maps

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.5.37",
+  "version": "2.5.39",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
@@ -50,34 +50,35 @@
   "author": "Leverege Devs",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "chalk": "^4.1.0",
+    "chalk": "^4.1.1",
     "clear": "^0.1.0",
     "clipboardy": "^2.3.0",
     "command-line-args": "^5.1.1",
     "command-line-usage": "^6.1.1",
-    "dotenv": "^8.2.0",
+    "dotenv": "^9.0.2",
     "execa": "^5.0.0",
     "figlet": "^1.5.0",
     "git-branch": "^2.0.1",
-    "glob": "^7.1.6",
+    "glob": "^7.1.7",
     "inquirer": "^7.3.3",
-    "js-yaml": "^4.0.0",
+    "js-yaml": "^4.1.0",
+    "kubernetes-client": "^9.0.0",
     "ncp": "^2.0.0",
-    "npm-check-updates": "^11.4.1",
+    "npm-check-updates": "^11.5.12",
     "npm-registry-fetch": "^9.0.0",
-    "open": "^7.4.2",
+    "open": "^8.0.8",
     "ora": "^5.4.0",
     "parse-gitignore": "^1.0.1",
     "readline-sync": "^1.4.10",
     "semver": "^7.3.5",
-    "simple-git": "^2.37.0"
+    "simple-git": "^2.39.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.13.14",
-    "@babel/core": "^7.13.15",
-    "@babel/node": "^7.13.13",
+    "@babel/cli": "^7.13.16",
+    "@babel/core": "^7.14.2",
+    "@babel/node": "^7.14.2",
     "@leverege/babel-preset-leverege-node": "^1.1.1",
     "@leverege/eslint-config-leverege": "^2.2.0",
-    "npm": "^7.9.0"
+    "npm": "^7.13.0"
   }
 }

package/src/dockreate

@@ -75,7 +75,7 @@ COPY ./.npmrc /usr/src/app/.npmrc
 RUN apk --no-cache add curl git openssh-client && \
     apk --update add --no-cache --virtual build-dep g++ gcc libgcc \\
       libstdc++ linux-headers make python ${apkadds} && \
-    npm install --production --silent && \
+    npm ci --production --silent && \
     rm -f /usr/src/app/.npmrc /root/.ssh/*
  
 # --------------------------------------------------------------
@@ -84,7 +84,7 @@ RUN apk --no-cache add curl git openssh-client && \
  
 FROM node:${nodeimg}
  
-# Install tint for PID 1 and replace shell with bash so we can source files
+# Install tini for PID 1 and replace shell with bash so we can source files
 RUN apk update && \
     apk add --no-cache tini bash vim ${apkadds} && \
     rm /bin/sh && ln -s /bin/bash /bin/sh && \
@@ -331,8 +331,7 @@ fi
 create_Dockerfile "$version" "$nodeimg" "$apkadds"
 create_bashrc "$version" "$nodeimg"
 
-[ -d ./workspace ] && rm -rf ./workspace
-mkdir -p ./workspace
+rm -rf ./workspace && mkdir -p ./workspace
 cp -rfp ../package*json ../dist/* ./workspace
  
 # grab the read only npmrc token for the image
@@ -359,7 +358,7 @@ else
 fi
 
 # submit the build request to gcloud
-gcloud builds submit --tag $gcimage:$version .
+time gcloud builds submit --tag $gcimage:$version .
  
 if [ $? -ne 0 ];
 then

package/src/helmup

@@ -118,7 +118,11 @@ SA_EXISTS
 
     # Verify the Kubernetes SA
     kubectl get sa -n monitoring $SDEXP_SA
-    exitOnError $? "The $SDEXP_SA SA seems to be missing"
+    if [[ $? -eq 1 ]];
+    then
+      printf "The $SDEXP_SA SA seems to be missing, which is weird - creating it now\n"
+      kubectl create sa -n monitoring stackdriver-exporter
+    fi
 
     # NOTE: The k8s SA != GCP SA - the former is created by the helm chart
     # that installs the stackdriver-exporter, the latter is handled here in
@@ -394,7 +398,7 @@ function ifPluggedIn() {
   if [ ! -x $PLUGIN ];
   then
     cat<<PLUGIN_NOEXEC
-    $RED_ERROR The plugin file is preset but is not executable.
+    $RED_ERROR The plugin file is present but is not executable.
               Try running => `color y "chmod +x $PLUGIN"`
 
 PLUGIN_NOEXEC

package/src/klog

@@ -4,11 +4,12 @@
 
 DTS="`date +\"%Y%m%d-%H%M%S\"`"
 PRETTY="pino-pretty -c -t 'HH:MM:ss.l'"
+IFS="/" read APP <<< "$1"
 
-if [ ! -z "$1" ];
+if [ ! -z "$APP" ];
 then
   NS=${2:-"default"}
-  kubecmd="kubectl logs -f -n $NS -l app=$1 -c $1 | pino-pretty -c -t hh:mm:ss.l"
+  kubecmd="kubectl logs -f -n $NS --max-log-requests=16 -l app=$APP -c $APP | tee $APP-$DTS.log | $PRETTY"
   echo " run=[$kubecmd]"
   eval ${kubecmd}
   exit $?

package/src/overwhelm.js

@@ -5,6 +5,7 @@
 const chalk = require( 'chalk' )
 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' )
@@ -225,6 +226,17 @@ ahoy.forEach( ( dir ) => {
     valuesOut += `\n${values}`
     valuesOut = doReplacements( valuesOut, over )
 
+    // 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, { encofind : 'utf-8' } ))
+      const allValues = YAML.load( valuesOut )
+      valuesOut = YAML.dump( deepmerge( allValues, overrides ), { quotingType : '"' } )
+    }
+
     fs.writeFileSync( `${dir}/values.yaml`, valuesOut )
   }
 } )

package/CHANGELOG.md

@@ -1,46 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-## [2.3.1] = 2020-05-10
-### Updated
-- (Circleate) Updated support for UI circle config
-
-## [2.2.3] = 2020-04-22
-### Updated
-- (Helmify) Added a CLI interface for Helmup
-
-## [2.1.5] - 2020-03-08
-### Updated
-- (Helmup) Simplified Timescale installation process
-
-## [2.0.0] - 2020-02-12
-### Added
-- (encrypt/decrypt) Allow for external KMS (BREAKING!!!)
-
-## [1.6.3] - 2019-07-02
-### Added
-- (pkglint) Added pkglint check for valid files
-
-## [1.5.0] - 2019-06-07
-### Added
-- (Dnsify) Added new Dnsify script to add new DNS records to cloudflare
-
-## [1.4.0] - 2019-05-02
-### Added
-- (Helmify) Added new Helmify script to bootstrap helm templates
-
-## [0.7.1] - 2019-03-07
-### Updated
-- (Overwhelm) Replaced glob library to fix vulnerability issue
-
-## [0.5.0] - 2019-03-04
-### Replaced
-- (Encrypt/Decrypt) Deprecate OpenSSL for GCP KMS encryption method
-
-## [0.4.0] - 2019-02-21
-### Added
-- (Circleate) Added smoke test step to do security audit
-- (Circleate) Account for edge cases with non-standard container name
-
-### Removed
-- (Circleate) Deleted junit reporter for test coverage