@leverege/build-tools 2.9.2 → 2.9.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.9.2",
+  "version": "2.9.4",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
     "repository": {
@@ -60,7 +60,7 @@
     "command-line-args": "^5.2.1",
     "command-line-usage": "^6.1.1",
     "deepmerge": "^4.2.2",
-    "dotenv": "^14.3.2",
+    "dotenv": "^16.0.0",
     "execa": "^5.1.1",
     "figlet": "^1.5.2",
     "glob": "^7.2.0",
@@ -76,11 +76,11 @@
     "simple-git": "^2.48.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.17.0",
-    "@babel/core": "^7.17.2",
+    "@babel/cli": "^7.17.6",
+    "@babel/core": "^7.17.5",
     "@babel/node": "^7.16.8",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^8.5.0"
+    "npm": "^8.5.2"
   }
 }

package/src/circleate

@@ -382,7 +382,7 @@ jobs:
 
       - run:
           name: Check if coverage meets at least 70%
-          command: ./node_modules/.bin/c8 check-coverage --functions 70 --lines 70 --statements 70
+          command: npx c8 check-coverage --functions 70 --lines 70 --statements 70
 
       - store_artifacts:
           path: coverage

package/src/helmup

@@ -514,31 +514,60 @@ PLUGIN_NOEXEC
   return 0
 }
 
+function getServiceAndChartVersion() {
+
+  # Allows chart version from command line via <deployment>/<x.y.z>
+  IFS="/" read SERVICE CHARTVER <<< "$1"
+
+  # Allows chart version as <deployment>/Chart-x.y.z*>
+  [ ! -z "$CHARTVER" ] && return # service and chart version from CLI
+
+  # force the move away from the old approach
+  LCL_CHART=`compgen -G $SERVICE/Chart-?*.?*.?*` &>/dev/null
+  if [ ! -z "$LCL_CHART" ];
+  then
+    CHARTVER=${LCL_CHART#*/Chart-}
+    cat<<DEPRECATED_CHART
+    $YELO_WARN The use of $SERVICE/$LCL_CHART to lock the chart version has
+    been deprecated. Create a top level `color g "Charts.json"` file instead:
+
+    {
+      "scheduler" : "3.6.1",
+      "$SERVICE" : "$CHARTVER"
+    }
+
+DEPRECATED_CHART
+    exit 1
+  fi
+
+  # check for the top level Charts.json file
+  local VERSIONS="./Versions.json"
+  if [ -f "$VERSIONS" ];
+  then
+    CHARTVER=`node -e "charts=require('$VERSIONS');console.log( charts['$SERVICE'].chart || '' )"`
+  fi
+}
+
+# not a fan of global vars but bash forced me to - set by getServiceAndChartVersion
+SERVICE=
+CHARTVER=
 function doInstall() {
 
-  helm remove repo stable &> /dev/null # stable was deprecated
+  helm repo remove stable &> /dev/null # stable was deprecated
   helm repo update &> /dev/null
 
   for PARAM in "$@";
   do
     # Allows chart version from command line via <deployment>/<x.y.z>
-    IFS="/" read SERVICE CHARTVER <<< "$PARAM"
-
-    # Allows chart version as <deployment>/Chart-x.y.z*>
-    if [ -z "$CHARTVER" ];
-    then
-      LCL_CHART=`compgen -G $SERVICE/Chart-?*.?*.?*` &>/dev/null
-      if [ ! -z "$LCL_CHART" ];
-      then
-        CHARTVER=${LCL_CHART#*/Chart-}
-        printf "\n$YELO_WARN Chart version controlled by => `color y $LCL_CHART`\n"
-      fi
-    fi
+    getServiceAndChartVersion "$PARAM"
     #printf "SVC=[$SERVICE] CHT=[$CHARTVER]\n"
 
     # slap additional helm syntax in there if the version is set
     [ ! -z "$CHARTVER" ] && CHARTVER="--version $CHARTVER"
 
+    # set the dry-run flag on what
+    [ "`basename $0`" == "helmwhat" ] && WHAT="--dry-run --debug"
+
     # If we're referencing a plugin then execute it and continue
     ifPluggedIn $SERVICE && continue
 
@@ -614,7 +643,7 @@ function doInstall() {
       transponder-*)
         # transponders use the same chart but different deployment name
         helm upgrade --install $SERVICE leverege/transponder \
-                     --values $SERVICE/values.yaml
+                     --values $SERVICE/values.yaml $CHARTVER $WHAT
         ;;
 
       "traefik")
@@ -651,7 +680,6 @@ function doInstall() {
           MUSEUM=$(<${OVERRIDE})
           printf "\n$YELO_WARN Local chartmuseum name override from ${SERVICE} to ${MUSEUM}\n"
         fi
-        [ "`basename $0`" == "helmwhat" ] && WHAT="--dry-run --debug"
         HELMUP="helm upgrade --install $SERVICE leverege/$MUSEUM -f $SERVICE/values.yaml $CHARTVER $WHAT"
         printf "Helming => `color g \"$HELMUP\"`\n" && $HELMUP
         SAVERR=$?