@leverege/build-tools 2.21.9-nick.4 → 2.21.10

package/lib/server/firebaseDeploy.js

@@ -20,7 +20,7 @@ let CHANNEL;
 
 // A single unnamed parameter is assumed to be a deploy target.
 // If named parameters exist, they may not be stored in argv,
-// so don't use the length of argv to decide whether to look for them
+// so don't look for a larger length of argv to decide whether to look for named paramters
 if (_zx.argv._.length === 1) {
   TARGET = _zx.argv._[0];
 } else {
@@ -31,6 +31,9 @@ if (_zx.argv._.length === 1) {
     CHANNEL.expiration = _zx.argv.channelExpiration ?? '7d';
   }
 }
+
+// If target has not been defined on the command line,
+// then enter interactive mode
 const INTERACTIVE_MODE = !TARGET;
 let exited = false;
 const SECRETS_DIR = 'secrets';
@@ -50,7 +53,9 @@ const firebasercContent = JSON.parse(await _zx.fs.readFile(_zx.path.join(process
 }));
 
 // If in a git repo, fetch the name of the git branch to use as a default
-// name in case a deployment channel is needed
+// name in case a deployment channel is needed. Examining this file directly
+// is less cumbersome then running an actual git command to fetch the
+// branch name
 let gitBranch;
 if (git) {
   const gitContent = (await _zx.fs.readFile(_zx.path.join(process.cwd(), '.git/HEAD'), {
@@ -58,11 +63,12 @@ if (git) {
   }))?.split('/');
   gitBranch = gitContent[gitContent?.length - 1]?.trimEnd('\n');
 }
-let maxPadding = 0;
-const targets = Object.entries(firebasercContent.targets).reduce((prev, [projectId, config, production]) => {
-  Object.entries(config.hosting).forEach(([siteId, aliases, production]) => {
+let maxSiteIdLength = 0;
+const targets = Object.entries(firebasercContent.targets).reduce((prev, [projectId, config]) => {
+  Object.entries(config.hosting).forEach(([siteId, aliases]) => {
     aliases.forEach(alias => {
-      maxPadding = Math.max(siteId.length, maxPadding);
+      // Store the longest length of site id for formatting later on
+      maxSiteIdLength = Math.max(siteId.length, maxSiteIdLength);
       prev[alias] = {
         projectId,
         siteId,
@@ -83,7 +89,7 @@ if (INTERACTIVE_MODE) {
     choices: Object.values(targets).map(t => {
       const productionLabel = t.production ? _ansiColors.default.bold.red('--PRODUCTION--') : '';
       return {
-        message: `${_ansiColors.default.bold.cyan('Site: ')}${t.siteId.padEnd(maxPadding)} ${_ansiColors.default.bold.green('Project: ')}${t.projectId} ${productionLabel}`,
+        message: `${_ansiColors.default.bold.cyan('Site: ')}${t.siteId.padEnd(maxSiteIdLength)} ${_ansiColors.default.bold.green('Project: ')}${t.projectId} ${productionLabel}`,
         value: t.alias
       };
     })
@@ -156,14 +162,15 @@ if (aliasFileExists) {
     encoding: 'utf-8'
   }));
 }
+console.log(`\n\n\n${_ansiColors.default.bold.green('====== Deployment Summary ======')}`);
+console.log(`${_ansiColors.default.blue('Firebase project:')} ${TARGET.projectId} ${TARGET.production ? _ansiColors.default.yellow('--PRODUCTION--') : ''}`);
+console.log(`${_ansiColors.default.blue('Site ID:')} ${TARGET.siteId}`);
+console.log(`${_ansiColors.default.blue('Channel Name:')} ${CHANNEL?.name ?? _ansiColors.default.italic.gray('(none)')}`);
+console.log(`${_ansiColors.default.blue('Channel Expiration date:')} ${CHANNEL?.name ? CHANNEL.expiration ?? _ansiColors.default.italic.gray('(none)') : _ansiColors.default.italic.gray('(n/a)')}`);
+console.log(`${_ansiColors.default.blue('Shared .env file:')} ${sharedFileExists ? `${SECRETS_DIR}/shared.env` : _ansiColors.default.italic.gray('(none)')}`);
+console.log(`${_ansiColors.default.blue('Additional .env overrides:')} ${aliasFileExists ? `${SECRETS_DIR}/${TARGET.alias}.env` : `${SECRETS_DIR}/${TARGET.siteId}.env`}`);
+console.log(`${_ansiColors.default.bold.green('===============================')}`);
 if (INTERACTIVE_MODE) {
-  console.log(`\n\n\n${_ansiColors.default.bold.green('====== Deployment Summary ======')}`);
-  console.log(`${_ansiColors.default.blue('Firebase project:')} ${TARGET.projectId} ${TARGET.production ? _ansiColors.default.yellow('--PRODUCTION--') : ''}`);
-  console.log(`${_ansiColors.default.blue('Site ID:')} ${TARGET.siteId}`);
-  console.log(`${_ansiColors.default.blue('Channel Name:')} ${CHANNEL?.name ?? _ansiColors.default.italic.gray('(none)')}`);
-  console.log(`${_ansiColors.default.blue('Channel Expiration date:')} ${CHANNEL?.name ? CHANNEL.expiration ?? _ansiColors.default.italic.gray('(none)') : _ansiColors.default.italic.gray('(n/a)')}`);
-  console.log(`${_ansiColors.default.blue('Shared .env file:')} ${sharedFileExists ? `${SECRETS_DIR}/shared.env` : _ansiColors.default.italic.gray('(none)')}`);
-  console.log(`${_ansiColors.default.blue('Additional .env overrides:')} ${aliasFileExists ? `${SECRETS_DIR}/${TARGET.alias}.env` : `${SECRETS_DIR}/${TARGET.siteId}.env`}`);
   const {
     confirmSelections
   } = await prompt([{
@@ -187,6 +194,7 @@ EXIT_EVENTS.forEach(event => {
 });
 await _zx.fs.writeFile(_zx.path.join(process.cwd(), '.env.temp'), envFileContent);
 try {
+  // deploying to a channel requires slightly different parameter structure 
   const deployType = CHANNEL ? `hosting:channel:deploy ${CHANNEL.name} ${CHANNEL.expiration ? `--expires ${CHANNEL.expiration}` : ''}`.split(' ') : 'deploy';
   const hostingPrefix = CHANNEL ? '' : 'hosting:';
   await (0, _zx.$)`npm run clean && DOTENV_CONFIG_PATH=${_zx.path.join(process.cwd(), '.env.temp')} npm run build && firebase use ${TARGET.projectId} && firebase ${deployType} --only ${hostingPrefix}${TARGET.siteId}`;

package/lib/server/overwhelm.js

@@ -1,8 +1,10 @@
 #!/usr/bin/env node
+"use strict";
 
+console.log(`TOP=>[${process.cwd()}] PWD=[${process.env.PWD}]`);
 /* eslint-disable no-console */
-"use strict";
 
+const path = require('node:path');
 const chalk = require('chalk');
 const cliArgs = require('command-line-args');
 // const cliHelp = require( 'command-line-usage' )
@@ -69,11 +71,21 @@ const optionsDefinitions = [/* eslint-disable no-multi-spaces */
 
 const args = cliArgs(optionsDefinitions);
 
+// See if we are in a monorepo, which changes some of the rules.
+const gitTop = exec('git rev-parse --show-toplevel', {
+  stdio: [undefined]
+}).toString().trim();
+let monoTop;
+if (fs.existsSync(`${gitTop}/packages`)) {
+  monoTop = path.basename(path.resolve()); // process.env.PWD
+  console.log(`MONO=[${monoTop}]`);
+}
+
 // 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;
+const context = args.context || monoTop || gitBranch;
 if (context === 'master') {
   console.log('***ERROR: master context is forbidden; change to a different branch\n\n');
   process.exit(1);

package/lib/web/firebaseDeploy.js

@@ -20,7 +20,7 @@ let CHANNEL;
 
 // A single unnamed parameter is assumed to be a deploy target.
 // If named parameters exist, they may not be stored in argv,
-// so don't use the length of argv to decide whether to look for them
+// so don't look for a larger length of argv to decide whether to look for named paramters
 if (_zx.argv._.length === 1) {
   TARGET = _zx.argv._[0];
 } else {
@@ -31,6 +31,9 @@ if (_zx.argv._.length === 1) {
     CHANNEL.expiration = _zx.argv.channelExpiration ?? '7d';
   }
 }
+
+// If target has not been defined on the command line,
+// then enter interactive mode
 const INTERACTIVE_MODE = !TARGET;
 let exited = false;
 const SECRETS_DIR = 'secrets';
@@ -50,7 +53,9 @@ const firebasercContent = JSON.parse(await _zx.fs.readFile(_zx.path.join(process
 }));
 
 // If in a git repo, fetch the name of the git branch to use as a default
-// name in case a deployment channel is needed
+// name in case a deployment channel is needed. Examining this file directly
+// is less cumbersome then running an actual git command to fetch the
+// branch name
 let gitBranch;
 if (git) {
   const gitContent = (await _zx.fs.readFile(_zx.path.join(process.cwd(), '.git/HEAD'), {
@@ -58,11 +63,12 @@ if (git) {
   }))?.split('/');
   gitBranch = gitContent[gitContent?.length - 1]?.trimEnd('\n');
 }
-let maxPadding = 0;
-const targets = Object.entries(firebasercContent.targets).reduce((prev, [projectId, config, production]) => {
-  Object.entries(config.hosting).forEach(([siteId, aliases, production]) => {
+let maxSiteIdLength = 0;
+const targets = Object.entries(firebasercContent.targets).reduce((prev, [projectId, config]) => {
+  Object.entries(config.hosting).forEach(([siteId, aliases]) => {
     aliases.forEach(alias => {
-      maxPadding = Math.max(siteId.length, maxPadding);
+      // Store the longest length of site id for formatting later on
+      maxSiteIdLength = Math.max(siteId.length, maxSiteIdLength);
       prev[alias] = {
         projectId,
         siteId,
@@ -83,7 +89,7 @@ if (INTERACTIVE_MODE) {
     choices: Object.values(targets).map(t => {
       const productionLabel = t.production ? _ansiColors.default.bold.red('--PRODUCTION--') : '';
       return {
-        message: `${_ansiColors.default.bold.cyan('Site: ')}${t.siteId.padEnd(maxPadding)} ${_ansiColors.default.bold.green('Project: ')}${t.projectId} ${productionLabel}`,
+        message: `${_ansiColors.default.bold.cyan('Site: ')}${t.siteId.padEnd(maxSiteIdLength)} ${_ansiColors.default.bold.green('Project: ')}${t.projectId} ${productionLabel}`,
         value: t.alias
       };
     })
@@ -156,14 +162,15 @@ if (aliasFileExists) {
     encoding: 'utf-8'
   }));
 }
+console.log(`\n\n\n${_ansiColors.default.bold.green('====== Deployment Summary ======')}`);
+console.log(`${_ansiColors.default.blue('Firebase project:')} ${TARGET.projectId} ${TARGET.production ? _ansiColors.default.yellow('--PRODUCTION--') : ''}`);
+console.log(`${_ansiColors.default.blue('Site ID:')} ${TARGET.siteId}`);
+console.log(`${_ansiColors.default.blue('Channel Name:')} ${CHANNEL?.name ?? _ansiColors.default.italic.gray('(none)')}`);
+console.log(`${_ansiColors.default.blue('Channel Expiration date:')} ${CHANNEL?.name ? CHANNEL.expiration ?? _ansiColors.default.italic.gray('(none)') : _ansiColors.default.italic.gray('(n/a)')}`);
+console.log(`${_ansiColors.default.blue('Shared .env file:')} ${sharedFileExists ? `${SECRETS_DIR}/shared.env` : _ansiColors.default.italic.gray('(none)')}`);
+console.log(`${_ansiColors.default.blue('Additional .env overrides:')} ${aliasFileExists ? `${SECRETS_DIR}/${TARGET.alias}.env` : `${SECRETS_DIR}/${TARGET.siteId}.env`}`);
+console.log(`${_ansiColors.default.bold.green('===============================')}`);
 if (INTERACTIVE_MODE) {
-  console.log(`\n\n\n${_ansiColors.default.bold.green('====== Deployment Summary ======')}`);
-  console.log(`${_ansiColors.default.blue('Firebase project:')} ${TARGET.projectId} ${TARGET.production ? _ansiColors.default.yellow('--PRODUCTION--') : ''}`);
-  console.log(`${_ansiColors.default.blue('Site ID:')} ${TARGET.siteId}`);
-  console.log(`${_ansiColors.default.blue('Channel Name:')} ${CHANNEL?.name ?? _ansiColors.default.italic.gray('(none)')}`);
-  console.log(`${_ansiColors.default.blue('Channel Expiration date:')} ${CHANNEL?.name ? CHANNEL.expiration ?? _ansiColors.default.italic.gray('(none)') : _ansiColors.default.italic.gray('(n/a)')}`);
-  console.log(`${_ansiColors.default.blue('Shared .env file:')} ${sharedFileExists ? `${SECRETS_DIR}/shared.env` : _ansiColors.default.italic.gray('(none)')}`);
-  console.log(`${_ansiColors.default.blue('Additional .env overrides:')} ${aliasFileExists ? `${SECRETS_DIR}/${TARGET.alias}.env` : `${SECRETS_DIR}/${TARGET.siteId}.env`}`);
   const {
     confirmSelections
   } = await prompt([{
@@ -187,6 +194,7 @@ EXIT_EVENTS.forEach(event => {
 });
 await _zx.fs.writeFile(_zx.path.join(process.cwd(), '.env.temp'), envFileContent);
 try {
+  // deploying to a channel requires slightly different parameter structure 
   const deployType = CHANNEL ? `hosting:channel:deploy ${CHANNEL.name} ${CHANNEL.expiration ? `--expires ${CHANNEL.expiration}` : ''}`.split(' ') : 'deploy';
   const hostingPrefix = CHANNEL ? '' : 'hosting:';
   await (0, _zx.$)`npm run clean && DOTENV_CONFIG_PATH=${_zx.path.join(process.cwd(), '.env.temp')} npm run build && firebase use ${TARGET.projectId} && firebase ${deployType} --only ${hostingPrefix}${TARGET.siteId}`;

package/lib/web/overwhelm.js

@@ -1,8 +1,10 @@
 #!/usr/bin/env node
+"use strict";
 
+console.log(`TOP=>[${process.cwd()}] PWD=[${process.env.PWD}]`);
 /* eslint-disable no-console */
-"use strict";
 
+const path = require('node:path');
 const chalk = require('chalk');
 const cliArgs = require('command-line-args');
 // const cliHelp = require( 'command-line-usage' )
@@ -69,11 +71,21 @@ const optionsDefinitions = [/* eslint-disable no-multi-spaces */
 
 const args = cliArgs(optionsDefinitions);
 
+// See if we are in a monorepo, which changes some of the rules.
+const gitTop = exec('git rev-parse --show-toplevel', {
+  stdio: [undefined]
+}).toString().trim();
+let monoTop;
+if (fs.existsSync(`${gitTop}/packages`)) {
+  monoTop = path.basename(path.resolve()); // process.env.PWD
+  console.log(`MONO=[${monoTop}]`);
+}
+
 // 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;
+const context = args.context || monoTop || gitBranch;
 if (context === 'master') {
   console.log('***ERROR: master context is forbidden; change to a different branch\n\n');
   process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.21.9-nick.4",
+  "version": "2.21.10",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -68,9 +68,9 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.19.3",
-    "@babel/core": "^7.19.3",
+    "@babel/core": "^7.20.2",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^8.19.2"
+    "npm": "^8.19.3"
   }
 }

package/src/firebaseDeploy.mjs

@@ -17,12 +17,12 @@ let CHANNEL
 
 // A single unnamed parameter is assumed to be a deploy target.
 // If named parameters exist, they may not be stored in argv,
-// so don't use the length of argv to decide whether to look for them
+// so don't look for a larger length of argv to decide whether to look for named paramters
 if ( argv._.length === 1 ) {
   TARGET = argv._[0]
 } else {
   TARGET = argv.target
-  
+
   if ( argv.channelName ) {
     CHANNEL = {}
     CHANNEL.name = argv.channelName
@@ -30,6 +30,8 @@ if ( argv._.length === 1 ) {
   }
 }
 
+// If target has not been defined on the command line,
+// then enter interactive mode
 const INTERACTIVE_MODE = !TARGET
 
 let exited = false
@@ -62,23 +64,27 @@ if ( !firebaserc || !firebaseJson ) {
 const firebasercContent = JSON.parse( await fs.readFile( path.join( process.cwd(), '.firebaserc' ), { encoding : 'utf-8' } ) )
 
 // If in a git repo, fetch the name of the git branch to use as a default
-// name in case a deployment channel is needed
+// name in case a deployment channel is needed. Examining this file directly
+// is less cumbersome then running an actual git command to fetch the
+// branch name
 let gitBranch
 if ( git ) {
   const gitContent = ( await fs.readFile( path.join( process.cwd(), '.git/HEAD' ), { encoding : 'utf-8' } ) )?.split( '/' )
   gitBranch = gitContent[gitContent?.length - 1]?.trimEnd( '\n' )
 }
 
-let maxPadding = 0
+let maxSiteIdLength = 0
 
 const targets = Object
   .entries( firebasercContent.targets )
-  .reduce( ( prev, [ projectId, config, production ] ) => {
+  .reduce( ( prev, [ projectId, config ] ) => {
     Object
       .entries( config.hosting )
-      .forEach( ( [ siteId, aliases, production ] ) => {
+      .forEach( ( [ siteId, aliases ] ) => {
         aliases.forEach( ( alias ) => {
-          maxPadding = Math.max( siteId.length, maxPadding )
+          // Store the longest length of site id for formatting later on
+          maxSiteIdLength = Math.max( siteId.length, maxSiteIdLength )
+
           prev[alias] = {
             projectId,
             siteId,
@@ -96,9 +102,9 @@ if ( INTERACTIVE_MODE ) {
     type : 'select',
     name : 'targetEnv',
     message : 'To which environment would you like to deploy?',
-    choices : Object.values( targets ).map( ( t ) => { 
+    choices : Object.values( targets ).map( ( t ) => {
       const productionLabel = t.production ? colors.bold.red( '--PRODUCTION--' ) : ''
-      return { message : `${colors.bold.cyan( 'Site: ' )}${t.siteId.padEnd( maxPadding )} ${colors.bold.green( 'Project: ' )}${t.projectId} ${productionLabel}`, value : t.alias } 
+      return { message : `${colors.bold.cyan( 'Site: ' )}${t.siteId.padEnd( maxSiteIdLength )} ${colors.bold.green( 'Project: ' )}${t.projectId} ${productionLabel}`, value : t.alias }
     } )
   } ] )
 
@@ -115,7 +121,7 @@ if ( INTERACTIVE_MODE ) {
       process.exit()
     }
   }
-  
+
   const { useChannel } = await prompt( [ {
     type : 'confirm',
     name : 'useChannel',
@@ -127,7 +133,7 @@ if ( INTERACTIVE_MODE ) {
       type : 'input',
       name : 'channelName',
       message : 'To which channel would you like to deploy?',
-      initial : gitBranch ?? 'temp-deploy' 
+      initial : gitBranch ?? 'temp-deploy'
     }, {
       type : 'input',
       name : 'channelExpiration',
@@ -137,7 +143,6 @@ if ( INTERACTIVE_MODE ) {
 
     CHANNEL = { name : channelName, expiration : channelExpiration }
   }
-  
 } else {
   TARGET = targets[TARGET]
 }
@@ -170,15 +175,16 @@ if ( aliasFileExists ) {
   exec.push( fs.readFile( path.join( process.cwd(), SECRETS_DIR, `${TARGET.siteId}.env` ), { encoding : 'utf-8' } ) )
 }
 
-if ( INTERACTIVE_MODE ) {
-  console.log( `\n\n\n${colors.bold.green( '====== Deployment Summary ======' )}` )
-  console.log( `${colors.blue( 'Firebase project:' )} ${TARGET.projectId} ${TARGET.production ? colors.yellow( '--PRODUCTION--' ) : ''}` )
-  console.log( `${colors.blue( 'Site ID:' )} ${TARGET.siteId}` )
-  console.log( `${colors.blue( 'Channel Name:' )} ${CHANNEL?.name ?? colors.italic.gray( '(none)' )}` )
-  console.log( `${colors.blue( 'Channel Expiration date:' )} ${CHANNEL?.name ? CHANNEL.expiration ?? colors.italic.gray( '(none)' ) : colors.italic.gray( '(n/a)' )}` ) 
-  console.log( `${colors.blue( 'Shared .env file:' )} ${sharedFileExists ? `${SECRETS_DIR}/shared.env` : colors.italic.gray( '(none)' )}` )
-  console.log( `${colors.blue( 'Additional .env overrides:' )} ${aliasFileExists ? `${SECRETS_DIR}/${TARGET.alias}.env` : `${SECRETS_DIR}/${TARGET.siteId}.env`}` )
+console.log( `\n\n\n${colors.bold.green( '====== Deployment Summary ======' )}` )
+console.log( `${colors.blue( 'Firebase project:' )} ${TARGET.projectId} ${TARGET.production ? colors.yellow( '--PRODUCTION--' ) : ''}` )
+console.log( `${colors.blue( 'Site ID:' )} ${TARGET.siteId}` )
+console.log( `${colors.blue( 'Channel Name:' )} ${CHANNEL?.name ?? colors.italic.gray( '(none)' )}` )
+console.log( `${colors.blue( 'Channel Expiration date:' )} ${CHANNEL?.name ? CHANNEL.expiration ?? colors.italic.gray( '(none)' ) : colors.italic.gray( '(n/a)' )}` ) 
+console.log( `${colors.blue( 'Shared .env file:' )} ${sharedFileExists ? `${SECRETS_DIR}/shared.env` : colors.italic.gray( '(none)' )}` )
+console.log( `${colors.blue( 'Additional .env overrides:' )} ${aliasFileExists ? `${SECRETS_DIR}/${TARGET.alias}.env` : `${SECRETS_DIR}/${TARGET.siteId}.env`}` )
+console.log( `${colors.bold.green( '===============================' )}` )
 
+if ( INTERACTIVE_MODE ) {
   const { confirmSelections } = await prompt( [ {
     type : 'confirm',
     name : 'confirmSelections',
@@ -205,8 +211,11 @@ EXIT_EVENTS
 await fs.writeFile( path.join( process.cwd(), '.env.temp' ), envFileContent )
 
 try {
+
+  // deploying to a channel requires slightly different parameter structure 
   const deployType = CHANNEL ? `hosting:channel:deploy ${CHANNEL.name} ${CHANNEL.expiration ? `--expires ${CHANNEL.expiration}` : ''}`.split( ' ' ) : 'deploy'
   const hostingPrefix = CHANNEL ? '' : 'hosting:'
+
   await $`npm run clean && DOTENV_CONFIG_PATH=${path.join( process.cwd(), '.env.temp' )} npm run build && firebase use ${TARGET.projectId} && firebase ${deployType} --only ${hostingPrefix}${TARGET.siteId}`
 } catch ( err ) {
   console.error( err )

package/src/helmup

@@ -1,5 +1,5 @@
 #
-# printf "\n***** RUNNING LOCALLY *****\n" && sleep 2
+printf "\n***** RUNNING LOCALLY *****\n" && sleep 2
 
 # Load the standard helper functions
 . `build-tools --bashfun`
@@ -555,7 +555,7 @@ NEED_MANAGED_SECRET
   addHelmRepo jetstack https://charts.jetstack.io
   helm upgrade --install cert-manager jetstack/cert-manager \
     --namespace cert-manager --set installCRDs=true \
-    --version v1.9
+    --version v1.10
 
   cat<<DELAY
 
@@ -630,7 +630,7 @@ TRAEFIK_CFG
 
   addHelmRepo traefik https://helm.traefik.io/traefik
 
-  [ -z "$TRAEFIK_HELM_CHART" ] && TRAEFIK_HELM_CHART="12"
+  [ -z "$TRAEFIK_HELM_CHART" ] && TRAEFIK_HELM_CHART="16"
   helm upgrade --install traefik traefik/traefik \
     --namespace traefik \
     --version  $TRAEFIK_HELM_CHART \
@@ -1029,10 +1029,10 @@ NOTRUNNING
 }
 
 # ---------- helmup MAIN ----------
-GITTOP=`git rev-parse --show-toplevel` && cd $GITTOP
+GITTOP=`git rev-parse --show-toplevel` # `&& cd $GITTOP
 K8S_UTILS="${GITTOP}/k8s-utils"
 
-overwhelm
+overwhelm.js #XXX
 [ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1
 
 doInstall $@

package/src/klog

@@ -3,7 +3,7 @@
 [ -f overwhelm.yaml ] && [ -f package.json ] && npm run ahoy
 
 DTS="`date +\"%Y%m%d-%H%M%S\"`"
-PRETTY="pino-pretty -c -t 'HH:MM:ss.l'"
+PRETTY="pino-pretty -c -t 'HH:MM:ss.l' -i 'severity'"
 IFS="/" read APP <<< "$1"
 
 if [ ! -z "$APP" ];

package/src/overwhelm.js

@@ -1,7 +1,9 @@
 #!/usr/bin/env node
 
+console.log( `TOP=>[${process.cwd()}] PWD=[${process.env.PWD}]` )
 /* eslint-disable no-console */
 
+const path = require( 'node:path' )
 const chalk = require( 'chalk' )
 const cliArgs = require( 'command-line-args' )
 // const cliHelp = require( 'command-line-usage' )
@@ -28,12 +30,22 @@ const optionsDefinitions = [
 ]
 const args = cliArgs( optionsDefinitions )
 
+// See if we are in a monorepo, which changes some of the rules.
+const gitTop = exec(
+  'git rev-parse --show-toplevel', { stdio : [ undefined ] }
+).toString().trim()
+let monoTop
+if( fs.existsSync( `${gitTop}/packages` ) ) {
+  monoTop = path.basename( path.resolve() ) // process.env.PWD
+  console.log( `MONO=[${monoTop}]` )
+}
+
 // 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
+const context = args.context || monoTop || gitBranch
 
 if ( context === 'master' ) {
   console.log( '***ERROR: master context is forbidden; change to a different branch\n\n' )

package/.env.temp

@@ -1,18 +0,0 @@
-THEFT_RECOVERY_URL='theft.recovermycar.com'
-MAPBOX_APIKEY=pk.eyJ1IjoibGV2ZXJlZ2UiLCJhIjoiY2p1Y3E0cWpkMG15azQzbnFzaDY2dmhiMSJ9.7N25h5jsjO2Aq_YmiLrAJw
-APPEARANCE_PROJECT_ID=7b2GTbmsZj3f5VdFpjGM8O
-INTERCOM_APP_ID='ec0qbuwi'
-LOCATOR_ALIAS_KEY='serialNumber'
-RECOVR_BILLING_MODULE='recovrBilling'
-IMAGINE_HOST=https://leverege-sandbox-imagine-api.leverege.com
-RECOVR_HOST=https://dev-recovr-notify.leverege.com
-# RECOVR_HOST=http://localhost:8296
-SYSTEM_ID=0UTmPFvRHXYLMlT4Kl2z1K
-PROJECT_ID=08HBeHEYGxu5Bg4TCCnAAV
-VEHICLE_NETWORK_ID='dev-dealership-vehicles'
-CONSUMER_VEHICLE_NETWORK_ID='dev-customer-vehicles'
-LOCATOR_NETWORK_ID='dev-recovr-tracker'
-BEACON_NETWORK_ID='dev-dealership-beacons'
-SALE_LOCATION_PARENT_PATH=sales
-CONSUMER_LOCATION_ID=1KceIcZlVWrOBvCzsEXYud
-IS_DEV=true

package/.firebaserc

@@ -1,40 +0,0 @@
-{
-  "projects": {
-    "default": "leverege-sandbox",
-    "stg-recovr-auto": "stg-recovr-auto",
-    "prd-recovr-auto":"prd-recovr-auto"
-  },
-  "targets": {
-    "leverege-sandbox": {
-      "hosting": {
-        "recovr": [
-          "dev"
-        ],
-        "dev-obd-recovr": [
-          "dev-obd"
-        ]
-      }
-    },
-    "stg-recovr-auto": {
-      "hosting": {
-        "stg-recovr": [
-          "stg"
-        ],
-        "stg-obd-recovr": [
-          "stg-obd"
-        ]
-      }
-    },
-    "prd-recovr-auto": {
-      "hosting": {
-        "recovr-auto": [
-          "prd"
-        ],
-        "prd-obd-recovr":[
-          "prd-obd"
-        ]
-      },
-      "production": true
-    }
-  }
-}

package/.firebasercizg

@@ -1,47 +0,0 @@
-{
-  "projects": {
-    "default": "leverege-sandbox",
-    "dev-keys": "leverege-dev-nick",
-    "prd-indoor-zoning" : "prd-indoor-zoning"
-  },
-  "targets": {
-    "leverege-sandbox": {
-      "hosting": {
-        "dev-izg": [
-          "dev-izg"
-        ],
-        "dev-olive-indoor-zoning": [
-          "dev-olive-indoor-zoning"
-        ]
-      }
-    },
-    "leverege-dev-nick": {
-      "hosting": {
-        "dev-keys": [
-          "dev-keys"
-        ]
-      }
-    },
-    "prd-indoor-zoning": {
-      "hosting": {
-        "prd-indoor-zoning-ui222": [
-          "prd-indoor-zoning-ui"
-        ],
-        "prd-olive-indoor-zoning-ui222": [
-          "prd-olive-indoor-zoning-ui"
-        ],
-        "prd-keys222": [
-          "prd-keys"
-        ]
-      },
-      "production": true
-    },
-    "stg-indoor-zoning-pen-test": {
-      "hosting": {
-        "stg-indoor-zoning-ui": [
-          "stg-indoor-zoning-ui"
-        ]
-      }
-    }
-  }
-}

package/.vscode/launch.json

@@ -1,18 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "firebase deploy",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "program": "${workspaceFolder}/src/firebaseDeploy.mjs",
-            "console": "integratedTerminal"
-        }
-    ]
-}

package/firebase.json

@@ -1,180 +0,0 @@
-{
-  "hosting": [
-    {
-      "site":"dev-izg",
-      "public": "dist",
-      "ignore": [
-        "firebase.json",
-        "**/.*",
-        "**/node_modules/**"
-      ],
-      "rewrites": [
-        {
-          "source": "**",
-          "destination": "/index.html"
-        }
-      ],
-      "headers": {
-        "X-Content-Type-Options": "nosniff",
-        "X-XSS-Protection": "1; mode=block",
-        "X-Frame-Options": "deny",
-        "Content-Security-Policy": "default-src 'self' 'unsafe-eval' 'unsafe-inline' data: blob: leverege-sandbox-imagine-api.leverege.com *.mapbox.com *.firebaseio.com wss://*.firebaseio.com *.googleapis.com *.intercom.io wss://*.intercom.io maxcdn.bootstrapcdn.com *.intercomcdn.com *.gstatic.com;",
-        "Referrer-Policy":"no-referrer"
-      }
-    },
-    {
-      "site":"dev-keys",
-      "public": "dist",
-      "ignore": [
-        "firebase.json",
-        "**/.*",
-        "**/node_modules/**"
-      ],
-      "rewrites": [
-        {
-          "source": "**",
-          "destination": "/index.html"
-        }
-      ],
-      "headers": {
-        "X-Content-Type-Options": "nosniff",
-        "X-XSS-Protection": "1; mode=block",
-        "X-Frame-Options": "deny",
-        "Content-Security-Policy": "default-src 'self' 'unsafe-eval' 'unsafe-inline' data: blob: leverege-sandbox-imagine-api.leverege.com *.mapbox.com *.firebaseio.com wss://*.firebaseio.com *.googleapis.com *.intercom.io wss://*.intercom.io maxcdn.bootstrapcdn.com *.intercomcdn.com *.gstatic.com;",
-        "Referrer-Policy":"no-referrer"
-      }
-    },
-    {
-      "site":"dev-keys",
-      "public": "dist",
-      "ignore": [
-        "firebase.json",
-        "**/.*",
-        "**/node_modules/**"
-      ],
-      "rewrites": [
-        {
-          "source": "**",
-          "destination": "/index.html"
-        }
-      ],
-      "headers": {
-        "X-Content-Type-Options": "nosniff",
-        "X-XSS-Protection": "1; mode=block",
-        "X-Frame-Options": "deny",
-        "Content-Security-Policy": "default-src 'self' 'unsafe-eval' 'unsafe-inline' data: blob: leverege-sandbox-imagine-api.leverege.com *.mapbox.com *.firebaseio.com wss://*.firebaseio.com *.googleapis.com *.intercom.io wss://*.intercom.io maxcdn.bootstrapcdn.com *.intercomcdn.com *.gstatic.com;",
-        "Referrer-Policy":"no-referrer"
-      }
-    },
-    {
-      "site":"dev-olive-indoor-zoning",
-      "public": "dist",
-      "ignore": [
-        "firebase.json",
-        "**/.*",
-        "**/node_modules/**"
-      ],
-      "rewrites": [
-        {
-          "source": "**",
-          "destination": "/index.html"
-        }
-      ],
-      "headers": {
-        "X-Content-Type-Options": "nosniff",
-        "X-XSS-Protection": "1; mode=block",
-        "X-Frame-Options": "deny",
-        "Content-Security-Policy": "default-src 'self' 'unsafe-eval' 'unsafe-inline' data: blob: leverege-sandbox-imagine-api.leverege.com *.mapbox.com *.firebaseio.com wss://*.firebaseio.com *.googleapis.com *.intercom.io wss://*.intercom.io maxcdn.bootstrapcdn.com *.intercomcdn.com *.gstatic.com;",
-        "Referrer-Policy":"no-referrer"
-      }
-    },
-    {
-      "site":"prd-indoor-zoning-ui",
-      "public": "dist",
-      "ignore": [
-        "firebase.json",
-        "**/.*",
-        "**/node_modules/**"
-      ],
-      "rewrites": [
-        {
-          "source": "**",
-          "destination": "/index.html"
-        }
-      ],
-      "headers": {
-        "X-Content-Type-Options": "nosniff",
-        "X-XSS-Protection": "1; mode=block",
-        "X-Frame-Options": "deny",
-        "Content-Security-Policy": "default-src 'self' 'unsafe-eval' 'unsafe-inline' data: blob: leverege-sandbox-imagine-api.leverege.com *.mapbox.com *.firebaseio.com wss://*.firebaseio.com *.googleapis.com *.intercom.io wss://*.intercom.io maxcdn.bootstrapcdn.com *.intercomcdn.com *.gstatic.com;",
-        "Referrer-Policy":"no-referrer"
-      }
-    },
-    {
-      "site":"prd-keys",
-      "public": "dist",
-      "ignore": [
-        "firebase.json",
-        "**/.*",
-        "**/node_modules/**"
-      ],
-      "rewrites": [
-        {
-          "source": "**",
-          "destination": "/index.html"
-        }
-      ],
-      "headers": {
-        "X-Content-Type-Options": "nosniff",
-        "X-XSS-Protection": "1; mode=block",
-        "X-Frame-Options": "deny",
-        "Content-Security-Policy": "default-src 'self' 'unsafe-eval' 'unsafe-inline' data: blob: leverege-sandbox-imagine-api.leverege.com *.mapbox.com *.firebaseio.com wss://*.firebaseio.com *.googleapis.com *.intercom.io wss://*.intercom.io maxcdn.bootstrapcdn.com *.intercomcdn.com *.gstatic.com;",
-        "Referrer-Policy":"no-referrer"
-      }
-    },
-    {
-      "site":"prd-olive-indoor-zoning-ui",
-      "public": "dist",
-      "ignore": [
-        "firebase.json",
-        "**/.*",
-        "**/node_modules/**"
-      ],
-      "rewrites": [
-        {
-          "source": "**",
-          "destination": "/index.html"
-        }
-      ],
-      "headers": {
-        "X-Content-Type-Options": "nosniff",
-        "X-XSS-Protection": "1; mode=block",
-        "X-Frame-Options": "deny",
-        "Content-Security-Policy": "default-src 'self' 'unsafe-eval' 'unsafe-inline' data: blob: leverege-sandbox-imagine-api.leverege.com *.mapbox.com *.firebaseio.com wss://*.firebaseio.com *.googleapis.com *.intercom.io wss://*.intercom.io maxcdn.bootstrapcdn.com *.intercomcdn.com *.gstatic.com;",
-        "Referrer-Policy":"no-referrer"
-      }
-    },
-    {
-      "site":"stg-indoor-zoning-ui",
-      "public": "dist",
-      "ignore": [
-        "firebase.json",
-        "**/.*",
-        "**/node_modules/**"
-      ],
-      "rewrites": [
-        {
-          "source": "**",
-          "destination": "/index.html"
-        }
-      ],
-      "headers": {
-        "X-Content-Type-Options": "nosniff",
-        "X-XSS-Protection": "1; mode=block",
-        "X-Frame-Options": "deny",
-        "Content-Security-Policy": "default-src 'self' 'unsafe-eval' 'unsafe-inline' data: blob: leverege-sandbox-imagine-api.leverege.com *.mapbox.com *.firebaseio.com wss://*.firebaseio.com *.googleapis.com *.intercom.io wss://*.intercom.io maxcdn.bootstrapcdn.com *.intercomcdn.com *.gstatic.com;",
-        "Referrer-Policy":"no-referrer"
-      }
-    }
-  ]
-}

package/secrets/dev-obd.env

@@ -1,13 +0,0 @@
-IMAGINE_HOST=https://leverege-sandbox-imagine-api.leverege.com
-RECOVR_HOST=https://dev-recovr-notify.leverege.com
-# RECOVR_HOST=http://localhost:8296
-SYSTEM_ID=0UTmPFvRHXYLMlT4Kl2z1K
-PROJECT_ID=08HBeHEYGxu5Bg4TCCnAAV
-VEHICLE_NETWORK_ID='dev-dealership-vehicles'
-CONSUMER_VEHICLE_NETWORK_ID='dev-customer-vehicles'
-LOCATOR_NETWORK_ID='dev-recovr-tracker'
-BEACON_NETWORK_ID='dev-dealership-beacons'
-SALE_LOCATION_PARENT_PATH=sales
-CONSUMER_LOCATION_ID=1KceIcZlVWrOBvCzsEXYud
-userManagementUiName='obd'
-IS_DEV=true

package/secrets/dev.env

@@ -1,12 +0,0 @@
-IMAGINE_HOST=https://leverege-sandbox-imagine-api.leverege.com
-RECOVR_HOST=https://dev-recovr-notify.leverege.com
-# RECOVR_HOST=http://localhost:8296
-SYSTEM_ID=0UTmPFvRHXYLMlT4Kl2z1K
-PROJECT_ID=08HBeHEYGxu5Bg4TCCnAAV
-VEHICLE_NETWORK_ID='dev-dealership-vehicles'
-CONSUMER_VEHICLE_NETWORK_ID='dev-customer-vehicles'
-LOCATOR_NETWORK_ID='dev-recovr-tracker'
-BEACON_NETWORK_ID='dev-dealership-beacons'
-SALE_LOCATION_PARENT_PATH=sales
-CONSUMER_LOCATION_ID=1KceIcZlVWrOBvCzsEXYud
-IS_DEV=true

package/secrets/prd-obd.env

@@ -1,12 +0,0 @@
-IMAGINE_HOST=https://prd-recovr-auto-imagine-api.leverege.com
-RECOVR_HOST=https://recovr-auto-notify.leverege.com
-SYSTEM_ID=2ExK7rl76meCVCCctjOJEY
-PROJECT_ID=1Je8Y7dNlfthv7ixV8oEfZ
-VEHICLE_NETWORK_ID='prd-auto-vehicles'
-CONSUMER_VEHICLE_NETWORK_ID='prd-customer-vehicles'
-BEACON_NETWORK_ID='prd-auto-beacons'
-GOOGLE_ANALYTICS_TRACKER_ID='G-LBTT0JT9V6'
-SALE_LOCATION_PARENT_PATH=location
-CONSUMER_LOCATION_ID=26OsDlsRqBTIOxMjyHg9S5
-userManagementUiName='obd'
-IS_DEV=true

package/secrets/prd.env

@@ -1,10 +0,0 @@
-IMAGINE_HOST=https://prd-recovr-auto-imagine-api.leverege.com
-RECOVR_HOST=https://recovr-auto-notify.leverege.com
-SYSTEM_ID=2ExK7rl76meCVCCctjOJEY
-PROJECT_ID=1Je8Y7dNlfthv7ixV8oEfZ
-VEHICLE_NETWORK_ID='prd-auto-vehicles'
-CONSUMER_VEHICLE_NETWORK_ID='prd-customer-vehicles'
-BEACON_NETWORK_ID='prd-auto-beacons'
-GOOGLE_ANALYTICS_TRACKER_ID='G-LBTT0JT9V6'
-SALE_LOCATION_PARENT_PATH=location
-CONSUMER_LOCATION_ID=26OsDlsRqBTIOxMjyHg9S5

package/secrets/shared.env

@@ -1,6 +0,0 @@
-THEFT_RECOVERY_URL='theft.recovermycar.com'
-MAPBOX_APIKEY=pk.eyJ1IjoibGV2ZXJlZ2UiLCJhIjoiY2p1Y3E0cWpkMG15azQzbnFzaDY2dmhiMSJ9.7N25h5jsjO2Aq_YmiLrAJw
-APPEARANCE_PROJECT_ID=7b2GTbmsZj3f5VdFpjGM8O
-INTERCOM_APP_ID='ec0qbuwi'
-LOCATOR_ALIAS_KEY='serialNumber'
-RECOVR_BILLING_MODULE='recovrBilling'

package/secrets/stg-obd.env

@@ -1,10 +0,0 @@
-IMAGINE_HOST=https://stg-recovr-auto-imagine-api.leverege.com
-# RECOVR_HOST=http://localhost:8296
-SYSTEM_ID=6CxONnaSOnbGFBS5gLnZWl
-PROJECT_ID=3vo2u8m9GEXPaQgMnJ45rh
-VEHICLE_NETWORK_ID='stg-auto-vehicles'
-CONSUMER_VEHICLE_NETWORK_ID='stg-customer-vehicles'
-BEACON_NETWORK_ID='stg-auto-beacons'
-CONSUMER_LOCATION_ID=1SRDkIuPWDpiAy4dsuy0JT
-userManagementUiName='obd'
-IS_DEV=false

package/secrets/stg.env

@@ -1,9 +0,0 @@
-IMAGINE_HOST=https://stg-recovr-auto-imagine-api.leverege.com
-# RECOVR_HOST=http://localhost:8296
-SYSTEM_ID=6CxONnaSOnbGFBS5gLnZWl
-PROJECT_ID=3vo2u8m9GEXPaQgMnJ45rh
-VEHICLE_NETWORK_ID='stg-auto-vehicles'
-CONSUMER_VEHICLE_NETWORK_ID='stg-customer-vehicles'
-BEACON_NETWORK_ID='stg-auto-beacons'
-CONSUMER_LOCATION_ID=1SRDkIuPWDpiAy4dsuy0JT
-IS_DEV=false