Merge pull request #12 from TerraHubCorp/dev

eistrati · web-flow · commit 6b6cebd9cc20 · 2019-03-05T08:56:19.000-05:00
Transform HCL into TerraHub config with template
diff --git a/README.md b/README.md
@@ -16,10 +16,11 @@ Manual Setup (set values in double quotes and run the following command in termi
 ```shell
 export GOOGLE_CLOUD_PROJECT=""            ## e.g. terrahub-123456
 export GOOGLE_APPLICATION_CREDENTIALS=""  ## e.g. ${HOME}/.config/gcloud/terraform.json
-export BILLING_ID=""    ## e.g. 123456-ABCDEF-ZYXWVU
-export PROJECT_NAME=""  ## e.g. TerraHub
-export IAM_NAME=""      ## e.g. terraform
-export IAM_DESC=""      ## e.g. terraform service account
+export BILLING_ID=""      ## e.g. 123456-ABCDEF-ZYXWVU
+export PROJECT_NAME=""    ## e.g. TerraHub
+export IAM_NAME=""        ## e.g. terraform
+export IAM_DESC=""        ## e.g. terraform service account
+export STORAGE_BUCKET=""  ## e.g. terrahub_bucket_123456
 ```
 ### Setup BILLING_ID Programmatically
 
@@ -142,8 +143,9 @@ Your output should be similar to the one below:
 Run the following command in terminal:
 ```shell
 terrahub configure -i google_storage -c component.template.terraform.backend.local.path='/tmp/.terrahub/local_backend/google_storage/terraform.tfstate'
-terrahub configure -i google_storage -c component.template.resource.google_storage_bucket.google_storage.name='demo_terraform_automation_${local.project["code"]}'
+terrahub configure -i google_storage -c component.template.resource.google_storage_bucket.google_storage.name="${STORAGE_BUCKET}"
 terrahub configure -i google_storage -c component.template.resource.google_storage_bucket.google_storage.location='US'
+terrahub configure -i google_storage -c component.template.resource.google_storage_bucket.google_storage.force_destroy='true'
 terrahub configure -i google_storage -c component.template.resource.google_storage_bucket.google_storage.project='${local.google_project_id}'
 terrahub configure -i google_storage -c component.template.variable -D -y
 ```
@@ -179,18 +181,25 @@ terrahub configure -i google_function -c component.template.output -D -y
 terrahub configure -i google_function -c component.template.output.id.value='${google_cloudfunctions_function.google_function.id}'
 terrahub configure -i google_function -c component.template.output.trigger_url.value='${google_cloudfunctions_function.google_function.https_trigger_url}'
 terrahub configure -i google_function -c build.env.variables.THUB_FUNCTION_ZIP='demo.zip'
-terrahub configure -i google_function -c build.env.variables.THUB_BUILD_PATH='..'
 terrahub configure -i google_function -c build.env.variables.THUB_FUNCTION_TXT='demo.txt'
-terrahub configure -i google_function -c build.env.variables.THUB_BUILD_OK='true'
+terrahub configure -i google_function -c build.env.variables.COMPONENT_NAME='google_function'
+terrahub configure -i google_function -c build.env.variables.OBJECT_NAME='google_storage_object'
+terrahub configure -i google_function -c build.env.variables.THUB_BUILD_PATH='..'
+terrahub configure -i google_function -c build.env.variables.THUB_BUILD_OK='false'
+terrahub configure -i google_function -c build.env.variables.THUB_BUCKET_PATH="gs://${STORAGE_BUCKET}"
+terrahub configure -i google_function -c build.env.variables.THUB_BUCKET_KEY='deploy/google_function'
 terrahub configure -i google_function -c build.phases.pre_build.commands[0]='echo "BUILD: Running pre_build step"'
-terrahub configure -i google_function -c build.phases.pre_build.commands[1]='if [ ! -e "$THUB_FUNCTION_TXT" ]; then touch "$THUB_FUNCTION_TXT"; fi'
+terrahub configure -i google_function -c build.phases.pre_build.commands[1]='./scripts/download.sh $THUB_FUNCTION_TXT $THUB_BUCKET_PATH/$THUB_BUCKET_KEY/$THUB_FUNCTION_TXT'
+terrahub configure -i google_function -c build.phases.pre_build.commands[2]='./scripts/compare.sh $THUB_FUNCTION_TXT $THUB_BUILD_PATH/*.js'
 terrahub configure -i google_function -c build.phases.pre_build.finally[0]='echo "BUILD: pre_build step successful"'
 terrahub configure -i google_function -c build.phases.build.commands[0]='echo "BUILD: Running build step"'
-terrahub configure -i google_function -c build.phases.build.commands[1]='if [ "$(head -n 1 "$THUB_FUNCTION_TXT")" != "$(stat -c %y "${THUB_BUILD_PATH}/index.js")" ]; then zip -j ${THUB_FUNCTION_ZIP} ${THUB_BUILD_PATH}/index.js; fi'
-terrahub configure -i google_function -c build.phases.build.commands[2]='if [ "$(head -n 1 "$THUB_FUNCTION_TXT")" != "$(stat -c %y "${THUB_BUILD_PATH}/index.js")" ]; then terrahub configure -i google_function -c component.template.resource.google_storage_bucket_object.google_storage_object.name=$(date +%s).zip; fi'
+terrahub configure -i google_function -c build.phases.build.commands[1]='./scripts/build.sh $COMPONENT_NAME $OBJECT_NAME $THUB_BUCKET_KEY/'
 terrahub configure -i google_function -c build.phases.build.finally[0]='echo "BUILD: build step successful"'
 terrahub configure -i google_function -c build.phases.post_build.commands[0]='echo "BUILD: Running post_build step"'
-terrahub configure -i google_function -c build.phases.post_build.commands[1]='echo $(stat -c %y "${THUB_BUILD_PATH}/index.js") > "$THUB_FUNCTION_TXT"'
+terrahub configure -i google_function -c build.phases.post_build.commands[1]='./scripts/shasum.sh $THUB_FUNCTION_TXT'
+terrahub configure -i google_function -c build.phases.post_build.commands[2]='./scripts/zip.sh $THUB_FUNCTION_ZIP $THUB_BUILD_PATH/*.js'
+terrahub configure -i google_function -c build.phases.post_build.commands[3]='./scripts/upload.sh $THUB_FUNCTION_TXT $THUB_BUCKET_PATH/$THUB_BUCKET_KEY/$THUB_FUNCTION_TXT'
+terrahub configure -i google_function -c build.phases.post_build.commands[4]='rm -f .terrahub_build.env $THUB_FUNCTION_TXT'
 terrahub configure -i google_function -c build.phases.post_build.finally[0]='echo "BUILD: post_build step successful"'
 ```
 
@@ -218,6 +227,7 @@ Project: demo-terraform-automation-google
 
 Run the following command in terminal:
 ```shell
+terrahub run -a -y -i google_storage
 terrahub build -i google_function
 terrahub run -a -y
 ```
@@ -231,4 +241,4 @@ Your output should be similar to the one below:
 Run the following command in terminal:
 ```
 curl https://us-central1-terrahub-123456.cloudfunctions.net/demofunctionxxxxxxxx
-```
+```
diff --git a/google_function/.terrahub.yml b/google_function/.terrahub.yml
@@ -5,12 +5,27 @@ component:
   dependsOn:
     - ../google_storage
   template:
+    terraform:
+      backend:
+        local:
+          path: /tmp/.terrahub/local_backend/google_function/terraform.tfstate
+    data:
+      terraform_remote_state:
+        storage:
+          backend: local
+          config:
+            path: /tmp/.terrahub/local_backend/google_storage/terraform.tfstate
     resource:
+      google_storage_bucket_object:
+        google_storage_object:
+          name: demo.zip
+          bucket: '${data.terraform_remote_state.storage.thub_id}'
+          source: ./demo.zip
       google_cloudfunctions_function:
         google_function:
-          name: 'demofunction${local.project["code"]}'
           depends_on:
             - google_storage_bucket_object.google_storage_object
+          name: 'demofunction${local.project["code"]}'
           region: us-central1
           runtime: nodejs8
           description: My demo function
@@ -20,21 +35,6 @@ component:
           trigger_http: true
           timeout: 60
           entry_point: helloGET
-      google_storage_bucket_object:
-        google_storage_object:
-          name: demo.zip
-          bucket: '${data.terraform_remote_state.storage.thub_id}'
-          source: ./demo.zip
-    terraform:
-      backend:
-        local:
-          path: /tmp/.terrahub/local_backend/google_function/terraform.tfstate
-    data:
-      terraform_remote_state:
-        storage:
-          backend: local
-          config:
-            path: /tmp/.terrahub/local_backend/google_storage/terraform.tfstate
     output:
       id:
         value: '${google_cloudfunctions_function.google_function.id}'
@@ -44,36 +44,37 @@ build:
   env:
     variables:
       THUB_FUNCTION_ZIP: demo.zip
-      THUB_BUILD_PATH: ..
       THUB_FUNCTION_TXT: demo.txt
-      THUB_BUILD_OK: true
+      COMPONENT_NAME: google_function
+      OBJECT_NAME: google_storage_object
+      THUB_BUILD_PATH: ..
+      THUB_BUILD_OK: false
+      THUB_BUCKET_PATH: 'gs://terrahub_bucket_123456'
+      THUB_BUCKET_KEY: deploy/google_function
   phases:
     pre_build:
       commands:
         - 'echo "BUILD: Running pre_build step"'
-        - 'if [ ! -e "$THUB_FUNCTION_TXT" ]; then touch "$THUB_FUNCTION_TXT"; fi'
+        - >-
+          ./scripts/download.sh $THUB_FUNCTION_TXT
+          $THUB_BUCKET_PATH/$THUB_BUCKET_KEY/$THUB_FUNCTION_TXT
+        - ./scripts/compare.sh $THUB_FUNCTION_TXT $THUB_BUILD_PATH/*.js
       finally:
         - 'echo "BUILD: pre_build step successful"'
     build:
       commands:
         - 'echo "BUILD: Running build step"'
-        - >-
-          if [ "$(head -n 1 "$THUB_FUNCTION_TXT")" != "$(stat -c %y
-          "${THUB_BUILD_PATH}/index.js")" ]; then zip -j ${THUB_FUNCTION_ZIP}
-          ${THUB_BUILD_PATH}/index.js; fi
-        - >-
-          if [ "$(head -n 1 "$THUB_FUNCTION_TXT")" != "$(stat -c %y
-          "${THUB_BUILD_PATH}/index.js")" ]; then terrahub configure -i
-          google_function -c
-          component.template.resource.google_storage_bucket_object.google_storage_object.name=$(date
-          +%s).zip; fi
+        - ./scripts/build.sh $COMPONENT_NAME $OBJECT_NAME $THUB_BUCKET_KEY/
       finally:
         - 'echo "BUILD: build step successful"'
     post_build:
       commands:
         - 'echo "BUILD: Running post_build step"'
+        - ./scripts/shasum.sh $THUB_FUNCTION_TXT
+        - ./scripts/zip.sh $THUB_FUNCTION_ZIP $THUB_BUILD_PATH/*.js
         - >-
-          echo $(stat -c %y "${THUB_BUILD_PATH}/index.js") >
-          "$THUB_FUNCTION_TXT"
+          ./scripts/upload.sh $THUB_FUNCTION_TXT
+          $THUB_BUCKET_PATH/$THUB_BUCKET_KEY/$THUB_FUNCTION_TXT
+        - rm -f .terrahub_build.env $THUB_FUNCTION_TXT
       finally:
         - 'echo "BUILD: post_build step successful"'
diff --git a/google_function/scripts/build.sh b/google_function/scripts/build.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+## Component name
+COMPONENT_NAME=${1}
+if [ -z "${COMPONENT_NAME}" ]; then
+  echo >&2 'ERROR: COMPONENT_NAME variable is empty. Aborting...'
+  exit 1
+fi
+
+## Object name
+OBJECT_NAME=${2}
+if [ -z "${OBJECT_NAME}" ]; then
+  echo >&2 'ERROR: OBJECT_NAME variable is empty. Aborting...'
+  exit 1
+fi
+
+## Bucket key
+THUB_BUCKET_KEY=${3}
+if [ -z "${THUB_BUCKET_KEY}" ]; then
+  echo >&2 'ERROR: THUB_BUCKET_KEY variable is empty. Aborting...'
+  exit 1
+fi
+
+## Setup environmental variables
+[ -f .terrahub_build.env ] && . .terrahub_build.env
+
+## Checking if THUB_BUILD_OK is true
+if [ "$THUB_BUILD_OK" == "true" ]; then
+  OBJECT_IN_COMPONENT='component.template.resource.google_storage_bucket_object.'${OBJECT_NAME}'.name'
+  terrahub configure -i ${COMPONENT_NAME} -c ${OBJECT_IN_COMPONENT}=${THUB_BUCKET_KEY}$(date +%s).zip
+  echo 'Build was executed'
+else
+  echo 'Build was NOT executed'
+fi
diff --git a/google_function/scripts/compare.sh b/google_function/scripts/compare.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+## Source path
+THUB_SRC=${1}
+if [ -z "${THUB_SRC}" ]; then
+  echo >&2 'ERROR: THUB_SRC variable is empty. Aborting...'
+  exit 1
+fi
+
+## Source files for build process
+THUB_COMPARE_PATH="${@:2}"
+if [ -z "${THUB_COMPARE_PATH}" ]; then
+  echo 'ERROR: THUB_COMPARE_PATH variable is empty. Aborting...'
+  exit 1
+fi
+
+## Setup environmental variables
+[ -f .terrahub_build.env ] && . .terrahub_build.env
+
+## Compare SHA256 sums from THUB_SRC file with files in THUB_COMPARE_PATH
+echo "THUB_BUILD_OK='${THUB_BUILD_OK}' ==> Comparing SHA256 sums."
+if [ "$(uname)" == "Darwin" ]; then
+  THUB_SHA=$(find -s ${THUB_COMPARE_PATH} -path **/node_modules -prune -o -type f -exec shasum -a 256 {} \; | sort -k 2 | shasum -a 256 | cut -f 1 -d " ")
+else
+  THUB_SHA=$(find ${THUB_COMPARE_PATH} -path **/node_modules -prune -o -type f -exec shasum -a 256 {} \; | sort -k 2 | shasum -a 256 | cut -f 1 -d " ")
+fi
+
+## Checking if needs to skip SHA256 sums compare
+echo "export THUB_SHA=\"${THUB_SHA}\"" >> .terrahub_build.env
+echo "INFO: Current SHA256 => ${THUB_SHA}"
+if [ "${THUB_BUILD_OK}" == "true" ]; then
+  echo "INFO: THUB_BUILD_OK='${THUB_BUILD_OK}' ==> Skipping comparing SHA256 sums."
+  exit 0
+fi
+
+## Checking if the project requires to be built
+THUB_COMPARE=$(head -n 1 ${THUB_SRC})
+echo "INFO: S3 Object SHA256 => ${THUB_COMPARE}"
+if [ "${THUB_SHA}" != "${THUB_COMPARE}" ]; then
+  echo 'Build is required!'
+  echo 'export THUB_BUILD_OK="true"' >> .terrahub_build.env
+fi
diff --git a/google_function/scripts/download.sh b/google_function/scripts/download.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+## Source path
+THUB_SRC=${1}
+if [ -z "${THUB_SRC}" ]; then
+  echo >&2 'ERROR: THUB_SRC variable is empty. Aborting...'
+  exit 1
+fi
+
+## S3 bucket name
+THUB_S3_PATH=${2-${THUB_S3_PATH}}
+if [ -z "${THUB_S3_PATH}" ]; then
+  echo >&2 'ERROR: THUB_S3_PATH variable is empty. Aborting...'
+  exit 1
+fi
+
+## Clean environmental variables
+> .terrahub_build.env
+
+## Checking if THUB_S3_PATH file exists in S3
+gsutil --version > /dev/null 2>&1 || { echo >&2 'gsutil is missing. Aborting...'; exit 1; }
+THUB_CHECK_TYPE=$(gsutil ls ${THUB_S3_PATH} || echo "")
+if [ -z "${THUB_CHECK_TYPE}" ]; then
+  echo "INFO: ${THUB_S3_PATH} does NOT exist ==> First execution."
+  echo 'export THUB_BUILD_OK="true"' >> .terrahub_build.env
+  exit 0
+fi
+
+## Downloading from S3
+echo 'Downloading THUB_SRC from THUB_S3_PATH'
+if [[ $THUB_CHECK_TYPE = *" PRE "* ]]; then
+  gsutil rsync ${THUB_S3_PATH} ${THUB_SRC}
+else
+  gsutil cp ${THUB_S3_PATH} ${THUB_SRC}
+fi
diff --git a/google_function/scripts/shasum.sh b/google_function/scripts/shasum.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+## Source path
+THUB_SRC=${1}
+if [ -z "${THUB_SRC}" ]; then
+  echo >&2 'ERROR: THUB_SRC variable is empty. Aborting...'
+  exit 1
+fi
+
+## Setup environmental variables
+[ -f .terrahub_build.env ] && . .terrahub_build.env
+
+## Checking if THUB_BUILD_OK is true
+if [ "$THUB_BUILD_OK" == "true" ]; then
+  ## Checking if SHA256 sums exists
+  if [ -z "${THUB_SHA}" ]; then
+    echo >&2 'ERROR: THUB_SHA variable is empty. Aborting...'
+    exit 1
+  fi
+
+  ## Write current SHA256 to THUB_SRC
+  echo "${THUB_SHA}" > ${THUB_SRC}
+else
+  echo 'Build was NOT executed ==> SHA256 will NOT be updated.'
+fi
diff --git a/google_function/scripts/upload.sh b/google_function/scripts/upload.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+## Source path
+THUB_SRC=${1}
+if [ -z "${THUB_SRC}" ]; then
+  echo >&2 'ERROR: THUB_SRC variable is empty. Aborting...'
+  exit 1
+fi
+
+## S3 bucket name
+THUB_S3_PATH=${2-${THUB_S3_PATH}}
+if [ -z "${THUB_S3_PATH}" ]; then
+  echo >&2 'ERROR: THUB_S3_PATH variable is empty. Aborting...'
+  exit 1
+fi
+
+## Setup environmental variables
+[ -f .terrahub_build.env ] && . .terrahub_build.env
+
+## Checking if THUB_BUILD_OK is true
+if [ "${THUB_BUILD_OK}" == "true" ]; then
+  ## Sync THUB_SRC to THUB_S3_PATH
+  gsutil --version > /dev/null 2>&1 || { echo >&2 'gsutil is missing. Aborting...'; exit 1; }
+  if [[ -d "${THUB_SRC}" ]]; then
+    gsutil rsync ${THUB_SRC} ${THUB_S3_PATH}
+  elif [[ -f "${THUB_SRC}" ]]; then
+    gsutil cp ${THUB_SRC} ${THUB_S3_PATH}
+  else
+    echo >&2 "ERROR: ${THUB_SRC} is not valid"
+    exit 1
+  fi
+else
+  echo 'Build was NOT executed ==> Files will NOT be uploaded.'
+fi
diff --git a/google_function/scripts/zip.sh b/google_function/scripts/zip.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+## Source path
+THUB_SRC=${1}
+if [ -z "${THUB_SRC}" ]; then
+  echo >&2 'ERROR: THUB_SRC variable is empty. Aborting...'
+  exit 1
+fi
+
+## Source files or folders for zip process
+THUB_ZIP_PATH="${@:2}"
+if [ -z "${THUB_ZIP_PATH}" ]; then
+  echo >&2 'ERROR: THUB_ZIP_PATH variable is empty. Aborting...'
+  exit 1
+fi
+
+## Setup environmental variables
+[ -f .terrahub_build.env ] && . .terrahub_build.env
+
+## Checking if THUB_BUILD_OK is true
+if [ "$THUB_BUILD_OK" == "true" ]; then
+  zip --version > /dev/null 2>&1 || { echo >&2 'zip is missing. Aborting...'; exit 1; }
+  zip -j ${THUB_SRC} ${THUB_ZIP_PATH}
+  echo 'Build was executed ==> zip file was created.'
+else
+  echo 'Build was NOT executed ==> zip file was NOT created.'
+fi
diff --git a/google_storage/.terrahub.yml b/google_storage/.terrahub.yml
@@ -6,8 +6,9 @@ component:
     resource:
       google_storage_bucket:
         google_storage:
-          name: 'demo_terraform_automation_${local.project["code"]}'
+          name: terrahub_bucket_123456
           location: US
+          force_destroy: true
           project: '${local.google_project_id}'
     output:
       id:
diff --git a/index.js b/index.js
@@ -1,3 +1,3 @@
 exports.helloGET = (req, res) => {
-    res.send('Hello World!');
+    res.send("Hello World!\n");
 };
