align to latest terrahub config changes

.terrahub.yml

@@ -2,23 +2,20 @@
 project:
   name: demo-terraform-automation-google
   code: f2754a99
-  include:
-  - '.'
-  exclude:
-  - '**/.terraform/*'
-  - '**/node_modules/*'
+  include: ['.']
+  exclude: ['**/.terraform/*', '**/node_modules/*']
 
 ## template config
 template:
+  provider:
+    google: {}
   locals:
     google_project_id: project-123456789012
     google_region: us-central1
     google_org_id: 123456789012
     google_service_account_name: demo-team
     google_billing_account: 123456-ABCDEF-ZYXWVU
     google_location_id: us-central
-  provider:
-    google: {}
 
 ## terraform config
 terraform:

README.md

@@ -7,7 +7,7 @@ Run the following command in terminal:
 gcloud auth login
 ```
 
-> NOTE: If you don't have Google Cloud CLI, check out
+> NOTE: If you don't have Google Cloud CLI, check out this
 [installation guide](https://cloud.google.com/sdk/install)
 
 ## Setup Environment Variables (Will Be Used Later)
@@ -30,7 +30,7 @@ Automated Setup (run the following command in terminal):
 export ORG_ID="$(gcloud organizations list --format=json | jq '.[0].name[14:]')"
 ```
 
-> NOTE: If you don't have JQ CLI, check out
+> NOTE: If you don't have JQ CLI, check out this
 [installation guide](https://stedolan.github.io/jq/download/)
 
 ### Setup BILLING_ID Programmatically
@@ -40,7 +40,7 @@ Automated Setup (run the following command in terminal):
 export BILLING_ID="$(gcloud beta billing accounts list --format=json | jq '.[0].name[16:]')"
 ```
 
-> NOTE: If you don't have JQ CLI, check out
+> NOTE: If you don't have JQ CLI, check out this
 [installation guide](https://stedolan.github.io/jq/download/)
 
 ## Create Google Cloud Project & Billing
@@ -123,10 +123,10 @@ Your output should be similar to the one below:
 ```
 Usage: terrahub [command] [options]
 
-terrahub@0.0.28 (built: 2018-10-11T12:33:57.775Z)
+terrahub@0.1.28 (built: 2019-02-08T17:17:41.912Z)
 ```
 
-> NOTE: If you don't have TerraHub CLI, check out
+> NOTE: If you don't have TerraHub CLI, check out this
 [installation guide](https://www.npmjs.com/package/terrahub)
 
 Run the following command in terminal:
@@ -180,9 +180,9 @@ Project: demo-terraform-google
 
 Run the following command in terminal:
 ```shell
-terrahub configure -c terraform.var.google_org_id="${ORG_ID}"
-terrahub configure -c terraform.var.google_billing_account="${BILLING_ID}"
-terrahub configure -c terraform.var.google_project_id="${GOOGLE_CLOUD_PROJECT}"
+terrahub configure -c template.locals.google_org_id="${ORG_ID}"
+terrahub configure -c template.locals.google_billing_account="${BILLING_ID}"
+terrahub configure -c template.locals.google_project_id="${GOOGLE_CLOUD_PROJECT}"
 ```
 
 Your output should be similar to the one below:

project/.terrahub.yml

@@ -1,17 +1,18 @@
 ## local config
 component:
   name: 'project'
+  mapping: ['.']
   template:
     resource:
       google_project:
           project:
-            auto_create_network: ${var.google_project_auto_create_network}
+            project_id: ${local.google_project_id}
+            org_id: ${local.google_org_id}
             billing_account: ${local.google_billing_account}
+            name: ${var.google_project_name}
+            auto_create_network: ${var.google_project_auto_create_network}
             folder_id: ${var.google_project_folder_id}
             labels: ${merge(var.default_labels, var.custom_labels)}
-            name: ${var.google_project_name}
-            org_id: ${local.google_org_id}
-            project_id: ${local.google_project_id}
     output:
       number:
           value: ${google_project.project.number}
@@ -39,7 +40,3 @@ component:
       google_project_folder_id: ""
       google_project_name: project
       google_project_skip_delete: false
-
-ci:
-  mapping:
-  - '.'

project_iam_binding_compute_admin/.terrahub.yml

@@ -1,14 +1,15 @@
 ## local config
 component:
   name: 'project_iam_binding_compute_admin'
+  mapping: ['.']
   dependsOn:
-  - '../project_iam_member'
+    - '../project_iam_member'
   template:
     resource:
       google_project_iam_binding:
           project_iam_binding_compute_admin:
-            members: ${var.google_project_members}
             project: ${local.google_project_id}
+            members: ${var.google_project_members}
             role: ${var.google_project_role}
     output:
       etag:
@@ -22,9 +23,5 @@ component:
           type: list
     tfvars:
       google_project_members:
-        - demo@mail.com
+        - demo@gmail.com
       google_project_role: roles/compute.instanceAdmin
-
-ci:
-  mapping:
-  - '.'

project_iam_binding_storage_admin/.terrahub.yml

@@ -1,14 +1,15 @@
 ## local config
 component:
   name: 'project_iam_binding_storage_admin'
+  mapping: ['.']
   dependsOn:
-  - '../project_iam_member'
+    - '../project_iam_member'
   template:
     resource:
       google_project_iam_binding:
           project_iam_binding_storage_admin:
-            members: ${var.google_project_members}
             project: ${local.google_project_id}
+            members: ${var.google_project_members}
             role: ${var.google_project_role}
     output:
       etag:
@@ -24,7 +25,3 @@ component:
       google_project_members:
         - [email protected]
       google_project_role: roles/storage.admin
-
-ci:
-  mapping:
-  - '.'

project_iam_member/.terrahub.yml

@@ -1,14 +1,15 @@
 ## local config
 component:
   name: 'project_iam_member'
+  mapping: ['.']
   dependsOn:
-  - '../project'
+    - '../project'
   template:
     resource:
       google_project_iam_member:
           project_iam_member:
-            member: ${var.google_project_member}
             project: ${local.google_project_id}
+            member: ${var.google_project_member}
             role: ${var.google_project_role}
     output:
       etag:
@@ -23,7 +24,3 @@ component:
     tfvars:
       google_project_member: [email protected]
       google_project_role: roles/viewer
-
-ci:
-  mapping:
-  - '.'

service_account/.terrahub.yml

@@ -1,15 +1,16 @@
 ## local config
 component:
   name: 'service_account'
+  mapping: ['.']
   dependsOn:
-  - '../project'
+    - '../project'
   template:
     resource:
       google_service_account:
           service_account:
+            project: ${local.google_project_id}
             account_id: ${local.google_service_account_name}
             display_name: ${var.google_service_account_display_name}
-            project: ${local.google_project_id}
     output:
       email:
           value: ${google_service_account.service_account.email}
@@ -24,7 +25,3 @@ component:
           type: string
     tfvars:
       google_service_account_display_name: service_account
-
-ci:
-  mapping:
-  - '.'

service_account_key/.terrahub.yml

@@ -1,16 +1,17 @@
 ## local config
 component:
   name: 'service_account_key'
+  mapping: ['.']
   dependsOn:
-  - '../service_account'
+    - '../service_account'
   template:
     resource:
       google_service_account_key:
           service_account_key:
+            service_account_id: ${local.google_service_account_name}@${local.google_project_id}.iam.gserviceaccount.com
             key_algorithm: ${var.google_service_account_key_algorithm}
             private_key_type: ${var.google_service_account_key_private_key_type}
             public_key_type: ${var.google_service_account_key_public_key_type}
-            service_account_id: ${local.google_service_account_name}@${local.google_project_id}.iam.gserviceaccount.com
     output:
       name:
           value: ${google_service_account_key.service_account_key.name}
@@ -35,7 +36,3 @@ component:
       google_service_account_key_algorithm: KEY_ALG_RSA_2048
       google_service_account_key_private_key_type: TYPE_GOOGLE_CREDENTIALS_FILE
       google_service_account_key_public_key_type: TYPE_X509_PEM_FILE
-
-ci:
-  mapping:
-  - '.'