From edc68799eec87bd6915a51b1134aa6efb0e120e5 Mon Sep 17 00:00:00 2001 From: Chaitanya Malpe Date: Thu, 26 Oct 2023 20:23:06 +0530 Subject: [PATCH] removed unneeded variable --- modules/kms/README.md | 29 ++++++++++++++--------------- modules/kms/main.tf | 2 +- modules/kms/variables.tf | 6 ------ 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/modules/kms/README.md b/modules/kms/README.md index 110ab1a4..c79ddb6a 100644 --- a/modules/kms/README.md +++ b/modules/kms/README.md @@ -5,14 +5,15 @@ This module allows creating and managing KMS crypto keys and IAM bindings at bot When using an existing keyring be mindful about applying IAM bindings, as all bindings used by this module are authoritative, and you might inadvertently override bindings managed by the keyring creator. -- [Protecting against destroy](#protecting-against-destroy) -- [Examples](#examples) - - [Using an existing keyring](#using-an-existing-keyring) - - [Keyring creation and crypto key rotation and IAM roles](#keyring-creation-and-crypto-key-rotation-and-iam-roles) - - [Crypto key purpose](#crypto-key-purpose) - - [Import job](#import-job) -- [Variables](#variables) -- [Outputs](#outputs) +- [Google KMS Module](#google-kms-module) + - [Protecting against destroy](#protecting-against-destroy) + - [Examples](#examples) + - [Using an existing keyring](#using-an-existing-keyring) + - [Keyring creation and crypto key rotation and IAM roles](#keyring-creation-and-crypto-key-rotation-and-iam-roles) + - [Crypto key purpose](#crypto-key-purpose) + - [Import job](#import-job) + - [Variables](#variables) + - [Outputs](#outputs) ## Protecting against destroy @@ -109,7 +110,6 @@ module "kms" { location = "europe-west1" name = "test" } - import_job_create = true import_job = { id = "my-import-job" import_method = "RSA_OAEP_3072_SHA1_AES_256" @@ -122,16 +122,15 @@ module "kms" { | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [keyring](variables.tf#L70) | Keyring attributes. | object({…}) | ✓ | | -| [project_id](variables.tf#L119) | Project id where the keyring will be created. | string | ✓ | | +| [keyring](variables.tf#L64) | Keyring attributes. | object({…}) | ✓ | | +| [project_id](variables.tf#L113) | Project id where the keyring will be created. | string | ✓ | | | [iam](variables.tf#L17) | Keyring IAM bindings in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | | [iam_bindings](variables.tf#L24) | Authoritative IAM bindings in {KEY => {role = ROLE, members = [], condition = {}}}. Keys are arbitrary. | map(object({…})) | | {} | | [iam_bindings_additive](variables.tf#L39) | Keyring individual additive IAM bindings. Keys are arbitrary. | map(object({…})) | | {} | | [import_job](variables.tf#L54) | Keyring import job attributes. | object({…}) | | null | -| [import_job_create](variables.tf#L64) | Set to true to create an import job for a keyring. | bool | | false | -| [keyring_create](variables.tf#L78) | Set to false to manage keys and IAM bindings in an existing keyring. | bool | | true | -| [keys](variables.tf#L84) | Key names and base attributes. Set attributes to null if not needed. | map(object({…})) | | {} | -| [tag_bindings](variables.tf#L124) | Tag bindings for this keyring, in key => tag value id format. | map(string) | | {} | +| [keyring_create](variables.tf#L72) | Set to false to manage keys and IAM bindings in an existing keyring. | bool | | true | +| [keys](variables.tf#L78) | Key names and base attributes. Set attributes to null if not needed. | map(object({…})) | | {} | +| [tag_bindings](variables.tf#L118) | Tag bindings for this keyring, in key => tag value id format. | map(string) | | {} | ## Outputs diff --git a/modules/kms/main.tf b/modules/kms/main.tf index bb9f05a8..b240706b 100644 --- a/modules/kms/main.tf +++ b/modules/kms/main.tf @@ -55,7 +55,7 @@ resource "google_kms_crypto_key" "default" { } resource "google_kms_key_ring_import_job" "default" { - count = var.import_job_create ? 1 : 0 + count = var.import_job != null ? 1 : 0 key_ring = local.keyring.id import_job_id = var.import_job.id import_method = var.import_job.import_method diff --git a/modules/kms/variables.tf b/modules/kms/variables.tf index 669d2e8a..c3291546 100644 --- a/modules/kms/variables.tf +++ b/modules/kms/variables.tf @@ -61,12 +61,6 @@ variable "import_job" { default = null } -variable "import_job_create" { - description = "Set to true to create an import job for a keyring." - type = bool - default = false -} - variable "keyring" { description = "Keyring attributes." type = object({