@leverege/build-tools 2.5.30 → 2.5.32

package/lib/server/build-tools.js

@@ -144,6 +144,6 @@ if (args.help) {
 
 
 if (args._unknown) {
-  console.log(`Hey Bozo, WTF am I supposed to do with ${args._unknown}?`);
+  console.log(`\nUnrecognized argument [${args._unknown}] try --help\n`);
   process.exit(1);
 }

package/lib/web/build-tools.js

@@ -144,6 +144,6 @@ if (args.help) {
 
 
 if (args._unknown) {
-  console.log(`Hey Bozo, WTF am I supposed to do with ${args._unknown}?`);
+  console.log(`\nUnrecognized argument [${args._unknown}] try --help\n`);
   process.exit(1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.5.30",
+  "version": "2.5.32",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
@@ -63,21 +63,21 @@
     "inquirer": "^7.3.3",
     "js-yaml": "^4.0.0",
     "ncp": "^2.0.0",
-    "npm-check-updates": "^11.1.4",
+    "npm-check-updates": "^11.1.9",
     "npm-registry-fetch": "^9.0.0",
     "open": "^7.4.2",
     "ora": "^5.3.0",
     "parse-gitignore": "^1.0.1",
     "readline-sync": "^1.4.10",
     "semver": "^7.3.4",
-    "simple-git": "^2.35.1"
+    "simple-git": "^2.35.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.12.17",
-    "@babel/core": "^7.12.17",
-    "@babel/node": "^7.12.17",
+    "@babel/cli": "^7.13.0",
+    "@babel/core": "^7.13.1",
+    "@babel/node": "^7.13.0",
     "@leverege/babel-preset-leverege-node": "^1.1.1",
     "@leverege/eslint-config-leverege": "^2.2.0",
-    "npm": "^7.5.4"
+    "npm": "^7.5.6"
   }
 }

package/src/bash-funcs

@@ -44,7 +44,7 @@ ERREXIT
 }
 
 function exitOnError() {
-  [ $1 -ne 0 ] && errorExit $2
+  [ $1 -ne 0 ] && errorExit "$2"
 }
 
 function yesOrSkipToContinue() {

package/src/build-tools.js

@@ -138,6 +138,6 @@ if ( args.help ) {
 
 /* eslint-disable no-underscore-dangle */
 if ( args._unknown ) {
-  console.log( `Hey Bozo, WTF am I supposed to do with ${args._unknown}?` )
+  console.log( `\nUnrecognized argument [${args._unknown}] try --help\n` )
   process.exit( 1 )
 }

package/src/helmup

@@ -221,7 +221,13 @@ function checkSSDStorageClass(){
 function getManagedSecret() {
   local SECNAME=$1
   local PROJECT="${2:-leverege-docker-images}"
-  SECRET=$(gcloud secrets versions access latest --secret=$SECNAME --project=$PROJECT)
+  SECRET=$(gcloud secrets versions access latest --secret="$SECNAME" --project=$PROJECT)
+  if [ $? -ne 0 ];
+  then
+    printf "This failed=>[gcloud secrets versions access latest --secret="$SECNAME" --project=$PROJECT]\n"
+    printf "Returned   =>[$SECRET]\n\n"
+    exit 1
+  fi
   echo $SECRET
 }
 
@@ -231,14 +237,18 @@ function installTraefik() {
   kubectl get secret cloudflare --namespace traefik &>/dev/null
   if [[ $? -eq 1 ]]; then
     cat<<NEED_TRAEFIK_SECRET
-  `color r "***ERROR:"` missing secret: `color y cloudflare` namespace: `color y traefik`
+   $RED_ERROR missing secret: `color y cloudflare` namespace: `color y traefik`
 
    This secret may be fetched from the leverege-docker-images cluster and
    properly injected into this cluster.
 NEED_TRAEFIK_SECRET
     yesToContinue "to copy and inject the cloudflare secret"
     TOKEN=$(getManagedSecret "CLOUDFLARE_API_TOKEN")
-    exitOnError $? "Failed to fetch the secret from leverege-docker-images"
+    if [ $? -ne 0 ];
+    then
+      printf "$RED_ERROR getManagedSecret reponse=>[$TOKEN]"
+      exitOnError 1 "Failed to fetch the secret from leverege-docker-images"
+    fi
     printf "\nInjecting=[$TOKEN] into cloudflare secret\n"
     kubectl create secret generic cloudflare \
       --namespace traefik \
@@ -331,8 +341,7 @@ function installVelero() {
     --set schedules.mysql.template.snapshotVolumes="true" 
 
   ## Instruct users to move velero keys
-  printf "\n$YELO_WARN MOVE THE SERVICE ACCOUNT TO YOUR KEYS FOLDER"
-  printf "\n$YELO_WARN NO REALLY...MOVE credentials-velero file NOW"
+  printf "\n$YELO_WARN Use the velero-credentials secret for accessing velero\n"
 }
 
 # ---------- helmup MAIN ----------
@@ -441,9 +450,13 @@ function doInstall() {
         ;;
 
       "elastic"|"elasticsearch")
+        LOCAL_ES_VALUES="elasticsearch/es-values.yaml"
+        [ ! -f "$LOCAL_ES_VALUES" ] && exitOnError 1 "Missing the local ES config file => `color y $LOCAL_ES_VALUES`"
         checkSSDStorageClass
-        helm repo add elastic https://helm.elastic.co
-        helm upgrade --install elasticsearch elastic/elasticsearch --set volumeClaimTemplate.storageClassName="ssd"
+        helm repo add elastic https://helm.elastic.co && helm repo update
+        helm upgrade --install elasticsearch elastic/elasticsearch \
+          --values $LOCAL_ES_VALUES \
+          --set volumeClaimTemplate.storageClassName="ssd"
         ;;
 
       "monitoring")