@leverege/build-tools 2.50.15 → 2.50.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.50.15",
+  "version": "2.50.17",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -61,10 +61,10 @@
     "command-line-usage": "^7.0.1",
     "deepmerge": "^4.3.1",
     "enquirer": "^2.4.1",
-    "execa": "^9.2.0",
-    "glob": "^10.4.1",
+    "execa": "^9.3.0",
+    "glob": "^10.4.2",
     "handlebars": "^4.7.8",
-    "inquirer": "^9.2.23",
+    "inquirer": "^9.3.2",
     "js-yaml": "^4.1.0",
     "ms": "^2.1.3",
     "npm-registry-fetch": "^17.1.0",
@@ -74,7 +74,7 @@
     "readline-sync": "^1.4.10",
     "semver": "^7.6.2",
     "simple-git": "^3.25.0",
-    "zx": "^8.1.2"
+    "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/git-tar.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Load the standard helper functions
+. `build-tools --bashfun`
+
 # If it isn't already set use the default ~/work/.gitar
 #
 [ -z $GITAR ] && GITAR="${HOME}/.gitar"
@@ -65,12 +68,13 @@ REPO=`basename ${GTOP}`
 #
 DTS="`date +\"%Y%m%d-%H%M%S\"`"
 
-TARB=${GITAR}/${REPO}/${DTS}.tar # Craft the target tarball name.
+TARS=${GITAR}/${REPO}
+TARB=${TARS}/${DTS}.tar # Craft the target tarball name.
 
 # Now do the work
 #
 cd ${GTOP}/..
-printf "\n*** Tarring     $TARB\n"
+printf "\n*** Tarring     `color g $TARB`\n"
 tar cf $TARB -X $TARX $REPO
 chmod 0640 $TARB
 
@@ -84,6 +88,9 @@ then
   FIZ=xz
 fi
 
-printf   "*** Compressing $TARB.$FIZ (background)\n\n"
+printf   "\n*** Compressing `color y $TARB.$FIZ` (background)\n"
 $ZIPPER $TARB &
+
+printf "\n*** Tarballs in `color g ${TARS}`\n\n"
+ls -lh ${TARS}
 cd - 2>&1 >/dev/null

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.4"
+[ -z "$REDIS_CHART_VERSION" ] && REDIS_CHART_VERSION="19.6.0"
 
 helm upgrade --install redis $OCI_CHART       \
              --values  redis/redis-local.yaml \

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

@@ -4,7 +4,7 @@ showInstalling "Velero Backup System"
 
 addHelmRepo vmware-tanzu https://vmware-tanzu.github.io/helm-charts
 
-[ -z "$VELERO_CHART_VERSION" ] && VELERO_CHART_VERSION="6"
+[ -z "$VELERO_CHART_VERSION" ] && VELERO_CHART_VERSION="7"
 #
 # Build the bucket, region and SA email variables and use --set to mod the
 # chart values as opposed to using an OVH:<label> approach. This eliminates

package/src/helmup.sh

@@ -666,7 +666,7 @@ function installVeleroEnvironment() {
   gcloud config set project $GCP_PROJECT_ID
 
   ## The major chart version will determine the bucket suffix
-  [ -z "$VELERO_HELM_CHART" ] && VELERO_HELM_CHART="6"
+  [ -z "$VELERO_HELM_CHART" ] && VELERO_HELM_CHART="7"
 
   ## Create a bucket
   BUCKET="$GCP_PROJECT_ID-velero-$VELERO_HELM_CHART"

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' )
 

package/src/zx-testing

@@ -1,216 +0,0 @@
-#!/usr/bin/env node
-/* eslint-disable no-console */
-// https://github.com/google/zx
-/* eslint-disable max-len */
-import pkg from 'enquirer'
-import colors from 'ansi-colors'
-import { $, fs, argv, path, chalk } from 'zx'
-
-const { prompt } = pkg
-
-// This will preserve coloration from spawned child processes
-process.env.FORCE_COLORS = 3
-process.env.FORCE_COLOR = '1'
-
-let TARGET
-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 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
-    CHANNEL.expiration = 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'
-const EXIT_EVENTS = [ 'SIGINT', 'exit', 'uncaughException', 'unhandledRejection' ]
-
-const [
-  firebaserc,
-  firebaseJson,
-  gitBranch
-] = await Promise.all( [
-  fs.exists( path.join( process.cwd(), '.firebaserc' ) ),
-  fs.exists( path.join( process.cwd(), 'firebase.json' ) ),
-  $`git rev-parse --abbrev-ref HEAD -C ${process.cwd()}`
-    .then( ( { stdout } ) => {
-      return stdout.split( '\n' )[0]
-    } )
-] )
-
-if ( !firebaserc ) {
-  console.log( chalk.red( 'No .firebaserc file found. Make sure that you are executing firebaseDeploy from within a firebase project directory.' ) )
-}
-
-if ( !firebaseJson ) {
-  console.log( chalk.red( 'No firebase.json file found. Make sure that you are executing firebaseDeploy from within a firebase project directory.' ) )
-}
-
-if ( !firebaserc || !firebaseJson ) {
-  process.exit()
-}
-
-const firebasercContent = JSON.parse( await fs.readFile( path.join( process.cwd(), '.firebaserc' ), { encoding : 'utf-8' } ) )
-
-let maxSiteIdLength = 0
-
-const targets = Object
-  .entries( firebasercContent.targets )
-  .reduce( ( prev, [ projectId, config ] ) => {
-    Object
-      .entries( config.hosting )
-      .forEach( ( [ siteId, aliases ] ) => {
-        aliases.forEach( ( alias ) => {
-          // Store the longest length of site id for formatting later on
-          maxSiteIdLength = Math.max( siteId.length, maxSiteIdLength )
-
-          // eslint-disable-next-line no-param-reassign
-          prev[alias] = {
-            projectId,
-            siteId,
-            alias,
-            production : config.production
-          }
-        } )
-      } )
-
-    return prev
-  }, {} )
-
-if ( INTERACTIVE_MODE ) {
-  const { targetEnv } = await prompt( [ {
-    type : 'autocomplete',
-    name : 'targetEnv',
-    message : 'To which environment would you like to deploy?',
-    choices : Object.values( targets ).map( ( t ) => {
-      const productionLabel = t.production ? colors.bold.red( '--PRODUCTION--' ) : ''
-      return { message : `${colors.bold.cyan( 'Site: ' )}${t.siteId.padEnd( maxSiteIdLength )} ${colors.bold.green( 'Project: ' )}${t.projectId} ${productionLabel}`, value : t.alias }
-    } )
-  } ] )
-
-  TARGET = targets[targetEnv]
-
-  if ( TARGET.production ) {
-    const { confirmProductionDeploy } = await prompt( [ {
-      type : 'confirm',
-      name : 'confirmProductionDeploy',
-      message : `${colors.bold.red( 'WARNING: ' )} This is a ${colors.bold.yellow( 'PRODUCTION' )} environment. Are you sure you want to deploy here?`
-    } ] )
-    if ( !confirmProductionDeploy ) {
-      console.log( 'Cancelling deployment...' )
-      process.exit()
-    }
-  }
-
-  const { useChannel } = await prompt( [ {
-    type : 'confirm',
-    name : 'useChannel',
-    message : 'Do you want to deploy to a temporary preview channel?'
-  } ] )
-
-  if ( useChannel ) {
-    const { channelName, channelExpiration } = await prompt( [ {
-      type : 'input',
-      name : 'channelName',
-      message : 'To which channel would you like to deploy?',
-      initial : gitBranch ?? 'temp-deploy'
-    }, {
-      type : 'input',
-      name : 'channelExpiration',
-      message : 'When should the channel expire?',
-      initial : '7d'
-    } ] )
-
-    CHANNEL = { name : channelName, expiration : channelExpiration }
-  }
-} else {
-  TARGET = targets[TARGET]
-}
-
-if ( !TARGET ) {
-  console.log( chalk.red( 'No such target exists in .firebaserc config.' ) )
-  process.exit()
-}
-
-const [ aliasFileExists, siteIdFileExists, sharedFileExists ] = await Promise.all( [
-  fs.exists( path.join( process.cwd(), SECRETS_DIR, `${TARGET.alias}.env` ) ),
-  fs.exists( path.join( process.cwd(), SECRETS_DIR, `${TARGET.siteId}.env` ) ),
-  fs.exists( path.join( process.cwd(), SECRETS_DIR, 'shared.env' ) )
-] )
-
-if ( !aliasFileExists && !siteIdFileExists ) {
-  console.log( chalk.red( `No env file for ${TARGET.alias} exists. Check your secrets directory and try again` ) )
-  process.exit()
-}
-
-const exec = []
-
-if ( sharedFileExists ) {
-  exec.push( fs.readFile( path.join( process.cwd(), SECRETS_DIR, 'shared.env' ), { encoding : 'utf-8' } ) )
-}
-
-if ( aliasFileExists ) {
-  exec.push( fs.readFile( path.join( process.cwd(), SECRETS_DIR, `${TARGET.alias}.env` ), { encoding : 'utf-8' } ) )
-} else {
-  exec.push( fs.readFile( path.join( process.cwd(), SECRETS_DIR, `${TARGET.siteId}.env` ), { encoding : 'utf-8' } ) )
-}
-
-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',
-    message : 'Proceed with this deployment?'
-  } ] )
-
-  if ( !confirmSelections ) {
-    console.log( 'Cancelling deployment...' )
-    process.exit()
-  }
-}
-const envFileContent = ( await Promise.all( exec ) ).join( '\n' )
-
-EXIT_EVENTS
-  .forEach( ( event ) => {
-    process.on( event, () => {
-      if ( !exited ) {
-        exited = true
-        fs.removeSync( path.join( process.cwd(), '.env.temp' ) )
-      }
-    } )
-  } )
-
-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' )} DEPLOYMENT_TARGET=${TARGET.siteId} npm run build && firebase use ${TARGET.projectId} && firebase ${deployType} --only ${hostingPrefix}${TARGET.siteId}`
-} catch ( err ) {
-  console.error( err )
-}