Feature/add cmek support 114 #115
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for the PR! 🚀 |
bharathkkb
reviewed
Aug 9, 2021
main.tf
Outdated
Comment on lines
87
to
107
| resource "google_kms_key_ring" "key_ring" { | ||
| count = var.encrypt_gcs_bucket_tfstate ? 1 : 0 | ||
| name = "${var.project_prefix}-keyring" | ||
| project = module.seed_project.project_id | ||
| location = var.default_region | ||
| } | ||
|
|
||
| resource "google_kms_crypto_key" "gcs_key" { | ||
| count = var.encrypt_gcs_bucket_tfstate ? 1 : 0 | ||
| name = "${var.project_prefix}-key" | ||
| key_ring = google_kms_key_ring.key_ring[0].self_link | ||
| rotation_period = var.key_rotation_period | ||
|
|
||
| lifecycle { | ||
| prevent_destroy = false | ||
| } | ||
|
|
||
| version_template { | ||
| algorithm = "GOOGLE_SYMMETRIC_ENCRYPTION" | ||
| protection_level = var.key_protection_level | ||
| } | ||
|
|
||
| } | ||
|
|
||
| resource "google_kms_crypto_key_iam_member" "gcs_key_iam" { | ||
| count = var.encrypt_gcs_bucket_tfstate ? 1 : 0 | ||
| crypto_key_id = google_kms_crypto_key.gcs_key[0].id | ||
| role = "roles/cloudkms.cryptoKeyEncrypterDecrypter" | ||
| member = "serviceAccount:${data.google_storage_project_service_account.gcs_account.email_address}" | ||
| } |
There was a problem hiding this comment.
Could we use https://github.com/terraform-google-modules/terraform-google-kms?
module "kms" {
source = "terraform-google-modules/kms/google"
version = "~> 1.2"
project_id = module.seed_project.project_id
location = var.default_region
keyring = "${var.project_prefix}-keyring"
keys = [ "${var.project_prefix}-key"]
key_rotation_period = var.key_rotation_period
key_protection_level = var. key_protection_level
set_decrypters_for = ["${var.project_prefix}-key"]
set_encrypters_for = ["${var.project_prefix}-key"]
decrypters = [
"serviceAccount:${data.google_storage_project_service_account.gcs_account.email_address}",
]
encrypters = [
"serviceAccount:${data.google_storage_project_service_account.gcs_account.email_address}",
]
}There was a problem hiding this comment.
Definitely. Leme update.
bharathkkb
previously approved these changes
Aug 10, 2021
main.tf
Outdated
| dynamic "encryption" { | ||
| for_each = var.encrypt_gcs_bucket_tfstate ? ["encryption"] : [] | ||
| content { | ||
| # default_kms_key_name = google_kms_crypto_key.gcs_key[0].id |
There was a problem hiding this comment.
My bad. Leme fix it.
|
/gcbrun |
rjerrems
reviewed
Aug 23, 2021
variables.tf
Outdated
| default = null | ||
| } | ||
|
|
||
| variable "prevent_destroy" { |
There was a problem hiding this comment.
nit: If this only applies to KMS, it should probably be prefixed with kms_
|
LGTM, just one minor nit on variable naming. |
rjerrems
previously approved these changes
Aug 23, 2021
|
@imrannayer can you also please rebase from master as your other change has been merged. |
bharathkkb
reviewed
Aug 23, 2021
There was a problem hiding this comment.
@imrannayer looks like there are changes from #116 in this PR. Could you rebase?
rjerrems
approved these changes
Aug 24, 2021
|
Thanks @imrannayer - I have created a follow up issue here #119 for add an example and tests |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed #114