@leverege/build-tools 2.0.6 → 2.0.8

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [2.0.0] - 2020-02-12
+### Added
+- (encrypt/decrypt) Allow for external KMS (BREAKING!!!)
+
 ## [1.6.3] - 2019-07-02
 ### Added
 - (pkglint) Added pkglint check for valid files

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "description": "A package for development build tools.",
   "main": "index.js",
   "scripts": {
@@ -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/helmify

@@ -7,23 +7,6 @@ if ! [ -x "$(command -v helm)" ]; then
   exit 1
 fi
 
-# Check if Chart Museum is installed
-if ! [ -x "$(command -v chartmuseum)" ]; then
-  echo 'Error: chartmuseum is not installed.'
-  echo 'To install: see instructions at https://leverege.atlassian.net/wiki/spaces/PLAT/pages/679542800/Helm+Charts+via+ChartMuseum' 
-  exit 1
-fi
-
-# Check if Chart Museum is running
-url='http://localhost:8080/'
-status_code=$(curl --write-out %{http_code} --silent --output /dev/null ${url})
-
-if [[ "$status_code" -ne 200 ]] ; then
-  echo 'Error: Chart Museum is not running'
-  echo 'To run: chartmuseum --debug --port=8080 --storage="google" --storage-google-bucket="leverege-helm-charts" --storage-google-prefix=""'
-  exit 1 
-fi
-
 # Bootstrap Helm charts
 chartname=${PWD##*/}
 chartname_go=${chartname//-/_}

package/src/helmup

@@ -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` ) )