@leverege/build-tools 2.37.1 → 2.37.2

package/lib/server/overwhelm.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 
-//XXX console.log( `TOP=>[${process.cwd()}] PWD=[${process.env.PWD}]` )
+// XXX console.log( `TOP=>[${process.cwd()}] PWD=[${process.env.PWD}]` )
 /* eslint-disable no-console */
 "use strict";
 
 const path = require('node:path');
+const exec = require('node:child_process').execSync;
+const fs = require('node:fs');
 const chalk = require('chalk');
 const cliArgs = require('command-line-args');
 // const cliHelp = require( 'command-line-usage' )
 const deepmerge = require('deepmerge');
-const exec = require('child_process').execSync;
-const fs = require('fs');
 const glob = require('glob');
 const parse = require('parse-gitignore');
 const ask = require('readline-sync');
@@ -146,8 +146,8 @@ if (!cfgs) {
 }
 
 // Check to see if we are deriving from another configuration.
-if (cfgs['PROJECT_BASE']) {
-  const baseName = cfgs['PROJECT_BASE'];
+if (cfgs.PROJECT_BASE) {
+  const baseName = cfgs.PROJECT_BASE;
   const tempCfgs = cfgs;
   cfgs = yaml[baseName];
   Object.keys(tempCfgs).forEach(key => {
@@ -362,7 +362,7 @@ if (over.PROJECT_NAME === 'minikube') {
   process.exit(0);
 }
 const projectId = over.PROJECT_ID;
-let zone = over['GCE_REGION'] + (over['GCE_ZONE'] ? `-${over['GCE_ZONE']}` : '');
+let zone = over.GCE_REGION + (over.GCE_ZONE ? `-${over.GCE_ZONE}` : '');
 if (!clusterName) {
   console.log(chalk.yellow(`
 
@@ -392,17 +392,6 @@ try {
 const currentCtx = kubeout.toString().trim();
 let desiredCtx = `gke_${projectId}_${zone}_${clusterName}`;
 let cmd = `gcloud container clusters get-credentials ${clusterName} --zone ${zone} --project ${projectId}`;
-
-// Check if we are using AWS
-if (cfgs.CLOUD === 'aws') {
-  const awsAcctId = cfgs['AWS_ACCT_ID'];
-  zone = over['AWS_REGION'];
-  desiredCtx = `arn:aws:eks:${zone}:${awsAcctId}:cluster/${clusterName}`;
-  cmd = `aws eks --region ${zone} update-kubeconfig --name ${clusterName}`;
-}
-
-// TODO - FETCH AWS CLUSTER CREDENTIALS 
-
 const matchedCtx = currentCtx === desiredCtx;
 if (args.matchk8s) {
   process.exit(matchedCtx ? 0 : 1);

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

@@ -1,4 +1,20 @@
 #!/usr/bin/env node
+/*
+ * refresh-npm-token will check the access time of the $HOME/.npmrc npm token
+ * file and if it is older than 24 hours then it will be updated to whatever
+ * value is currently in the NPM_DEVELOPER_SECRET on leverege-artifacts. It
+ * will also check to see if the deprecated $HOME/.npmrc.ro file exists and
+ * will suggest to the user to remove it. If either of the token files exist
+ * the first 6 and last four characters of the token will be extracted and
+ * reported via slack to allow DevOps operators to clean up old tokens in npm.
+ *
+ * For testing the Unix touch command may be used to modify the access access
+ * time of the npmrc token. The REFRESH_NPM_TOKEN_DEBUG env variable may also
+ * be set to enable debugging and disable the slack channel spam.
+ *
+ * touch -d 2023-08-20 ~/.npmrc; REFRESH_NPM_TOKEN_DEBUG=1 refresh-npm-token.mjs
+ */
+
 /* eslint-disable security/detect-non-literal-fs-filename */
 "use strict";
 
@@ -13,6 +29,11 @@ const refreshThreshold = 3600 * 24; // 1 day
 
 // eslint-disable-next-line no-console
 const log = console.log;
+const debug = (obj, text) => {
+  if (process.env.REFRESH_NPM_TOKEN_DEBUG) {
+    log(obj, _chalk.default.yellow(text));
+  }
+};
 const fetchToken = filename => {
   const results = {
     filename,
@@ -43,8 +64,10 @@ const fetchToken = filename => {
 // fetch the tokens - note the RO token is deprecated and may not exist
 const npmrc = fetchToken(`${_nodeOs.default.homedir()}/.npmrc`);
 const npmrcRo = fetchToken(`${_nodeOs.default.homedir()}/.npmrc.ro`);
-
-// log( { npmrc, npmrcRo }, '<==Your tokens be' )
+debug({
+  npmrc,
+  npmrcRo
+}, '<==Your current tokens'); // debug
 
 if (npmrc.exists && npmrc.lastUpdated < refreshThreshold) {
   process.exit(0);
@@ -52,11 +75,14 @@ if (npmrc.exists && npmrc.lastUpdated < refreshThreshold) {
 
 // fetch the contents of the npmrc secret stored on leverege-registry
 let npmrcSecret;
+const execaOpts = ['secrets', 'versions', 'access', 'latest', '--secret=NPM_DEVELOPER_NPMRC', '--project=leverege-registry'];
 try {
-  const {
-    stdout
-  } = await (0, _execa.default)('gcloud', ['secrets', 'versions', 'access', 'latest', '--secret=NPM_DEVELOPER_NPMRC', '--project=leverege-registry']);
-  npmrcSecret = stdout;
+  const execaOut = await (0, _execa.default)('gcloud', execaOpts);
+  npmrcSecret = execaOut.stdout;
+  debug({
+    execaOut,
+    execaOpts
+  }, '<==exec info'); // debug
 } catch (err) {
   log(_chalk.default.yellow(`\nFailed Command => [${err.escapedCommand}]\n\n`), _chalk.default.red(err.stderr));
   process.exit(1);
@@ -81,13 +107,20 @@ const slackData = {
   text: `--- npmrc refreshed by \`${process.env.USER}\` at ${now}\n     tokens RW [\`${npmrc.token}\`] RO [\`${npmrcRo.token}\`]`,
   channel: '#dev-ops-helm'
 };
-fetch(slackURL, {
-  method: 'POST',
-  body: JSON.stringify(slackData),
-  headers: {
-    'Content-Type': 'application/json'
-  }
-}).catch(err => log(err));
+if (process.env.REFRESH_NPM_TOKEN_DEBUG) {
+  log({
+    slackURL,
+    slackData
+  }, '<==Slack skipped');
+} else {
+  fetch(slackURL, {
+    method: 'POST',
+    body: JSON.stringify(slackData),
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  });
+}
 if (npmrcRo.exists) {
   log(_chalk.default.red('\nWARNING - the need for the ~/.npmrc.ro file has been eliminated - please remove'));
   process.exit(1);

package/lib/web/overwhelm.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 
-//XXX console.log( `TOP=>[${process.cwd()}] PWD=[${process.env.PWD}]` )
+// XXX console.log( `TOP=>[${process.cwd()}] PWD=[${process.env.PWD}]` )
 /* eslint-disable no-console */
 "use strict";
 
 const path = require('node:path');
+const exec = require('node:child_process').execSync;
+const fs = require('node:fs');
 const chalk = require('chalk');
 const cliArgs = require('command-line-args');
 // const cliHelp = require( 'command-line-usage' )
 const deepmerge = require('deepmerge');
-const exec = require('child_process').execSync;
-const fs = require('fs');
 const glob = require('glob');
 const parse = require('parse-gitignore');
 const ask = require('readline-sync');
@@ -146,8 +146,8 @@ if (!cfgs) {
 }
 
 // Check to see if we are deriving from another configuration.
-if (cfgs['PROJECT_BASE']) {
-  const baseName = cfgs['PROJECT_BASE'];
+if (cfgs.PROJECT_BASE) {
+  const baseName = cfgs.PROJECT_BASE;
   const tempCfgs = cfgs;
   cfgs = yaml[baseName];
   Object.keys(tempCfgs).forEach(key => {
@@ -362,7 +362,7 @@ if (over.PROJECT_NAME === 'minikube') {
   process.exit(0);
 }
 const projectId = over.PROJECT_ID;
-let zone = over['GCE_REGION'] + (over['GCE_ZONE'] ? `-${over['GCE_ZONE']}` : '');
+let zone = over.GCE_REGION + (over.GCE_ZONE ? `-${over.GCE_ZONE}` : '');
 if (!clusterName) {
   console.log(chalk.yellow(`
 
@@ -392,17 +392,6 @@ try {
 const currentCtx = kubeout.toString().trim();
 let desiredCtx = `gke_${projectId}_${zone}_${clusterName}`;
 let cmd = `gcloud container clusters get-credentials ${clusterName} --zone ${zone} --project ${projectId}`;
-
-// Check if we are using AWS
-if (cfgs.CLOUD === 'aws') {
-  const awsAcctId = cfgs['AWS_ACCT_ID'];
-  zone = over['AWS_REGION'];
-  desiredCtx = `arn:aws:eks:${zone}:${awsAcctId}:cluster/${clusterName}`;
-  cmd = `aws eks --region ${zone} update-kubeconfig --name ${clusterName}`;
-}
-
-// TODO - FETCH AWS CLUSTER CREDENTIALS 
-
 const matchedCtx = currentCtx === desiredCtx;
 if (args.matchk8s) {
   process.exit(matchedCtx ? 0 : 1);

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

@@ -1,4 +1,20 @@
 #!/usr/bin/env node
+/*
+ * refresh-npm-token will check the access time of the $HOME/.npmrc npm token
+ * file and if it is older than 24 hours then it will be updated to whatever
+ * value is currently in the NPM_DEVELOPER_SECRET on leverege-artifacts. It
+ * will also check to see if the deprecated $HOME/.npmrc.ro file exists and
+ * will suggest to the user to remove it. If either of the token files exist
+ * the first 6 and last four characters of the token will be extracted and
+ * reported via slack to allow DevOps operators to clean up old tokens in npm.
+ *
+ * For testing the Unix touch command may be used to modify the access access
+ * time of the npmrc token. The REFRESH_NPM_TOKEN_DEBUG env variable may also
+ * be set to enable debugging and disable the slack channel spam.
+ *
+ * touch -d 2023-08-20 ~/.npmrc; REFRESH_NPM_TOKEN_DEBUG=1 refresh-npm-token.mjs
+ */
+
 /* eslint-disable security/detect-non-literal-fs-filename */
 "use strict";
 
@@ -13,6 +29,11 @@ const refreshThreshold = 3600 * 24; // 1 day
 
 // eslint-disable-next-line no-console
 const log = console.log;
+const debug = (obj, text) => {
+  if (process.env.REFRESH_NPM_TOKEN_DEBUG) {
+    log(obj, _chalk.default.yellow(text));
+  }
+};
 const fetchToken = filename => {
   const results = {
     filename,
@@ -43,8 +64,10 @@ const fetchToken = filename => {
 // fetch the tokens - note the RO token is deprecated and may not exist
 const npmrc = fetchToken(`${_nodeOs.default.homedir()}/.npmrc`);
 const npmrcRo = fetchToken(`${_nodeOs.default.homedir()}/.npmrc.ro`);
-
-// log( { npmrc, npmrcRo }, '<==Your tokens be' )
+debug({
+  npmrc,
+  npmrcRo
+}, '<==Your current tokens'); // debug
 
 if (npmrc.exists && npmrc.lastUpdated < refreshThreshold) {
   process.exit(0);
@@ -52,11 +75,14 @@ if (npmrc.exists && npmrc.lastUpdated < refreshThreshold) {
 
 // fetch the contents of the npmrc secret stored on leverege-registry
 let npmrcSecret;
+const execaOpts = ['secrets', 'versions', 'access', 'latest', '--secret=NPM_DEVELOPER_NPMRC', '--project=leverege-registry'];
 try {
-  const {
-    stdout
-  } = await (0, _execa.default)('gcloud', ['secrets', 'versions', 'access', 'latest', '--secret=NPM_DEVELOPER_NPMRC', '--project=leverege-registry']);
-  npmrcSecret = stdout;
+  const execaOut = await (0, _execa.default)('gcloud', execaOpts);
+  npmrcSecret = execaOut.stdout;
+  debug({
+    execaOut,
+    execaOpts
+  }, '<==exec info'); // debug
 } catch (err) {
   log(_chalk.default.yellow(`\nFailed Command => [${err.escapedCommand}]\n\n`), _chalk.default.red(err.stderr));
   process.exit(1);
@@ -81,13 +107,20 @@ const slackData = {
   text: `--- npmrc refreshed by \`${process.env.USER}\` at ${now}\n     tokens RW [\`${npmrc.token}\`] RO [\`${npmrcRo.token}\`]`,
   channel: '#dev-ops-helm'
 };
-fetch(slackURL, {
-  method: 'POST',
-  body: JSON.stringify(slackData),
-  headers: {
-    'Content-Type': 'application/json'
-  }
-}).catch(err => log(err));
+if (process.env.REFRESH_NPM_TOKEN_DEBUG) {
+  log({
+    slackURL,
+    slackData
+  }, '<==Slack skipped');
+} else {
+  fetch(slackURL, {
+    method: 'POST',
+    body: JSON.stringify(slackData),
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  });
+}
 if (npmrcRo.exists) {
   log(_chalk.default.red('\nWARNING - the need for the ~/.npmrc.ro file has been eliminated - please remove'));
   process.exit(1);

package/package.json

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

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="4"
+[ -z "$VELERO_CHART_VERSION" ] && VELERO_CHART_VERSION="5"
 #
 # 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

@@ -399,7 +399,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="4"
+  [ -z "$VELERO_HELM_CHART" ] && VELERO_HELM_CHART="5"
 
   ## Create a bucket
   BUCKET="$GCP_PROJECT_ID-velero-$VELERO_HELM_CHART"

package/src/overwhelm.js

@@ -1,15 +1,16 @@
 #!/usr/bin/env node
 
-//XXX console.log( `TOP=>[${process.cwd()}] PWD=[${process.env.PWD}]` )
+// XXX console.log( `TOP=>[${process.cwd()}] PWD=[${process.env.PWD}]` )
 /* eslint-disable no-console */
 
 const path = require( 'node:path' )
+const exec = require( 'node:child_process' ).execSync
+const fs = require( 'node:fs' )
+
 const chalk = require( 'chalk' )
 const cliArgs = require( 'command-line-args' )
 // const cliHelp = require( 'command-line-usage' )
 const deepmerge = require( 'deepmerge' )
-const exec = require( 'child_process' ).execSync
-const fs = require( 'fs' )
 const glob = require( 'glob' )
 const parse = require( 'parse-gitignore' )
 const ask = require( 'readline-sync' )
@@ -36,7 +37,7 @@ const gitTop = exec(
   'git rev-parse --show-toplevel', { stdio : [ undefined ] }
 ).toString().trim()
 let monoTop
-if( fs.existsSync( `${gitTop}/packages` ) ) {
+if ( fs.existsSync( `${gitTop}/packages` ) ) {
   monoTop = path.basename( path.resolve() ) // process.env.PWD
   console.log( `MONO=[${monoTop}]` )
 }
@@ -97,8 +98,8 @@ if ( !cfgs ) {
 }
 
 // Check to see if we are deriving from another configuration.
-if ( cfgs['PROJECT_BASE'] ) {
-  const baseName = cfgs['PROJECT_BASE']
+if ( cfgs.PROJECT_BASE ) {
+  const baseName = cfgs.PROJECT_BASE
   const tempCfgs = cfgs
   cfgs = yaml[baseName]
   Object.keys( tempCfgs ).forEach( ( key ) => { cfgs[key] = tempCfgs[key] } )
@@ -294,21 +295,21 @@ ahoy.forEach( ( dir ) => {
 
 // we can also apply replaceables to any top level .ovh files to support top level config maps
 glob.sync( '**/*.ovh' ).forEach( ( cfgmap ) => {
-  const target = cfgmap.replace(/.ovh$/,'')
+  const target = cfgmap.replace( /.ovh$/, '' )
   let valuesOut = fs.readFileSync( cfgmap, { encoding : 'utf-8' } )
   valuesOut = doReplacements( valuesOut, over )
   fs.writeFileSync( target, valuesOut )
 } )
 
-if( args.genvals ) { process.exit( 0 ) }
+if ( args.genvals ) { process.exit( 0 ) }
 
 // Set the GCP context for safety!
 const clusterName = over.CLUSTER_NAME
 if ( over.PROJECT_NAME === 'minikube' ) {
-  process.exit(0)
+  process.exit( 0 )
 }
 const projectId = over.PROJECT_ID
-let zone = over['GCE_REGION'] + ( over['GCE_ZONE'] ? `-${over['GCE_ZONE']}` : '' )
+let zone = over.GCE_REGION + ( over.GCE_ZONE ? `-${over.GCE_ZONE}` : '' )
 
 if ( !clusterName ) {
   console.log( chalk.yellow(
@@ -341,16 +342,6 @@ const currentCtx = kubeout.toString().trim()
 let desiredCtx = `gke_${projectId}_${zone}_${clusterName}`
 let cmd = `gcloud container clusters get-credentials ${clusterName} --zone ${zone} --project ${projectId}`
 
-// Check if we are using AWS
-if ( cfgs.CLOUD === 'aws' ) {
-  const awsAcctId = cfgs['AWS_ACCT_ID']
-  zone = over['AWS_REGION']
-  desiredCtx = `arn:aws:eks:${zone}:${awsAcctId}:cluster/${clusterName}`
-  cmd = `aws eks --region ${zone} update-kubeconfig --name ${clusterName}`
-}
-
-// TODO - FETCH AWS CLUSTER CREDENTIALS 
-
 const matchedCtx = ( currentCtx === desiredCtx )
 
 if ( args.matchk8s ) {

package/src/push-my-chart

@@ -8,7 +8,7 @@ const pushItGood = async () => {
   const pusher = ( semverLt( version.stdout, '3.7.0' ) ? 'push' : 'cm-push' )
 
   try {
-    const museum = await execa ( 'helm', [ pusher, 'helm', 'leverege' ] )
+    const museum = await execa( 'helm', [ pusher, 'helm', 'leverege' ] )
     console.log( museum.stdout )
   } catch ( ex ) {
     console.log( ex.stderr )

package/src/refresh-npm-token.mjs

@@ -1,4 +1,20 @@
 #!/usr/bin/env node
+/*
+ * refresh-npm-token will check the access time of the $HOME/.npmrc npm token
+ * file and if it is older than 24 hours then it will be updated to whatever
+ * value is currently in the NPM_DEVELOPER_SECRET on leverege-artifacts. It
+ * will also check to see if the deprecated $HOME/.npmrc.ro file exists and
+ * will suggest to the user to remove it. If either of the token files exist
+ * the first 6 and last four characters of the token will be extracted and
+ * reported via slack to allow DevOps operators to clean up old tokens in npm.
+ *
+ * For testing the Unix touch command may be used to modify the access access
+ * time of the npmrc token. The REFRESH_NPM_TOKEN_DEBUG env variable may also
+ * be set to enable debugging and disable the slack channel spam.
+ *
+ * touch -d 2023-08-20 ~/.npmrc; REFRESH_NPM_TOKEN_DEBUG=1 refresh-npm-token.mjs
+ */
+
 /* eslint-disable security/detect-non-literal-fs-filename */
 import fs from 'node:fs'
 import os from 'node:os'
@@ -11,6 +27,9 @@ const refreshThreshold = 3600 * 24 // 1 day
 
 // eslint-disable-next-line no-console
 const log = console.log
+const debug = ( obj, text ) => {
+  if ( process.env.REFRESH_NPM_TOKEN_DEBUG ) { log( obj, chalk.yellow( text ) ) }
+}
 
 const fetchToken = ( filename ) => {
   const results = {
@@ -43,22 +62,24 @@ const fetchToken = ( filename ) => {
 const npmrc = fetchToken( `${os.homedir()}/.npmrc` )
 const npmrcRo = fetchToken( `${os.homedir()}/.npmrc.ro` )
 
-// log( { npmrc, npmrcRo }, '<==Your tokens be' )
+debug( { npmrc, npmrcRo }, '<==Your current tokens' ) // debug
 
 if ( npmrc.exists && npmrc.lastUpdated < refreshThreshold ) { process.exit( 0 ) }
 
 // fetch the contents of the npmrc secret stored on leverege-registry
 let npmrcSecret
+const execaOpts = [
+  'secrets',
+  'versions',
+  'access',
+  'latest',
+  '--secret=NPM_DEVELOPER_NPMRC',
+  '--project=leverege-registry',
+]
 try {
-  const { stdout } = await execa( 'gcloud', [
-    'secrets',
-    'versions',
-    'access',
-    'latest',
-    '--secret=NPM_DEVELOPER_NPMRC',
-    '--project=leverege-registry',
-  ] )
-  npmrcSecret = stdout
+  const execaOut = await execa( 'gcloud', execaOpts )
+  npmrcSecret = execaOut.stdout
+  debug( { execaOut, execaOpts }, '<==exec info' )// debug
 } catch ( err ) {
   log( chalk.yellow( `\nFailed Command => [${err.escapedCommand}]\n\n` ), chalk.red( err.stderr ) )
   process.exit( 1 )
@@ -85,14 +106,17 @@ const slackData = {
   channel : '#dev-ops-helm',
 }
 
-fetch( slackURL, {
-  method : 'POST',
-  body : JSON.stringify( slackData ),
-  headers : {
-    'Content-Type' : 'application/json',
-  },
-} )
-  .catch( err => log( err ) )
+if ( process.env.REFRESH_NPM_TOKEN_DEBUG ) {
+  log( { slackURL, slackData }, '<==Slack skipped' )
+} else {
+  fetch( slackURL, {
+    method : 'POST',
+    body : JSON.stringify( slackData ),
+    headers : {
+      'Content-Type' : 'application/json',
+    },
+  } )
+}
 
 if ( npmrcRo.exists ) {
   log( chalk.red( '\nWARNING - the need for the ~/.npmrc.ro file has been eliminated - please remove' ) )