Make acctest use bootstrapped KMS key, instead of making new key that…

… resembles a shared key (GoogleCloudPlatform#9926)
tdbhacks · Feb 23, 2024 · eefc136 · eefc136
1 parent af33f4f
commit eefc136
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/mmv1/products/workbench/Instance.yaml b/mmv1/products/workbench/Instance.yaml
@@ -76,8 +76,9 @@ examples:
     vars:
       instance_name: 'workbench-instance'
       network_name: 'wbi-test-default'
-      keyring_name: 'tftest-shared-keyring-1'
-      key_name: 'tftest-shared-key-1'
+      key_name: 'my-crypto-key'
+    test_vars_overrides:
+      key_name: 'acctest.BootstrapKMSKeyInLocation(t, "us-central1").CryptoKey.Name'
     test_env_vars:
       service_account: :SERVICE_ACCT
     ignore_read_extra:

diff --git a/mmv1/templates/terraform/examples/workbench_instance_full.tf.erb b/mmv1/templates/terraform/examples/workbench_instance_full.tf.erb
@@ -10,16 +10,6 @@ resource "google_compute_subnetwork" "my_subnetwork" {
   ip_cidr_range = "10.0.1.0/24"
 }
 
-resource "google_kms_key_ring" "keyring" {
-  name = "<%= ctx[:vars]['keyring_name'] %>"
-  location = "global"
-}
-
-resource "google_kms_crypto_key" "crypto-key" {
-  name     = "<%= ctx[:vars]['key_name'] %>"
-  key_ring = google_kms_key_ring.keyring.id
-}
-
 resource "google_workbench_instance" "<%= ctx[:primary_resource_id] %>" {
   name = "<%= ctx[:vars]['instance_name'] %>"
   location = "us-central1-a"
@@ -41,14 +31,14 @@ resource "google_workbench_instance" "<%= ctx[:primary_resource_id] %>" {
       disk_size_gb  = 310
       disk_type = "PD_SSD"
       disk_encryption = "GMEK"
-      kms_key = google_kms_crypto_key.crypto-key.id
+      kms_key = "<%= ctx[:vars]['key_name'] %>"
     }
 
     data_disks {
       disk_size_gb  = 330
       disk_type = "PD_SSD"
       disk_encryption = "GMEK"
-      kms_key = google_kms_crypto_key.crypto-key.id
+      kms_key = "<%= ctx[:vars]['key_name'] %>"
     }
 
     network_interfaces {