@leverege/build-tools 2.5.38 → 2.5.40

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/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.38",
+  "version": "2.5.40",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
@@ -55,30 +55,30 @@
     "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.1.0",
     "kubernetes-client": "^9.0.0",
     "ncp": "^2.0.0",
-    "npm-check-updates": "^11.5.1",
+    "npm-check-updates": "^11.5.12",
     "npm-registry-fetch": "^9.0.0",
-    "open": "^8.0.6",
+    "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.38.0"
+    "simple-git": "^2.39.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.13.16",
-    "@babel/core": "^7.13.16",
-    "@babel/node": "^7.13.13",
+    "@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.11.1"
+    "npm": "^7.13.0"
   }
 }

package/src/helmup

@@ -398,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/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 )
   }
 } )