@leverege/build-tools 2.1.4 → 2.1.6

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [2.1.5] - 2020-03-08
+### Updated
+- (Helmup) Simplified Timescale installation process
+
 ## [2.0.0] - 2020-02-12
 ### Added
 - (encrypt/decrypt) Allow for external KMS (BREAKING!!!)

package/lib/web/dnsify/CloudflareAPI.js

@@ -47,9 +47,7 @@ var path = require('path');
 var _require = require('util'),
     promisify = _require.promisify;
 
-var CloudflareAPI =
-/*#__PURE__*/
-function () {
+var CloudflareAPI = /*#__PURE__*/function () {
   function CloudflareAPI(options) {
     _classCallCheck(this, CloudflareAPI);
 
@@ -71,9 +69,7 @@ function () {
   _createClass(CloudflareAPI, [{
     key: "decrypt",
     value: function () {
-      var _decrypt = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee() {
+      var _decrypt = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
         var projectId,
             keyRingId,
             cryptoKeyId,
@@ -163,9 +159,7 @@ function () {
   }, {
     key: "deleteSecrets",
     value: function () {
-      var _deleteSecrets = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee2() {
+      var _deleteSecrets = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
         var deleteFile;
         return regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
@@ -192,9 +186,7 @@ function () {
   }, {
     key: "createDNSRecord",
     value: function () {
-      var _createDNSRecord = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee3() {
+      var _createDNSRecord = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
         return regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {

package/lib/web/dnsify/index.js

@@ -5,6 +5,8 @@ require("core-js/modules/es.symbol");
 
 require("core-js/modules/es.array.filter");
 
+require("core-js/modules/es.array.for-each");
+
 require("core-js/modules/es.object.get-own-property-descriptor");
 
 require("core-js/modules/es.object.get-own-property-descriptors");
@@ -21,7 +23,7 @@ require("regenerator-runtime/runtime");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -95,9 +97,7 @@ function main() {
 }
 
 function _main() {
-  _main = _asyncToGenerator(
-  /*#__PURE__*/
-  regeneratorRuntime.mark(function _callee() {
+  _main = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
     var CF;
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {

package/lib/web/packleate/Packleator.js

@@ -6,6 +6,8 @@ require("core-js/modules/es.array.concat");
 
 require("core-js/modules/es.array.filter");
 
+require("core-js/modules/es.array.for-each");
+
 require("core-js/modules/es.array.index-of");
 
 require("core-js/modules/es.array.iterator");
@@ -46,7 +48,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -72,9 +74,7 @@ var tar = require('tar');
 
 var semver = require('semver');
 
-var Packleator =
-/*#__PURE__*/
-function () {
+var Packleator = /*#__PURE__*/function () {
   function Packleator(options) {
     _classCallCheck(this, Packleator);
 
@@ -97,9 +97,7 @@ function () {
   _createClass(Packleator, [{
     key: "run",
     value: function () {
-      var _run = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee2() {
+      var _run = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
         var _this = this;
 
         var deps;
@@ -149,12 +147,8 @@ function () {
                       callback();
                     });
                   });
-                },
-                /*#__PURE__*/
-                function () {
-                  var _ref = _asyncToGenerator(
-                  /*#__PURE__*/
-                  regeneratorRuntime.mark(function _callee(err) {
+                }, /*#__PURE__*/function () {
+                  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(err) {
                     var _this$outputPackageJs, name, version, fileName;
 
                     return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -239,9 +233,7 @@ function () {
   }, {
     key: "rebuildPackageJson",
     value: function () {
-      var _rebuildPackageJson = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee3() {
+      var _rebuildPackageJson = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
         var _this2 = this;
 
         var packageJson, tarredPackages, _packageJson$dependen, dependencies, _packageJson$devDepen, devDependencies;
@@ -288,9 +280,7 @@ function () {
   }, {
     key: "rebuildPackageLockJson",
     value: function () {
-      var _rebuildPackageLockJson = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee4() {
+      var _rebuildPackageLockJson = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
         var packageLockJson, tarredPackages, recurseDeps;
         return regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) {
@@ -339,9 +329,7 @@ function () {
   }, {
     key: "copyFiles",
     value: function () {
-      var _copyFiles = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee5() {
+      var _copyFiles = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
         var _this3 = this;
 
         var startsWith, endsWith;
@@ -401,9 +389,7 @@ function () {
   }, {
     key: "pack",
     value: function () {
-      var _pack = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee6(name, version, dir) {
+      var _pack = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(name, version, dir) {
         var fileName;
         return regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) {
@@ -454,9 +440,7 @@ function () {
   }, {
     key: "cleanup",
     value: function () {
-      var _cleanup = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee7() {
+      var _cleanup = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
         return regeneratorRuntime.wrap(function _callee7$(_context7) {
           while (1) {
             switch (_context7.prev = _context7.next) {
@@ -488,9 +472,7 @@ function () {
   }, {
     key: "npmInstall",
     value: function () {
-      var _npmInstall = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee8() {
+      var _npmInstall = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
         var _this4 = this;
 
         var dir,
@@ -544,9 +526,7 @@ function () {
   }, {
     key: "getPrivateDeps",
     value: function () {
-      var _getPrivateDeps = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee9(depth) {
+      var _getPrivateDeps = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9(depth) {
         var _this5 = this;
 
         return regeneratorRuntime.wrap(function _callee9$(_context9) {
@@ -591,9 +571,7 @@ function () {
   }, {
     key: "getPackageJson",
     value: function () {
-      var _getPackageJson = _asyncToGenerator(
-      /*#__PURE__*/
-      regeneratorRuntime.mark(function _callee10() {
+      var _getPackageJson = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
         var dir,
             lock,
             lockModifier,

package/lib/web/packleate/index.js

@@ -5,6 +5,8 @@ require("core-js/modules/es.symbol");
 
 require("core-js/modules/es.array.filter");
 
+require("core-js/modules/es.array.for-each");
+
 require("core-js/modules/es.object.get-own-property-descriptor");
 
 require("core-js/modules/es.object.get-own-property-descriptors");
@@ -21,7 +23,7 @@ require("regenerator-runtime/runtime");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -107,9 +109,7 @@ function main() {
 }
 
 function _main() {
-  _main = _asyncToGenerator(
-  /*#__PURE__*/
-  regeneratorRuntime.mark(function _callee() {
+  _main = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
     var packleator;
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {

package/src/helmup

@@ -53,6 +53,13 @@ function setOrUnset() {
 }
 
 function checkTimescalePassword(){
+  if [ -f values-databases.yaml ] || [ -d timescale-db ];
+  then
+    printf "\n\n`color r '*** Deleting old timescale files ***'`\n\n"
+    rm -rf values-databases.yaml timescale-db
+    git add -A
+  fi
+
   kubectl get secret postgresql-password
   if [[ $? -eq 1 ]]; then
     printf "\n*** Autogenerating Timescale password ***\n\n"
@@ -63,7 +70,7 @@ function checkTimescalePassword(){
       --from-literal=postgresql-password=${psql_pw} \
       --from-literal=postgresql-replication-password=${psql_rep_pw}
 
-    printf "`color r 'Save Timescale creds to Keeweb =>'`\n\n"  
+    printf "\n\n`color y '*** Save Timescale creds to Keeweb ***'`\n\n"
     printf "`color g "postgresql-password / ${psql_pw}"`\n"
     printf "`color g "postgresql-replication-password / ${psql_rep_pw}"`\n\n"
   fi
@@ -338,6 +345,18 @@ npm run ahoy
 
 helm repo update &> /dev/null # && helm search leverege
 
+# If a helmup.plugin file exists and is executable helmup assumes it is
+# an installation specific script that should be executed instead of one
+# of the standard setup scripts.
+#
+function ifPluggedIn() {
+  PLUGIN="$1/helmup.plugin"
+  [ ! -x $PLUGIN ] && return 1
+  printf "\n***Executing local plugin code => `color y $PLUGIN`\n\n" && sleep 2
+  "$PLUGIN"
+  return 0
+}
+
 function doInstall() {
 
   for PARAM in "$@";
@@ -345,6 +364,9 @@ function doInstall() {
     IFS="/" read SERVICE CHARTVER <<< "$PARAM"
     [ ! -z "$CHARTVER" ] && CHARTVER="--version $CHARTVER"
 
+    # If we're referencing a plugin the execute it and continue
+    ifPluggedIn $SERVICE && continue
+
     case "$SERVICE" in
       "platform")
         doInstall "${PLATFORM[@]}"