@leverege/build-tools 2.96.5 → 2.96.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.96.5",
+  "version": "2.96.7",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/helmup.sh

@@ -8,6 +8,20 @@ export _FROM_HELMUP_="true"
 # Load the standard helper functions
 . `build-tools --bashfun`
 
+if [[ ! -z "$BUILD_TOOLS_DEBUG" ]]; then
+  cat<<BAD_IDEA
+
+  `color y "***WARNING: enabling debugging for helmup is a bad idea..."`
+
+  Unfortunately, trying to debug this script by turning on verbose output
+  will only exacerbate the problems you're attempting to find. This is because
+  the additional output ends up fouling the execution of the script in bizarre
+  ways. Sorry, just don't do this, future you.
+
+BAD_IDEA
+  exit 1
+fi
+
 SHELMUP_ARGS=("$*")
 
 # artifact-registry => https://console.cloud.google.com/artifacts?project=leverege-registry
@@ -71,6 +85,7 @@ SYSTEM=(
   velero
   cnpg-db-psql-stack
   cnpg-db-tsdb-basic
+# cnpg-db-tsdb-dh
 )
 
 SYSTEM_LEGACY=(
@@ -80,10 +95,36 @@ SYSTEM_LEGACY=(
   monitoring # do monitoring last to show password
 )
 
+LEVEREGE_SERVICES=(
+  "${PLATFORM[@]}"
+  "${AUXILIARY[@]}"
+  "${SYSTEM_LEGACY[@]}"
+  "${SYSTEM[@]}"
+)
+
+SYSTEM_SERVICES=(
+  "${SYSTEM_LEGACY[@]}"
+  "${SYSTEM[@]}"
+)
+
+function in_array() {
+  local seeking=$1; shift
+  local item
+  for item in "$@"; do
+    [[ "$item" == "$seeking" ]] && return 0
+  done
+  return 1
+}
+
 function isLeveregeService() {
-  local answer=0
-  [[ ${PLATFORM[@]} =~ $1 || ${AUXILIARY[@]} =~ $1 || ${SYSTEM_LEGACY[@]}} =~ $1 || ${SYSTEM[@]} =~ $1 ]] && answer=1
-  echo $answer
+  in_array "$1" "${LEVEREGE_SERVICES[@]}"
+}
+function isSystemService() {
+  in_array "$1" "${SYSTEM_SERVICES[@]}" 
+}
+
+isNotSystemService() {
+  ! isSystemService "$1" 
 }
 
 # Accepts 3 paramaters - 1 mandatory.
@@ -449,19 +490,13 @@ BAD_SECRETS
 
 function findChartLocation() {
   local service_name="$1"
-  local output
+  local output=""
 
-  # check the compass for a chart location
-  if output="$(chart-compass --service "$service_name")";
-  then
-    # chart exists in local chart-compass.yaml
-    local chart_location="oci://$output"
+  if output="$(chart-compass --service "$service_name")" && [[ -n "$output" ]]; then
+    printf 'oci://%s\n' "$output"
   else
-    # nope - fallback to using the legacy museum location
-    local chart_location="leverege/$service_name"
+    printf 'leverege/%s\n' "$service_name"
   fi
-
-  echo "$chart_location"
 }
 
 function getServiceAndChartInfo() {
@@ -474,24 +509,21 @@ function getServiceAndChartInfo() {
   local versions_file="./Versions.json"
 
   # Allows chart version from command line via <deployment>/<x.y.z>
-  IFS="/" read SERVICE CHARTVER <<< "$1"
-
+  IFS="/" read -r SERVICE CHARTVER <<< "$input"
   [[ -z "$SERVICE" ]] && return 1
 
-  CHARTLOC="$(findChartLocation $SERVICE)"
+  CHARTLOC="$(findChartLocation "$SERVICE")" || return 1
 
   # Allows chart version as <deployment>/x.y.z>
-  if [[ -n "$CHARTVER" ]]; then
-    return 0 # service and chart version from CLI
-  fi
+  [[ -n "$CHARTVER" ]] && return 0
 
   # check for the top level Versions.json file
   if [[ -f "$versions_file" ]]; then
-    CHARTVER=$(jq -r --arg svc "$SERVICE" '.[$svc].chart // ""' "$versions_file")
-    if [[ -n "$CHARTVER" ]]; then
-      FROM_VERSIONS=1
-    fi
+    CHARTVER="$(jq -r --arg svc "$SERVICE" '.[$svc].chart // empty' "$versions_file")"
+    [[ -n "$CHARTVER" ]] && FROM_VERSIONS=1
   fi
+
+  return 0
 }
 
 function checkUpgradeNotes() {
@@ -562,8 +594,7 @@ function doInstall() {
   do
     # Allows chart version from command line via <deployment>/<x.y.z>
     getServiceAndChartInfo "$PARAM"
-    #printf "SVC=[$SERVICE] CHT=[$CHARTVER]\n"
-
+    
     # slap additional helm syntax in there if the version is set
     [ ! -z "$CHARTVER" ] && CHARTVER="--version $CHARTVER"
 
@@ -572,7 +603,7 @@ function doInstall() {
     [ "$INVOKED_AS" == "helmwhat" ] && HELM_WHAT="--dry-run --debug" && K8S_WHAT="--dry-run=server -o yaml"
 
     # helminit is used to redeploy an existing service
-    if [ "$INVOKED_AS" == "helminit" ] && [[ $(isLeveregeService $SERVICE) -eq 1 ]];
+    if [[ "$INVOKED_AS" == "helminit" ]] && isLeveregeService $SERVICE;
     then
       yesToContinue "if are you `color y certain` you want to run `color y helminit`"
       local BACKUP_DIR="$SERVICE-bak"
@@ -662,7 +693,7 @@ REBOOTSTRAP
       *)
         # if the service dir is missing then check to see if it's a platform
         # service and if it is then try to bootstrap from charts in build-tools
-        [ ! -d $SERVICE ] && [[ $(isLeveregeService $SERVICE) -eq 1 ]] && bootstrapLocalSetup $SERVICE
+        [ ! -d $SERVICE ] && isLeveregeService $SERVICE && bootstrapLocalSetup $SERVICE
 
         if [ ! -d $SERVICE ] || [ ! -f $SERVICE/values-local.yaml ];
         then