@leverege/build-tools 2.9.4 → 2.9.6

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.4",
+  "version": "2.9.6",
   "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",
@@ -81,6 +80,6 @@
     "@babel/node": "^7.16.8",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^8.5.2"
+    "npm": "^8.5.3"
   }
 }

package/src/circleate

@@ -53,7 +53,7 @@ executors:
 jobs:
   install:
     docker:
-      - image: circleci/node:fermium
+      - image: circleci/node:gallium
     steps:
       - checkout
       - restore_cache:
@@ -79,7 +79,7 @@ jobs:
 
   security-check:
     docker:
-      - image: circleci/node:fermium
+      - image: circleci/node:gallium
     steps:
       - checkout
       - attach_workspace:
@@ -90,7 +90,7 @@ jobs:
 
   license-check:
     docker:
-      - image: circleci/node:fermium
+      - image: circleci/node:gallium
     steps:
       - checkout
       - attach_workspace:
@@ -105,7 +105,7 @@ jobs:
 
   lint:
     docker:
-      - image: circleci/node:fermium
+      - image: circleci/node:gallium
     steps:
       - checkout
       - attach_workspace:
@@ -119,7 +119,7 @@ jobs:
 
   docs:
     docker:
-      - image: circleci/node:fermium
+      - image: circleci/node:gallium
     steps:
       - checkout
       - attach_workspace:
@@ -136,7 +136,7 @@ jobs:
     environment:
       TZ: 'America/New_York'
     docker:
-      - image: circleci/node:fermium
+      - image: circleci/node:gallium
       # IF YOU NEED ANY OF THESE, UNCOMMENT TO USE
       # - image: redis
       # - image: circleci/mysql:5.7
@@ -172,7 +172,7 @@ jobs:
 
       - run:
           name: Check if coverage meets at least 70%
-          command: ./node_modules/.bin/nyc check-coverage --functions 70 --lines 70 --statements 70
+          command: npx c8 check-coverage --functions 70 --lines 70 --statements 70
 
       - store_artifacts:
           path: coverage
@@ -181,7 +181,7 @@ jobs:
   build:
     # build should make dist image and prepare docker file
     docker:
-      - image: circleci/node:fermium
+      - image: circleci/node:gallium
 
     steps:
       - checkout
@@ -476,7 +476,7 @@ jobs:
 
   build:
     docker:
-      - image: circleci/node:fermium
+      - image: circleci/node:gallium
     steps:
       - checkout
       - restore_cache:
@@ -510,7 +510,7 @@ jobs:
 
   deploy-dev:
     docker:
-      - image: circleci/node:fermium
+      - image: circleci/node:gallium
     steps:
       - attach_workspace:
           at: ~/project
@@ -521,7 +521,7 @@ jobs:
 
   deploy-prod:
     docker:
-      - image: circleci/node:fermium
+      - image: circleci/node:gallium
     steps:
       - attach_workspace:
           at: ~/project

package/src/helmup

@@ -516,6 +516,8 @@ PLUGIN_NOEXEC
 
 function getServiceAndChartVersion() {
 
+  SERVICE=
+  CHARTVER=
   # Allows chart version from command line via <deployment>/<x.y.z>
   IFS="/" read SERVICE CHARTVER <<< "$1"
 
@@ -529,7 +531,7 @@ function getServiceAndChartVersion() {
     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:
+    been deprecated. Create a top level `color g "Versions.json"` file instead:
 
     {
       "scheduler" : "3.6.1",
@@ -544,7 +546,7 @@ DEPRECATED_CHART
   local VERSIONS="./Versions.json"
   if [ -f "$VERSIONS" ];
   then
-    CHARTVER=`node -e "charts=require('$VERSIONS');console.log( charts['$SERVICE'].chart || '' )"`
+    CHARTVER=`node -e "charts=require('$VERSIONS');console.log( charts['$SERVICE']?.chart || '' )"`
   fi
 }
 
@@ -642,8 +644,8 @@ function doInstall() {
 
       transponder-*)
         # transponders use the same chart but different deployment name
-        helm upgrade --install $SERVICE leverege/transponder \
-                     --values $SERVICE/values.yaml $CHARTVER $WHAT
+        HELMUP="helm upgrade --install $SERVICE leverege/transponder --values $SERVICE/values.yaml $CHARTVER $WHAT"
+        printf "Helming => `color g \"$HELMUP\"`\n\n" && $HELMUP
         ;;
 
       "traefik")

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