improving terrahub components naming

Author: eistrati

README.md

@@ -113,8 +113,8 @@ 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 google_storage \
+&& terrahub component -t google_cloudfunctions_function -n google_function -o ../google_storage
 ```
 
 Your output should be similar to the one below:
@@ -141,11 +141,11 @@ 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_${local.project["code"]}'
-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.project='${local.google_project_id}'
-terrahub configure -i demo_storage_bucket -c component.template.variable -D -y
+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.location='US'
+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
 ```
 
 Your output should be similar to the one below:
@@ -157,41 +157,41 @@ Your output should be similar to the one below:
 
 Run the following command in terminal:
 ```shell
-terrahub configure -i demo_function -c component.template.terraform.backend.local.path='/tmp/.terrahub/local_backend/demo_function/terraform.tfstate'
-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}'
-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"]}'
-terrahub configure -i demo_function -c component.template.resource.google_cloudfunctions_function.demo_function.region='us-central1'
-terrahub configure -i demo_function -c component.template.resource.google_cloudfunctions_function.demo_function.runtime='nodejs8'
-terrahub configure -i demo_function -c component.template.resource.google_cloudfunctions_function.demo_function.description='My demo function'
-terrahub configure -i demo_function -c component.template.resource.google_cloudfunctions_function.demo_function.available_memory_mb=128
-terrahub configure -i demo_function -c component.template.resource.google_cloudfunctions_function.demo_function.source_archive_bucket='${data.terraform_remote_state.storage.thub_id}'
-terrahub configure -i demo_function -c component.template.resource.google_cloudfunctions_function.demo_function.source_archive_object='${google_storage_bucket_object.demo_object.name}'
-terrahub configure -i demo_function -c component.template.resource.google_cloudfunctions_function.demo_function.trigger_http=true
-terrahub configure -i demo_function -c component.template.resource.google_cloudfunctions_function.demo_function.timeout=60
-terrahub configure -i demo_function -c component.template.resource.google_cloudfunctions_function.demo_function.entry_point='helloGET'
-terrahub configure -i demo_function -c component.template.variable -D -y
-terrahub configure -i demo_function -c component.template.output -D -y
-terrahub configure -i demo_function -c component.template.output.id.value='${google_cloudfunctions_function.demo_function.id}'
-terrahub configure -i demo_function -c component.template.output.trigger_url.value='${google_cloudfunctions_function.demo_function.https_trigger_url}'
-terrahub configure -i demo_function -c build.env.variables.THUB_FUNCTION_ZIP='demo.zip'
-terrahub configure -i demo_function -c build.env.variables.THUB_BUILD_PATH='..'
-terrahub configure -i demo_function -c build.env.variables.THUB_FUNCTION_TXT='demo.txt'
-terrahub configure -i demo_function -c build.env.variables.THUB_BUILD_OK='true'
-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]='if [ ! -e "$THUB_FUNCTION_TXT" ]; then touch "$THUB_FUNCTION_TXT"; fi'
-terrahub configure -i demo_function -c build.phases.pre_build.finally[0]='echo "BUILD: pre_build step successful"'
-terrahub configure -i demo_function -c build.phases.build.commands[0]='echo "BUILD: Running build step"'
-terrahub configure -i demo_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 demo_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 demo_function -c component.template.resource.google_storage_bucket_object.demo_object.name=$(date +%s).zip; fi'
-terrahub configure -i demo_function -c build.phases.build.finally[0]='echo "BUILD: build step successful"'
-terrahub configure -i demo_function -c build.phases.post_build.commands[0]='echo "BUILD: Running post_build step"'
-terrahub configure -i demo_function -c build.phases.post_build.commands[1]='echo $(stat -c %y "${THUB_BUILD_PATH}/index.js") > "$THUB_FUNCTION_TXT"'
-terrahub configure -i demo_function -c build.phases.post_build.finally[0]='echo "BUILD: post_build step successful"'
+terrahub configure -i google_function -c component.template.terraform.backend.local.path='/tmp/.terrahub/local_backend/google_function/terraform.tfstate'
+terrahub configure -i google_function -c component.template.data.terraform_remote_state.storage.backend='local'
+terrahub configure -i google_function -c component.template.data.terraform_remote_state.storage.config.path='/tmp/.terrahub/local_backend/google_storage/terraform.tfstate'
+terrahub configure -i google_function -c component.template.resource.google_storage_bucket_object.google_storage_object.name='demo.zip'
+terrahub configure -i google_function -c component.template.resource.google_storage_bucket_object.google_storage_object.bucket='${data.terraform_remote_state.storage.thub_id}'
+terrahub configure -i google_function -c component.template.resource.google_storage_bucket_object.google_storage_object.source='./demo.zip'
+terrahub configure -i google_function -c component.template.resource.google_cloudfunctions_function.google_function.depends_on[0]='google_storage_bucket_object.google_storage_object'
+terrahub configure -i google_function -c component.template.resource.google_cloudfunctions_function.google_function.name='demofunction${local.project["code"]}'
+terrahub configure -i google_function -c component.template.resource.google_cloudfunctions_function.google_function.region='us-central1'
+terrahub configure -i google_function -c component.template.resource.google_cloudfunctions_function.google_function.runtime='nodejs8'
+terrahub configure -i google_function -c component.template.resource.google_cloudfunctions_function.google_function.description='My demo function'
+terrahub configure -i google_function -c component.template.resource.google_cloudfunctions_function.google_function.available_memory_mb=128
+terrahub configure -i google_function -c component.template.resource.google_cloudfunctions_function.google_function.source_archive_bucket='${data.terraform_remote_state.storage.thub_id}'
+terrahub configure -i google_function -c component.template.resource.google_cloudfunctions_function.google_function.source_archive_object='${google_storage_bucket_object.google_storage_object.name}'
+terrahub configure -i google_function -c component.template.resource.google_cloudfunctions_function.google_function.trigger_http=true
+terrahub configure -i google_function -c component.template.resource.google_cloudfunctions_function.google_function.timeout=60
+terrahub configure -i google_function -c component.template.resource.google_cloudfunctions_function.google_function.entry_point='helloGET'
+terrahub configure -i google_function -c component.template.variable -D -y
+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.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.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}/demo.js")" ]; then zip -j ${THUB_FUNCTION_ZIP} ${THUB_BUILD_PATH}/demo.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}/demo.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.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}/demo.js") > "$THUB_FUNCTION_TXT"'
+terrahub configure -i google_function -c build.phases.post_build.finally[0]='echo "BUILD: post_build step successful"'
 ```
 
 Your output should be similar to the one below:
@@ -209,16 +209,16 @@ terrahub graph
 Your output should be similar to the one below:
 ```
 Project: demo-terraform-automation-google
- └─ demo_storage_bucket_7b3c5d2c [path: ./demo_storage_bucket_7b3c5d2c]
-    └─ demo_function_7b3c5d2c [path: ./demo_function_7b3c5d2c]
+ └─ google_storage [path: ./google_storage]
+    └─ google_function [path: ./google_function]
 ```
 
 
 ## Run TerraHub Automation
 
 Run the following command in terminal:
 ```shell
-terrahub build -i demo_function
+terrahub build -i google_function
 terrahub run -a -y
 ```
 

index.js renamed to demo.js

@@ -1,45 +1,45 @@
 component:
-  name: demo_function
+  name: google_function
   mapping:
     - .
   dependsOn:
-    - ../demo_storage_bucket
+    - ../google_storage
   template:
     resource:
       google_cloudfunctions_function:
-        demo_function:
+        google_function:
           name: 'demofunction${local.project["code"]}'
           depends_on:
-            - google_storage_bucket_object.demo_object
+            - google_storage_bucket_object.google_storage_object
           region: us-central1
           runtime: nodejs8
           description: My demo function
           available_memory_mb: 128
           source_archive_bucket: '${data.terraform_remote_state.storage.thub_id}'
-          source_archive_object: '${google_storage_bucket_object.demo_object.name}'
+          source_archive_object: '${google_storage_bucket_object.google_storage_object.name}'
           trigger_http: true
           timeout: 60
           entry_point: helloGET
       google_storage_bucket_object:
-        demo_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/demo_function/terraform.tfstate
+          path: /tmp/.terrahub/local_backend/google_function/terraform.tfstate
     data:
       terraform_remote_state:
         storage:
           backend: local
           config:
-            path: /tmp/.terrahub/local_backend/demo_storage_bucket/terraform.tfstate
+            path: /tmp/.terrahub/local_backend/google_storage/terraform.tfstate
     output:
       id:
-        value: '${google_cloudfunctions_function.demo_function.id}'
+        value: '${google_cloudfunctions_function.google_function.id}'
       trigger_url:
-        value: '${google_cloudfunctions_function.demo_function.https_trigger_url}'
+        value: '${google_cloudfunctions_function.google_function.https_trigger_url}'
 build:
   env:
     variables:
@@ -59,21 +59,21 @@ build:
         - '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
+          "${THUB_BUILD_PATH}/demo.js")" ]; then zip -j ${THUB_FUNCTION_ZIP}
+          ${THUB_BUILD_PATH}/demo.js; fi
         - >-
           if [ "$(head -n 1 "$THUB_FUNCTION_TXT")" != "$(stat -c %y
-          "${THUB_BUILD_PATH}/index.js")" ]; then terrahub configure -i
-          demo_function -c
-          component.template.resource.google_storage_bucket_object.demo_object.name=$(date
+          "${THUB_BUILD_PATH}/demo.js")" ]; then terrahub configure -i
+          google_function -c
+          component.template.resource.google_storage_bucket_object.google_storage_object.name=$(date
           +%s).zip; fi
       finally:
         - 'echo "BUILD: build step successful"'
     post_build:
       commands:
         - 'echo "BUILD: Running post_build step"'
         - >-
-          echo $(stat -c %y "${THUB_BUILD_PATH}/index.js") >
+          echo $(stat -c %y "${THUB_BUILD_PATH}/demo.js") >
           "$THUB_FUNCTION_TXT"
       finally:
         - 'echo "BUILD: post_build step successful"'

demo_storage_bucket/.terrahub.yml

@@ -0,0 +1,26 @@
+component:
+  name: google_storage
+  mapping:
+    - .
+  template:
+    resource:
+      google_storage_bucket:
+        google_storage:
+          name: 'demo_terraform_automation_${local.project["code"]}'
+          location: US
+          project: '${local.google_project_id}'
+    output:
+      id:
+        value: '${google_storage_bucket.google_storage.id}'
+      thub_id:
+        value: '${google_storage_bucket.google_storage.id}'
+      self_link:
+        value: '${google_storage_bucket.google_storage.self_link}'
+      project:
+        value: '${google_storage_bucket.google_storage.project}'
+      url:
+        value: '${google_storage_bucket.google_storage.url}'
+    terraform:
+      backend:
+        local:
+          path: /tmp/.terrahub/local_backend/google_storage/terraform.tfstate