@leverege/build-tools 2.37.2 → 2.38.0-john.1

package/lib/server/getjson.js

@@ -20,10 +20,10 @@
  */
 "use strict";
 
-const fs = require('fs');
-const cliArgs = require('command-line-args');
-const cliHelp = require('command-line-usage');
-
+var _fs = _interopRequireDefault(require("fs"));
+var _commandLineArgs = _interopRequireDefault(require("command-line-args"));
+var _commandLineUsage = _interopRequireDefault(require("command-line-usage"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* eslint-disable no-console */
 const optionList = [
 // Use optionList to tie into the Usage statements
@@ -51,17 +51,17 @@ const sections = [{
   header: 'Options',
   optionList
 }];
-const args = cliArgs(optionList, {
+const args = (0, _commandLineArgs.default)(optionList, {
   partial: true
 });
-const help = cliHelp(sections);
+const help = (0, _commandLineUsage.default)(sections);
 if (!args.file) {
   console.error('\n***ERROR: Missing a --file param\n');
   console.log(help);
   process.exit(1);
 }
 try {
-  const json = JSON.parse(fs.readFileSync(args.file, 'utf8'));
+  const json = JSON.parse(_fs.default.readFileSync(args.file, 'utf8'));
   const value = json[args.key];
   const match = new RegExp(args.regex || '.*').exec(value);
   console.log(match ? match[match.length - 1] : '');

package/lib/server/push-my-chart.js

@@ -0,0 +1,18 @@
+#!/usr/bin/env node
+"use strict";
+
+var _execa = _interopRequireDefault(require("execa"));
+var _semver = require("semver");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const pushItGood = async () => {
+  const version = await (0, _execa.default)('helm', ['version', '--short']);
+  const pusher = (0, _semver.lt)(version.stdout, '3.7.0') ? 'push' : 'cm-push';
+  try {
+    const museum = await (0, _execa.default)('helm', [pusher, 'helm', 'leverege']);
+    console.log(museum.stdout);
+  } catch (ex) {
+    console.log(ex.stderr);
+    process.exit(1);
+  }
+};
+pushItGood();

package/lib/server/refresh-npm-token.js

@@ -22,8 +22,14 @@ var _nodeFs = _interopRequireDefault(require("node:fs"));
 var _nodeOs = _interopRequireDefault(require("node:os"));
 var _chalk = _interopRequireDefault(require("chalk"));
 var _execa = _interopRequireDefault(require("execa"));
+var _semver = require("semver");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // we can't use $ until we upgrade to ESM execa
+if ((0, _semver.lt)(process.version, '18.0.0')) {
+  console.log(_chalk.default.red('\n\n***ERROR: must be running at least node 18\n'));
+  process.exit(1);
+}
+
 // max age in seconds of the npmrc file before refresh
 const refreshThreshold = 3600 * 24; // 1 day
 

package/lib/server/unleash.js

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 "use strict";
 
-const execa = require('execa');
-const SimpleGit = require('simple-git');
-const git = new SimpleGit();
+var _execa = _interopRequireDefault(require("execa"));
+var _simpleGit = _interopRequireDefault(require("simple-git"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const git = new _simpleGit.default();
 const getCurrentBranchName = async () => {
   const branchInfo = await git.branch();
 
@@ -28,7 +29,7 @@ const isProtected = async () => {
 };
 const npmRunner = async script => {
   try {
-    const results = await execa('npm', ['run', script], {
+    const results = await (0, _execa.default)('npm', ['run', script], {
       stdio: 'inherit'
     });
     return results;

package/lib/web/getjson.js

@@ -20,10 +20,10 @@
  */
 "use strict";
 
-const fs = require('fs');
-const cliArgs = require('command-line-args');
-const cliHelp = require('command-line-usage');
-
+var _fs = _interopRequireDefault(require("fs"));
+var _commandLineArgs = _interopRequireDefault(require("command-line-args"));
+var _commandLineUsage = _interopRequireDefault(require("command-line-usage"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* eslint-disable no-console */
 const optionList = [
 // Use optionList to tie into the Usage statements
@@ -51,17 +51,17 @@ const sections = [{
   header: 'Options',
   optionList
 }];
-const args = cliArgs(optionList, {
+const args = (0, _commandLineArgs.default)(optionList, {
   partial: true
 });
-const help = cliHelp(sections);
+const help = (0, _commandLineUsage.default)(sections);
 if (!args.file) {
   console.error('\n***ERROR: Missing a --file param\n');
   console.log(help);
   process.exit(1);
 }
 try {
-  const json = JSON.parse(fs.readFileSync(args.file, 'utf8'));
+  const json = JSON.parse(_fs.default.readFileSync(args.file, 'utf8'));
   const value = json[args.key];
   const match = new RegExp(args.regex || '.*').exec(value);
   console.log(match ? match[match.length - 1] : '');

package/lib/web/push-my-chart.js

@@ -0,0 +1,18 @@
+#!/usr/bin/env node
+"use strict";
+
+var _execa = _interopRequireDefault(require("execa"));
+var _semver = require("semver");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const pushItGood = async () => {
+  const version = await (0, _execa.default)('helm', ['version', '--short']);
+  const pusher = (0, _semver.lt)(version.stdout, '3.7.0') ? 'push' : 'cm-push';
+  try {
+    const museum = await (0, _execa.default)('helm', [pusher, 'helm', 'leverege']);
+    console.log(museum.stdout);
+  } catch (ex) {
+    console.log(ex.stderr);
+    process.exit(1);
+  }
+};
+pushItGood();

package/lib/web/refresh-npm-token.js

@@ -22,8 +22,14 @@ var _nodeFs = _interopRequireDefault(require("node:fs"));
 var _nodeOs = _interopRequireDefault(require("node:os"));
 var _chalk = _interopRequireDefault(require("chalk"));
 var _execa = _interopRequireDefault(require("execa"));
+var _semver = require("semver");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // we can't use $ until we upgrade to ESM execa
+if ((0, _semver.lt)(process.version, '18.0.0')) {
+  console.log(_chalk.default.red('\n\n***ERROR: must be running at least node 18\n'));
+  process.exit(1);
+}
+
 // max age in seconds of the npmrc file before refresh
 const refreshThreshold = 3600 * 24; // 1 day
 

package/lib/web/unleash.js

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 "use strict";
 
-const execa = require('execa');
-const SimpleGit = require('simple-git');
-const git = new SimpleGit();
+var _execa = _interopRequireDefault(require("execa"));
+var _simpleGit = _interopRequireDefault(require("simple-git"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const git = new _simpleGit.default();
 const getCurrentBranchName = async () => {
   const branchInfo = await git.branch();
 
@@ -28,7 +29,7 @@ const isProtected = async () => {
 };
 const npmRunner = async script => {
   try {
-    const results = await execa('npm', ['run', script], {
+    const results = await (0, _execa.default)('npm', ['run', script], {
       stdio: 'inherit'
     });
     return results;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.37.2",
+  "version": "2.38.0-john.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -19,24 +19,24 @@
   },
   "bin": {
     "build-tools": "src/build-tools.js",
-    "circleate": "src/circleate",
+    "circleate": "src/circleate.sh",
     "decrypt-secrets": "src/decrypt-secrets",
     "dirty-git": "src/dirty-git",
     "dockreate": "src/dockreate",
     "encrypt-secrets": "src/encrypt-secrets",
     "firebaseDeploy": "src/firebaseDeploy.mjs",
     "firebaseServe": "src/firebaseServe.mjs",
-    "getfbcfg": "src/getfbcfg.js",
-    "getjson": "src/getjson.js",
+    "getfbcfg": "src/getfbcfg.mjs",
+    "getjson": "src/getjson.mjs",
     "git-tar": "src/git-tar",
     "helmdn": "src/helmdn",
-    "helmup": "src/helmup",
-    "helminit": "src/helmup",
-    "helmwhat": "src/helmup",
-    "k8cryo": "src/k8cryo",
-    "k8scale": "src/k8scale",
-    "k8thaw": "src/k8cryo",
-    "k8x": "src/k8x",
+    "helmup": "src/helmup.sh",
+    "helminit": "src/helmup.sh",
+    "helmwhat": "src/helmup.sh",
+    "k8cryo": "src/k8cryo.sh",
+    "k8scale": "src/k8scale.sh",
+    "k8thaw": "src/k8cryo.sh",
+    "k8x": "src/k8x.sh",
     "klog": "src/klog",
     "npm-link": "src/npm-link",
     "npm-unlink": "src/npm-unlink",
@@ -45,10 +45,10 @@
     "pkglint": "src/pkglint",
     "prune-git": "src/prune-git",
     "pull-git": "src/pull-git",
-    "push-my-chart": "src/push-my-chart",
+    "push-my-chart": "src/push-my-chart.mjs",
     "refresh-npm-token": "src/refresh-npm-token.mjs",
     "tag-release": "src/tag-release.mjs",
-    "unleash": "src/unleash.js"
+    "unleash": "src/unleash.mjs"
   },
   "author": "Leverege Devs",
   "license": "SEE LICENSE IN LICENSE.md",

package/src/bash-funcs

@@ -5,6 +5,12 @@
 # and can now be easily added to a script via bash sourcing:
 #         . `build-tools --bashfun`
 
+# Typically /dev/null is used to redirect the noise but sometimes we need to
+# see exactly what certain commands are complaining about. Running any of the
+# build-tools with BUILD_TOOLS_DEBUG=1 will redirect the noise to stdout.
+DEVNULL="/dev/null"
+[ ! -z "BUILD_TOOLS_DEBUG" ] && DEVNULL="/dev/stdout" && printf "\n***BUILD_TOOLS_DEBUG DEVNULL=>$DEVNULL\n"
+
 # Simple ANSI color coded string generator.
 function color() {
   local color=
@@ -121,13 +127,13 @@ function addHelmRepo() {
   Adding helm repo => $(color g "$chart") from $(color g "$url")
 
 REPOADD
-  helm repo add --force-update $chart $url &> /dev/null
-  helm repo update &> /dev/null
+  helm repo add --force-update $chart $url &> $DEVNULL
+  helm repo update &> $DEVNULL
 }
 
 function removeHelmRepo(){
   [ ! -z "$SKIP_RM_HELM_REPO" ] && return
-  helm repo remove $1 &>/dev/null
+  helm repo remove $1 &> $DEVNULL
 }
 
 # initial use for logging helm activities
@@ -141,5 +147,5 @@ function postToSlack() {
 
   curl -X POST -H 'Content-type: application/json' \
            --data "{\"text\":\"$slackmsg\",\"channel\":\"$channel\"}" \
-           "$slackURL" &>/dev/null
+           "$slackURL" &> $DEVNULL
 }

package/src/dockreate

@@ -5,6 +5,7 @@ if [ -z "$1" ]; then
 fi
 
 # printf "\n****LOCAL DOCKREATE****\n\n" && sleep 1
+DOCKER_BUILDKIT=1
 
 # Load common bash functions
 . `build-tools --bashfun`

package/src/{getjson.js → getjson.mjs}

@@ -18,9 +18,9 @@
 /**
  * Get a command line switch parser.
  */
-const fs = require( 'fs' )
-const cliArgs = require( 'command-line-args' )
-const cliHelp = require( 'command-line-usage' )
+import fs from 'fs'
+import cliArgs from 'command-line-args'
+import cliHelp from 'command-line-usage'
 
 /* eslint-disable no-console */
 const optionList = [ // Use optionList to tie into the Usage statements

package/src/{helmup → helmup.sh}

@@ -80,7 +80,7 @@ WORKLOAD_ID
  
   # Verify the Kubernetes SA and create it if necessary
   printf "\nChecking for the $NAMESPACE/$SVC_ACCT k8s SA\n"
-  kubectl get sa -n $NAMESPACE $SVC_ACCT &>/dev/null
+  kubectl get sa -n $NAMESPACE $SVC_ACCT &> $DEVNULL
   if [[ $? -eq 1 ]];
   then
     printf "Creating the k8s $SVC_ACCT SA in $NAMESPACE\n"
@@ -101,7 +101,7 @@ function generatePassword() {
 
 function createNamespaceIfNeeded() {
   # Check the namespace exists in kubernetes
-  kubectl get namespace $1 &> /dev/null
+  kubectl get namespace $1 &> $DEVNULL
   if [[ $? -eq 1 ]];
   then
     printf "\n*** Creating $1 namespace ***\n\n"
@@ -155,7 +155,7 @@ MISSING_HELMUP_PLUGIN
 
 function errorIfMissingSecret() {
   SECRET="$1"
-  kubectl get secret $SECRET &> /dev/null
+  kubectl get secret $SECRET &> $DEVNULL
   if [[ $? = 1 || SECRET = "" ]];
   then
     errorExit "missing secret `color y $SECRET` - did you `color g 'service-man --new-k8s'` ?"
@@ -176,9 +176,9 @@ function installStackdriverExporterEnvironment() {
 
   # guarantee any previous remnants of the exporter are gone
   printf "\n*** Removing the previous $SDEXP_SA installation...\n"
-  helm uninstall -n $SDEXP_NS $SDEXP_SA                 &> /dev/null
-  kubectl delete serviceaccounts -n $SDEXP_NS $SDEXP_SA &> /dev/null
-  gcloud --quiet iam service-accounts delete $SDEXP_EM  &> /dev/null
+  helm uninstall -n $SDEXP_NS $SDEXP_SA                 &> $DEVNULL
+  kubectl delete serviceaccounts -n $SDEXP_NS $SDEXP_SA &> $DEVNULL
+  gcloud --quiet iam service-accounts delete $SDEXP_EM  &> $DEVNULL
 
   # NOTE: The k8s SA != GCP SA - the former is created by the helm chart
   # that installs the stackdriver-exporter, the latter is handled here in
@@ -188,13 +188,13 @@ function installStackdriverExporterEnvironment() {
   printf "\n*** Creating GCP SA with $SDEXP_NS/viewer ***\n"
   gcloud iam service-accounts create $SDEXP_SA \
     --project "$GCP_PROJECT_ID" \
-    --display-name "Prometheus Stackdriver Exporter" &>/dev/null
+    --display-name "Prometheus Stackdriver Exporter" &> $DEVNULL
   warnOnError $? "the GCP SA $SDEXP_SA may already exist"
 
   printf "\n*** Binding IAM role of $SDEXP_NS viewer to $SDEXP_SA in $GCP_PROJECT_ID\n"
   gcloud projects add-iam-policy-binding "$GCP_PROJECT_ID" \
     --role "roles/$SDEXP_NS.viewer" \
-    --member "serviceAccount:$SDEXP_EM" &>/dev/null
+    --member "serviceAccount:$SDEXP_EM" &> $DEVNULL
   sleep 2 # give the IAM binding a chance to complete before moving on
 
   bindWorkloadIdentity $SDEXP_SA $SDEXP_NS
@@ -289,7 +289,7 @@ function installPreemptibleKiller() {
   printf "\nBinding the IAM role to the $SVC_ACCT SA\n"
   gcloud projects add-iam-policy-binding $GCP_PROJECT_ID \
     --member=serviceAccount:${service_account_email} \
-    --role=projects/${GCP_PROJECT_ID}/roles/preemptibleKiller &> /dev/null
+    --role=projects/${GCP_PROJECT_ID}/roles/preemptibleKiller &> $DEVNULL
   warnOnError $? "Binding may have failed or it already exists"
 
   bindWorkloadIdentity $SVC_ACCT $NAMESPACE
@@ -368,7 +368,7 @@ function installCertManagerSecret() {
   createNamespaceIfNeeded cert-manager
 
   local NSPACE="default"
-  kubectl get secret cloudflare --namespace $NSPACE &>/dev/null
+  kubectl get secret cloudflare --namespace $NSPACE &> $DEVNULL
   if [[ $? -eq 1 ]];
   then
     cat<<NEED_MANAGED_SECRET
@@ -405,7 +405,7 @@ function installVeleroEnvironment() {
   BUCKET="$GCP_PROJECT_ID-velero-$VELERO_HELM_CHART"
   GCE_REGION=`overwhelm -k GCE_REGION`
   printf "\nCreating storage bucket `color g $BUCKET` in `color g $GCE_REGION`\n"
-  gsutil mb -l $GCE_REGION gs://$BUCKET/ &> /dev/null
+  gsutil mb -l $GCE_REGION gs://$BUCKET/ &> $DEVNULL
   warnOnError $? "Bucket failed to create or already exists - go check it\n"
 
   ## Create a service account
@@ -413,7 +413,7 @@ function installVeleroEnvironment() {
   gcloud iam service-accounts create velero \
     --project $GCP_PROJECT_ID \
     --display-name "Velero service account" \
-    --description "Velero service account" &>/dev/null
+    --description "Velero service account" &> $DEVNULL
   if [ $? -eq 0 ];
   then
     # no error means a new SA was created - slight delay to let it update
@@ -446,7 +446,7 @@ function installVeleroEnvironment() {
   gcloud iam roles create velero.server \
     --project $GCP_PROJECT_ID \
     --title "Velero Server" \
-    --permissions "$(IFS=","; echo "${ROLE_PERMISSIONS[*]}")" &>/dev/null
+    --permissions "$(IFS=","; echo "${ROLE_PERMISSIONS[*]}")" &> $DEVNULL
   if [ $? -ne 0 ];
   then
     # assume error is that role exists so try updating instead
@@ -454,7 +454,7 @@ function installVeleroEnvironment() {
     gcloud iam roles update velero.server \
       --project $GCP_PROJECT_ID \
       --title "Velero Server" \
-      --permissions "$(IFS=","; echo "${ROLE_PERMISSIONS[*]}")" &>/dev/null
+      --permissions "$(IFS=","; echo "${ROLE_PERMISSIONS[*]}")" &> $DEVNULL
   fi
   warnOnError $? "Failed to add roles to velero.server - perhaps they already exist?"
 
@@ -463,7 +463,7 @@ function installVeleroEnvironment() {
     --project $GCP_PROJECT_ID \
     --member serviceAccount:$SERVICE_ACCOUNT_EMAIL \
     --condition 'None' \
-    --role projects/$GCP_PROJECT_ID/roles/velero.server &>/dev/null
+    --role projects/$GCP_PROJECT_ID/roles/velero.server &> $DEVNULL
   warnOnError $? "gcloud problem binding IAM policy"
 
   printf "\nBinding workload identity IAM policy to the SA\n"
@@ -485,7 +485,7 @@ function installVeleroEnvironment() {
   gsutil iam ch serviceAccount:$SERVICE_ACCOUNT_EMAIL:objectAdmin gs://$BUCKET
 
   ## Clean up from previous failed install
-  kubectl delete volumesnapshotlocation.velero.io -n velero gcp &>/dev/null
+  kubectl delete volumesnapshotlocation.velero.io -n velero gcp &> $DEVNULL
 }
 
 # If a helmup.plugin file exists and is executable helmup assumes it is
@@ -522,7 +522,7 @@ function getServiceAndChartVersion() {
   [ ! -z "$CHARTVER" ] && return # service and chart version from CLI
 
   # force the move away from the old approach
-  LCL_CHART=`compgen -G $SERVICE/Chart-?*.?*.?*` &>/dev/null
+  LCL_CHART=`compgen -G $SERVICE/Chart-?*.?*.?*` &> $DEVNULL
   if [ ! -z "$LCL_CHART" ];
   then
     CHARTVER=${LCL_CHART#*/Chart-}
@@ -564,7 +564,7 @@ CHARTVER=
 FROM_VERSIONS=
 function doInstall() {
 
-  helm repo update &> /dev/null
+  helm repo update &> $DEVNULL
 
   for PARAM in "$@";
   do
@@ -786,4 +786,4 @@ overwhelm
 GCP_PROJECT_ID="$(getProjectIdFromK8sContext)"
 
 doInstall $@
-cd - &> /dev/null
+cd - &> $DEVNULL

package/src/{push-my-chart → push-my-chart.mjs}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-const execa = require( 'execa' )
-const semverLt = require( 'semver/functions/lt' )
+import execa from 'execa'
+import { lt as semverLt } from 'semver'
 
 const pushItGood = async () => {
   const version = await execa( 'helm', [ 'version', '--short' ] )

package/src/refresh-npm-token.mjs

@@ -22,6 +22,13 @@ import os from 'node:os'
 import chalk from 'chalk'
 import execa from 'execa' // we can't use $ until we upgrade to ESM execa
 
+import { lt as semverLt } from 'semver'
+
+if ( semverLt ( process.version, '18.0.0' ) ) {
+  console.log( chalk.red( '\n\n***ERROR: must be running at least node 18\n' ) )
+  process.exit( 1 )
+}
+
 // max age in seconds of the npmrc file before refresh
 const refreshThreshold = 3600 * 24 // 1 day
 

package/src/{unleash.js → unleash.mjs}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-const execa = require( 'execa' )
-const SimpleGit = require( 'simple-git' )
+import execa from 'execa'
+import SimpleGit from 'simple-git'
 
 const git = new SimpleGit()