@leverege/build-tools 2.50.0 → 2.50.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.50.0",
+  "version": "2.50.2",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/bash-funcs

@@ -156,7 +156,7 @@ function sendToSlack() {
 \`$toPost\`
 node `node --version` / `build-tools --version` /  helm `helm version --short`
 EOSLACK
-  send-to-slack --project leverege-registry \
+  send-to-slack --project ${REFRESH_NPM_PROJECT:-leverege-registry} \
                 --config REFRESH_NPM_SLACK_CONFIG \
                 --message "\"$slackmsg\""
   # the "\"$var\"" escaped " is necessary for proper message encapsulation

package/src/firebaseDeploy.mjs

@@ -3,7 +3,6 @@
 // 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
@@ -97,8 +96,8 @@ if ( INTERACTIVE_MODE ) {
     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 }
+      const productionLabel = t.production ? chalk.bold.red( '--PRODUCTION--' ) : ''
+      return { message : `${chalk.bold.cyan( 'Site: ' )}${t.siteId.padEnd( maxSiteIdLength )} ${chalk.bold.green( 'Project: ' )}${t.projectId} ${productionLabel}`, value : t.alias }
     } )
   } ] )
 
@@ -108,7 +107,7 @@ if ( INTERACTIVE_MODE ) {
     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?`
+      message : `${chalk.bold.red( 'WARNING: ' )} This is a ${chalk.bold.yellow( 'PRODUCTION' )} environment. Are you sure you want to deploy here?`
     } ] )
     if ( !confirmProductionDeploy ) {
       console.log( 'Cancelling deployment...' )
@@ -169,14 +168,14 @@ if ( aliasFileExists ) {
   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( '===============================' )}` )
+console.log( `\n\n\n${chalk.bold.green( '====== Deployment Summary ======' )}` )
+console.log( `${chalk.blue( 'Firebase project:' )} ${TARGET.projectId} ${TARGET.production ? chalk.yellow( '--PRODUCTION--' ) : ''}` )
+console.log( `${chalk.blue( 'Site ID:' )} ${TARGET.siteId}` )
+console.log( `${chalk.blue( 'Channel Name:' )} ${CHANNEL?.name ?? chalk.italic.gray( '(none)' )}` )
+console.log( `${chalk.blue( 'Channel Expiration date:' )} ${CHANNEL?.name ? CHANNEL.expiration ?? chalk.italic.gray( '(none)' ) : chalk.italic.gray( '(n/a)' )}` ) 
+console.log( `${chalk.blue( 'Shared .env file:' )} ${sharedFileExists ? `${SECRETS_DIR}/shared.env` : chalk.italic.gray( '(none)' )}` )
+console.log( `${chalk.blue( 'Additional .env overrides:' )} ${aliasFileExists ? `${SECRETS_DIR}/${TARGET.alias}.env` : `${SECRETS_DIR}/${TARGET.siteId}.env`}` )
+console.log( `${chalk.bold.green( '===============================' )}` )
 
 if ( INTERACTIVE_MODE ) {
   const { confirmSelections } = await prompt( [ {
@@ -192,12 +191,15 @@ if ( INTERACTIVE_MODE ) {
 }
 const envFileContent = ( await Promise.all( exec ) ).join( '\n' )
 
+const ac = new AbortController()
+
 EXIT_EVENTS
   .forEach( ( event ) => {
     process.on( event, () => {
       if ( !exited ) {
         exited = true
         fs.removeSync( path.join( process.cwd(), '.env.temp' ) )
+        ac.abort()
       }
     } )
   } )
@@ -210,7 +212,8 @@ try {
   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}`
+  await $( { ac } )`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}`
+    .pipe( process.stdout )
 } catch ( err ) {
   console.error( err )
 }

package/src/firebaseServe.mjs

@@ -126,12 +126,15 @@ if ( aliasFileExists ) {
 
 const envFileContent = ( await Promise.all( exec ) ).join( '\n' )
 
+const ac = new AbortController()
+
 EXIT_EVENTS
   .forEach( ( event ) => {
     process.on( event, () => {
       if ( !exited ) {
         exited = true
         fs.removeSync( path.join( process.cwd(), '.env.temp' ) )
+        ac.abort()
       }
     } )
   } )
@@ -139,7 +142,7 @@ EXIT_EVENTS
 await fs.writeFile( path.join( process.cwd(), '.env.temp' ), envFileContent )
 
 try {
-  await $`DOTENV_CONFIG_PATH=${path.join( process.cwd(), '.env.temp' )} DEPLOYMENT_TARGET=${TARGET.siteId} npm run serve --colors`
+  await $( { ac } )`DOTENV_CONFIG_PATH=${path.join( process.cwd(), '.env.temp' )} DEPLOYMENT_TARGET=${TARGET.siteId} npm run serve --colors`.pipe( process.stdout )
 } catch ( err ) {
   console.error( err )
 }

package/registry-compass.yaml

@@ -1,20 +0,0 @@
-registry:
-  - root: us-docker.pkg.dev
-  - repositories:
-    - name: stack
-      charts:
-        - api-server
-        - authz-server
-        - emailer
-        - message-processor
-    - name: leverege
-      charts:
-        - pubsub-pulse
-        - pusher
-        - overdose
-    - name: cox-health
-      charts:
-        - actions-server
-        - analytics-server
-        - centrak-healthz
-        - centrak-ingestor

package/src/chart-compass.mjs

@@ -1,96 +0,0 @@
-#!/usr/bin/env node
-/*
- * chart-to-registry will...
- */
-import fs from 'node:fs'
-
-import chalk from 'chalk'
-import commandLineArgs from 'command-line-args'
-import commandLineUsage from 'command-line-usage'
-import { lt as semverLt } from 'semver'
-import YAML from 'js-yaml'
-
-import {
-  condir,
-  debug,
-  errorExit,
-  log,
-  warning,
-  getGitRootDirectory,
-  parsePackageJson,
-  parseHelmChart,
-  shellCmd } from './Utils.mjs'
-
-const commandLineOptions = [ // Use commandLineOptions to tie into the Usage statements
-  /* eslint-disable max-len */
-  {
-    name : 'location',
-    type : String,
-    description : '{green the location of the artifact registry the chart will be pushed to (default us-docker.pkg.dev)}',
-  },
-  {
-    name : 'project',
-    type : String,
-    description : '{green the name of the google project containing the npmrc and slack config secrets (default leverege-registry)}',
-  },
-  {
-    name : 'repository',
-    type : String,
-    description : '{green the target repository to receive the pushed chart}',
-  },
-  {
-    name : 'dry-run',
-    type : Boolean,
-    description : '{yellow perform everything except the actual chart push}',
-  },
-  {
-    name : 'help',
-    type : Boolean,
-    description : '{green display this help screen}',
-  },
-  /* eslint-enable max-len */
-]
-
-const sections = [
-  {
-    header : 'Leverege Helm Chart Compass (for helmup)',
-    content : `{green This tool helps helmup navigate the helm charts stored in the
-artifact-registries.}`
-  },
-  { header : 'Options',
-    optionList : commandLineOptions,
-  },
-]
-
-const args = commandLineArgs( commandLineOptions, { camelCase : true, partial : true } )
-const usage = commandLineUsage( sections )
-
-if ( args.help ) {
-  log( usage )
-  process.exit( 0 )
-}
-
-/* eslint-disable no-underscore-dangle */
-if ( args._unknown ) {
-  log( usage )
-  log( `\nUnrecognized argument [${chalk.bold.red( args._unknown )}]\n` )
-  process.exit( 1 )
-}
-/* eslint-enable no-underscore-dangle */
-
-const minNodejsVersion = '18.0.0'
-if ( semverLt( process.version, minNodejsVersion ) ) {
-  errorExit( `\n***ERROR: must be running at least node ${minNodejsVersion}\n` )
-}
-
-// First of all, fail if we are not in a git repository
-let gitRoot
-try {
-  gitRoot = await getGitRootDirectory()
-} catch ( error ) {
-  errorExit( chalk.red.bold( error ), { errorCode : 5 } )
-}
-
-const chartCompass = YAML.load( fs.readFileSync( './registry-compass.yaml', 'utf8' ) )
-
-condir( { chartCompass }, '<==Navigation' )