@leverege/build-tools 2.9.4 → 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.4",
+  "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",

package/src/helmup

@@ -529,7 +529,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 +544,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 || '' )"&>/dev/null`
   fi
 }
 

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