@leverege/build-tools 2.9.3 → 2.9.5

package/lib/server/overwhelm.js

@@ -76,6 +76,15 @@ const context = args.context || gitBranch;
 if (context === 'master') {
   console.log('***ERROR: master context is forbidden; change to a different branch\n\n');
   process.exit(1);
+}
+
+if (!fs.existsSync('overwhelm.yaml')) {
+  console.log(chalk.red.bold(`
+
+***ERROR overwhelm => missing the overwhelm.yaml file - this command expects
+                      to execute from within a platform-k8s branch
+  `));
+  process.exit(1);
 } // Load the default values and then overlay with the project specific yaml
 // values. This supports the notion of this type of approach in the
 // overwhelm yaml settings:

package/lib/web/overwhelm.js

@@ -76,6 +76,15 @@ const context = args.context || gitBranch;
 if (context === 'master') {
   console.log('***ERROR: master context is forbidden; change to a different branch\n\n');
   process.exit(1);
+}
+
+if (!fs.existsSync('overwhelm.yaml')) {
+  console.log(chalk.red.bold(`
+
+***ERROR overwhelm => missing the overwhelm.yaml file - this command expects
+                      to execute from within a platform-k8s branch
+  `));
+  process.exit(1);
 } // Load the default values and then overlay with the project specific yaml
 // values. This supports the notion of this type of approach in the
 // overwhelm yaml settings:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.9.3",
+  "version": "2.9.5",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
     "repository": {
@@ -20,7 +20,6 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "bin": {
-    "anchor": "src/anchor",
     "build-tools": "src/build-tools.js",
     "circleate": "src/circleate",
     "decrypt-secrets": "src/decrypt-secrets",
@@ -60,7 +59,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 +75,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,26 +514,52 @@ 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 "Versions.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 || '' )"&>/dev/null`
+  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

package/src/overwhelm.js

@@ -39,6 +39,15 @@ if ( context === 'master' ) {
   process.exit( 1 )
 }
 
+if ( !fs.existsSync( 'overwhelm.yaml' ) ) {
+  console.log( chalk.red.bold( `
+
+***ERROR overwhelm => missing the overwhelm.yaml file - this command expects
+                      to execute from within a platform-k8s branch
+  ` ) )
+  process.exit( 1 )
+}
+
 // Load the default values and then overlay with the project specific yaml
 // values. This supports the notion of this type of approach in the
 // overwhelm yaml settings:

package/src/anchor

@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# Load the standard helper functions
-. `build-tools --bashfun`
-
-if [ -z "$1" ] || [ -z "$2" ];
-then
-  cat<<USAGE
-
-  $(color g "Usage: anchor <service name> <chart version>\n")
-
-USAGE
-  exit 1
-fi
-
-SERVICE=$1
-VERSION=$2
-ANCHOR="${SERVICE}/Chart-${VERSION}"
-
-if compgen -G "${SERVICE}/Chart-*" > /dev/null ;
-then
-  cat<<ALREADY_ANCHORED
-
-$(color r "$SERVICE is already anchored")
-$(color y "Go remove the existing anchor from ${SERVICE} and try again")
-
-`/bin/ls ${SERVICE}/Chart*`
-
-ALREADY_ANCHORED
-exit 1
-fi
-
-printf "Locking $SERVICE chart version at $VERSION\n"
-touch ${ANCHOR}
-
-if [ -f "${ANCHOR}" ];
-then
-  printf "Service locked with creation of ${ANCHOR}\n"
-else
-  printf "***ERROR: failed to create anchor ${ANCHOR}\n"
-fi