@leverege/build-tools 2.66.4 → 2.66.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.66.4",
+  "version": "2.66.6",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -68,7 +68,7 @@
     "commander": "^13.1.0",
     "deepmerge": "^4.3.1",
     "enquirer": "^2.4.1",
-    "execa": "^9.5.2",
+    "execa": "^9.5.3",
     "glob": "^11.0.2",
     "handlebars": "^4.7.8",
     "ignore": "^7.0.4",
@@ -78,12 +78,14 @@
     "ms": "^2.1.3",
     "npm-registry-fetch": "^18.0.2",
     "ora": "^8.2.0",
+    "p-limit": "^6.2.0",
     "package-up": "^5.0.0",
     "readline-sync": "^1.4.10",
     "semver": "^7.7.1",
+    "shell-quote": "^1.8.2",
     "simple-git": "^3.27.0",
     "toml": "^3.0.0",
-    "zx": "^8.5.3"
+    "zx": "^8.5.4"
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^5.0.1",

package/src/Docker.mjs

@@ -215,6 +215,8 @@ const buildContainerImage = async ( {
 
   const { fullName : builderName } = await getGcpAccount()
   const gcloudBuild = `gcloud builds submit --project ${artifactProject}`
+  const gcloudProjectNumber = await shellCmd( `gcloud projects describe ${artifactProject} --format="value(projectNumber)"` )
+  const cloudBuildSA = `--service-account=${gcloudProjectNumber}-compute@cloudbuild.gserviceaccount.com`
   const gcloudLogs = `--gcs-log-dir ${formCloudBuildBucketName( artifactProject )}/log`
   let gcloudTags = `--tag ${imageName}:${imageVersion}`
   
@@ -231,7 +233,8 @@ const buildContainerImage = async ( {
   *** Submitting Build as ${builderName} ***
       ${gcloudBuild} \\
            ${gcloudLogs}  \\
-           ${gcloudTags}
+           ${gcloudTags} \\
+           ${cloudBuildSA}
   ` ) )
 
   if ( process.env.DRY_RUN === '1' ) {

package/src/DockerPy.mjs

@@ -185,6 +185,8 @@ async function buildContainerImage( {
 
   const { fullName : builderName } = await getGcpAccount()
   const gcloudBuild = `gcloud builds submit --project ${artifactProject}`
+  const gcloudProjectNumber = await shellCmd( `gcloud projects describe ${artifactProject} --format="value(projectNumber)"` )
+  const cloudBuildSA = `--service-account=${gcloudProjectNumber}-compute@cloudbuild.gserviceaccount.com`
   const gcloudLogs = `--gcs-log-dir ${formCloudBuildBucketName( artifactProject )}/log`
   let gcloudTags = `--tag ${imageName}:${imageVersion}`
   
@@ -201,7 +203,8 @@ async function buildContainerImage( {
   *** Submitting Build as ${builderName} ***
       ${gcloudBuild} \\
            ${gcloudLogs}  \\
-           ${gcloudTags}
+           ${gcloudTags} \\
+           ${cloudBuildSA}
   ` ) )
 
   if ( process.env.DRY_RUN === '1' ) {

package/src/Utils.mjs

@@ -8,6 +8,7 @@ import ignore from 'ignore'
 import inquirer from 'inquirer'
 import { glob } from 'glob'
 import { packageUp } from 'package-up'
+import { parse } from 'shell-quote'
 import YAML from 'js-yaml'
 
 // __dirname goes away with ESM so we take this approach instead and
@@ -72,20 +73,25 @@ export const proceed = async ( query = 'Do you wish to proceed?' ) => {
   } )
 }
 
-export const shellCmd = async ( cmdstr, opts = {} ) => {
+export const shellCmd = async ( cmd, opts = {} ) => {
   try {
-    // due to the escaping rules we pull apart the cmdstr and invoke $ using
-    // the (command, argsArray) or the escaped command sent to spawn will have
-    // addition double quotes which causes fail
-    const [ command, ...args ] = cmdstr.split( ' ' )
+    let command, args
+
+    if ( Array.isArray( cmd ) ) {
+      [ command, ...args ] = cmd
+    } 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
+    }
 
-    debug( { command, args }, '<==execa $ invoke' )
-    const results = await $( opts )`${command} ${args}`
-    debug( { results }, '<==execa $ results' )
+    debug( { command, args }, '<== execa $ invoke' )
+    const results = await $( opts )( command, args )
+    debug( { results }, '<== execa $ results' )
 
     return results.stdout
   } catch ( error ) {
-    debug( { error }, '<==shellCmd' )
+    debug( { error }, '<== shellCmd' )
     throw error
   }
 }

package/src/helm-charts/prom-operator/rules/kubestate-rules.yaml

@@ -176,7 +176,7 @@ spec:
 #               LABELS = {{ $labels }}
         - alert: KubernetesHpaMetricsUnavailability
           expr: kube_horizontalpodautoscaler_status_condition{status="false", condition="ScalingActive"} == 1
-          for: 0m
+          for: 3m # awesome was => 0m
           labels:
             severity: warning
           annotations:

package/src/helm-charts/prom-operator/rules/prometheus-rules.yaml

@@ -32,7 +32,7 @@ spec:
                 LABELS = {{ $labels }}
         - alert: PrometheusAllTargetsMissing
           expr: sum by (job) (up) == 0
-          for: 0m
+          for: 3m # awesome was => 0m
           labels:
             severity: critical
           annotations:

package/src/templates/dockerfileTemplatePy.hbs

@@ -37,11 +37,10 @@ COPY --chown={{runuser}}:{{runuser}} ./bashrc /home/{{runuser}}/.bashrc
 
 RUN uv venv
 ENV VIRTUAL_ENV=/usr/src/app/.venv
-ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+ENV PATH="$VIRTUAL_ENV/bin:$PATH:/home/{{runuser}}/.local/bin"
 
 # Setup keyring for Google Artifact Registry.
-RUN uv pip install keyring
-RUN uv pip install keyrings.google-artifactregistry-auth
+RUN uv tool install keyring --with keyrings.google-artifactregistry-auth
 
 #RUN echo "extra-index-url = https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple" >> ~/.config/pip/pip.conf
 #ENV UV_EXTRA_INDEX_URL "https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple"