@leverege/build-tools 2.4.2 → 2.4.3

package/lib/server/helmify/helm.js

@@ -35,24 +35,8 @@ function transformGoFormat(input) {
   return input.replace(/-/g, '_');
 }
 
-function mapServiceToType(service) {
-  switch (service) {
-    case 'none':
-      return null;
-
-    case 'internal':
-      return 'ClusterIP';
-
-    case 'external':
-      return 'NodePort';
-
-    default:
-      return null;
-  }
-}
-
-async function createValuesYAML(name, version, redisAccess, securityContext, preemptible, serviceType) {
-  const openPort = serviceType !== 'none';
+async function createValuesYAML(name, version, redisAccess, securityContext, preemptible, protocol, scaler, cloud) {
+  const openPort = protocol !== 'none';
   const portFromEnv = process.env.PORT || process.env.SERVER_PORT;
   const portNumber = parseInt(portFromEnv) || 8080;
   let values = {
@@ -70,7 +54,7 @@ async function createValuesYAML(name, version, redisAccess, securityContext, pre
       "readOnlyRootFs": !securityContext
     },
     "cloud": {
-      "provider": "gcp",
+      "provider": cloud,
       "project": "",
       "region": "",
       "sqlInstance": ""
@@ -84,7 +68,7 @@ async function createValuesYAML(name, version, redisAccess, securityContext, pre
     }
   };
 
-  if (serviceType) {
+  if (scaler) {
     values = Object.assign(values, scalerValues);
   }
 
@@ -105,9 +89,9 @@ async function createChartYAML(chart) {
   }
 }
 
-async function createServiceYAML(name, serviceType) {
+async function createServiceYAML(name, serviceType, protocol) {
   try {
-    await execa('helminit-svc', [name, serviceType]);
+    await execa('helminit-svc', [name, serviceType, protocol]);
   } catch (err) {
     console.error('Failed to create service.yaml file', chalk.red.bold('ERROR'));
     process.exit(1);
@@ -144,12 +128,13 @@ async function createTemplates() {
   }, {
     name: 'securityContext',
     type: 'confirm',
-    message: 'Does this server need special write access to filesystem?'
+    message: 'Does this server need special write access to filesystem?',
+    default: false
   }, {
-    name: 'service',
+    name: 'protocol',
     type: 'rawlist',
-    message: 'Does this server need a TCP port open for internal or external access?',
-    choices: ['none', 'internal', 'external'],
+    message: 'Does this server require a TCP or UDP port open for communication?',
+    choices: ['none', 'UDP', 'TCP'],
     default: ['none']
   }, {
     name: 'scaler',
@@ -159,8 +144,8 @@ async function createTemplates() {
     name: 'cloud',
     type: 'rawlist',
     message: 'By default, which cloud platform will this server be deployed on?',
-    choices: ['GCP', 'AWS'],
-    default: ['GCP']
+    choices: ['gcp', 'aws'],
+    default: ['gcp']
   }, {
     name: 'cloudServices',
     type: 'checkbox',
@@ -220,17 +205,26 @@ module.exports = {
     await createChartYAML(chart);
     const templateOpts = await createTemplates();
     const {
-      service,
+      protocol,
       scaler,
       cloudServices,
       redisAccess,
       securityContext,
-      preemptible
-    } = templateOpts;
-    const serviceType = mapServiceToType(service);
-
-    if (serviceType) {
-      await createServiceYAML(chartSafeName, serviceType);
+      preemptible,
+      cloud
+    } = templateOpts; // Based on protocol, ask about serviceType 
+
+    if (protocol !== 'none') {
+      const servicesQ = [{
+        name: 'service',
+        type: 'rawlist',
+        message: 'What kind of service does your server need (ClusterIP for internal, NodePort/LB for external)?',
+        choices: ['ClusterIP', 'NodePort', 'LoadBalancer'],
+        default: ['ClusterIP']
+      }];
+      const ans = await inquirer.prompt(servicesQ);
+      const serviceType = ans.service;
+      await createServiceYAML(chartSafeName, serviceType, protocol);
     }
 
     if (scaler) {
@@ -240,7 +234,7 @@ module.exports = {
     const enableFirebase = cloudServices.includes('firebase');
     const enableBigQuery = cloudServices.includes('bigquery');
     await createDeploymentYAML(name, enableFirebase, enableBigQuery);
-    await createValuesYAML(chartSafeName, appVersion, redisAccess, securityContext, preemptible, serviceType);
+    await createValuesYAML(chartSafeName, appVersion, redisAccess, securityContext, preemptible, protocol, scaler, cloud);
     console.log(chalk.green.bold(`\n\n Helm chart for ${name} is now ready \n`));
     console.log(chalk.yellow.bold('Add any additional env vars to value.yaml and deployment.yaml prior to deployment'));
   }

package/lib/web/packleate/Packleator.js

@@ -6,12 +6,16 @@ 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");
 
 require("core-js/modules/es.object.get-own-property-descriptor");
 
+require("core-js/modules/es.object.get-own-property-descriptors");
+
 require("core-js/modules/es.object.keys");
 
 require("core-js/modules/es.object.to-string");
@@ -42,7 +46,9 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
+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(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"); } }
 
@@ -68,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);
 
@@ -93,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;
@@ -145,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) {
@@ -235,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;
@@ -284,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) {
@@ -335,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;
@@ -397,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) {
@@ -450,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) {
@@ -484,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,
@@ -540,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) {
@@ -587,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

@@ -3,12 +3,14 @@
 
 require("core-js/modules/es.symbol");
 
-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.object.get-own-property-descriptor");
 
+require("core-js/modules/es.object.get-own-property-descriptors");
+
 require("core-js/modules/es.object.keys");
 
 require("core-js/modules/es.object.to-string");
@@ -19,7 +21,9 @@ require("core-js/modules/web.dom-collections.for-each");
 
 require("regenerator-runtime/runtime");
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
+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(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; }
 
@@ -105,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.4.2",
+  "version": "2.4.3",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {

package/src/dockreate

@@ -200,21 +200,7 @@ runuser=$(strip_undefined "`node -p \"require('../package.json').leverege.runuse
 container="`node -p \"require('../package.json').leverege.container\"`"
 if [ "$container" == "undefined" ];
 then
-  gitremote=`git config --get remote.origin.url`
-  if [ -z $gitremote ];
-  then
-  cat<<NOCONTAINER
-
-  $(colorize 'red' '***ERROR: attempting to build an unnamed container')
-
-  You are attempting to create a docker image without a container name or
-  a git remote setup. Either define a $(colorize 'yellow' 'container') statement in the leverege
-  section of package.json, or add a $(colorize 'green' 'git remote') to this repository.
-
-NOCONTAINER
-  exit 1
-  fi
-  container=$(basename $gitremote .git)
+  container=$(basename `git config --get remote.origin.url` .git)
 fi
 gcimage=gcr.io/$project/$container
 

package/src/helminit-svc

@@ -2,6 +2,7 @@
 
 chartName=$1
 serviceType=$2
+protocol=$3
 
 touch helm/templates/service.yaml
 
@@ -15,7 +16,7 @@ spec:
   selector:
     app: {{ .Chart.Name }}
   ports:
-  - protocol: TCP
+  - protocol: $protocol
     port: {{ .Values.$chartName.port }}
     targetPort: api
 EOSERVICE

package/src/helmup

@@ -298,6 +298,7 @@ function installVelero() {
     --set "initContainers[0].volumeMounts[0].name"="plugins" \
     --set schedules.timescale.schedule="0 3 * * *" \
     --set schedules.timescale.template.ttl="720h" \
+    --set schedules.timescale.template.labelSelector.matchLabels.release="timescale-db" \
     --set schedules.timescale.template.labelSelector.matchLabels.app="postgresql" \
     --set schedules.timescale.template.snapshotVolumes="true"