Skip to content

Commit 12958cd

Browse files
jessdejongmelinath
andauthored
Fix failing CMEK tests for Managed Kafka Cluster creation (#15386)
Co-authored-by: Stephen Lewis (Burrows) <[email protected]>
1 parent 575efeb commit 12958cd

File tree

2 files changed

+6
-26
lines changed

2 files changed

+6
-26
lines changed

mmv1/products/managedkafka/Cluster.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ examples:
5656
cluster_id: 'my-cluster'
5757
key_name: 'example-key'
5858
key_ring_name: 'example-key-ring'
59+
bootstrap_iam:
60+
- member: "serviceAccount:service-{project_number}@gcp-sa-managedkafka.iam.gserviceaccount.com"
61+
role: "roles/cloudkms.cryptoKeyEncrypterDecrypter"
62+
test_vars_overrides:
63+
key_name: 'acctest.BootstrapKMSKeyInLocation(t, "us-central1").CryptoKey.Name'
5964
external_providers: ["time"]
6065
parameters:
6166
- name: 'location'

mmv1/templates/terraform/examples/managedkafka_cluster_cmek.tf.tmpl

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ resource "google_managed_kafka_cluster" "{{$.PrimaryResourceId}}" {
1111
subnet = "projects/${data.google_project.project.number}/regions/us-central1/subnetworks/default"
1212
}
1313
}
14-
kms_key = google_kms_crypto_key.key.id
14+
kms_key = "{{index $.Vars "key_name"}}"
1515
}
1616

1717
provider = google-beta
@@ -24,31 +24,6 @@ resource "google_project_service_identity" "kafka_service_identity" {
2424
provider = google-beta
2525
}
2626

27-
resource "google_kms_crypto_key" "key" {
28-
name = "{{index $.Vars "key_name"}}"
29-
key_ring = google_kms_key_ring.key_ring.id
30-
31-
provider = google-beta
32-
}
33-
34-
resource "google_kms_key_ring" "key_ring" {
35-
name = "{{index $.Vars "key_ring_name"}}"
36-
location = "us-central1"
37-
38-
provider = google-beta
39-
}
40-
41-
resource "google_kms_crypto_key_iam_binding" "crypto_key_binding" {
42-
crypto_key_id = google_kms_crypto_key.key.id
43-
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
44-
45-
members = [
46-
"serviceAccount:service-${data.google_project.project.number}@gcp-sa-managedkafka.iam.gserviceaccount.com",
47-
]
48-
49-
provider = google-beta
50-
}
51-
5227
data "google_project" "project" {
5328
provider = google-beta
5429
}

0 commit comments

Comments
 (0)