@leverege/build-tools 2.39.1 → 2.39.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.39.1",
+  "version": "2.39.3",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -24,6 +24,7 @@
     "getfbcfg": "src/getfbcfg.mjs",
     "getjson": "src/getjson.mjs",
     "git-tar": "src/git-tar.sh",
+    "helmcycle": "src/helmup.sh",
     "helmdn": "src/helmdn.sh",
     "helmup": "src/helmup.sh",
     "helminit": "src/helmup.sh",
@@ -35,7 +36,7 @@
     "klog": "src/klog.sh",
     "npm-link": "src/npm-link.sh",
     "npm-unlink": "src/npm-unlink.sh",
-    "overwhelm": "src/overwhelm.js",
+    "overwhelm": "src/overwhelm.mjs",
     "pkgck": "src/pkgck.sh",
     "pkglint": "src/pkglint.sh",
     "prune-git": "src/prune-git.sh",
@@ -68,6 +69,6 @@
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^4.2.0",
-    "npm": "^10.0.0"
+    "npm": "^10.1.0"
   }
 }

package/src/Utils.mjs

@@ -10,6 +10,7 @@ export const debug = ( obj, text ) => {
     log( obj, `${chalk.yellow( '***DEBUG:' )} ${chalk.green( text )}` )
   }
 }
+export const err = console.error
 
 export const shellCmd = async ( cmdstr, opts = {} ) => {
   try {

package/src/dockreate.sh

@@ -228,11 +228,34 @@ fi
 # TODO: these should be combined into one require
 nodeimg=$(packageJson '.leverege.nodeimg')
 nodeimg="${nodeimg:-hydrogen-alpine}"
-nodeops=$(packageJson '.leverege.nodeops')
 apkadds=$(packageJson '.leverege.apkadds')
 runuser=$(packageJson '.leverege.runuser')
 [ -z "${runuser}" ] && runuser='node'
 
+# DEPRECATED 09/11/2023
+nodeops=$(packageJson '.leverege.nodeops')
+if [ ! -z "$nodeops" ];
+then
+  cat<<DEP_NODEOPS
+
+  Support for the node options being specified in the leverege section of
+  package.json has been deprecated in favor of using the `color g NODE_OPTIONS` env
+  variable in the helm/values.yaml chart. Remove this line from the leverege
+  section in package.json:
+
+    `color y "\"nodeops\" : \"$nodeops\""`
+
+  and then add this line to the config section of the service's helm chart
+  values.yaml file:
+
+    `color g "NODE_OPTIONS: \"\""`
+
+  and finally set it from values-local.yaml at deployment. Don't forget to
+  update the helm chart version and push it to the museum.
+DEP_NODEOPS
+  yesToContinue "to ignore this warning"
+fi
+
 npmlogging='--silent' # allow for verbose npm logs
 if [ "$VERBOSE_DOCKREATE_NPM" == "yes" ];
 then
@@ -351,7 +374,7 @@ cat<<IMGINFO
   Project:   $(color g $project)
   Container: $(color g $container)
   NodeImage: $(color g $nodeimg)
-  NopeOps:   $(color y $nodeops)
+  NodeOps:   $(color r $nodeops) `color toast DEPRECATED`
   AddedPkgs: $(color g $apkadds)
   PluggedIn: ${pluggedIn}
   Version:   $(color g $version)  $tagstat

package/src/helmup.sh

@@ -622,6 +622,7 @@ function doInstall() {
     # helminit is used to redeploy an existing service
     if [ "$INVOKED_AS" == "helminit" ] && [ -f "$SERVICE/helmup.plugin" ];
     then
+      yesToContinue "if are you `color y certain` you want to run `color y helminit`"
       local BACKUP_DIR="$SERVICE-bak"
       if [ ! -d "$BACKUP_DIR" ];
       then
@@ -639,6 +640,11 @@ CATBACKUP
       fi
     fi
 
+    if [ "$INVOKED_AS" == "helmcycle" ];
+    then
+      helmdn $SERVICE
+    fi
+
     # If we're referencing a plugin then execute it and continue
     ifPluggedIn $SERVICE && continue
 

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, log, shellCmd } from './Utils.mjs'
+import { debug, err, log, shellCmd } from './Utils.mjs'
 
 const optionsDefinitions = [
   /* eslint-disable no-multi-spaces */
@@ -384,6 +384,6 @@ log( `\n\nExecuting: ${chalk.bold.yellow( cmd )}\n\n` )
 try {
   await shellCmd( cmd )
 } catch ( error ) {
-  log( { error, cmd }, '***ERROR overwhelm' )
+  err( { error, cmd }, '***ERROR overwhelm' )
   process.exit( 1 )
 }