Merge pull request #3 from TerraHubCorp/google-first-demo

change google_account_id to google_service_account_name

Author: eistrati

.terrahub.yml

@@ -12,7 +12,7 @@ terraform:
     google_project_id: project-123456789012
     google_region: us-central1
     google_org_id: 123456789012
-    google_account_id: demo-team
+    google_service_account_name: demo-team
     google_billing_account: 123456-ABCDEF-ZYXWVU
     google_location_id: us-central
   version: 0.11.7

project_service_account/README.md

@@ -7,7 +7,7 @@ Allows management of a Google Cloud Platform service account
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
 |google_service_account_display_name|The display name for the service account. Can be updated without creating a new resource.|string|project-service-account|No|
-|google_account_id|The service account ID. Changing this forces a new service account to be created.|string||Yes|
+|google_service_account_name|The service account Name. Changing this forces a new service account to be created.|string||Yes|
 |google_project_id|The ID of the project that the service account will be created in. Defaults to the provider project configuration.|string||Yes|
 
 ## output parameters

project_service_account/main.tf

@@ -1,5 +1,5 @@
 resource "google_service_account" "project_service_account" {
   display_name = "${var.google_service_account_display_name}"
-  account_id   = "${var.google_account_id}"
+  account_id   = "${var.google_service_account_name}"
   project      = "${var.google_project_id}"
 }

project_service_account/variables.tf

@@ -7,8 +7,8 @@ variable "google_service_account_display_name" {
   description = "The display name for the service account. Can be updated without creating a new resource."
 }
 
-variable "google_account_id" {
-  description = "The service account ID. Changing this forces a new service account to be created."
+variable "google_service_account_name" {
+  description = "The service account NAME. Changing this forces a new service account to be created."
 }
 
 variable "google_project_id" {

project_service_account_key/README.md

@@ -6,7 +6,7 @@ Creates and manages service account key-pairs, which allow the user to establish
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-|google_account_id|The Service account id of the Key Pair. This can be a string in the format {ACCOUNT} or projects/{PROJECT_ID}/serviceAccounts/{ACCOUNT}, where {ACCOUNT} is the email address or unique id of the service account. If the {ACCOUNT} syntax is used, the project will be inferred from the account.|string||Yes|
+|google_service_account_name|The Service account name of the Key Pair. This can be a string in the format {ACCOUNT} or projects/{PROJECT_ID}/serviceAccounts/{ACCOUNT}, where {ACCOUNT} is the email address or unique id of the service account. If the {ACCOUNT} syntax is used, the project will be inferred from the account.|string||Yes|
 |google_service_account_key_algorithm|The algorithm used to generate the key. KEY_ALG_RSA_2048 is the default algorithm. Valid values are listed at ServiceAccountPrivateKeyType (only used on create)|string|KEY_ALG_RSA_2048|No|
 |google_service_account_key_public_key_type|The output format of the public key requested. X509_PEM is the default output format.|string|X509_PEM|No|
 |google_service_account_key_private_key_type|The output format of the private key. TYPE_GOOGLE_CREDENTIALS_FILE is the default output format.|string|TYPE_GOOGLE_CREDENTIALS_FILE|No|

project_service_account_key/main.tf

@@ -1,5 +1,5 @@
 resource "google_service_account_key" "project_service_account_key" {
-  service_account_id = "${var.google_account_id}@${var.google_project_id}.iam.gserviceaccount.com"
+  service_account_id = "${var.google_service_account_name}@${var.google_project_id}.iam.gserviceaccount.com"
   key_algorithm      = "${var.google_service_account_key_algorithm}"
   public_key_type    = "${var.google_service_account_key_public_key_type}"
   private_key_type   = "${var.google_service_account_key_private_key_type}"

project_service_account_key/variables.tf

@@ -3,8 +3,8 @@
 #############
 # top level #
 #############
-variable "google_account_id" {
-  description = "The Service account id of the Key Pair. This can be a string in the format {ACCOUNT} or projects/{PROJECT_ID}/serviceAccounts/{ACCOUNT}, where {ACCOUNT} is the email address or unique id of the service account. If the {ACCOUNT} syntax is used, the project will be inferred from the account."
+variable "google_service_account_name" {
+  description = "The Service account name of the Key Pair. This can be a string in the format {ACCOUNT} or projects/{PROJECT_ID}/serviceAccounts/{ACCOUNT}, where {ACCOUNT} is the email address or unique id of the service account. If the {ACCOUNT} syntax is used, the project will be inferred from the account."
 }
 
 variable "google_project_id" {