@leverege/build-tools 2.47.4 → 2.47.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.47.4",
+  "version": "2.47.5",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -77,6 +77,6 @@
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^4.2.0",
-    "npm": "^10.4.0"
+    "npm": "^10.5.0"
   }
 }

package/src/Docker.mjs

@@ -85,8 +85,7 @@ const pluginTemplate = `
 # a best practice.
 `
 
-const bashrcTemplate = `
-#!/bin/bash
+const bashrcTemplate = `#!/bin/bash
 #
 alias h=history
 
@@ -117,12 +116,16 @@ cmetrics()
 
 cmstat()
 {
-  wget -qO- localhost:5111${1}
+  wget -qO- localhost:5111
 }
 
 cmclear()
 {
-  cmstat /status/clear
+  # Future me - thinking this should call cmstat and pass in the endpoint as
+  # a parameter? Well don't do it - without escaping the dollar 1 in cmstat
+  # the port will end up being 51111, and escaping causes linting to complain
+  # about unnecessary escaping.
+  wget -qO- localhost:5111/status/clear
 }
 
 dunm() {
@@ -283,6 +286,7 @@ const repoCleanup = async () => {
     'docker/.keep',
     'docker/.npmrc',
     'docker/.gitignore',
+    'docker/.previous',
     'docker/Dockerfile',
     'docker/workspace',
   ]

package/src/Utils.mjs

@@ -334,7 +334,7 @@ export const parseHelmChart = async ( helmroot = './helm' ) => {
   } )
 }
 
-export const analyzeRepository = async () => {
+export const analyzeRepository = async ( giveGuidance ) => {
   const gitRoot = await getGitRootDirectory()
   const subPkgs = await glob( `${gitRoot}/packages/**/package.json`, { ignore : '/**/node_modules/**' } )
   const helmChart = await parseHelmChart()
@@ -382,6 +382,12 @@ export const analyzeRepository = async () => {
   } catch ( error ) {
     errorExit( error )
   }
+
+  if ( giveGuidance ) {
+    // let npm build run in guidance mode
+    await shellCmd( 'npm run build' )
+  }
+
   const containerName = closestPackageJson.name
   const artifactProject = closestPackageJson.artifactRegistry.project
   const artifactRegistry = closestPackageJson.leverege.registry

package/src/cnpg-snapshot.mjs

@@ -33,6 +33,6 @@ const tmpfile = temporaryFile()
 
 debug( { replaced, tmpfile }, '<==Apply That' )
 
-fs.writeFileSync( tmpfile, replaced )
+fs.writeFileSync( tmpfile, replaced ) // eslint-disable-line security/detect-non-literal-fs-filename
 await shellCmd( 'overwhelm' )
 await shellCmd( `kubectl apply -f ${tmpfile}` )

package/src/docker-to-registry.mjs

@@ -29,6 +29,9 @@ if ( !imageVersion ) {
   errorExit( '***Error: docker-to-registry requires an image version' )
 }
 
+// may use guide-me or guideme to ask for update guidance
+const giveGuidance = imageVersion.match( /^guide-*me$/ ) !== null
+
 const willGitTag = imageVersion.match( /^v\d+\.\d+\.\d+$/ )
 const tagInfo = willGitTag ?
   chalk.yellow.bold( 'will be git tagged' ) :
@@ -67,7 +70,7 @@ if ( !fs.existsSync( './helm' ) ) {
   process.exit( 1 )
 }
 
-const repoDescr = await analyzeRepository()
+const repoDescr = await analyzeRepository( giveGuidance )
 debug( { repoDescr }, '<==The Repo Description' )
 
 const dockerInfo = await docker.generateDockerfile()
@@ -82,7 +85,7 @@ const {
   isNpmWorkspace,
 } = repoDescr
 
-if ( imageVersion === 'guide-me' ) {
+if ( giveGuidance ) {
   await docker.validateCloudBuildBucket( artifactProject )
 }
 
@@ -92,7 +95,7 @@ const registryFolder = `${artifactRegistry}/images/${containerName}`
 log( chalk.green.bold( 'Updating dependencies and workspace...' ) )
 await shellCmd( 'npm install', { stdio : 'inherit' } )
 
-if ( imageVersion === 'guide-me' ) {
+if ( giveGuidance ) {
   await docker.repoCleanup() // adjusts gitignore files and removes cruft
   /* eslint-disable max-len */
   log( `

package/src/helm-charts/redis/helmup.plugin

@@ -4,7 +4,7 @@ showInstalling "Redis"
 
 OCI_CHART="oci://registry-1.docker.io/bitnamicharts/redis"
 
-[ -z "$REDIS_CHART_VERSION" ] && REDIS_CHART_VERSION="18.12.1"
+[ -z "$REDIS_CHART_VERSION" ] && REDIS_CHART_VERSION="18.16.1"
 
 helm upgrade --install redis $OCI_CHART       \
              --values  redis/redis-local.yaml \

package/src/helm-charts/traefik/traefik-local.yaml

@@ -13,11 +13,13 @@ deployment:
 logs:
   general:
     format: json
-    level: WARN # DEBUG
+    level: WARN # INFO # DEBUG
   access:
     enabled: true
     format: json
-    bufferingSize: 10
+#   fields:
+#     headers:
+#       defaultmode: keep
 
 # Custom entry points may be added here - the first two are port definitions
 # for both unsecured and secured MQTT ports used by connect. Note that the