@leverege/build-tools 2.0.5 → 2.0.7

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; }
 

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"); } }
 

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; }
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "A package for development build tools.",
   "main": "index.js",
   "scripts": {
     "build": "npm run compile",
     "compile": "rm -fr lib && npm run compile_server && npm run compile_web",
-    "compile_server": "NODE_ENV=server babel -d lib/server src/ --copy-files",
+    "compile_server": "NODE_ENV=server babel -d lib/server src/ && cp src/dnsify/accounts.json.enc lib/server/dnsify/accounts.json.enc",
     "compile_web": "NODE_ENV=web babel -d lib/web src/",
     "licenseCheck": "license-checker --summary --failOn GPL",
     "prepublintOnly": "npm run lint && npm run build",
@@ -33,7 +33,7 @@
   "author": "Leverege Devs",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@google-cloud/kms": "^1.6.2",
+    "@google-cloud/kms": "^1.6.3",
     "async": "^3.1.1",
     "chalk": "^3.0.0",
     "cloudflare": "^2.7.0",
@@ -53,13 +53,13 @@
     "tar": "^5.0.5"
   },
   "devDependencies": {
-    "@babel/cli": "^7.8.3",
-    "@babel/core": "^7.8.3",
+    "@babel/cli": "^7.8.4",
+    "@babel/core": "^7.8.4",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@babel/plugin-proposal-optional-chaining": "^7.8.3",
-    "@babel/preset-env": "^7.8.3",
+    "@babel/preset-env": "^7.8.4",
     "@babel/register": "^7.8.3",
-    "@leverege/eslint-config-leverege": "^2.0.7",
+    "@leverege/eslint-config-leverege": "^2.0.8",
     "core-js": "^3.6.4"
   }
 }

package/src/circleate

@@ -45,44 +45,12 @@ create_server_config(){
 version: 2.1
 orbs:
   gcp-gcr: circleci/gcp-gcr@0.6.1
-  anchore: anchore/anchore-engine@1.2.0
 executors:
   default:
     description: >
       A debian-based machine executor.
     machine: true
-  anchore_engine:
-    description: Machine runner with anchore engine default environment variables set.
-    parameters:
-      anchore_engine_version:
-        description: Version of anchore-engine container to run (recommended to keep default value)
-        type: string
-        default: "v0.3.2"
-    environment:
-      ANCHORE_CLI_USER: admin
-      ANCHORE_CLI_PASS: foobar
-      ANCHORE_CLI_SSL_VERIFY: 'n'
-      ANCHORE_VERSION: << parameters.anchore_engine_version >>
-    machine:
-      image: circleci/classic:201808-01
 jobs:
-  docker-scan:
-    # runs anchore image scan for vulnerabilities
-    executor: anchore/anchore_engine
-    steps:
-      - attach_workspace:
-          at: ~/project
-      - run:
-          name: build container
-          command: 'docker build -t "\${CIRCLE_PROJECT_REPONAME}:ci" ~/project/docker/'
-      - anchore/analyze_local_image:
-          image_name: '\${CIRCLE_PROJECT_REPONAME}:ci'
-          timeout: '500'
-          policy_failure: true
-      - anchore/parse_reports
-      - store_artifacts:
-          path: anchore-report
-
   gcr:
     # gcr build docker image and pushes to gcr
     executor: default
@@ -98,14 +66,23 @@ jobs:
           image: \$CONTAINER_NAME
           tag: \$PACKAGE_VERSION
           path: docker
+          dockerfile: docker/Dockerfile
       - gcp-gcr/push-image:
           image: \$CONTAINER_NAME
           tag: \$PACKAGE_VERSION
-      - gcp-gcr/add-image-tag:
+      - run:
+          name: Check if branch is master
+          command: |
+            if [ \$CIRCLE_BRANCH == 'master' ]; then 
+              echo "export GCR_TAG=stable" >> \$BASH_ENV; 
+            else
+              echo "export GCR_TAG=latest" >> \$BASH_ENV;
+            fi
+      - gcp-gcr/tag-image:
           image: \$CONTAINER_NAME
           source-tag: \$PACKAGE_VERSION
-          target-tag: latest
-      - gcp-gcr/add-image-tag:
+          target-tag: \$GCR_TAG
+      - gcp-gcr/tag-image:
           image: \$CONTAINER_NAME
           source-tag: \$PACKAGE_VERSION
           target-tag: circle-\$NODE_IMAGE-\$CIRCLE_USERNAME
@@ -273,27 +250,24 @@ workflows:
           context: npm
           filters:
             branches:
-              only: master
+              only: 
+                - development
+                - /release-.*/
+                - master
           requires:
             - smoke-test
-      - docker-scan:
-          filters:
-            branches:
-              only: master
-          requires:
-            - smoke-test
-            - coverage
-            - build
       - gcr:
           context: google
           filters:
             branches:
-              only: master
+              only: 
+                - development
+                - /release-.*/
+                - master
           requires:
             - smoke-test
             - build
             - coverage
-            - docker-scan
 EOCIRCLE
 }
 

package/src/helmup

@@ -149,7 +149,7 @@ function installVelero() {
     --set schedules.timescale.schedule="0 3 * * *" \
     --set schedules.timescale.template.ttl="720h" \
     --set schedules.timescale.template.labelSelector.matchLabels.app="postgresql" \
-    --set schedules.timescale.template.snapshotVolumes="true" \
+    --set schedules.timescale.template.snapshotVolumes="true" 
 
   ## Instruct users to move velero keys
   printf "\n$YELO_WARN MOVE THE SERVICE ACCOUNT TO YOUR KEYS FOLDER"
@@ -157,19 +157,6 @@ function installVelero() {
 }
 
 # ---------- helmup MAIN ----------
-command -v chartmuseum &> /dev/null
-if [ $? -ne 0 ];
-then
-  cat<<NOMUSEUM
-
-$RED_ERROR Missing chartmuseum. Head over to the wiki site and follow the
-           instructions in the section entitled Installing ChartMuseum down
-           in the How-to articles -> Helm Charts via ChartMuseum.
-
-NOMUSEUM
-  exit 1
-fi
-
 GITTOP=`git rev-parse --show-toplevel` && cd $GITTOP
 if [ -d "${GITTOP}/k8-utils" ];
 then
@@ -207,7 +194,7 @@ fi
 npm run ahoy
 [ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1
 
-helm repo update &> /dev/null && helm search chartmuseum
+helm repo update &> /dev/null && helm search leverege
 
 function doInstall() {
 
@@ -315,7 +302,7 @@ function doInstall() {
           MUSEUM=$(<${OVERRIDE})
           printf "\n$YELO_WARN Local chartmuseum name override from ${SERVICE} to ${MUSEUM}\n"
         fi
-        HELMUP="helm upgrade --install $SERVICE chartmuseum/$MUSEUM -f $SERVICE/values.yaml $CHARTVER"
+        HELMUP="helm upgrade --install $SERVICE leverege/$MUSEUM -f $SERVICE/values.yaml $CHARTVER"
         printf "Helming => `color g \"$HELMUP\"`\n" && $HELMUP
         SAVERR=$?
         if [ $SAVERR -ne 0 ];
@@ -325,14 +312,9 @@ function doInstall() {
 $RED_ERROR helm exited with error status: $SAVERR
 
 $RED_ERROR The $SERVICE chart failed to upgrade or install. There may be an
-           issue with the service's helm charts, or chartmuseum may not be
-           up and running? If the latter, try firing it up with:
-
-chartmuseum \\
-  --port="8080" \\
-  --storage-google-bucket="leverege-helm-charts" \\
-  --storage-google-prefix="" \\
-  --storage="google" &> /dev/null &
+           issue with the service's helm charts, or you may have to follow
+           the instructions on the wiki under `color g "Helm Charts via Chartmuseum"`
+           in the `color y "Using the Public Endpoint"` section.
 
 NOTRUNNING
           exit 1

package/src/overwhelm

@@ -300,7 +300,7 @@ ahoy.forEach( ( dir ) => {
 
   ` )
   }
-  const ans = ask.question( `Enter "${chalk.bold.green( 'yes' )}" if you wish to proceed => ` )
+  const ans = ask.question( `Enter "${chalk.bold.green( 'yes' )}" if you wish to fetch the credentials => ` )
   if ( ans !== 'yes' ) {
     if ( matchedCtx ) {
       console.log( chalk.bold.yellow( `\n\nSkipping a refetch of your GCP context and credentials\n\n` ) )