@leverege/build-tools 2.43.4 → 2.43.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.43.4",
+  "version": "2.43.6",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -72,6 +72,6 @@
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^4.2.0",
-    "npm": "^10.2.0"
+    "npm": "^10.2.1"
   }
 }

package/src/chart-to-registry.mjs

@@ -6,10 +6,9 @@
 import chalk from 'chalk'
 import commandLineArgs from 'command-line-args'
 import commandLineUsage from 'command-line-usage'
-import ms from 'ms'
 import { lt as semverLt } from 'semver'
 
-import { debug, log, shellCmd } from './Utils.mjs'
+import { debug, err, log, shellCmd } from './Utils.mjs'
 
 const commandLineOptions = [ // Use commandLineOptions to tie into the Usage statements
   /* eslint-disable max-len */
@@ -57,8 +56,9 @@ if ( args._unknown ) {
 
 const gcpProject = args.project ? args.project : process.env.HELM_CHART_REGISTRY || 'leverege-registry'
 
-if ( semverLt( process.version, '18.0.0' ) ) {
-  log( chalk.red( '\n\n***ERROR: must be running at least node 18\n' ) )
+const minNodejsVersion = '18.13.0'
+if ( semverLt( process.version, minNodejsVersion ) ) {
+  log( chalk.red( `\n\n***ERROR: must be running at least node ${minNodejsVersion}\n` ) )
   process.exit( 1 )
 }
 
@@ -67,3 +67,19 @@ const getGcpSecretCommand = ( secretName ) => {
 }
 
 log( chalk.yellow( '\n\n***WARNING: Under Construction' ) )
+
+// gcloud auth print-access-token | helm registry login -u oauth2accesstoken \
+// -p ${password} https://us-docker.pkg.dev
+//
+// Get the current access token and use it to login to the registry with helm.
+try {
+  const accessToken = await shellCmd( 'gcloud auth print-access-token' )
+  const registryLoginCommand = `helm registry login -u oauth2accesstoken -p ${accessToken}`
+
+  const loginResult = await shellCmd( `${registryLoginCommand} https://us-docker.pkg.dev` ) // TODO: cmd line param
+} catch( error ) {
+  err( error, '<==Error fetching the token' )
+  process.exit( 1 )
+}
+
+// helm push hello-chart-0.1.0.tgz oci://us-docker.pkg.dev/PROJECT/pubsub-pulse/chart

package/src/circleate.sh

@@ -241,6 +241,7 @@ workflows:
           requires:
             - install
       - coverage:
+          context: npm
           requires:
             - install
       - docs:
@@ -413,6 +414,7 @@ workflows:
           requires:
             - install
       - coverage:
+          context: npm
           requires:
             - install
       - docs:

package/src/dirty-git.sh

@@ -1,13 +1,20 @@
 #!/bin/bash
-
+#
+# Unicode character sets here:
+#   ://en.wikipedia.org/wiki/List_of_Unicode_characters
+# start looking around dingbats (3/4 down page"
+#
 CLEAN="\e[32m✔\e[0m"
 DIRTY="\e[31m✘\e[0m"
 STASH="\e[33;44m$\e[0m"
 AHEAD="\e[34;42m!\e[0m"
+#NOHED="\e[31m✖\e[0m"
+NOHED="\e[31;43m⚑\e[0m"
 LOCKD="\e[35m\e[0m"
+ELAS7="\e[33m7\e[0m"
 
 clear
-printf "${CLEAN} clean  ${DIRTY} dirty  ${STASH} stashed ${AHEAD} unpushed ${LOCKD} locked\n\n"
+printf "${CLEAN} clean  ${DIRTY} dirty  ${STASH} stashed ${AHEAD} unpushed ${NOHED} no remote ${LOCKD} locked\n\n"
 for dir in $@;
 do
   [ ! -d $dir ] || [ ! -d $dir/.git ] && continue
@@ -16,9 +23,15 @@ do
   [[ `git status --porcelain` ]] && status="$DIRTY" || status="$CLEAN"
   scount=`git stash list | wc -l`
   [ $scount -gt 0 ] && stash="\e[33;44m$\e[0m" || stash=" "
-  ahead=`git rev-list FETCH_HEAD..HEAD --count`
-  [ $ahead -gt 0 ] && ahead="$AHEAD" || ahead=" "
+  ahead=`git rev-list FETCH_HEAD..HEAD --count 2>/dev/null`
+  if [ -z "$ahead" ];
+  then
+    ahead="$NOHED" # "✖" # "❓"
+  else
+    [ $ahead -gt 0 ] && ahead="$AHEAD" || ahead=" "
+  fi
   [ -f "Versions.json" ] && locked="$LOCKD" || locked=" "
+  [ ! -d "elasticsearch8" ] && elastic="$ELAS7" || elastic=" "
   cd - &>/dev/null
-  printf "${status} %-28s ${stash}${ahead}${locked} %s\n" $dir $branch
+  printf "${status} %-28s ${stash}${ahead}${locked}${elastic} %s\n" $dir $branch
 done

package/src/helm-charts/api-server/values-local.yaml

@@ -1,5 +1,5 @@
 image:
-  tag: # v5.4.4
+  tag: # v5.1.2
 
 config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'

package/src/helm-charts/authz-server/values-local.yaml

@@ -3,3 +3,5 @@ image:
 
 config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'
+  IN_MEM_CONTROLLER_ACTIVE: "false"
+  USE_MEMORY_CONTROLLER_CHECK_MODE : "false"

package/src/helm-charts/db-curator-dh/values-local.yaml

@@ -0,0 +1,11 @@
+nameOverride: "db-curator-dh"
+
+image:
+  tag: # v4.2.0
+
+config:
+  LOG_CONFIG: '{"type":"pino","level":"warn"}'
+
+  TSDB_CLEANUP_ENABLED: "true"
+  FIREBASE_CLEANUP_ENABLED: "false"
+  TSDB_HOST: "timescale-dense-history-postgresql"

package/src/helm-charts/messenger/values-local.yaml

@@ -1,5 +1,5 @@
 image:
- tag: # v2.7.0
+ tag: # v2.8.0
 
 config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'

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

@@ -4,10 +4,11 @@ showInstalling "PostgreSQL Database"
 
 errorIfMissingSecret authz-postgres
 
-addBitnamiRepo
+addBitnamiRepo # latest
 
+[ -z "$POSTGRESQL_CHART_VERSION" ] && POSTGRESQL_CHART_VERSION="10"
 helm upgrade --install postgres bitnami/postgresql  \
              --values  postgres/postgres-local.yaml \
-             --version 10 $HELM_WHAT
+             --version $POSTGRESQL_CHART_VERSION $HELM_WHAT
 
 removeHelmRepo bitnami

package/src/helm-charts/resource-server/values-local.yaml

@@ -1,5 +1,5 @@
 image:
-  tag: # v1.0.1
+  tag: # v1.1.0
 
 config:
   LOG_CONFIG: '{"type":"pino","level":"warn"}'

package/src/helm-charts/transponder-bq/values-local.yaml

@@ -1,7 +1,7 @@
 nameOverride: transponder-bq
 
 image:
-  tag: # v5.0.1
+  tag: # v5.0.3
 
 config:
   TRANSPONDER_RUN_MODE: "bigQueryJson"

package/src/helm-charts/transponder-rt/values-local.yaml

@@ -1,7 +1,7 @@
 nameOverride: transponder-rt
 
 image:
-  tag: v5.0.1
+  tag: # v5.0.3
 
 config:
   TRANSPONDER_RUN_MODE: "rt"

package/src/helm-charts/transponder-tsdb/values-local.yaml

@@ -7,7 +7,7 @@
 nameOverride: transponder-tsdb
 
 image:
-  tag: # v5.0.1
+  tag: # v5.0.3
 
 config:
   TRANSPONDER_RUN_MODE: "timescale"
@@ -15,7 +15,7 @@ config:
 
   TRANSPORT_CONFIG: '{
     "type": "pubsub",
-    "projectId": "OVH:<PROJECT_NAME>",
+    "projectId": "OVH:<PROJECT_ID>",
     "publisher": {
         "batching": {
           "maxMilliseconds": 0,

package/src/helmup.sh

@@ -690,8 +690,8 @@ CATBACKUP
         installDefaultConfigs
         ;;
 
-      db-curator*)
-        # db-curator / db-curator-dh diffs are defined in values-local.yaml
+      db-curator-dh)
+        # db-curator-dh is a variant of db-curator with diff controlled in values-local.yaml
         HELMUP="helm upgrade --install $SERVICE leverege/db-curator --values $SERVICE/values.yaml $CHARTVER $HELM_WHAT"
         doHelmup "$HELMUP"
         ;;