@leverege/build-tools 2.50.14 → 2.50.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.50.14",
+  "version": "2.50.16",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -61,20 +61,20 @@
     "command-line-usage": "^7.0.1",
     "deepmerge": "^4.3.1",
     "enquirer": "^2.4.1",
-    "execa": "^9.1.0",
-    "glob": "^10.4.1",
+    "execa": "^9.2.0",
+    "glob": "^10.4.2",
     "handlebars": "^4.7.8",
     "inquirer": "^9.2.23",
     "js-yaml": "^4.1.0",
     "ms": "^2.1.3",
-    "npm-registry-fetch": "^17.0.1",
+    "npm-registry-fetch": "^17.1.0",
     "package-up": "^5.0.0",
     "parse-gitignore": "^2.0.0",
     "read-pkg": "^9.0.1",
     "readline-sync": "^1.4.10",
     "semver": "^7.6.2",
-    "simple-git": "^3.24.0",
-    "zx": "^8.1.2"
+    "simple-git": "^3.25.0",
+    "zx": "^8.1.3"
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^4.2.0",

package/src/Utils.mjs

@@ -7,7 +7,9 @@ import { glob } from 'glob'
 import { packageUp } from 'package-up'
 import YAML from 'js-yaml'
 
-const debugEnabled = process.env.BUILD_TOOLS_DEBUG === '1'
+let debugEnabled = process.env.BUILD_TOOLS_DEBUG === '1'
+
+export const disableDebug = () => debugEnabled = false
 
 /* eslint-disable no-console */
 export const err = console.error

package/src/bash-funcs

@@ -29,8 +29,12 @@ RED_ERROR=`color r '***ERROR:'`
 YELO_WARN="`color y '***WARNING:'`"
 GREEN_INFO=`color g '***INFO:'`
 
+function clearScreen() {
+  [ "$BUILD_TOOLS_DEBUG" != "1" ] && clear
+}
+
 function clearlyWarn() {
-  [ -z "$1" ] && clear
+  clearScreen
   cat<<CLEARWARN
 
  `color y '*** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***'`

package/src/helm-charts/grafana/helmup.plugin

@@ -4,7 +4,7 @@ showInstalling "Grafana"
 
 addHelmRepo grafana https://grafana.github.io/helm-charts
 
-[ -z "$GRAFANA_CHART_VERSION" ] && GRAFANA_CHART_VERSION="7"
+[ -z "$GRAFANA_CHART_VERSION" ] && GRAFANA_CHART_VERSION="8"
 helm upgrade --install grafana grafana/grafana \
   --namespace monitoring --create-namespace \
   --values grafana/grafana-local.yaml \

package/src/helm-charts/redis/helmup.plugin

@@ -4,7 +4,7 @@ showInstalling "Redis"
 
 OCI_CHART="oci://registry-1.docker.io/bitnamicharts/redis"
 
-[ -z "$REDIS_CHART_VERSION" ] && REDIS_CHART_VERSION="19.5.0"
+[ -z "$REDIS_CHART_VERSION" ] && REDIS_CHART_VERSION="19.5.4"
 
 helm upgrade --install redis $OCI_CHART       \
              --values  redis/redis-local.yaml \

package/src/overwhelm.mjs

@@ -15,7 +15,7 @@ import parse from 'parse-gitignore'
 import ask from 'readline-sync'
 import YAML from 'js-yaml'
 
-import { debug, err, log, shellCmd } from './Utils.mjs'
+import { debug, disableDebug, err, log, shellCmd } from './Utils.mjs'
 
 const optionsDefinitions = [
   /* eslint-disable no-multi-spaces */
@@ -33,6 +33,9 @@ const optionsDefinitions = [
 ]
 const args = cliArgs( optionsDefinitions )
 
+// when using --key we only want the key contents w/o debug info
+if ( args.key ) { disableDebug() }
+
 // See if we are in a monorepo, which changes some of the rules.
 const gitTop = await shellCmd( 'git rev-parse --show-toplevel' )
 
@@ -74,6 +77,13 @@ if ( fs.existsSync( 'values-default.yaml' ) ) {
   }
 }
 
+// Avoid race condition when running overwhelm for the first time on a new
+// cluster and the default-configs.yaml file has yet to be created.
+const defaultConfigs = 'default-configs.yaml'
+if ( !fs.existsSync( defaultConfigs ) ) {
+  fs.closeSync( fs.openSync( defaultConfigs, 'w' ) ) // same as unix touch
+}
+
 // 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:
@@ -201,7 +211,7 @@ const doReplacements = ( yamls, replacements ) => {
 
 // Collect all of the yaml from the yams...
 const buildYaml = ( yamls, replacements ) => {
-  const always = [ 'default-configs.yaml' ]
+  const always = [ defaultConfigs ]
   const values = [ ...always, ...yamls ]
   const loaded = []
   let allYamls = ''