From bd21487d732ba7bc736aa6ba4d72d76441e8aef0 Mon Sep 17 00:00:00 2001 From: Deepika Daluka Date: Thu, 29 Sep 2022 18:17:35 +0530 Subject: [PATCH] Updated readme and variable name --- modules/project/README.md | 2 +- modules/project/service-accounts.tf | 4 ++-- modules/project/variables.tf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/project/README.md b/modules/project/README.md index ceff6418f6..64ee2d4f84 100644 --- a/modules/project/README.md +++ b/modules/project/README.md @@ -368,7 +368,7 @@ output "compute_robot" { | [billing_account](variables.tf#L23) | Billing account id. | string | | null | | [contacts](variables.tf#L29) | List of essential contacts for this resource. Must be in the form EMAIL -> [NOTIFICATION_TYPES]. Valid notification types are ALL, SUSPENSION, SECURITY, TECHNICAL, BILLING, LEGAL, PRODUCT_UPDATES. | map(list(string)) | | {} | | [custom_roles](variables.tf#L36) | Map of role name => list of permissions to create in this project. | map(list(string)) | | {} | -| [default_service_account_setting](variables.tf#L49) | Project default service account setting: can be one of `delete`, `deprivilege`, `disable`, or `keep`. | string | | "keep" | +| [default_service_account](variables.tf#L49) | Project default service account setting: can be one of `delete`, `deprivilege`, `disable`, or `keep`. | string | | "keep" | | [descriptive_name](variables.tf#L43) | Name of the project name. Used for project name instead of `name` variable. | string | | null | | [group_iam](variables.tf#L55) | Authoritative IAM binding for organization groups, in {GROUP_EMAIL => [ROLES]} format. Group emails need to be static. Can be used in combination with the `iam` variable. | map(list(string)) | | {} | | [iam](variables.tf#L62) | IAM bindings in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | diff --git a/modules/project/service-accounts.tf b/modules/project/service-accounts.tf index 972cb6af26..f6da4fbf6b 100644 --- a/modules/project/service-accounts.tf +++ b/modules/project/service-accounts.tf @@ -142,8 +142,8 @@ resource "google_kms_crypto_key_iam_member" "service_identity_cmek" { } resource "google_project_default_service_accounts" "default_service_accounts" { - count = upper(var.default_service_account_setting) == "KEEP" ? 0 : 1 - action = upper(var.default_service_account_setting) + count = upper(var.default_service_account) == "KEEP" ? 0 : 1 + action = upper(var.default_service_account) project = local.project.project_id restore_policy = "REVERT_AND_IGNORE_FAILURE" depends_on = [google_project_service.project_services] diff --git a/modules/project/variables.tf b/modules/project/variables.tf index a2f717febb..30eff53aa0 100644 --- a/modules/project/variables.tf +++ b/modules/project/variables.tf @@ -46,7 +46,7 @@ variable "descriptive_name" { default = null } -variable "default_service_account_setting" { +variable "default_service_account" { description = "Project default service account setting: can be one of `delete`, `deprivilege`, `disable`, or `keep`." default = "keep" type = string