Skip to content

Commit 8d84908

Browse files
Update tests to use bootstrapped KMS keys (#12609) (#877)
[upstream:0974a52691872c92d017186d92f29420f2b3bdf1] Signed-off-by: Modular Magician <[email protected]>
1 parent be2e6dc commit 8d84908

File tree

3 files changed

+6
-39
lines changed
  • dataproc_metastore_service_cmek_test
  • kmsConfig_create
  • secure_source_manager_instance_cmek

3 files changed

+6
-39
lines changed

dataproc_metastore_service_cmek_test/main.tf

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ resource "google_dataproc_metastore_service" "default" {
88
location = "us-central1"
99

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

1414
hive_metastore_config {
@@ -21,27 +21,15 @@ resource "google_dataproc_metastore_service" "default" {
2121
]
2222
}
2323

24-
resource "google_kms_crypto_key" "crypto_key" {
25-
name = "example-key-${local.name_suffix}"
26-
key_ring = google_kms_key_ring.key_ring.id
27-
28-
purpose = "ENCRYPT_DECRYPT"
29-
}
30-
31-
resource "google_kms_key_ring" "key_ring" {
32-
name = "example-keyring-${local.name_suffix}"
33-
location = "us-central1"
34-
}
35-
3624
resource "google_kms_crypto_key_iam_member" "crypto_key_member_1" {
37-
crypto_key_id = google_kms_crypto_key.crypto_key.id
25+
crypto_key_id = "acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-bootstrap-metastore-service-key1").CryptoKey.Name-${local.name_suffix}"
3826
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
3927

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

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

4735
member = "serviceAccount:${data.google_storage_project_service_account.gcs_account.email_address}"

kmsConfig_create/main.tf

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
1-
resource "google_kms_key_ring" "keyring" {
2-
name = "key-ring-${local.name_suffix}"
3-
location = "us-central1"
4-
}
5-
6-
resource "google_kms_crypto_key" "crypto_key" {
7-
name = "crypto-name-${local.name_suffix}"
8-
key_ring = google_kms_key_ring.keyring.id
9-
# rotation_period = "7776000s"
10-
}
11-
121
resource "google_netapp_kmsconfig" "kmsConfig" {
132
name = "kms-test-${local.name_suffix}"
143
description="this is a test description"
15-
crypto_key_name=google_kms_crypto_key.crypto_key.id
4+
crypto_key_name="crypto-name-${local.name_suffix}"
165
location="us-central1"
176
}

secure_source_manager_instance_cmek/main.tf

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
1-
resource "google_kms_key_ring" "key_ring" {
2-
name = "my-keyring-${local.name_suffix}"
3-
location = "us-central1"
4-
}
5-
6-
resource "google_kms_crypto_key" "crypto_key" {
7-
name = "my-key-${local.name_suffix}"
8-
key_ring = google_kms_key_ring.key_ring.id
9-
}
10-
111
resource "google_kms_crypto_key_iam_member" "crypto_key_binding" {
12-
crypto_key_id = google_kms_crypto_key.crypto_key.id
2+
crypto_key_id = "my-key-${local.name_suffix}"
133
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
144

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

2313
depends_on = [
2414
google_kms_crypto_key_iam_member.crypto_key_binding

0 commit comments

Comments
 (0)