@leverege/build-tools 2.0.2 → 2.0.4

package/lib/server/circleate

@@ -44,7 +44,7 @@ create_server_config(){
   cat<<EOCIRCLE > config.yml
 version: 2.1
 orbs:
-  gcp-gcr: circleci/gcp-gcr@0.0.1
+  gcp-gcr: circleci/gcp-gcr@0.6.1
   anchore: anchore/anchore-engine@1.2.0
 executors:
   default:
@@ -80,6 +80,8 @@ jobs:
           timeout: '500'
           policy_failure: true
       - anchore/parse_reports
+      - store_artifacts:
+          path: anchore-report
 
   gcr:
     # gcr build docker image and pushes to gcr
@@ -90,14 +92,20 @@ jobs:
       - run: |
           echo "export CONTAINER_NAME=\$(cat ~/project/container_name)" >> \$BASH_ENV
           echo "export PACKAGE_VERSION=\$(cat ~/project/package_version)" >> \$BASH_ENV
-      - gcp-gcr/gcr-auth
-      - gcp-gcr/build-image:
+          echo "export NODE_IMAGE=\$(cat ~/project/node_img)" >> \$BASH_ENV
+      - gcp-gcr/build-and-push-image
+      - gcp-gcr/build-and-push-image
           image: \$CONTAINER_NAME
           tag: \$PACKAGE_VERSION
-          path-to-dockerfile: docker
-      - gcp-gcr/push-image:
+          path: docker
+      - gcp-gcr/add-image-tag:
           image: \$CONTAINER_NAME
-          tag: \$PACKAGE_VERSION
+          source-tag: \$PACKAGE_VERSION
+          target-tag: latest
+      - gcp-gcr/add-image-tag:
+          image: \$CONTAINER_NAME
+          source-tag: \$PACKAGE_VERSION
+          target-tag: circle-\$NODE_IMAGE-\$CIRCLE_USERNAME
 
   smoke-test:
     # smoke test checks for license, security, and linting
@@ -119,9 +127,7 @@ jobs:
 
       - run: 
           name: Check for vulnerabilities
-          command: |
-            sudo npm install -g npm@latest
-            npm audit --production
+          command: npm audit --production
 
       - run:
           name: Check for LICENSE and README files
@@ -230,10 +236,12 @@ jobs:
             then
               container=\$CIRCLE_PROJECT_REPONAME
             fi
+            NODE_IMAGE="\`node -p \"require('./package.json').leverege.nodeimg\"\`"
 
             echo v\${PACKAGE_VERSION} > package_version
             echo "export PACKAGE_VERSION=v\${PACKAGE_VERSION}" >> \$BASH_ENV
             echo \${container} > container_name
+            echo \${NODE_IMAGE} > node_img
       - run: 
           name: Create Dockerfile and build dist directory
           command: npm run dockerize \$PACKAGE_VERSION
@@ -245,6 +253,7 @@ jobs:
             - docker/*
             - package_version
             - container_name
+            - node_img
             - package*json
 
 workflows:
@@ -309,9 +318,7 @@ jobs:
 
       - run: 
           name: Check for vulnerabilities
-          command: |
-            sudo npm install -g npm@latest
-            npm audit --production
+          command: npm audit --production
 
       - run:
           name: Check for LICENSE and README files

package/lib/server/helmup

@@ -150,10 +150,6 @@ function installVelero() {
     --set schedules.timescale.template.ttl="720h" \
     --set schedules.timescale.template.labelSelector.matchLabels.app="postgresql" \
     --set schedules.timescale.template.snapshotVolumes="true" \
-    --set schedules.mysql.schedule="0 2 * * *" \
-    --set schedules.mysql.template.ttl="720h" \
-    --set schedules.mysql.template.labelSelector.matchLabels.app="mysql" \
-    --set schedules.mysql.template.snapshotVolumes="true"
 
   ## Instruct users to move velero keys
   printf "\n$YELO_WARN MOVE THE SERVICE ACCOUNT TO YOUR KEYS FOLDER"

package/lib/server/pkglint

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+C_off='\e[0m'
+C_yellow='\e[93m'
+
+good() {
+  printf "\e[32m✔${C_off}"
+}
+
+bad() {
+  printf "\e[31m✘${C_off}"
+}
+
+check_file() {
+  local C_stat=$(bad)
+  local filename=$1
+
+  if [ -f $filename ]; then
+    C_stat=$(good)
+    printf "$C_stat $filename\n"
+  else
+    printf "$C_stat $filename is missing\n\n"
+    printf "${C_yellow}  Please create $filename before pushing to prod\n\n"
+    exit 1
+  fi
+}
+
+printf "\nChecking repo for markdown files\n\n"
+
+files=( README.md LICENSE.md )
+for file in ${files[@]}; do
+  check_file $file
+done
+
+printf "\nAll required files exist\n\n"

package/lib/web/dnsify/index.js

@@ -5,8 +5,6 @@ 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");
@@ -23,7 +21,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(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 _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 _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,8 +6,6 @@ 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");
@@ -48,7 +46,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(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 _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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 

package/lib/web/packleate/index.js

@@ -5,8 +5,6 @@ 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");
@@ -23,7 +21,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(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 _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 _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,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "A package for development build tools.",
   "main": "index.js",
   "scripts": {
@@ -28,7 +28,7 @@
     "overwhelm": "src/overwhelm",
     "packleate": "lib/web/packleate/index.js",
     "pkgck": "src/pkgck",
-    "pkglint": "lib/server/pkglint/index.js"
+    "pkglint": "src/pkglint"
   },
   "author": "Leverege Devs",
   "license": "SEE LICENSE IN LICENSE.md",

package/src/circleate

@@ -44,7 +44,7 @@ create_server_config(){
   cat<<EOCIRCLE > config.yml
 version: 2.1
 orbs:
-  gcp-gcr: circleci/gcp-gcr@0.0.1
+  gcp-gcr: circleci/gcp-gcr@0.6.1
   anchore: anchore/anchore-engine@1.2.0
 executors:
   default:
@@ -80,6 +80,8 @@ jobs:
           timeout: '500'
           policy_failure: true
       - anchore/parse_reports
+      - store_artifacts:
+          path: anchore-report
 
   gcr:
     # gcr build docker image and pushes to gcr
@@ -90,14 +92,20 @@ jobs:
       - run: |
           echo "export CONTAINER_NAME=\$(cat ~/project/container_name)" >> \$BASH_ENV
           echo "export PACKAGE_VERSION=\$(cat ~/project/package_version)" >> \$BASH_ENV
-      - gcp-gcr/gcr-auth
-      - gcp-gcr/build-image:
+          echo "export NODE_IMAGE=\$(cat ~/project/node_img)" >> \$BASH_ENV
+      - gcp-gcr/build-and-push-image
+      - gcp-gcr/build-and-push-image
           image: \$CONTAINER_NAME
           tag: \$PACKAGE_VERSION
-          path-to-dockerfile: docker
-      - gcp-gcr/push-image:
+          path: docker
+      - gcp-gcr/add-image-tag:
           image: \$CONTAINER_NAME
-          tag: \$PACKAGE_VERSION
+          source-tag: \$PACKAGE_VERSION
+          target-tag: latest
+      - gcp-gcr/add-image-tag:
+          image: \$CONTAINER_NAME
+          source-tag: \$PACKAGE_VERSION
+          target-tag: circle-\$NODE_IMAGE-\$CIRCLE_USERNAME
 
   smoke-test:
     # smoke test checks for license, security, and linting
@@ -119,9 +127,7 @@ jobs:
 
       - run: 
           name: Check for vulnerabilities
-          command: |
-            sudo npm install -g npm@latest
-            npm audit --production
+          command: npm audit --production
 
       - run:
           name: Check for LICENSE and README files
@@ -230,10 +236,12 @@ jobs:
             then
               container=\$CIRCLE_PROJECT_REPONAME
             fi
+            NODE_IMAGE="\`node -p \"require('./package.json').leverege.nodeimg\"\`"
 
             echo v\${PACKAGE_VERSION} > package_version
             echo "export PACKAGE_VERSION=v\${PACKAGE_VERSION}" >> \$BASH_ENV
             echo \${container} > container_name
+            echo \${NODE_IMAGE} > node_img
       - run: 
           name: Create Dockerfile and build dist directory
           command: npm run dockerize \$PACKAGE_VERSION
@@ -245,6 +253,7 @@ jobs:
             - docker/*
             - package_version
             - container_name
+            - node_img
             - package*json
 
 workflows:
@@ -309,9 +318,7 @@ jobs:
 
       - run: 
           name: Check for vulnerabilities
-          command: |
-            sudo npm install -g npm@latest
-            npm audit --production
+          command: npm audit --production
 
       - run:
           name: Check for LICENSE and README files

package/src/helmup

@@ -150,10 +150,6 @@ function installVelero() {
     --set schedules.timescale.template.ttl="720h" \
     --set schedules.timescale.template.labelSelector.matchLabels.app="postgresql" \
     --set schedules.timescale.template.snapshotVolumes="true" \
-    --set schedules.mysql.schedule="0 2 * * *" \
-    --set schedules.mysql.template.ttl="720h" \
-    --set schedules.mysql.template.labelSelector.matchLabels.app="mysql" \
-    --set schedules.mysql.template.snapshotVolumes="true"
 
   ## Instruct users to move velero keys
   printf "\n$YELO_WARN MOVE THE SERVICE ACCOUNT TO YOUR KEYS FOLDER"

package/src/pkglint

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+C_off='\e[0m'
+C_yellow='\e[93m'
+
+good() {
+  printf "\e[32m✔${C_off}"
+}
+
+bad() {
+  printf "\e[31m✘${C_off}"
+}
+
+check_file() {
+  local C_stat=$(bad)
+  local filename=$1
+
+  if [ -f $filename ]; then
+    C_stat=$(good)
+    printf "$C_stat $filename\n"
+  else
+    printf "$C_stat $filename is missing\n\n"
+    printf "${C_yellow}  Please create $filename before pushing to prod\n\n"
+    exit 1
+  fi
+}
+
+printf "\nChecking repo for markdown files\n\n"
+
+files=( README.md LICENSE.md )
+for file in ${files[@]}; do
+  check_file $file
+done
+
+printf "\nAll required files exist\n\n"

package/lib/server/pkglint/index.js

@@ -1,22 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-
-const glob = require('glob');
-
-const filesToCheck = ['README.md', 'LICENSE.md'];
-const mdFiles = glob.sync('*.md'); // from https://github.com/lodash/lodash/issues/1743
-
-function arrayContainsArray(superset, subset) {
-  if (subset.length === 0) {
-    return false;
-  }
-
-  return subset.every(value => {
-    return superset.indexOf(value) >= 0;
-  });
-}
-
-if (!arrayContainsArray(mdFiles, filesToCheck)) {
-  console.log('Cannot find README.md or LICENSE.md');
-  process.exit(1);
-}

package/lib/web/pkglint/index.js

@@ -1,26 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-
-require("core-js/modules/es.array.every");
-
-require("core-js/modules/es.array.index-of");
-
-var glob = require('glob');
-
-var filesToCheck = ['README.md', 'LICENSE.md'];
-var mdFiles = glob.sync('*.md'); // from https://github.com/lodash/lodash/issues/1743
-
-function arrayContainsArray(superset, subset) {
-  if (subset.length === 0) {
-    return false;
-  }
-
-  return subset.every(function (value) {
-    return superset.indexOf(value) >= 0;
-  });
-}
-
-if (!arrayContainsArray(mdFiles, filesToCheck)) {
-  console.log('Cannot find README.md or LICENSE.md');
-  process.exit(1);
-}

package/src/pkglint/index.js

@@ -1,22 +0,0 @@
-#!/usr/bin/env node
-
-const glob = require( 'glob' )
-
-const filesToCheck = [ 'README.md', 'LICENSE.md' ]
-
-const mdFiles = glob.sync( '*.md' )
-
-// from https://github.com/lodash/lodash/issues/1743
-function arrayContainsArray( superset, subset ) {
-  if ( subset.length === 0 ) {
-    return false
-  }
-  return subset.every( ( value ) => {
-    return ( superset.indexOf( value ) >= 0 )
-  } )
-}
-
-if ( !arrayContainsArray( mdFiles, filesToCheck ) ) {
-  console.log( 'Cannot find README.md or LICENSE.md' )
-  process.exit( 1 )
-}