@leverege/build-tools 2.1.8 → 2.2.0

package/lib/web/dnsify/CloudflareAPI.js

@@ -6,8 +6,12 @@ require("core-js/modules/es.symbol.description");
 
 require("core-js/modules/es.symbol.iterator");
 
+require("core-js/modules/es.array.from");
+
 require("core-js/modules/es.array.iterator");
 
+require("core-js/modules/es.array.slice");
+
 require("core-js/modules/es.object.to-string");
 
 require("core-js/modules/es.promise");
@@ -20,11 +24,15 @@ require("core-js/modules/web.dom-collections.iterator");
 
 require("regenerator-runtime/runtime");
 
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(n); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) { return; } var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
@@ -82,8 +90,8 @@ var CloudflareAPI = /*#__PURE__*/function () {
             contentsBuffer,
             name,
             ciphertext,
-            _ref,
-            _ref2,
+            _yield$client$decrypt,
+            _yield$client$decrypt2,
             result,
             writeFile,
             _args = arguments;
@@ -119,9 +127,9 @@ var CloudflareAPI = /*#__PURE__*/function () {
                 });
 
               case 16:
-                _ref = _context.sent;
-                _ref2 = _slicedToArray(_ref, 1);
-                result = _ref2[0];
+                _yield$client$decrypt = _context.sent;
+                _yield$client$decrypt2 = _slicedToArray(_yield$client$decrypt, 1);
+                result = _yield$client$decrypt2[0];
                 // Writes the decrypted file to disk
                 writeFile = promisify(fs.writeFile);
                 _context.next = 22;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.1.8",
+  "version": "2.2.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
@@ -52,17 +52,17 @@
     "parse-gitignore": "^1.0.1",
     "readline-sync": "^1.4.10",
     "recursive-copy": "^2.0.10",
-    "regenerator-runtime": "^0.13.3",
+    "regenerator-runtime": "^0.13.5",
     "semver": "^6.3.0",
     "tar": "^5.0.5"
   },
   "devDependencies": {
     "@babel/cli": "^7.8.4",
-    "@babel/core": "^7.8.7",
+    "@babel/core": "^7.9.0",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-proposal-optional-chaining": "^7.8.3",
-    "@babel/preset-env": "^7.8.7",
-    "@babel/register": "^7.8.6",
+    "@babel/plugin-proposal-optional-chaining": "^7.9.0",
+    "@babel/preset-env": "^7.9.0",
+    "@babel/register": "^7.9.0",
     "@leverege/eslint-config-leverege": "^2.0.10",
     "core-js": "^3.6.4"
   }

package/src/helmup

@@ -3,7 +3,7 @@
 # This script is used to ease the pain of transition testing to chart museum
 # for adding / updating deployments on a fluster.
 #
-# printf "\nRUNNING LOCALLY\n" && sleep 2
+# printf "\n***** RUNNING LOCALLY *****\n" && sleep 2
 PLATFORM=(
   api-server
   db-curator
@@ -16,7 +16,6 @@ PLATFORM=(
   transponder-bq
   transponder-fb
   transponder-postgres
-# transponder-sql
 )
 
 SYSTEM=(
@@ -25,6 +24,8 @@ SYSTEM=(
   polaris
   redis
   velero
+  reloader
+  tiller
 # monitoring
 # custom-metrics
 )
@@ -359,7 +360,21 @@ function doInstall() {
 
   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
+      for PARAM in $SERVICE/.chart-?.?.?; do
+        IFS="-" read JUNK VERSION <<< "$PARAM"
+        [ $VERSION != "?.?.?" ] && CHARTVER=$VERSION
+        printf "PARAM=[$PARAM] SVC=[$SERVICE] CHT=[$CHARTVER]\n"
+        break
+      done
+    fi
+
+    # slap additional helm syntax in there if the version is set
     [ ! -z "$CHARTVER" ] && CHARTVER="--version $CHARTVER"
 
     # If we're referencing a plugin the execute it and continue
@@ -379,11 +394,6 @@ function doInstall() {
         printf "\nGithub repo is here => https://github.com/helm/charts/tree/master/stable/coredns\n\n"
         ;;
 
-#     "disks") DEPRECATED
-#       checkSSDStorageClass
-#       helm upgrade --install disks ./disks
-#       ;;
-
       "elastic"|"elasticsearch")
         checkSSDStorageClass
         helm repo add elastic https://helm.elastic.co
@@ -423,6 +433,12 @@ function doInstall() {
         printf "To start a specific version => `color c 'REDIS_HELM_CHART="v9.1.5" helmup redis'`\n\n"
         ;;
 
+      "tiller")
+        kubectl create -f $GITTOP/k8s-utils/tiller.yaml &> /dev/null
+        helm init --service-account tiller --upgrade --history-max 5
+        sleep 3
+        ;;
+
       "timescale-db")
         checkTimescalePassword
         helm upgrade --install timescale-db leverege/timescale-db
@@ -440,6 +456,10 @@ function doInstall() {
         installVelero # because it's a little more involved
         ;;
 
+      "reloader")
+        helm upgrade --install reloader stable/reloader
+        ;;
+
       *)
         if [ ! -d $SERVICE ] || [ ! -f $SERVICE/values-local.yaml ];
         then

package/src/overwhelm

@@ -17,6 +17,7 @@ const optionsDefinitions = [
   { name : 'export',   alias : 'e', type : Boolean, default : false },
   { name : 'continue', alias : 'c', type : Boolean, default : false },
   { name : 'checkctx', alias : 't', type : Boolean, default : false },
+  { name : 'fetchctx', alias : 'f', type : Boolean, default : false },
   { name : 'verbose',  alias : 'v', type : Boolean, default : false },
 ]
 const args = cliArgs( optionsDefinitions )
@@ -200,10 +201,14 @@ const opt = {
 
 const ahoy = glob.sync( '*/', opt )
 
-// Generate the values.yaml files in directories not marked with .nohelm.
+// .noahoy = skips generation of values.yaml but allows helmup to run
+// .nohelm = overwhelm and helmup will skip the deployment entirely
 ahoy.forEach( ( dir ) => {
-  if ( !fs.existsSync( `${dir}/.nohelm` ) ) {
-    console.log( `Generating values in ${dir}` )
+  if ( fs.existsSync( `${dir}/.noahoy` ) ) {
+    !args.fetchctx && console.log( chalk.yellow( `***WARNING: .noahoy detected, not regenerating ${dir}values.yaml` ) )
+  }
+  else if ( !fs.existsSync( `${dir}/.nohelm` ) ) {
+    args.verbose && console.log( `Generating values in ${dir}` )
 
     let valuesOut = [] // An accumulator for all of the output values.
 
@@ -211,7 +216,7 @@ ahoy.forEach( ( dir ) => {
     const valuesLocal = `${dir}values-local.yaml`
 
     if ( fs.existsSync( valuesLocal ) ) {
-      console.log( `     Local values in ${valuesLocal}` )
+      args.verbose && console.log( `     Local values in ${valuesLocal}` )
       valuesOut += `\n# AHOY => values-local.yaml\n\n`
       valuesOut += fs.readFileSync( valuesLocal, { encoding : 'utf-8' } )
     }
@@ -250,9 +255,10 @@ ahoy.forEach( ( dir ) => {
 
   let kubeout = '_no_current_context_'
   try {
-    // if current is not set exec will throw
-    kubeout = exec( 'kubectl config current-context' )
-  } catch (err) { }
+    kubeout = exec( 'kubectl config current-context', { stdio: [ undefined ] } )
+  } catch (err) {
+    // err && console.log( `Caught Error =>[${err}]` )
+  }
 
   const currentCtx = kubeout.toString().trim()
   let desiredCtx = `gke_${projectId}_${zone}_${clusterName}`
@@ -270,17 +276,27 @@ ahoy.forEach( ( dir ) => {
 
   const matchedCtx = ( currentCtx === desiredCtx )
   
+  // just fetch the context and exit if -f is specified
+  if ( args.fetchctx ) {
+    if ( !matchedCtx ) {
+      try {
+        exec( `${cmd}`, { stdio: [ undefined ] } )
+      } catch (err) {
+        process.exit( 61 ) // ECONNREFUSED
+      }
+    }
+    process.exit( 0 )
+  }
+
   if ( matchedCtx ) {
     console.log( `
 
-  Current context ${chalk.bold.green(currentCtx)} matches the desired
-  context. Do you want to update credentials anyway?
+  Current context matches => ${chalk.bold.green(currentCtx)}
 
   ` )
   }
   else {
     console.log( `
-
   You are about to change your Kubernetes context to:
       CLUSTER_NAME => ${chalk.bold.green(clusterName)}
       PROJECT_ID   => ${chalk.bold.green(projectId)}
@@ -288,7 +304,8 @@ ahoy.forEach( ( dir ) => {
 
   ` )
   }
-  const ans = ask.question( `Enter "${chalk.bold.green( 'yes' )}" if you wish to fetch the credentials => ` )
+  const operation = matchedCtx ? 'refetch the credentials' : 'switch your context'
+  const ans = ask.question( `Enter "${chalk.bold.green( 'yes' )}" if you wish to ${operation} => ` )
   if ( ans !== 'yes' ) {
     if ( matchedCtx ) {
       console.log( chalk.bold.yellow( `\n\nSkipping a refetch of your Kubernetes context and credentials\n\n` ) )
@@ -299,7 +316,7 @@ ahoy.forEach( ( dir ) => {
     process.exit( 1 )
   }
 
-  console.log( `\n\nExecuting: ${cmd}\n\n` )
+  console.log( `\n\nExecuting: ${chalk.bold.yellow(cmd)}\n\n` )
   exec( `${cmd}`, ( error, out ) => {
     if ( error ) {
       console.log( `\n\n***ERROR ${error}\n\n` )