@leverege/build-tools 2.18.0-beta.1 → 2.18.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.18.0-beta.1",
+  "version": "2.18.0-beta.10",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -22,7 +22,6 @@
   "bin": {
     "build-tools": "src/build-tools.js",
     "circleate": "src/circleate",
-    "decrypt-env-to-pipeline": "src/decrypt-env-to-pipeline",
     "decrypt-secrets": "src/decrypt-secrets",
     "dirty-git": "src/dirty-git",
     "dockreate": "src/dockreate",

package/src/decrypt-secrets

@@ -5,6 +5,7 @@ display_usage() {
 } 
 
 install_gcloud() {
+  uname -a
   install () {
     # Set sudo to work whether logged in as root user or non-root user
     if [[ $EUID == 0 ]]; then export SUDO=""; else export SUDO="sudo"; fi
@@ -56,16 +57,48 @@ initialize_gcloud() {
   gcloud --quiet config set compute/zone ${GOOGLE_COMPUTE_ZONE}
 }
 
+function decryptEnvToPipeline() {
+  printf "______________BitBucket Pipeline Detected______________\n"
+  printf "  GCLOUD_PROJECT      [$GCLOUD_PROJECT]\n"
+  printf "  GCLOUD_COMPUTE_ZONE [$GCLOUD_COMPUTE_ZONE]\n"
+
+  install_gcloud
+
+  gcloud --quiet config set project ${GCLOUD_PROJECT}
+  gcloud --quiet config set compute/zone ${GCLOUD_COMPUTE_ZONE}
+  echo ${GCLOUD_SERVICE_KEY} | gcloud auth activate-service-account --key-file=-
+
+  # decrypt .env.enc file
+  gcloud kms decrypt \
+    --project $GCLOUD_PROJECT \
+    --key circle-ci \
+    --keyring build-tools \
+    --location $GCLOUD_COMPUTE_ZONE \
+    --plaintext-file .env \
+    --ciphertext-file .env.enc
+
+  exit $?
+}
+
 if [ "$1" == "-h" ]; then
   display_usage
   exit 1
 fi
 
+printf "\nBITBUCKETCI=[$BITBUCKETCI] CIRCLECI=[$CIRCLECI]\n"
+
+if [ "$BITBUCKETCI" == "true" ];
+then
+  decryptEnvToPipeline
+fi
+
 if [ "$CIRCLECI" == "true" ]; then
   install_gcloud
   initialize_gcloud
 fi
 
+printf "\nXXXXXXXXXX SHOULD NOT BE HERE XXXXXXXXXX\n" && exit 0 # XXX
+
 git_origin=`git config --get remote.origin.url`
 
 if [[ $git_origin = https* ]]; then
@@ -75,7 +108,7 @@ else
 fi
 
 # Set project based on org name
-printf "\nDetecting organization name...\n"
+printf "\nSON OF A BITCH XXX - Detecting organization name...\n"
 
 if [ "$git_orgname" = "leverege" ]; then
   printf "\nUsing leverege\n\n"
@@ -110,4 +143,4 @@ if [ -f "secrets.tar.gz.enc" ]; then
 
   # untar secrets.tar.gz
   tar xvzf secrets.tar.gz
-fi
+fi

package/src/decrypt-env-to-pipeline

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-gcloud --quiet config set project ${GOOGLE_PROJECT}
-gcloud --quiet config set compute/zone ${GOOGLE_COMPUTE_ZONE}
-echo ${GCLOUD_SERVICE_KEY} | gcloud auth activate-service-account --key-file=-
-
-# decrypt .env.enc file
-gcloud kms decrypt \
-  --project $GOOGLE_PROJECT \
-  --key circle-ci \
-  --keyring build-tools \
-  --location $GOOGLE_COMPUTE_ZONE \
-  --plaintext-file .env \
-  --ciphertext-file .env.enc