fix build function

Author: root

.terrahub.yml

@@ -15,5 +15,5 @@ template:
   provider:
     google: {}
   locals:
-    google_project_id: terrahub-demo-f2754a99
+    google_project_id: terrahub-123456
     google_billing_account: 123456-ABCDEF-ZYXWVU

README.md

@@ -114,8 +114,7 @@ Your output should be similar to the one below:
 Run the following command in terminal:
 ```shell
 terrahub component -t google_storage_bucket -n demo_storage_bucket \
-&& terrahub component -t google_cloudfunctions_function -n demo_function -o ../demo_storage_bucket \
-&& terrahub component -t google_storage_bucket -n demo_www -o ../demo_storage_bucket
+&& terrahub component -t google_cloudfunctions_function -n demo_function -o ../demo_storage_bucket
 ```
 
 Your output should be similar to the one below:
@@ -143,8 +142,9 @@ Your output should be similar to the one below:
 Run the following command in terminal:
 ```shell
 terrahub configure -i demo_storage_bucket -c component.template.terraform.backend.local.path='/tmp/.terrahub/local_backend/demo_storage_bucket/terraform.tfstate'
-terrahub configure -i demo_storage_bucket -c component.template.resource.google_storage_bucket.demo_storage_bucket.name='demo_storage_bucket_a123456b'
+terrahub configure -i demo_storage_bucket -c component.template.resource.google_storage_bucket.demo_storage_bucket.name='demo_storage_bucket_99999999'
 terrahub configure -i demo_storage_bucket -c component.template.resource.google_storage_bucket.demo_storage_bucket.location='US'
+terrahub configure -i demo_storage_bucket -c component.template.resource.google_storage_bucket.demo_storage_bucket.force_destroy='true'
 terrahub configure -i demo_storage_bucket -c component.template.resource.google_storage_bucket.demo_storage_bucket.project='${local.google_project_id}'
 terrahub configure -i demo_storage_bucket -c component.template.variable -D -y
 ```
@@ -162,7 +162,7 @@ terrahub configure -i demo_function -c component.template.terraform.backend.loca
 terrahub configure -i demo_function -c component.template.data.terraform_remote_state.storage.backend='local'
 terrahub configure -i demo_function -c component.template.data.terraform_remote_state.storage.config.path='/tmp/.terrahub/local_backend/demo_storage_bucket/terraform.tfstate'
 terrahub configure -i demo_function -c component.template.resource.google_storage_bucket_object.demo_object.name='demo.zip'
-terrahub configure -i demo_function -c component.template.resource.google_storage_bucket_object.demo_object.bucket='${data.terraform_remote_state.storage.thub_id}/deploy/demo_function'
+terrahub configure -i demo_function -c component.template.resource.google_storage_bucket_object.demo_object.bucket='${data.terraform_remote_state.storage.thub_id}'
 terrahub configure -i demo_function -c component.template.resource.google_storage_bucket_object.demo_object.source='./demo.zip'
 terrahub configure -i demo_function -c component.template.resource.google_cloudfunctions_function.demo_function.depends_on[0]='google_storage_bucket_object.demo_object'
 terrahub configure -i demo_function -c component.template.resource.google_cloudfunctions_function.demo_function.name='demofunction${local.project["code"]}'
@@ -185,8 +185,8 @@ terrahub configure -i demo_function -c build.env.variables.COMPONENT_NAME='demo_
 terrahub configure -i demo_function -c build.env.variables.OBJECT_NAME='demo_object'
 terrahub configure -i demo_function -c build.env.variables.THUB_BUILD_PATH='..'
 terrahub configure -i demo_function -c build.env.variables.THUB_BUILD_OK='false'
-terrahub configure -i demo_function -c build.env.variables.THUB_BUCKET_PATH='gs://demo_storage_bucket_a123456b'
-terrahub configure -i demo_function -c build.env.variables.THUB_BUCKET_KEY: 'deploy/demo_function'
+terrahub configure -i demo_function -c build.env.variables.THUB_BUCKET_PATH='gs://demo_storage_bucket_99999999'
+terrahub configure -i demo_function -c build.env.variables.THUB_BUCKET_KEY='deploy/demo_function'
 terrahub configure -i demo_function -c build.phases.pre_build.commands[0]='echo "BUILD: Running pre_build step"'
 terrahub configure -i demo_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 demo_function -c build.phases.pre_build.commands[2]='./scripts/compare.sh $THUB_FUNCTION_TXT $THUB_BUILD_PATH/*.js'
@@ -207,19 +207,6 @@ Your output should be similar to the one below:
 ✅ Done
 ```
 
-## Customize TerraHub Component for Frontend
-
-Run the following command in terminal:
-```shell
-terrahub configure -i demo_www -c component.template.terraform.backend.local.path='/tmp/.terrahub/local_backend/demo_www/terraform.tfstate'
-
-```
-
-Your output should be similar to the one below:
-```
-✅ Done
-```
-
 ## Visualize TerraHub Components
 
 Run the following command in terminal:
@@ -239,8 +226,8 @@ Project: demo-terraform-automation-google
 
 Run the following command in terminal:
 ```shell
-terrahub run -a -y -i demo_storage
-terrahub build -i demo_function,demo_www
+terrahub run -a -y -i demo_storage_bucket
+terrahub build -i demo_function
 terrahub run -a -y
 ```
 

demo_function/.terrahub.yml

@@ -5,12 +5,27 @@ component:
   dependsOn:
     - ../demo_storage_bucket
   template:
+    terraform:
+      backend:
+        local:
+          path: /tmp/.terrahub/local_backend/demo_function/terraform.tfstate
+    data:
+      terraform_remote_state:
+        storage:
+          backend: local
+          config:
+            path: /tmp/.terrahub/local_backend/demo_storage_bucket/terraform.tfstate
     resource:
+      google_storage_bucket_object:
+        demo_object:
+          name: deploy/demo_function/1551790491.zip
+          bucket: '${data.terraform_remote_state.storage.thub_id}'
+          source: ./demo.zip
       google_cloudfunctions_function:
         demo_function:
-          name: 'demofunction${local.project["code"]}'
           depends_on:
             - google_storage_bucket_object.demo_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:
-        demo_object:
-          name: deploy/demo_function/1551778012.zip
-          bucket: '${data.terraform_remote_state.storage.thub_id}'
-          source: ./demo.zip
-    terraform:
-      backend:
-        local:
-          path: /tmp/.terrahub/local_backend/demo_function/terraform.tfstate
-    data:
-      terraform_remote_state:
-        storage:
-          backend: local
-          config:
-            path: /tmp/.terrahub/local_backend/demo_storage_bucket/terraform.tfstate
     output:
       id:
         value: '${google_cloudfunctions_function.demo_function.id}'
@@ -48,8 +48,8 @@ build:
       COMPONENT_NAME: demo_function
       OBJECT_NAME: demo_object
       THUB_BUILD_PATH: ..
-      THUB_BUILD_OK: 'false'
-      THUB_BUCKET_PATH: 'gs://demo_storage_bucket_7b3c5d2c'
+      THUB_BUILD_OK: false
+      THUB_BUCKET_PATH: 'gs://demo_storage_bucket_99999999'
       THUB_BUCKET_KEY: deploy/demo_function
   phases:
     pre_build:

demo_function/demo.zip

@@ -6,10 +6,10 @@ component:
     resource:
       google_storage_bucket:
         demo_storage_bucket:
-          name: 'demo_storage_bucket_${local.project["code"]}'
+          name: demo_storage_bucket_99999999
           location: US
+          force_destroy: true
           project: '${local.google_project_id}'
-          force_destroy: 'true'
     output:
       id:
         value: '${google_storage_bucket.demo_storage_bucket.id}'