another set of fixes

Author: eistrati

google_function/.terrahub.yml

@@ -5,27 +5,12 @@ 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
@@ -35,6 +20,21 @@ 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}'
@@ -45,8 +45,8 @@ build:
     variables:
       THUB_FUNCTION_ZIP: demo.zip
       THUB_FUNCTION_TXT: demo.txt
-      THUB_COMPONENT: google_function
-      THUB_OBJECT: google_storage_object
+      COMPONENT_NAME: google_function
+      OBJECT_NAME: google_storage_object
       THUB_BUILD_PATH: ..
       THUB_BUILD_OK: false
       THUB_BUCKET_PATH: 'gs://terrahub_bucket_123456'
@@ -64,7 +64,7 @@ build:
     build:
       commands:
         - 'echo "BUILD: Running build step"'
-        - ./scripts/build.sh $THUB_COMPONENT $THUB_OBJECT $THUB_BUCKET_KEY/
+        - ./scripts/build.sh $COMPONENT_NAME $OBJECT_NAME $THUB_BUCKET_KEY/
       finally:
         - 'echo "BUILD: build step successful"'
     post_build:

google_function/scripts/build.sh

@@ -1,20 +1,20 @@
 #!/bin/bash
 
-## Component name
+## TerraHub Component
 THUB_COMPONENT=${1}
 if [ -z "${THUB_COMPONENT}" ]; then
   echo >&2 'ERROR: THUB_COMPONENT variable is empty. Aborting...'
   exit 1
 fi
 
-## Object name
+## Google Storage object name
 THUB_OBJECT=${2}
 if [ -z "${THUB_OBJECT}" ]; then
   echo >&2 'ERROR: THUB_OBJECT variable is empty. Aborting...'
   exit 1
 fi
 
-## Bucket key
+## Google Storage bucket key
 THUB_BUCKET_KEY=${3}
 if [ -z "${THUB_BUCKET_KEY}" ]; then
   echo >&2 'ERROR: THUB_BUCKET_KEY variable is empty. Aborting...'