@leverege/build-tools 2.36.1 → 2.37.0

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

@@ -7,35 +7,52 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _execa = _interopRequireDefault(require("execa"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // we can't use $ until we upgrade to ESM execa
-// the standard user npmrc token is stored here
-const npmrc = `${_nodeOs.default.homedir()}/.npmrc`;
-
 // max age in seconds of the npmrc file before refresh
 const refreshThreshold = 3600 * 24; // 1 day
 
 const log = console.log;
-
-// calculate number of seconds since last update and exit if the file
-// was recently updated
-let lastUpdated = refreshThreshold * 2; // forces refresh if npmrc file does not exist
-let oldToken;
-try {
-  if (_nodeFs.default.existsSync(npmrc)) {
-    const stat = _nodeFs.default.statSync(npmrc);
-    lastUpdated = Math.trunc((Date.now() - stat.mtimeMs) / 1000);
-    // grab the old token for logging a redacted version
-    const oldNpmrc = _nodeFs.default.readFileSync(npmrc, 'utf8');
-    const found = oldNpmrc.match(/_authToken=(.*)\n/);
-    if (found) {
-      oldToken = `${found[1].slice(0, 8)}......${found[1].slice(-4)}`;
+const fetchToken = opts => {
+  const {
+    filename,
+    logMissing
+  } = opts;
+  const results = {
+    token: 'none',
+    lastUpdated: -1
+  };
+  try {
+    if (_nodeFs.default.existsSync(filename)) {
+      const stat = _nodeFs.default.statSync(filename);
+      results.lastUpdated = Math.trunc((Date.now() - stat.mtimeMs) / 1000);
+      // grab the current token for logging a redacted version
+      const currentNpmrc = _nodeFs.default.readFileSync(filename, 'utf8');
+      const found = currentNpmrc.match(/_authToken=(.*)\n/);
+      if (found) {
+        results.token = `${found[1].slice(0, 8)}......${found[1].slice(-4)}`;
+      }
+    }
+  } catch (statErr) {
+    if (logMissing) {
+      log({
+        statErr
+      }, `<==fs.statSync failed on file ${filename}`);
     }
   }
-} catch (statErr) {
-  log({
-    statErr
-  }, `<==fs.statSync failed on file ${npmrc}`);
-}
-if (lastUpdated < refreshThreshold) {
+  return results;
+};
+
+// fetch the tokens - note the RO token is deprecated and may not exist
+const npmrc = fetchToken({
+  filename: `${_nodeOs.default.homedir()}/.npmrc`,
+  logMissing: true
+});
+const npmrcRo = fetchToken({
+  filename: `${_nodeOs.default.homedir()}/.npmrc.ro`
+});
+
+// log( { npmrc, npmrcRo }, '<==Your tokens be' )
+
+if (npmrc.lastUpdated < refreshThreshold) {
   process.exit(0);
 }
 
@@ -66,7 +83,7 @@ try {
 const now = new Date().toLocaleString();
 const slackURL = 'https://hooks.slack.com/services/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';
 const slackData = {
-  text: `--- npmrc refreshed by \`${process.env['USER']}\` at ${now}\n     token [\`${oldToken}\`]`,
+  text: `--- npmrc refreshed by \`${process.env['USER']}\` at ${now}\n     tokens RW [\`${npmrc.token}\`] RO [\`${npmrcRo.token}\`]`,
   channel: '#dev-ops-helm'
 };
 fetch(slackURL, {
@@ -75,4 +92,8 @@ fetch(slackURL, {
   headers: {
     'Content-Type': 'application/json'
   }
-}).catch(err => console.log(err));
+}).catch(err => console.log(err));
+if (npmrcRo.token != 'none') {
+  log(_chalk.default.red(`\nWARNING - the need for the ~/.npmrc.ro file has been eliminated - please remove`));
+  process.exit(1);
+}

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

@@ -7,35 +7,52 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _execa = _interopRequireDefault(require("execa"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // we can't use $ until we upgrade to ESM execa
-// the standard user npmrc token is stored here
-const npmrc = `${_nodeOs.default.homedir()}/.npmrc`;
-
 // max age in seconds of the npmrc file before refresh
 const refreshThreshold = 3600 * 24; // 1 day
 
 const log = console.log;
-
-// calculate number of seconds since last update and exit if the file
-// was recently updated
-let lastUpdated = refreshThreshold * 2; // forces refresh if npmrc file does not exist
-let oldToken;
-try {
-  if (_nodeFs.default.existsSync(npmrc)) {
-    const stat = _nodeFs.default.statSync(npmrc);
-    lastUpdated = Math.trunc((Date.now() - stat.mtimeMs) / 1000);
-    // grab the old token for logging a redacted version
-    const oldNpmrc = _nodeFs.default.readFileSync(npmrc, 'utf8');
-    const found = oldNpmrc.match(/_authToken=(.*)\n/);
-    if (found) {
-      oldToken = `${found[1].slice(0, 8)}......${found[1].slice(-4)}`;
+const fetchToken = opts => {
+  const {
+    filename,
+    logMissing
+  } = opts;
+  const results = {
+    token: 'none',
+    lastUpdated: -1
+  };
+  try {
+    if (_nodeFs.default.existsSync(filename)) {
+      const stat = _nodeFs.default.statSync(filename);
+      results.lastUpdated = Math.trunc((Date.now() - stat.mtimeMs) / 1000);
+      // grab the current token for logging a redacted version
+      const currentNpmrc = _nodeFs.default.readFileSync(filename, 'utf8');
+      const found = currentNpmrc.match(/_authToken=(.*)\n/);
+      if (found) {
+        results.token = `${found[1].slice(0, 8)}......${found[1].slice(-4)}`;
+      }
+    }
+  } catch (statErr) {
+    if (logMissing) {
+      log({
+        statErr
+      }, `<==fs.statSync failed on file ${filename}`);
     }
   }
-} catch (statErr) {
-  log({
-    statErr
-  }, `<==fs.statSync failed on file ${npmrc}`);
-}
-if (lastUpdated < refreshThreshold) {
+  return results;
+};
+
+// fetch the tokens - note the RO token is deprecated and may not exist
+const npmrc = fetchToken({
+  filename: `${_nodeOs.default.homedir()}/.npmrc`,
+  logMissing: true
+});
+const npmrcRo = fetchToken({
+  filename: `${_nodeOs.default.homedir()}/.npmrc.ro`
+});
+
+// log( { npmrc, npmrcRo }, '<==Your tokens be' )
+
+if (npmrc.lastUpdated < refreshThreshold) {
   process.exit(0);
 }
 
@@ -66,7 +83,7 @@ try {
 const now = new Date().toLocaleString();
 const slackURL = 'https://hooks.slack.com/services/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';
 const slackData = {
-  text: `--- npmrc refreshed by \`${process.env['USER']}\` at ${now}\n     token [\`${oldToken}\`]`,
+  text: `--- npmrc refreshed by \`${process.env['USER']}\` at ${now}\n     tokens RW [\`${npmrc.token}\`] RO [\`${npmrcRo.token}\`]`,
   channel: '#dev-ops-helm'
 };
 fetch(slackURL, {
@@ -75,4 +92,8 @@ fetch(slackURL, {
   headers: {
     'Content-Type': 'application/json'
   }
-}).catch(err => console.log(err));
+}).catch(err => console.log(err));
+if (npmrcRo.token != 'none') {
+  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.36.1",
+  "version": "2.37.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/helmdn

@@ -92,6 +92,17 @@ function annihilateVelero() {
 }
 
 function helmDown() {
+  if [ -f "$1/.nohelmdn" ];
+  then
+  cat<<NOHELMDN
+  `color r "***ERROR: $1/.nohelmdn blocker detect - helmdn blocked"`
+
+  Somebody really doesn't want you to helmdn $1
+
+NOHELMDN
+  exit 1
+  fi
+
   local namespace=${2:-default}
   local helmdn="helm uninstall $1 -n $namespace"
   eval $helmdn

package/src/refresh-npm-token.mjs

@@ -5,33 +5,47 @@ import os from 'node:os'
 import chalk from 'chalk'
 import execa from 'execa' // we can't use $ until we upgrade to ESM execa
 
-// the standard user npmrc token is stored here
-const npmrc = `${os.homedir()}/.npmrc`
-
 // max age in seconds of the npmrc file before refresh
-const refreshThreshold = 3600 *24 // 1 day
+const refreshThreshold = 3600 * 24 // 1 day
 
 const log = console.log
 
-// calculate number of seconds since last update and exit if the file
-// was recently updated
-let lastUpdated = refreshThreshold * 2 // forces refresh if npmrc file does not exist
-let oldToken
-try {
-  if ( fs.existsSync( npmrc ) ) {
-    const stat = fs.statSync( npmrc )
-    lastUpdated = Math.trunc( ( Date.now() - stat.mtimeMs ) / 1000 )
-    // grab the old token for logging a redacted version
-    const oldNpmrc = fs.readFileSync( npmrc, 'utf8' )
-    const found = oldNpmrc.match( /_authToken=(.*)\n/ )
-    if( found ) {
-      oldToken = `${found[1].slice(0,8)}......${found[1].slice(-4)}`
+const fetchToken = ( opts ) => {
+  const { filename, logMissing } = opts
+  const results = { token : 'none', lastUpdated : -1 }
+
+  try {
+    if ( fs.existsSync( filename ) ) {
+      const stat = fs.statSync( filename )
+      results.lastUpdated = Math.trunc( ( Date.now() - stat.mtimeMs ) / 1000 )
+      // grab the current token for logging a redacted version
+      const currentNpmrc = fs.readFileSync( filename, 'utf8' )
+      const found = currentNpmrc.match( /_authToken=(.*)\n/ )
+      if( found ) {
+        results.token = `${found[1].slice(0,8)}......${found[1].slice(-4)}`
+      }
+    }
+  } catch ( statErr ) {
+    if ( logMissing ) {
+      log( { statErr }, `<==fs.statSync failed on file ${filename}` )
     }
   }
-} catch ( statErr ) {
-  log( { statErr }, `<==fs.statSync failed on file ${npmrc}` )
+
+  return results
 }
-if ( lastUpdated < refreshThreshold ) { process.exit( 0 ) }
+
+// fetch the tokens - note the RO token is deprecated and may not exist
+const npmrc = fetchToken( {
+  filename : `${os.homedir()}/.npmrc`,
+  logMissing : true,
+} )
+const npmrcRo = fetchToken( {
+  filename : `${os.homedir()}/.npmrc.ro`,
+} )
+
+// log( { npmrc, npmrcRo }, '<==Your tokens be' )
+
+if ( npmrc.lastUpdated < refreshThreshold ) { process.exit( 0 ) }
 
 // fetch the contents of the npmrc secret stored on leverege-registry
 let npmrcSecret
@@ -66,7 +80,7 @@ try {
 const now = ( new Date() ).toLocaleString()
 const slackURL = 'https://hooks.slack.com/services/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'
 const slackData = {
-  text: `--- npmrc refreshed by \`${process.env['USER']}\` at ${now}\n     token [\`${oldToken}\`]`,
+  text: `--- npmrc refreshed by \`${process.env['USER']}\` at ${now}\n     tokens RW [\`${npmrc.token}\`] RO [\`${npmrcRo.token}\`]`,
   channel: '#dev-ops-helm',
 }
 
@@ -78,3 +92,9 @@ fetch( slackURL, {
   },
 } )
   .catch( err => console.log( err ) )
+
+if ( npmrcRo.token != 'none' ) {
+  log( chalk.red( `\nWARNING - the need for the ~/.npmrc.ro file has been eliminated - please remove` ) )
+  process.exit( 1 )
+}
+