Merge pull request #8 from TerraHubCorp/dev

Transform HCL into TerraHub config with template

Author: iasha102

.terrahub.yml

@@ -2,21 +2,22 @@
 project:
   name: demo-terraform-automation-google
   code: f2754a99
-  include:
-  - '.'
-  exclude:
-  - '**/.terraform/*'
-  - '**/node_modules/*'
+  include: ['.']
+  exclude: ['**/.terraform/*', '**/node_modules/*']
 
-## terraform config
-terraform:
-  varFile:
-  - default.tfvars
-  var:
+## 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
+
+## terraform config
+terraform:
+  varFile: ['default.tfvars']    
   version: 0.11.7

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,7 +1,42 @@
 ## local config
 component:
   name: 'project'
-
-ci:
-  mapping:
-  - '.'
+  mapping: ['.']
+  template:
+    resource:
+      google_project:
+          project:
+            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)}
+    output:
+      number:
+          value: ${google_project.project.number}
+    variable:
+      google_project_name:
+          type: string
+      google_project_folder_id:
+          type: string
+      google_project_skip_delete:
+          type: string
+      google_project_auto_create_network:
+          type: string
+      custom_labels:
+          type: map
+      default_labels:
+          type: map
+    tfvars:
+      custom_labels: {}
+      default_labels:
+        description: managed-by-terrahub
+        name: project
+        thubcode: f2754a99
+        thubenv: default
+      google_project_auto_create_network: true
+      google_project_folder_id: ""
+      google_project_name: project
+      google_project_skip_delete: false

project/README.md

@@ -1,9 +1,27 @@
 ## local config
 component:
   name: 'project_iam_binding_compute_admin'
+  mapping: ['.']
   dependsOn:
-  - '../project_iam_member'
-
-ci:
-  mapping:
-  - '.'
+    - '../project_iam_member'
+  template:
+    resource:
+      google_project_iam_binding:
+          project_iam_binding_compute_admin:
+            project: ${local.google_project_id}
+            members: ${var.google_project_members}
+            role: ${var.google_project_role}
+    output:
+      etag:
+          value: ${google_project_iam_binding.project_iam_binding_compute_admin.etag}
+    provider:
+      google: {}
+    variable:
+      google_project_role:
+          type: string
+      google_project_members:
+          type: list
+    tfvars:
+      google_project_members:
+        - demo@gmail.com
+      google_project_role: roles/compute.instanceAdmin