@leverege/build-tools 2.103.0 → 2.104.0

package/.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10

package/eslint.config.mjs

@@ -0,0 +1,13 @@
+import eslintConfig from '@leverege/eslint-config-leverege'
+
+export default [
+  ...eslintConfig,
+  {
+    rules: {
+      '@stylistic/curly-newline': 'off',
+      '@stylistic/key-spacing': 'off',
+      '@stylistic/object-curly-newline': 'off',
+      '@stylistic/nonblock-statement-body-position': 'off'
+    }
+  }
+]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.103.0",
+  "version": "2.104.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -9,7 +9,7 @@
   },
   "scripts": {
     "clean": "rm -rf lib",
-    "lint": "find ./src -name \\*.\\*js | xargs npx eslint --report-unused-disable-directives",
+    "lint": "eslint",
     "prepare": "[ $SKIP_PREPARE ] && exit 0 || ./src/hook-and-release.mjs",
     "test": "mocha -t 60000 --exit 'test/**/!(*e2e*).mjs'",
     "test-all": "mocha -t 60000 --exit 'test/**/**.mjs'",
@@ -66,7 +66,6 @@
     "send-to-slack": "src/send-to-slack.mjs",
     "service-man": "src/service-man/service-man.mjs",
     "snapshot-cnpg": "src/snapshot-cnpg.mjs",
-    "unleash": "src/unleash.mjs",
     "upload-model": "src/upload-model.sh",
     "yarn-build": "src/yarn-build.mjs"
   },
@@ -111,8 +110,9 @@
     "zx": "^8.8.5"
   },
   "devDependencies": {
-    "@leverege/eslint-config-leverege": "^5.1.2",
+    "@leverege/eslint-config-leverege": "^9.0.1",
     "chai": "^6.2.2",
+    "eslint": "^9",
     "mocha": "^11.7.5",
     "npm": "^11.14.1"
   }

package/src/Docker.mjs

@@ -98,7 +98,7 @@ const generateDockerfile = async ( options ) => {
   // could probably be tightened up a little.
   try {
     fs.readdirSync( './docker' )
-  } catch ( err ) {
+  } catch ( err ) { // eslint-disable-line no-unused-vars
     warning( 'creating the missing ./docker directory' )
     fs.mkdirSync( './docker' ) // TODO: blindly assumes the mkdir succeeds
   }
@@ -120,7 +120,7 @@ const generateDockerfile = async ( options ) => {
   try {
     fs.writeFileSync( bashrcFile, bashrcTemplate )
     fs.appendFileSync( bashrcFile, bashrcPlugin )
-  } catch ( err ) {
+  } catch ( err ) { // eslint-disable-line no-unused-vars
     errorExit( `***ERROR: failed creation of the ${bashrcFile} file` )
   }
 
@@ -136,7 +136,7 @@ const generateDockerfile = async ( options ) => {
     if ( build.length === 0 ) {
       errorExit( `***ERROR: the build dir is empty - ${chalk.yellow( 'npm run build' )}` )
     }
-  } catch ( err ) {
+  } catch ( err ) { // eslint-disable-line no-unused-vars
     errorExit( `***ERROR: expected the ${buildDir} directory to exist - ${chalk.yellow( 'npm run build' )}` )
   }
 

package/src/Utils.mjs

@@ -132,7 +132,7 @@ export const shellCmd = async ( cmd, opts = {} ) => {
     } else {
       const parsed = parse( cmd ).filter( x => typeof x === 'string' )
       // the leading ; forces a break from previous line otherwise trailing ) and leading [ collide
-      ;[ command, ...args ] = parsed // eslint-disable-line semi-style
+      ;[ command, ...args ] = parsed // eslint-disable-line @stylistic/semi-style
     }
 
     debug( { command, args }, '<== execa $ invoke' )
@@ -271,7 +271,7 @@ export const getGitBranchAndUpstream = async () => {
   let upstream = 'no-upstream'
   try {
     upstream = await tryCommand( `git rev-parse --abbrev-ref ${branch}@{u}`, 'getGitUpstream' ) ?? 'no-upstream'
-  } catch ( error ) {}
+  } catch ( error ) {} // eslint-disable-line no-unused-vars
   return { branch, upstream }
 }
 
@@ -710,12 +710,12 @@ export const analyzeRepository = async ( giveGuidance ) => {
   let wsName
   try {
     wsName = await shellCmd( 'npm exec -c pwd -ws' )
-  } catch ( err ) { }
+  } catch ( err ) { } // eslint-disable-line no-unused-vars
 
   let gitRemote
   try {
     gitRemote = await shellCmd( 'git config --get remote.origin.url' )
-  } catch ( err ) { }
+  } catch ( err ) { } // eslint-disable-line no-unused-vars
 
   // TODO: Add in Define VERBOSE_DOCKREATE_NPM="yes" for verbose build logging
   // TODO: Validity check for version and package.json

package/src/build-cnpg-image.mjs

@@ -139,7 +139,7 @@ const buildAndPushImage = async () => {
   const dockerfilePath = path.join( buildDir, 'Dockerfile' )
 
   try {
-    fs.writeFileSync( dockerfilePath, renderedDockerfile )
+    fs.writeFileSync( dockerfilePath, renderedDockerfile ) // eslint-disable-line security/detect-non-literal-fs-filename
 
     log( chalk.yellow( '\nBuilding Docker image...' ) )
     const cloudBuildSubmit = 'gcloud builds submit --project leverege-registry'

package/src/chart-compass.mjs

@@ -96,7 +96,7 @@ if ( args.init ) {
     errorExit( '\n***ERROR: expected to run in the root of a platform-k8s branch - no overwhelm.yaml present' )
   }
 
-  if ( fs.existsSync( args.compass ) ) {
+  if ( fs.existsSync( args.compass ) ) { // eslint-disable-line security/detect-non-literal-fs-filename
     errorExit( `\n***ERROR: ${args.compass} compass file already exists - not overwriting` )
   }
 
@@ -107,12 +107,12 @@ if ( args.init ) {
 
 // simply wraps the YAML read/sync
 const buildCompassMap = ( yamlFile ) => {
-  if ( !fs.existsSync( yamlFile ) ) {
+  if ( !fs.existsSync( yamlFile ) ) { // eslint-disable-line security/detect-non-literal-fs-filename
     debug( `chart-compass file ${yamlFile} does not exist` )
     process.exit( 1 )
   }
 
-  const chartCompass = YAML.load( fs.readFileSync( yamlFile, 'utf8' ) )
+  const chartCompass = YAML.load( fs.readFileSync( yamlFile, 'utf8' ) ) // eslint-disable-line security/detect-non-literal-fs-filename
   return chartCompass
 }
 

package/src/chart-to-registry.mjs

@@ -151,7 +151,7 @@ try {
   } else {
     errorExit( `\n***ERROR: chart ${chartName} version ${chartVersion} already exists` )
   }
-} catch ( error ) {
+} catch ( error ) { // eslint-disable-line no-unused-vars
   debug( `Chart ${chartName} version ${chartVersion} does not exist - proceeding` )
 }
 

package/src/custom-images/bitnami-audits/bitnami-audit.mjs

@@ -123,7 +123,7 @@ const runner = async ( projects ) => {
     log( `Project [${project}]` )
     try {
       await prepareContext( project ) // eslint-disable-line no-await-in-loop
-    } catch ( error ) {
+    } catch ( error ) { // eslint-disable-line no-unused-vars
       log( `Project or context is invalid, skipping [${chalk.redBright( project )}]` )
       continue
     }

package/src/dashboard/DashboardManager.mjs

@@ -59,6 +59,7 @@ export default class DashboardManager {
       // leaf directory — apply JSON files using basename as the Grafana folder name
       const folderName = path.basename( dir )
       for ( const file of jsonFiles ) {
+        // eslint-disable-next-line no-await-in-loop
         const name = await this.#applyDashboard( folderName, path.join( dir, file.name ) )
         if ( name ) applied.add( name )
       }
@@ -79,6 +80,7 @@ export default class DashboardManager {
           .filter( f => f.endsWith( '.json' ) )
 
         for ( const file of files ) {
+          // eslint-disable-next-line no-await-in-loop
           const name = await this.#applyDashboard( folder.name, path.join( dir, folder.name, file ) )
           if ( name ) applied.add( name )
         }
@@ -159,6 +161,7 @@ export default class DashboardManager {
     if ( subDirs.length === 0 ) {
       const folderName = path.basename( dir )
       for ( const file of jsonFiles ) {
+        // eslint-disable-next-line no-await-in-loop
         const name = await this.#applyDashboard( folderName, path.join( dir, file.name ), local )
         if ( name ) applied.add( name )
       }
@@ -168,6 +171,7 @@ export default class DashboardManager {
           .filter( f => f.endsWith( '.json' ) )
 
         for ( const file of files ) {
+        // eslint-disable-next-line no-await-in-loop
           const name = await this.#applyDashboard( folder.name, path.join( dir, folder.name, file ), local )
           if ( name ) applied.add( name )
         }
@@ -259,6 +263,7 @@ export default class DashboardManager {
         continue
       }
       try {
+        // eslint-disable-next-line no-await-in-loop
         await api.deleteNamespacedConfigMap( { name, namespace : this.#namespace } )
         log( chalk.red( `  ✗ pruned ${name}` ) )
       } catch ( e ) {
@@ -290,6 +295,7 @@ export default class DashboardManager {
         continue
       }
       try {
+        // eslint-disable-next-line no-await-in-loop
         await api.deleteNamespacedConfigMap( { name, namespace : this.#namespace } )
         log( chalk.red( `  ✗ pruned (local) ${name}` ) )
       } catch ( e ) {

package/src/firebaseDeploy.mjs

@@ -79,7 +79,6 @@ const targets = Object
           // Store the longest length of site id for formatting later on
           maxSiteIdLength = Math.max( siteId.length, maxSiteIdLength )
 
-          // eslint-disable-next-line no-param-reassign
           prev[alias] = {
             projectId,
             siteId,

package/src/firebaseServe.mjs

@@ -65,7 +65,6 @@ const targets = Object
       .entries( config.hosting )
       .forEach( ( [ siteId, aliases ] ) => {
         aliases.forEach( ( alias ) => {
-          // eslint-disable-next-line no-param-reassign
           prev[alias] = {
             projectId,
             siteId,

package/src/overwhelm.mjs

@@ -26,7 +26,7 @@ import {
 } from './Utils.mjs'
 
 const optionsDefinitions = [
-  /* eslint-disable no-multi-spaces */
+  /* DISABLED eslint-disable no-multi-spaces */
   { name : 'context',    alias : 'x', type : String, default : '' },
   { name : 'deprecated', alias : 'd', type : Boolean, default : false },
   { name : 'section',    alias : 's', type : String, default : 'default' },
@@ -38,7 +38,7 @@ const optionsDefinitions = [
   { name : 'genvals',    alias : 'g', type : Boolean, default : false }, // only generates values.yaml
   { name : 'matchk8s',   alias : 'm', type : Boolean, default : false }, // checks k8s context
   { name : 'verbose',    alias : 'v', type : Boolean, default : false },
-  /* eslint-enable no-multi-spaces */
+  /* DISABLED eslint-enable no-multi-spaces */
 ]
 const args = cliArgs( optionsDefinitions )
 
@@ -307,12 +307,12 @@ ahoy.forEach( ( dir ) => {
     const valuesAll = YAML.load( valuesOut ) || {}
     const valuesSvc = {
       service : {
-        /* eslint-disable no-template-curly-in-string */
+        /* DISABLE eslint-disable no-template-curly-in-string */
         project_id : '${PROJECT_ID}',
         project_name : '${PROJECT_NAME}',
         host : '${HOST}',
         ingress : '${INGRESS}',
-        /* eslint-enable no-template-curly-in-string */
+        /* DISABLE eslint-enable no-template-curly-in-string */
       }
     }
     const valuesMerged = YAML.dump( deepmerge( valuesSvc, valuesAll ), { quotingType : '"' } )
@@ -342,33 +342,11 @@ if ( over.PROJECT_NAME === 'minikube' ) {
 const projectId = over.PROJECT_ID
 const zone = over.GCE_REGION + ( over.GCE_ZONE ? `-${over.GCE_ZONE}` : '' )
 
-if ( !clusterName ) {
-  /* eslint-disable quotes */
-  log( chalk.yellow(
-    `
-
-    The overwhelm.yaml file in this branch is missing a CLUSTER_NAME setting,
-    which was added to support cluster names that do not match the project
-    name. Since the mismatch is rare, you can probably get by with simply
-    adding this line following PROJECT_NAME in the default section of
-    overwhelm.yaml:
-
-      ${chalk.bold.green( `CLUSTER_NAME   : '\${PROJECT_NAME}'` )}
-
-    However, if the CLUSTER_NAME is not the same as the PROJECT_NAME then go
-    ahead and add the CLUSTER_NAME setting to the ${chalk.bold.green( projectId )} section of the
-    overwhelm.yaml file.
-
-    ` ) )
-  /* eslint-enable quotes */
-  process.exit( 1 )
-}
-
 // the kubectl call will throw if there isn't an existing context
 let currentCtx = '_no_current_context_'
 try {
   currentCtx = await shellCmd( 'kubectl config current-context' )
-} catch ( err ) {
+} catch ( err ) { // eslint-disable-line no-unused-vars
   // err && log( `Caught Error =>[${err}]` )
 }
 
@@ -386,7 +364,7 @@ if ( args.fetchctx ) {
   if ( !matchedCtx ) {
     try {
       await shellCmd( cmd )
-    } catch ( err ) {
+    } catch ( err ) { // eslint-disable-line no-unused-vars
       process.exit( 61 ) // ECONNREFUSED
     }
   }

package/src/repo-panopticon.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-/* eslint-disable security/detect-non-literal-fs-filename, no-multi-spaces, key-spacing */
+/* eslint-disable security/detect-non-literal-fs-filename */
 import fs from 'node:fs'
 import path from 'node:path'
 

package/src/service-man/config/CommandLine.mjs

@@ -94,12 +94,14 @@ const cliOptionList = [ // Use cliOptionList to tie into the Usage statements
     default : false,
     description : '{green display this help screen}',
   },
-  { name : 'version',
+  {
+    name : 'version',
     type : Boolean,
     default : false,
     description : '{green returns the build-tools repo version}',
   },
-  { name : 'verbose',
+  {
+    name : 'verbose',
     alias : 'v',
     type : Boolean,
     default : false,
@@ -114,7 +116,8 @@ const sections = [
   {green This utility attempts to ease the pain of managing IAM roles and the creation of service accounts for new clusters and services.}
 `,
   },
-  { header : 'Options',
+  {
+    header : 'Options',
     optionList : cliOptionList,
   },
 ]

package/src/service-man/config/Config.mjs

@@ -57,7 +57,7 @@ export default class Config {
   Remove => ` + chalk.yellow.bold( dumpDir ) )
         process.exit( 1 )
       }
-    } catch ( err ) {
+    } catch ( err ) { // eslint-disable-line no-unused-vars
       // this file does not exist is a good thing
     }
 

package/src/service-man/gcloud-k8s/RolesManager.mjs

@@ -24,7 +24,7 @@ export default class RolesManager {
         /* eslint-disable-next-line no-await-in-loop */
         await shellCmd( `gcloud iam roles ${iamVerb} ${roleName} --project ${k8sProject}` )
         iamVerb = 'update' // no err then the role exists - do an update
-      } catch ( err ) {
+      } catch ( err ) { // eslint-disable-line no-unused-vars
         iamVerb = 'create' // failed call so role does not exist - create it
       }
 

package/src/service-man/gcloud-k8s/SecretsManager.mjs

@@ -42,7 +42,7 @@ export default class SecretsManager {
     try {
       await shellCmd( `gcloud secrets describe ${key} --project ${project}` )
       exists = true
-    } catch ( err ) {
+    } catch ( err ) { // eslint-disable-line no-unused-vars
       exists = false
     }
 
@@ -72,7 +72,7 @@ export default class SecretsManager {
       if ( labelStr ) createCmd.push( `--labels=${labelStr}` )
       if ( annotationStr ) createCmd.push( `--set-annotations=${annotationStr}` )
       await shellCmd( createCmd, { input : value } )
-    } catch ( err ) {
+    } catch ( err ) { // eslint-disable-line no-unused-vars
       log( chalk.red( `\nSM secret write failed for ${key}\n` ) )
     }
   }
@@ -136,7 +136,7 @@ ${dataLines}
       log( `  Applying ExternalSecret => ${chalk.green( name )} in ${chalk.yellow( namespace )}` )
       try {
         await shellCmd( [ 'kubectl', 'apply', '-f', '-' ], { input : yaml } ) // eslint-disable-line no-await-in-loop
-      } catch ( err ) {
+      } catch ( err ) { // eslint-disable-line no-unused-vars
         log( chalk.red( `\nExternalSecret apply failed for ${name}\n` ) )
       }
     }

package/src/service-man/gcloud-k8s/ServiceAccountManager.mjs

@@ -74,7 +74,7 @@ export default class ServiceAccountManager {
       try {
         await shellCmd( `${command} ${options}` ) // eslint-disable-line no-await-in-loop
         return true
-      } catch ( err ) {
+      } catch ( err ) { // eslint-disable-line no-unused-vars
         log( '   IAM propagating => ', chalk.yellow( role ) )
       }
       await delayWithBackoff( retryCount ) // eslint-disable-line no-await-in-loop
@@ -108,7 +108,7 @@ export default class ServiceAccountManager {
       try {
         await shellCmd( `${command} ${options}` ) // eslint-disable-line no-await-in-loop
         return true
-      } catch ( err ) {
+      } catch ( err ) { // eslint-disable-line no-unused-vars
         await delayWithBackoff( retryCount ) // eslint-disable-line no-await-in-loop
       }
     }
@@ -136,7 +136,7 @@ export default class ServiceAccountManager {
         if ( shellOut.match( `email: ${serviceName}` ) ) {
           return true
         }
-      } catch ( err ) {
+      } catch ( err ) { // eslint-disable-line no-unused-vars
         log( '            SA propagating => ', chalk.yellow( serviceName ) )
         await delayWithBackoff( retryCount ) // eslint-disable-line no-await-in-loop
       }
@@ -220,7 +220,7 @@ export default class ServiceAccountManager {
           log( '\nSkip existing SvcAct =>', chalk.yellow( saName ) )
           continue
         }
-      } catch ( err ) {
+      } catch ( err ) { // eslint-disable-line no-unused-vars
         log( '\nCreating new SvcAcct =>', chalk.green( saName ) )
       }
 

package/src/unleash.mjs

@@ -39,7 +39,7 @@ const npmRunner = async ( script ) => {
     const cmd = `npm run ${script}`
     const results = await shellCmd( cmd, { stdio : 'inherit' } )
     return results
-  } catch ( err ) {
+  } catch ( err ) { // eslint-disable-line no-unused-vars
     process.exit( 1 )
   }
   return undefined