@leverege/build-tools 2.18.0-beta.12 → 2.18.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.18.0-beta.12",
+  "version": "2.18.0-beta.2",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -22,6 +22,7 @@
   "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

@@ -56,49 +56,33 @@ initialize_gcloud() {
   gcloud --quiet config set compute/zone ${GOOGLE_COMPUTE_ZONE}
 }
 
-# If this is running from a BitBucket Pipeline then it is assumed that our
-# custom image from the pipeline-image is executing which already has the
-# Google SDK + gcloud installed - so just use it.
-if [ "$BITBUCKETCI" == "true" ];
-then
-  printf "  GCLOUD_PROJECT      [$GCLOUD_PROJECT]\n"
-  printf "  GCLOUD_COMPUTE_ZONE [$GCLOUD_COMPUTE_ZONE]\n"
-
-  gcloud --quiet config set project ${GCLOUD_PROJECT}
-  gcloud --quiet config set compute/zone ${GCLOUD_COMPUTE_ZONE}
+function decryptEnvToPipeline() {
+  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 $GCLOUD_PROJECT \
+    --project $GOOGLE_PROJECT \
     --key circle-ci \
     --keyring build-tools \
-    --location $GCLOUD_COMPUTE_ZONE \
+    --location $GOOGLE_COMPUTE_ZONE \
     --plaintext-file .env \
     --ciphertext-file .env.enc
 
-  if [ -f "secrets.tar.gz.enc" ]; then
-    # decrypt the secrets.tar.gz.enc
-    gcloud kms decrypt \
-      --project $GCLOUD_PROJECT \
-      --key circle-ci \
-      --keyring build-tools \
-      --location $GCLOUD_COMPUTE_ZONE \
-      --plaintext-file secrets.tar.gz \
-      --ciphertext-file secrets.tar.gz.enc
-
-    # untar secrets.tar.gz
-    tar xvzf secrets.tar.gz
-  fi
-
-  exit 0 # may want to improve error report/handling
-fi
+  exit $?
+}
 
 if [ "$1" == "-h" ]; then
   display_usage
   exit 1
 fi
 
+if [ "$BITBUCKETCI" == "true" ];
+then
+  decryptEnvToPipeline
+fi
+
 if [ "$CIRCLECI" == "true" ]; then
   install_gcloud
   initialize_gcloud
@@ -113,7 +97,7 @@ else
 fi
 
 # Set project based on org name
-printf "\nSON OF A BITCH XXX - Detecting organization name...\n"
+printf "\nDetecting organization name...\n"
 
 if [ "$git_orgname" = "leverege" ]; then
   printf "\nUsing leverege\n\n"

package/src/dockreate

@@ -402,7 +402,7 @@ BUILDERR
 fi
 
 # Tag the container with the node detailsand the culprit.
-gcloud container images add-tag --quiet $gcimage:$version $gcimage:$pckgdts-$nodeimg-$USER $gcimage:latest
+gcloud container images add-tag --quiet $gcimage:$version $gcimage:$pckgdts-$nodeimg-$USER
 if [ ! -z "$artifact" ];
 then
   cat<<END_ARTY