@leverege/build-tools 2.63.0-pedro.1 → 2.63.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.63.0-pedro.1",
+  "version": "2.63.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -17,6 +17,7 @@
     "build-tools": "src/build-tools.mjs",
     "build-and-push": "src/build-and-push.sh",
     "build-cnpg-image": "src/build-cnpg-image.mjs",
+    "chart-to-museum": "src/chart-to-museum.mjs",
     "chart-to-registry": "src/chart-to-registry.mjs",
     "circleate": "src/circleate.sh",
     "decrypt-secrets": "src/decrypt-secrets.sh",
@@ -69,7 +70,7 @@
     "execa": "^9.5.2",
     "glob": "^11.0.1",
     "handlebars": "^4.7.8",
-    "inquirer": "^12.4.1",
+    "inquirer": "^12.4.2",
     "js-yaml": "^4.1.0",
     "jsdoc": "^4.0.4",
     "ms": "^2.1.3",
@@ -86,4 +87,4 @@
     "@leverege/eslint-config-leverege": "^5.0.1",
     "npm": "^11.1.0"
   }
-}
+}

package/src/build-cnpg-image.mjs

@@ -123,19 +123,24 @@ const buildAndPushImage = async () => {
   debug( { renderedDockerfile }, '<==Dockerfile' )
 
   // Write the Dockerfile to a temporary location
-  const dockerfilePath = path.resolve( 'Dockerfile.temp' )
+  const buildDir = './build-tmp'
+  fs.mkdirSync( buildDir )
+  const dockerfilePath = path.resolve( `${buildDir}/Dockerfile` )
   fs.writeFileSync( dockerfilePath, renderedDockerfile )
 
   // Build the image
   log( chalk.yellow( '\nBuilding Docker image...' ) )
-  await shellCmd( `docker build --file ${dockerfilePath} --tag ${LEVEREGE_IMAGE_NAME_WITH_TAG} .`, { stdio : 'inherit' } )
+  const cloudBuildSubmit = 'gcloud builds submit --project leverege-registry'
+  const cloudBuildLog = '--gcs-log-dir gs://leverege-registry_cloudbuild/log'
+  const imageTag = `--tag ${LEVEREGE_IMAGE_NAME_WITH_TAG}`
+  await shellCmd( `${cloudBuildSubmit} ${cloudBuildLog} ${imageTag} ${buildDir}`, { stdio : 'inherit' } )
 
   // Push the image
-  log( chalk.green( '\nPushing Docker image...' ) )
-  await shellCmd( `docker push ${LEVEREGE_IMAGE_NAME_WITH_TAG}`, { stdio : 'inherit' } )
+  //log( chalk.green( '\nPushing Docker image...' ) )
+  //await shellCmd( `docker push ${LEVEREGE_IMAGE_NAME_WITH_TAG}`, { stdio : 'inherit' } )
 
   // Clean up the temporary Dockerfile
-  fs.unlinkSync( dockerfilePath )
+  fs.rmdirSync( buildDir, { recursive : true } )
 }
 
 // Main execution flow

package/src/chart-compass.mjs

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-/* eslint-disable */
 /*
- * chart-to-registry will...
+ * chart-to-registry will use a chart 
  */
 import fs from 'node:fs'
 
@@ -12,32 +11,32 @@ import { lt as semverLt } from 'semver'
 import YAML from 'js-yaml'
 
 import {
-  condir,
+  BUILD_TOOLS_ROOT,
   debug,
   errorExit,
   log,
-  warning,
   getGitRootDirectory,
-  parsePackageJson,
-  parseHelmChart,
-  shellCmd } from './Utils.mjs'
+  shellCmd,
+  warning,
+} from './Utils.mjs'
 
 const commandLineOptions = [ // Use commandLineOptions to tie into the Usage statements
-   
   {
-    name : 'location',
+    name : 'service',
     type : String,
-    description : '{green the location of the artifact registry the chart will be pushed to (default us-docker.pkg.dev)}',
+    description : '{green chart name to navigate to}',
   },
   {
-    name : 'project',
+    name : 'compass',
     type : String,
-    description : '{green the name of the google project containing the npmrc and slack config secrets (default leverege-registry)}',
+    defaultValue : 'chart-compass.yaml',
+    description : '{green chart compass definition file for describing chart locations}',
   },
   {
-    name : 'repository',
-    type : String,
-    description : '{green the target repository to receive the pushed chart}',
+    name : 'init',
+    type : Boolean,
+    defaultValue : false,
+    description : '{green generate a chart-compass.yaml file if none present}',
   },
   {
     name : 'dry-run',
@@ -49,7 +48,6 @@ const commandLineOptions = [ // Use commandLineOptions to tie into the Usage sta
     type : Boolean,
     description : '{green display this help screen}',
   },
-   
 ]
 
 const sections = [
@@ -79,9 +77,9 @@ if ( args._unknown ) {
 }
 /* eslint-enable no-underscore-dangle */
 
-const minNodejsVersion = '18.0.0'
+const minNodejsVersion = '22.13.0'
 if ( semverLt( process.version, minNodejsVersion ) ) {
-  errorExit( `\n***ERROR: must be running at least node ${minNodejsVersion}\n` )
+  warning( `suggest upgrading to at least node ${minNodejsVersion} - xxx\n` )
 }
 
 // First of all, fail if we are not in a git repository
@@ -92,6 +90,47 @@ try {
   errorExit( chalk.red.bold( error ), { errorCode : 5 } )
 }
 
-const chartCompass = YAML.load( fs.readFileSync( './registry-compass.yaml', 'utf8' ) )
+// we can initialize a new compass from the template in build-tools
+if ( args.init ) {
+  if ( !fs.existsSync( './overwhelm.yaml' ) ) {
+    errorExit( '\n***ERROR: expected to run in the root of a platform-k8s branch - no overwhelm.yaml present' )
+  }
+
+  if ( fs.existsSync( args.compass ) ) {
+    errorExit( `\n***ERROR: ${args.compass} compass file already exists - not overwriting` )
+  }
+
+  const copyOut = await shellCmd( `cp ${BUILD_TOOLS_ROOT}/chart-compass.yaml ${args.compass}` )
+  log( '\nBootstrapped a new chart compass defition => ', chalk.green.bold( args.compass ) )
+  process.exit( 0 )
+}
+
+// simply wraps the YAML read/sync
+const buildCompassMap = ( yamlFile ) => {
+  const chartCompass = YAML.load( fs.readFileSync( yamlFile, 'utf8' ) )
+  return chartCompass
+}
+
+const findChartUrl = ( config, chartName ) => {
+  for ( const entry of config ) {
+    const chartsPath = entry.charts_path || 'charts'
+    for ( const [ repo, charts ] of Object.entries( entry.repositories ) ) {
+      debug( { entry, repo, charts }, '<==for Object.entries' )
+      if ( charts.includes( chartName ) ) {
+        return `${entry.registry}/${repo}/${chartsPath}/${chartName}`
+      }
+    }
+  }
+  return undefined
+}
+
+const compassYaml = `${gitRoot}/${args.compass}`
+const compassMap = buildCompassMap( compassYaml )
+
+const chartRegistry = findChartUrl( compassMap, args.service )
 
-condir( { chartCompass }, '<==Navigation' )
+if ( chartRegistry ) {
+  log( chartRegistry )
+} else {
+  process.exit( 1 )
+}

package/src/chart-compass.yaml

@@ -0,0 +1,22 @@
+- registry: us-docker.pkg.dev/leverege-registry
+  repositories:
+    stack:
+      - api-server
+      - authz-server
+      - db-curator
+      - emailer
+      - imagine
+      - message-processor
+      - messenger
+      - reason
+      - resource-server
+      - rule-enginer
+      - scheduler
+      - transponder-bq
+      - transponder-dh
+      - transponder-rt
+      - transponder-tsdb
+    leverege:
+      - pubsub-pulse
+      - pusher
+      - overdose

package/src/chart-to-museum.mjs

@@ -0,0 +1,53 @@
+#!/usr/bin/env node
+
+import chalk from 'chalk'
+import commandLineArgs from 'command-line-args'
+import commandLineUsage from 'command-line-usage'
+import { lt as semverLt } from 'semver'
+
+import { log, shellCmd } from './Utils.mjs'
+
+const commandLineOptions = [
+  {
+    name : 'help',
+    type : Boolean,
+    description : '{green display this help screen}',
+  },
+]
+
+const sections = [
+  {
+    header : 'Leverege Helm Chart Museum Pusher',
+    content : `{green This legacy tool acts as a simple method for assembling and storing a local
+helm chart structure on the Leverege Chart Museum using Google Cloud Storage.
+This approach is considered legacy since we have transitioned to using the
+Google Artifact Registry for distributing helm charts.
+}`
+  },
+  { header : 'Options',
+    optionList : commandLineOptions,
+  },
+]
+
+const args = commandLineArgs( commandLineOptions, { camelCase : true, partial : true } )
+const usage = commandLineUsage( sections )
+
+if ( args.help ) {
+  log( usage )
+  process.exit( 0 )
+}
+
+const pushItGood = async () => {
+  const version = await shellCmd( 'helm version --short' )
+  const pusher = ( semverLt( version, '3.7.0' ) ? 'push' : 'cm-push' )
+
+  try {
+    const museum = await shellCmd( `helm ${pusher} helm leverege` )
+    log( chalk.green( museum ) )
+  } catch ( ex ) {
+    log( chalk.red( ex.stderr ) )
+    process.exit( 1 )
+  }
+}
+
+pushItGood()

package/src/chart-to-registry.mjs

@@ -14,10 +14,9 @@ import {
   errorExit,
   log,
   warning,
-  getGitRootDirectory,
-  parsePackageJson,
-  parseHelmChart,
-  shellCmd } from './Utils.mjs'
+  analyzeRepository,
+  shellCmd,
+} from './Utils.mjs'
 
 const commandLineOptions = [ // Use commandLineOptions to tie into the Usage statements
   {
@@ -55,8 +54,8 @@ const commandLineOptions = [ // Use commandLineOptions to tie into the Usage sta
 const sections = [
   {
     header : 'Leverege Helm Chart to Artifact Registry',
-    content : `{green This tool helps ...
-... multi-line help.}`
+    content : `{green This tool is responsible for pushing a helm chart to its designated GCP
+Artifact Registry repository.}`
   },
   { header : 'Options',
     optionList : commandLineOptions,
@@ -79,34 +78,17 @@ if ( args._unknown ) {
 }
 /* eslint-enable no-underscore-dangle */
 
-const minNodejsVersion = '18.0.0'
+const minNodejsVersion = '22.0.0'
 if ( semverLt( process.version, minNodejsVersion ) ) {
   errorExit( `\n***ERROR: must be running at least node ${minNodejsVersion}\n` )
 }
 
-// First of all, fail if we are not in a git repository
-let gitRoot
-try {
-  gitRoot = await getGitRootDirectory()
-} catch ( error ) {
-  errorExit( chalk.red.bold( error ), { errorCode : 5 } )
-}
+// load up all we need to know about the repo
+const repoDescr = await analyzeRepository()
 
-// Next, parse the package.json file looking for sections of interest
-let packageJson
-try {
-  packageJson = await parsePackageJson( './package.json' )
-} catch ( error ) {
-  errorExit( error )
-}
-
-// And then load up the helm chart too
-let helmChart
-try {
-  helmChart = await parseHelmChart( `${gitRoot}/helm` )
-} catch ( error ) {
-  errorExit( error )
-}
+const {
+  helmChart,
+} = repoDescr
 
 // helm push helm-package.tgz oci://REGISTRY_LOCATION/REGISTRY_PROJECT/REGISTRY_REPOSITORY/charts
 //
@@ -116,7 +98,6 @@ const registryRepository = args.repository || helmChart.registryRepository
 const ociPushEndpoint = `oci://${registryLocation}/${registryProject}/${registryRepository}/charts`
 
 debug( {
-  packageJson,
   helmChart,
   registryLocation,
   registryProject,

package/src/helm-charts/cnpg-operator/cnpg-cleanup-snapshot-cronjob.yaml

@@ -0,0 +1,73 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: cnpg-cleanup-sa
+  namespace: cnpg-operands
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: cnpg-cleanup-role
+  namespace: cnpg-operands
+rules:
+  - apiGroups: ["postgresql.cnpg.io"]
+    resources: ["backups"]
+    verbs: ["get", "list", "delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: cnpg-cleanup-rolebinding
+  namespace: cnpg-operands
+subjects:
+  - kind: ServiceAccount
+    name: cnpg-cleanup-sa
+    namespace: cnpg-operands
+roleRef:
+  kind: Role
+  name: cnpg-cleanup-role
+  apiGroup: rbac.authorization.k8s.io
+---
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: cnpg-cleanup-snapshot
+  namespace: cnpg-operands
+spec:
+  schedule: "0 13 * * *" # 13 UTC is ~8AM EST
+  successfulJobsHistoryLimit: 2
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          serviceAccountName: cnpg-cleanup-sa
+          restartPolicy: Never
+          containers:
+            - name: cnpg-cleanup-snapshots
+              image: bitnami/kubectl:latest
+              command:
+                - "/bin/bash"
+                - "-c"
+                - |
+                  echo "Starting CNPG Cleanup"
+                  CURRENT_DATE=$(date +%s)
+                  RETENTION_DAYS=21
+                  SNAPSHOTS_JSON=$(kubectl get backups.postgresql.cnpg.io -n cnpg-operands -o json)
+                  echo "$SNAPSHOTS_JSON" | jq -c '.items[]' | while read -r snapshot
+                  do
+                    NAME=$(echo "$snapshot" | jq -r '.metadata.name')
+                    CREATION_TIMESTAMP=$(echo "$snapshot" | jq -r '.metadata.creationTimestamp')
+                    if [[ "$NAME" != *"-backup-"* ]];
+                    then
+                      echo "Skipping manual snapshot: $NAME"
+                      continue
+                    fi
+                    SNAPSHOT_DATE=$(date -d "$CREATION_TIMESTAMP" +%s)
+                    AGE=$(( (CURRENT_DATE - SNAPSHOT_DATE) / 86400 ))
+                    if [ "$AGE" -gt "$RETENTION_DAYS" ];
+                    then
+                      echo "Deleting snapshot: $NAME (Age: $AGE days)"
+                      kubectl delete backups.postgresql.cnpg.io "$NAME" -n cnpg-operands 2> /dev/null
+                    fi
+                  done
+                  echo "Cleanup complete."

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

@@ -2,7 +2,7 @@
 #
 showInstalling "Elastic Search 8"
 
-[ -z "$ELASTIC_CHART_VERSION" ] && ELASTIC_CHART_VERSION="21.4.1"
+[ -z "$ELASTIC_CHART_VERSION" ] && ELASTIC_CHART_VERSION="21.4.5"
 
 OCI_CHART="oci://registry-1.docker.io/bitnamicharts/elasticsearch"
 

package/src/helm-charts/prom-operator/helmup.plugin

@@ -4,7 +4,7 @@ showInstalling "The Prometheus Operator and Components"
 addHelmRepo prometheus-community https://prometheus-community.github.io/helm-charts
 
 showInstalling "The Prometheus Operator (kube-prometheus-stack)"
-[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="68"
+[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="69"
 
 NS="--namespace prometheus"
 

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="20.6.1"
+[ -z "$REDIS_CHART_VERSION" ] && REDIS_CHART_VERSION="20.7.1"
 
 helm upgrade --install redis $OCI_CHART       \
              --values  redis/redis-local.yaml \

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

@@ -17,10 +17,10 @@ TRAEFIK_NAMESPACE="traefik"
 
 addHelmRepo traefik https://helm.traefik.io/traefik
 
-[ -z "$TRAEFIK_CHART_VERSION" ] && TRAEFIK_CHART_VERSION="33"
+[ -z "$TRAEFIK_CHART_VERSION" ] && TRAEFIK_CHART_VERSION="34"
 helm upgrade --install traefik traefik/traefik \
              --namespace $TRAEFIK_NAMESPACE --create-namespace \
-             --values  traefik/traefik-local.yaml \
+             --values  traefik/values.yaml \
              --version $TRAEFIK_CHART_VERSION $HELM_WHAT
 
 removeHelmRepo traefik

package/src/helm-charts/traefik/{traefik-local.yaml → values-local.yaml}

@@ -4,7 +4,7 @@
 #
 #service:
 #  spec:
-#    loadBalancerIP: "xx.xx.xx.xx"
+#    loadBalancerIP: ${TRAEFIK_IP} # set in overwhelm.yaml
 #  single: true # true by default,  set to false for UDP support
 
 deployment:
@@ -24,6 +24,7 @@ resources:
     cpu: "100m"
     memory: "50Mi"
 
+# enable this for prometheus operator scraping
 metrics:
   prometheus:
     serviceMonitor:
@@ -31,6 +32,11 @@ metrics:
       interval: 30s
       namespace: prometheus
 
+additionalArguments:
+  # this will enable the dashboard on port 8080 in v3 - https://doc.traefik.io/traefik/operations/api/
+  - "--api.insecure=true"
+# - "--entrypoints.web.transport.respondingTimeouts.readTimeout=300"
+
 # 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
 # mqtts port has TLS termination performed by traefik and both ports are then

package/src/helmup.sh

@@ -700,6 +700,36 @@ EOSNAPSC
   sleep 2 # hold up processing for a moment to allow IAM mods to propagate
 }
 
+function installCronCnpgCleanupSnapshot() {
+  CNPG_OPERATOR_DIR="cnpg-operator"
+  if [ ! -d "$CNPG_OPERATOR_DIR" ];
+  then
+    cat<<CNPG_OPERATOR_MISSING
+  `color r "The cnpg-operator must be installed before proceeding"`
+
+CNPG_OPERATOR_MISSING
+    exit 1
+  fi
+
+  CNPG_CLEANUP_CRONJOB_YAML="cnpg-cleanup-snapshot-cronjob.yaml"
+  CNPG_CLEANUP_CRONJOB="$CNPG_OPERATOR_DIR/$CNPG_CLEANUP_CRONJOB_YAML"
+  if [ ! -f "$CNPG_CLEANUP_CRONJOB" ];
+  then
+    cat<<CNPG_FETCH_CLEANUP_CRONJOB_YAML
+  `color y "Missing $CNPG_CLEANUP_CRONJOB_YAML - grabbing a copy from build-tools"`
+
+CNPG_FETCH_CLEANUP_CRONJOB_YAML
+    CNPG_OP_ROOT="$(build-tools --reporoot)/src/helm-charts/cnpg-operator"
+    cp $CNPG_OP_ROOT/$CNPG_CLEANUP_CRONJOB_YAML $CNPG_CLEANUP_CRONJOB
+  fi
+
+  cat<<CNPG_CLEANUP_CRONJOB_APPLY
+  `color g "Creating cronjob =>"``color y " kubectl apply -f $CNPG_CLEANUP_CRONJOB"`
+
+CNPG_CLEANUP_CRONJOB_APPLY
+  kubectl apply -f $CNPG_CLEANUP_CRONJOB
+}
+
 function ensureCnpgSecret() {
   local mgrSecret=$1
   local k8sSecret=$2
@@ -965,6 +995,11 @@ CATBACKUP
       "cnpg-operator")
         installCnpgOperatorEnvironment
         bootstrapLocalSetup $SERVICE
+        installCronCnpgCleanupSnapshot
+        ;;
+
+      "cnpg-cronjob")
+        installCronCnpgCleanupSnapshot
         ;;
 
       "cronZombieKiller"|"zombie-killer")

package/src/hook-and-release/Config.mjs

@@ -247,11 +247,11 @@ export default class Config {
   }
 
   async runNpmScripts( runDirectories = [] ) {
-    for ( const runDirectory of runDirectories ) { // eslint-disable-line no-restricted-syntax
+    for ( const runDirectory of runDirectories ) {
       const scripts = this.npmScripts
 
       // for each script run sequentially
-      for ( const script of scripts ) { // eslint-disable-line no-restricted-syntax
+      for ( const script of scripts ) {
         const cmd = `npm run ${script}`
         log( `hook-and-release in ${chalk.green( runDirectory )} => ${chalk.green( cmd )}` )
         if ( !this.cliArgs.debug ) {

package/src/pkgck.sh

@@ -85,9 +85,9 @@ check_git_version() {
   printf "$clr$tag$C_off"
 }
 
-check_nodemon() {
-  nodemon="`getjson --file ./package.json --key nodemon`"
-}
+#check_nodemon() {
+#  nodemon="`getjson --file ./package.json --key nodemon`"
+#}
 
 check_scope() {
   private="`node -p \"require('./package.json').private == true\"`"

package/src/push-my-chart.mjs

@@ -1,16 +1,62 @@
 #!/usr/bin/env node
 
+import chalk from 'chalk'
+import commandLineArgs from 'command-line-args'
+import commandLineUsage from 'command-line-usage'
 import { lt as semverLt } from 'semver'
 
-import { log, shellCmd } from './Utils.mjs'
+import { debug, log, shellCmd } from './Utils.mjs'
+
+const commandLineOptions = [
+  {
+    name : 'no-registry',
+    type : Boolean,
+    defaultValue : false,
+    description : '{green push to the museum but not the artifact registry}',
+  },
+  {
+    name : 'help',
+    type : Boolean,
+    description : '{green display this help screen}',
+  },
+]
+
+const sections = [
+  {
+    header : 'Leverege Helm Chart Museum Pusher',
+    content : `{green This tool pushes Helm charts to both the legacy Chartmuseum (hosted on GCS)
+and a Google Artifact Registry. It maintains compatibility with existing
+Chartmuseum users while enabling a seamless transition to Artifact Registry
+without disrupting current configurations.}`
+  },
+  { header : 'Options',
+    optionList : commandLineOptions,
+  },
+]
+
+const args = commandLineArgs( commandLineOptions, { camelCase : true, partial : true } )
+const usage = commandLineUsage( sections )
+
+if ( args.help ) {
+  log( usage )
+  process.exit( 0 )
+}
 
 const pushItGood = async () => {
   const version = await shellCmd( 'helm version --short' )
   const pusher = ( semverLt( version, '3.7.0' ) ? 'push' : 'cm-push' )
 
   try {
+    log( chalk.green( 'Pushing chart to the Chartmuseum\n' ) )
     const museum = await shellCmd( `helm ${pusher} helm leverege` )
-    log( museum )
+    debug( { museum }, '<==output from helm push' )
+    if ( args.noRegistry ) {
+      log( `${chalk.bold.yellow( '\nskipping the chart push to the artifact registry' )}` )
+    } else {
+      log( chalk.green( 'Pushing chart to the Artifact Registry\n' ) )
+      const registry = await shellCmd( 'chart-to-registry' )
+      debug( { registry }, '<==chart-to-registry' )
+    }
   } catch ( ex ) {
     log( ex.stderr )
     process.exit( 1 )

package/src/refresh-py-idx.sh

@@ -1,12 +1,15 @@
 #!/bin/bash
 
 function leveregeBuildToolsRefreshPyIdx() {
+  # Execute gcloud command to get the token
+  local TOKEN=$(gcloud auth print-access-token)
+
   # Write to pip.conf
   local PIP_CONFIG_DIR="$HOME/.config/pip"
   mkdir -p "$PIP_CONFIG_DIR"
   local PIP_CONFIG_CONTENT="
   [global]
-  extra-index-url = https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple/
+  extra-index-url = https://oauth2accesstoken:${TOKEN}@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple/
   "
   echo "$PIP_CONFIG_CONTENT" > "$PIP_CONFIG_DIR/pip.conf"
   echo "Updated ~/.config/pip/pip.conf"
@@ -26,7 +29,7 @@ function leveregeBuildToolsRefreshPyIdx() {
   echo "Updated ~/.pypirc"
 
   # Escape for sed
-  UV_EXTRA_INDEX_URL="https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple"
+  UV_EXTRA_INDEX_URL="https://oauth2accesstoken:${TOKEN}@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple"
 
   local SHELLS=("bash" "dash" "zsh" "fish")
 

package/.har/config.json

@@ -1,11 +0,0 @@
-{
-  "protected-branches": [
-    "development",
-    "main"
-  ],
-  "npm-scripts": [
-    "lint",
-    "test"
-  ],
-  "ignore-packages": []
-}

package/.har/pre-commit

@@ -1 +0,0 @@
-hook-and-release

package/.har/pre-push

@@ -1 +0,0 @@
-hook-and-release

package/.publishrc

@@ -1,15 +0,0 @@
-{
-  "validations": {
-    "vulnerableDependencies": false,
-    "uncommittedChanges": true,
-    "untrackedFiles": true,
-    "branch": "development",
-    "gitTag": true,
-    "sensitiveData": false
-  },
-  "confirm": true,
-  "publishCommand": "npm publish",
-  "publishTag": "latest",
-  "prePublishScript": "npm run build",
-  "postPublishScript": false
-}

package/src/docker-to-registry.sh

@@ -1,611 +0,0 @@
-#!/bin/bash
-if [ -z "$1" ]; then
-  echo "   Usage: docker-to-registry <version number>"
-  exit 1
-fi
-
-# printf "\n****LOCAL DOCKREATE****\n\n" && sleep 1
-
-# The base docker image maybe overridden with:
-#
-#   BASE_NODE_IMAGE="gallium-alpine" npm run dockerize <version>
-#
-BASE_NODE_IMAGE="${BASE_NODE_IMAGE:-iron-alpine}" # node 20, iron
-
-# Load common bash functions
-. `build-tools --bashfun`
-cat<<DEPRECATED_TOOL
-
-  `color y "***DEPRECATED docker-to-registry.sh - upgrade to docker-to-registry.mjs***"`
-
-DEPRECATED_TOOL
-exit 1
-
-PKGTOP="$npm_config_local_prefix"
-cd $PKGTOP/docker
-
-if [ ! -x "$(command -v jq)" ];
-then
- cat<<NO_JQ
- 
-  `color r "***ERROR: Missing jq JSON processor"` => `color g 'brew install jq'`
-
-NO_JQ
- exit 1
-fi
-
-if [ ! -d "$PKGTOP/dist" ];
-then
-  cat<<NO_DIST
-
-  `color r "***ERROR: Missing the dist directory, run this first => "``color g 'npm run build'`
-
-NO_DIST
-  exit 1
-fi
-
-function packageJson() {
-  result=$(jq -r $1 $PKGTOP/package.json)
-  if [ "$result" != "null" ]
-  then
-    echo $result
-  else
-    echo $2
-  fi
-}
-
-# Global Vars
-pluginFile="Dockerfile.plugin"
-
-# cleanup trapper for gracefully killing, which doesn't do much right now
-function cleanup() {
-  [ ! -z "$DOCKER_SKIP_CLEANUP" ] && printf "\nSkipping clean up\n\n" && exit 1
-  printf "\nCleaning up and exiting...\n\n"
-  rm -rf ./workspace ./scripts $SSHDIR .npmrc
-  exit 0
-}
-trap cleanup INT
-
-function strip_undefined() {
-  local result="$1"
-  [ "$1" == "undefined" ] && result=""
-  printf "$result"
-}
-
-function create_DockerfilePlugin() {
-  [ -f 'Dockerfile.plugin' ] && return
-
-  cat<<DOCKERPLUGIN > Dockerfile.plugin
-# Dockerfile.plugin - optionally extend the service Docker image
-#
-# This file may be used to run additional docker commands during the image
-# build process without needing to maintain a local custom Dockerfile. For
-# example, uncommenting the following docker RUN command will cause the
-# curl and vim packages to be added to the deployed image thus making them
-# available from the pod's command line on k8s:
-#
-# RUN apk update && apk add --no-cache curl vim
-#
-# Keep in mind that the Alpine Linux base image is used to keep image
-# footprints small, so adding packages "just because" is not considered
-# a best practice.
-DOCKERPLUGIN
-}
-
-# Useful links with information regarding k8s/docker/nodejs and PID 1
-#   No PID 1 for NodeJS     => https://bit.ly/2r4gHkZ
-#   What tini is all about  => https://bit.ly/2HsSxqP
-#   Graceful kills with k8s => https://bit.ly/2NONEJG
-#
-# Params: $1 = version from dockerize invocation
-#         $2 = additional packages to install (htop redis-cli etc)
-function create_Dockerfile() {
-  local regvers="${1}"
-  local apkadds="${2}"
-
-  create_DockerfilePlugin
-
-  echo "Creating the Dockerfile for node ${BASE_NODE_IMAGE}"
-  cat<<DOCKERBLD > Dockerfile
-# Version ${regvers} @ `date`
-#
-# The FROM directive sets the Base Image for subsequent instructions
-FROM node:${BASE_NODE_IMAGE} as intermediate
-ENV NODE_ENV production
- 
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-
-# Install app dependencies
-COPY ./workspace/ /usr/src/app/
-ENV GRPC_VERBOSITY ERROR
-
-# --------------------------------------------------------------
-# copy the ssh keys into place, npm install, and remove them
-# --------------------------------------------------------------
-  
-# Install packages to install private repos with ssh keys
-COPY ./.npmrc /usr/src/app/.npmrc
-RUN apk --no-cache add openssh-client && \
-    apk --update add --no-cache --virtual build-dep g++ gcc libgcc \\
-      libstdc++ linux-headers make ${apkadds} && \
-    npm install -g npm@10 && \
-    npm ci --only=production --ignore-scripts --no-optional ${npmlogging} && \
-    rm -f /usr/src/app/.npmrc /root/.ssh/*
- 
-# --------------------------------------------------------------
-# On to the real build now, the thing before was just an intermediate container
-# --------------------------------------------------------------
- 
-FROM node:${BASE_NODE_IMAGE}
- 
-# Install tini for PID 1 and replace shell with bash so we can source files
-RUN apk update && \
-    apk add --no-cache bash curl tini vim ${apkadds} && \
-    npm install -g npm@10 && \
-    rm /bin/sh && ln -s /bin/bash /bin/sh && \
-    mkdir -p /usr/src/app /tmp/levlog && \
-    chown node:node /usr/src/app
-DOCKERBLD
-
-  if [ -f "${pluginFile}" ];
-  then
-    printf "\n# ${pluginFile} BEGIN\n" >> Dockerfile
-    cat $pluginFile >> Dockerfile
-    printf "# ${pluginFile} END\n\n" >> Dockerfile
-  fi
-
-  cat<<EODOCKER >> Dockerfile
-ENTRYPOINT [ "/sbin/tini", "--" ]
-WORKDIR /usr/src/app
- 
-COPY --chown=node:node --from=intermediate /usr/src/app /usr/src/app
-
-USER ${runuser}
-COPY ./bashrc /home/node/.bashrc
-CMD [ "/bin/bash", "-c", "node index.js" ]
-EODOCKER
-} # end of create_Dockerfile
-
-# Params: $1 = version from dockerize invocation
-function create_bashrc() {
-  cat<<EOBASHRC > bashrc
-#!/bin/bash
-#
-# Version $1 @ `date`
-
-alias h=history
-
-alias ls='ls -CF --color=auto'
-alias ll='ls -lh'
-alias lla='ls -lha'
-alias glep='grep -l -s'
-alias m=less
-alias menv='env | sort | less'
-
-alias whatsmyip='wget -qO- ifconfig.co'
-
-alias err='wget -q -O- localhost:5111/logLevel/error'
-alias wrn='wget -q -O- localhost:5111/logLevel/warn'
-alias inf='wget -q -O- localhost:5111/logLevel/info'
-alias dbg='wget -q -O- localhost:5111/logLevel/debug'
-alias trc='wget -q -O- localhost:5111/logLevel/trace'
-
-socks()
-{
-  netstat -ant | awk '{print $6}' | sort | uniq -c | sort -n
-}
-
-cmetrics()
-{
-  wget -qO- localhost:5111/metrics
-}
-
-cmstat()
-{
-  wget -qO- localhost:5111\${1}
-}
-
-cmclear()
-{
-  cmstat /status/clear
-}
-EOBASHRC
-} # end of create_bashrc
-
-# Spilt a character delimited string and emit the object at the specified
-# index. So passing a full registry string in like:
-#   us-docker.pkg.dev/leverege-registry/leverege
-#
-# the project name may be extracted by calling this like:
-#   getNthOvjectFromDelimitedString $registry 1 '/'
-#
-function getNthObjectFromDelimitedString() {
-  local inputStr=$1
-  local index=$2
-  local delimeter=$3
-
-  IFS=$delimeter
-  read -ra ADDR <<< "$inputStr"
-
-  echo ${ADDR[$index]}
-}
-
-# ---------- MAIN PROCESSING STARTS HERE ----------
-#
-# make sure we have a current npmrc file
-refresh-npm-token
-
-# deprecation checks first...
-deprecated=$(packageJson '.leverege.project')
-if [ ! -z "$deprecated" ];
-then
-  cat<<DEPRECATED_PROJECT
-
-  $(color y '***DEPRECATED: leverege.project setting in package.json')
-
-  Setting the project in the package.json leverege section was used for builds
-  being stored in the deprecated GCP container registry. Remove the deprecated
-  leverege.project setting from package.json and try again.
-
-  "leverege": {
-    $(color r "\"project\": \"$deprecated\",")
-    ...
-  }
-
-DEPRECATED_PROJECT
-  exit 1
-fi
-
-deprecated=$(packageJson '.leverege.container')
-if [ ! -z "$deprecated" ];
-then
-  cat<<DEPRECATED_CONTAINER
-
-  $(color y '***DEPRECATED: leverege.container is no longer supported')
-
-  Setting the container name explicitly from the package.json leverge block
-  is no longer supported. The container name will be automatically derived
-  from the git repository's remote root, which is the default behavior. Remove
-  the container line from the leverege section in package.json and try again.
-
-  "leverege": {
-    $(color r "\"container\": \"$deprecated\",")
-    ...
-  }
-DEPRECATED_CONTAINER
-  exit 1
-fi
-
-deprecated=$(packageJson '.leverege.nodeimg')
-if [ ! -z "$deprecated" ];
-then
-  cat<<DEPRECATED_NODEIMAGE
-
-  $(color y '***DEPRECATED: leverege.nodeimg is no longer supported')
-
-  Setting the node base image using the nodeimg statement in package.json is no
-  longer supported. By default the actual node image version will be defaulted
-  by this script and wil rarely need to be a specific version.  Remove the
-  nodeimg line from the leverege section in package.json and try again.
-
-  "leverege": {
-    $(color r "\"nodeimg\": \"$deprecated\",")
-    ...
-  }
-DEPRECATED_NODEIMAGE
-  exit 1
-fi
-
-deprecated=$(packageJson '.leverege.artifact')
-if [ ! -z "$deprecated" ];
-then
-  cat<<DEPRECATED_ARTIFACT
-
-  $(color y '***DEPRECATED: leverege.artifact is no longer supported')
-
-  Setting the artifact registry folder is no longer supported. Instead use the
-  $(color g leverege.registry) setting to specify the full artifact registry and folder
-  used for storing the docker image. Remove the artifact line from the leverege
-  section in package.json and try again.
-
-  "leverege": {
-    $(color r "\"artifact\": \"$deprecated\",")
-    ...
-  }
-  
-  $(color g "New syntax example:")
-  
-  "leverege": {
-    $(color g "\"registry\": \"us-docker.pkg.dev/leverege-registry/$deprecated\",")
-  }
-DEPRECATED_ARTIFACT
-  exit 1
-fi
-
-deprecated=$(packageJson '.leverege.nodeops')
-if [ ! -z "$deprecated" ];
-then
-  cat<<DEPRECATED_NODEOPS
-
-  $(color y '***DEPRECATED: leverege.nodeops are no longer supported')
-
-  Setting the hard coded node options on the image is no longer supported. The
-  better approach is to add $(color g 'NODE_OPTIONS') to the config section of the chart's
-  values.yaml to allow downstream users to easily tune the options as needed.
-  Remove the nodeops line from the leverege section in package.json and try again.
-
-  "leverege": {
-    $(color r "\"nodeops\": \"$deprecated\",")
-    ...
-  }
-DEPRECATED_NODEOPS
-  exit 1
-fi
-
-# the container name will be the git root for the repo
-gitremote=`git config --get remote.origin.url`
-if [ -z $gitremote ];
-then
-  cat<<NOCONTAINER
-
-  $(color r '***ERROR: attempting to build an unnamed container')
-
-  You are attempting to create a docker image without a container name or
-  a git remote setup. Either define a $(color y 'container') statement in the leverege
-  section of package.json, or add a $(color g 'git remote') to this repository.
-
-NOCONTAINER
-  exit 1
-fi
-container=$(basename $gitremote .git)
-
-# build the registry specification
-registry=$(packageJson '.leverege.registry')
-if [ ! -z "$registry" ];
-then
-  gcp_project="$(getNthObjectFromDelimitedString $registry 1 '/')"
-  registry_folder=$registry/images/$container
-else
-  cat<<MISSING_REGISTRY
-
-  $(color r '***ERROR: the leverege.registry setting is required in package.json')
-
-  The $(color g 'leverege.registry') setting is now required and must be set to point to the
-  base URL of the artifact registry, plus the folder that the image is to be
-  stored in. For example, the Leverege Google project that contains our artifact
-  registry is $(color g 'leverege-registry') which contains several folders that are used to
-  group images by commonality. The stack services store their images in the
-  $(color g 'stack') folder, while general purpose services that we use may end up in the
-  $(color g 'leverege') folder.
-
-  Using api-server as an example, given this setting in api-server's package.json:
-
-  "leverege": {
-    $(color g '"registry": "us-docker.pkg.dev/leverege-registry/stack"')
-  }
-
-  the resultant docker image gets stored in:
-
-      $(color g 'us-docker.pkg.dev/leverege-registry/stack/images/api-server')
-
-  The helm/values.yaml file would then reference the same location:
-
-  image:
-    pullPolicy: IfNotPresent
-    registry: $(color g 'us-docker.pkg.dev/leverege-registry/leverege/images')
-    tag: ""
-MISSING_REGISTRY
-  exit 1
-fi
-
-# verify the cloud build bucket exists
-#
-build_bucket="gs://${gcp_project}_cloudbuild"
-gsutil ls -p $gcp_project -b $build_bucket &> /dev/null
-if [ "$?" -ne 0 ];
-then
-  cat<<MISSING_BUILD_BUCKET
-
-  $(color r "***ERROR: missing the cloud build bucket $build_bucket")
-
-  Go to Cloud Storage on the $(color g $gcp_project) GCP project and create the
-  target cloud build bucket before proceeding.
-
-  Build bucket => $(color g $build_bucket)
-MISSING_BUILD_BUCKET
-  exit 1
-fi
-
-version=$1
-[[ -f '.previous' ]] && previous=`cat .previous` || previous='FIRST BUILD'
-#pckgver="v`node -p \"require('../package.json').version\"`"
-pckgver="v$(packageJson '.version')"
-pckgdts="`date +\"%Y%m%d-%H%M\"`"
-# egrep was deprecated in 2007!
-tagging=`echo $version | egrep -e "^v\d+\.\d+\.\d+$"`
-
-if [ $tagging ];
-then
-  if [[ `git status --porcelain` ]]; then
-    cat<<DIRTAG
-
-  $(color r '***ERROR: attempting to tag a non-beta dirty git repository')
-
-  You are attempting to create a tagged release image for pushing to the
-  container registry, but there are locally modified files. This is not
-  allowed since the applied tag will not be relevant to the image version
-  due to the pending commits.
-
-  Available options for proceeding:
-
-    $(color g '1) cleanly commit all local mods assuming relevance')
-    $(color y '2) eliminate unwanted local modifications')
-    $(color r '3) stash anything that is irrelevant to this release')
-
-
-DIRTAG
-    exit 1
-  fi
-
-  # since we're tagging, the current branch must have an upstream
-  branch=`git rev-parse --abbrev-ref HEAD`
-  git rev-parse --abbrev-ref ${branch}@{u} &> /dev/null
-
-  if [ $? -ne 0 ];
-  then
-    cat<<NOUPSTR
-
-  $(color r '***ERROR: the current branch must have an upstream')
-
-  You are attempting to create a tagged release image for pushing to the
-  container registry, but the current branch does not have an upstream to
-  push to. This is not allowed since the applied tag will be stranded here
-  in your local repository, which is what we are attempting to avoid.
-
-  Available options for proceeding:
-
-    $(color g '1) set an upstream for this branch via:')
-    $(color g "       git push --set-upstream origin ${branch}")
-
-    $(color y '2) rebase, squash and merge onto a branch with an upstream')
-
-NOUPSTR
-    exit 1
-  fi
-
-  tagstat=$(color y 'will be tagged')
-else
-  tagstat=$(color r 'BETA RELEASE WILL NOT BE TAGGED')
-fi
-
-pluggedIn=$(color g "no")
-[ -f "${pluginFile}" ] && pluggedIn=$(color y "YES")
-
-apkadds=$(packageJson '.leverege.apkadds')
-runuser=$(packageJson '.leverege.runuser')
-[ -z "${runuser}" ] && runuser='node'
-
-npmlogging='--silent' # allow for verbose npm logs
-if [ "$VERBOSE_DOCKREATE_NPM" == "yes" ];
-then
-  npmlogging='--ddd'
-else
-  hintverbose=1
-fi
-
-echo "Updating dependencies and workspace..." && npm install
-if [ $? -ne 0 ];
-then
-  cat<<INSTALLFAILED
-
-  $(color y 'npm install') $(color r 'FAILED') - fix it in order to proceed
-
-INSTALLFAILED
-  exit 1
-fi
-
-cat<<IMGINFO
-  Project:   $(color g $gcp_project)
-  Registry:  $(color g $registry)
-  Container: $(color g $container)
-  Version:   $(color g $version)  $tagstat
-  Folder:    $(color y $registry_folder)
-  NodeImage: $(color g $BASE_NODE_IMAGE)
-  AddedPkgs: $(color g $apkadds)
-  PluggedIn: ${pluggedIn}
-  Run User:  $(color g $runuser)
-  Previous:  $(color y $previous)
-  DateStamp: $(color g $pckgdts)
-  NPM Logs:  $(color g $npmlogging)
-
-IMGINFO
-
-[ $hintverbose ] && printf "  Define $(color g VERBOSE_DOCKREATE_NPM=\"yes\") for verbose build logging\n\n"
-
-if [ "$pckgver" != "$version" ];
-then
-  cat<<EOPKG
-  $(color y '***WARNING: specified version does not match package.json version' )
-                   package.json => $(color g "$pckgver")
-                   specified    => $(color r "$version")
-
-EOPKG
-  if [ $tagging ];
-  then
-    cat<<EONOPE
-
-  $(color r '... and you are attempting to release so NOPE!' )
-
-EONOPE
-    exit 1
-  fi
-fi
-
-create_Dockerfile "$version" "$apkadds"
-create_bashrc "$version"
-
-rm -rf ./workspace && mkdir -p ./workspace
-cp -rfp ${PKGTOP}/package*json ${PKGTOP}/dist/* ./workspace
- 
-# grab the npmrc token for the image
-cp -f "$HOME/.npmrc" .npmrc
-
-[ "$CIRCLECI" == "true" ] && exit 0
-
-printf "Hit return to continue or ^C to exit\n\n"; read ANS
-
-echo $version > .previous
-
-echo "Changing Google Project to $project"
-gcloud config set project $gcp_project
-
-echo "Creating Docker Image for $registry_folder:$version"
-echo "   Building the workspace"
-
-# use kaniko to cache builds
-if [ "$USE_KANIKO" == "yes" ];
-then
-  gcloud config set builds/use_kaniko True
-else
-  gcloud config unset builds/use_kaniko
-fi
-
-# need a logging area outside of the default cloud build bucket in order
-# to enable 3rd party builders from outside of leverege.com user space
-build_logs="--gcs-log-dir $build_bucket/logs"
-
-# submit the build request to gcloud with logs directed to the cloudbuild
-# logging bucket from the docker directory
-time gcloud builds submit $build_logs --tag $registry_folder:$version .
- 
-if [ $? -ne 0 ];
-then
-  bldErr=$?
-  cat<<BUILDERR
-
-  $(color r '***ERROR: build failed! Aborting without tagging.')
-
-  The gcloud build process seems to have run into a problem. Please fix the
-  issue and rerun the dockerize process. This build will not be tagged, nor
-  will it be pushed.
-
-BUILDERR
-  exit $bldErr
-fi
-
-# Tag the container with the node detailsand the culprit.
-gcloud container images add-tag --quiet $registry_folder:$version \
-                                        $registry_folder:$pckgdts-$BASE_NODE_IMAGE-$USER \
-                                        $registry_folder:latest
-
-if [ $tagging ];
-then
-  printf "\n$(color g "Tagging and Pushing $version")\n"
-  git tag -af $1 -m "Docker version $1"
-  git push --follow-tags
-else
-  printf "\n$(color y '*** Skipped git tagging - beta release')\n\n"
-fi
-
-cleanup