Skip to content

Update tests to use bootstrapped KMS keys #877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 23, 2024
Merged

Update tests to use bootstrapped KMS keys #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions dataproc_metastore_service_cmek_test/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ resource "google_dataproc_metastore_service" "default" {
location = "us-central1"

encryption_config {
kms_key = google_kms_crypto_key.crypto_key.id
kms_key = "acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-bootstrap-metastore-service-key1").CryptoKey.Name-${local.name_suffix}"
}

hive_metastore_config {
Expand All @@ -21,27 +21,15 @@ resource "google_dataproc_metastore_service" "default" {
]
}

resource "google_kms_crypto_key" "crypto_key" {
name = "example-key-${local.name_suffix}"
key_ring = google_kms_key_ring.key_ring.id

purpose = "ENCRYPT_DECRYPT"
}

resource "google_kms_key_ring" "key_ring" {
name = "example-keyring-${local.name_suffix}"
location = "us-central1"
}

resource "google_kms_crypto_key_iam_member" "crypto_key_member_1" {
crypto_key_id = google_kms_crypto_key.crypto_key.id
crypto_key_id = "acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-bootstrap-metastore-service-key1").CryptoKey.Name-${local.name_suffix}"
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"

member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-metastore.iam.gserviceaccount.com"
}

resource "google_kms_crypto_key_iam_member" "crypto_key_member_2" {
crypto_key_id = google_kms_crypto_key.crypto_key.id
crypto_key_id = "acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-bootstrap-metastore-service-key1").CryptoKey.Name-${local.name_suffix}"
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"

member = "serviceAccount:${data.google_storage_project_service_account.gcs_account.email_address}"
Expand Down
13 changes: 1 addition & 12 deletions kmsConfig_create/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
resource "google_kms_key_ring" "keyring" {
name = "key-ring-${local.name_suffix}"
location = "us-central1"
}

resource "google_kms_crypto_key" "crypto_key" {
name = "crypto-name-${local.name_suffix}"
key_ring = google_kms_key_ring.keyring.id
# rotation_period = "7776000s"
}

resource "google_netapp_kmsconfig" "kmsConfig" {
name = "kms-test-${local.name_suffix}"
description="this is a test description"
crypto_key_name=google_kms_crypto_key.crypto_key.id
crypto_key_name="crypto-name-${local.name_suffix}"
location="us-central1"
}
14 changes: 2 additions & 12 deletions secure_source_manager_instance_cmek/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
resource "google_kms_key_ring" "key_ring" {
name = "my-keyring-${local.name_suffix}"
location = "us-central1"
}

resource "google_kms_crypto_key" "crypto_key" {
name = "my-key-${local.name_suffix}"
key_ring = google_kms_key_ring.key_ring.id
}

resource "google_kms_crypto_key_iam_member" "crypto_key_binding" {
crypto_key_id = google_kms_crypto_key.crypto_key.id
crypto_key_id = "my-key-${local.name_suffix}"
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"

member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-sourcemanager.iam.gserviceaccount.com"
Expand All @@ -18,7 +8,7 @@ resource "google_kms_crypto_key_iam_member" "crypto_key_binding" {
resource "google_secure_source_manager_instance" "default" {
location = "us-central1"
instance_id = "my-instance-${local.name_suffix}"
kms_key = google_kms_crypto_key.crypto_key.id
kms_key = "my-key-${local.name_suffix}"

depends_on = [
google_kms_crypto_key_iam_member.crypto_key_binding
Expand Down