fix: Make key handle sweepable (GoogleCloudPlatform#11905)

karolgorc · Oct 11, 2024 · 5dcb844 · 5dcb844
1 parent f068449
commit 5dcb844
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/mmv1/products/kms/KeyHandle.yaml b/mmv1/products/kms/KeyHandle.yaml
@@ -54,8 +54,9 @@ examples:
     primary_resource_id: 'example-keyhandle'
     min_version: 'beta'
     vars:
+      folder_name: 'my-folder'
       key_project_name: 'key-proj'
-      resource_project_name: 'resources'
+      resource_project_name: 'res-proj'
     test_env_vars:
       org_id: 'ORG_ID'
       billing_account: 'BILLING_ACCT'

diff --git a/mmv1/templates/terraform/examples/kms_key_handle_basic.tf.tmpl b/mmv1/templates/terraform/examples/kms_key_handle_basic.tf.tmpl
@@ -1,7 +1,7 @@
 # Create Folder in GCP Organization
 resource "google_folder" "autokms_folder" {
   provider     = google-beta
-  display_name = "folder-example"
+  display_name = "{{index $.Vars "folder_name"}}"
   parent       = "organizations/{{index $.TestEnvVars "org_id"}}"
   deletion_protection = false
 }
@@ -89,7 +89,7 @@ resource "time_sleep" "wait_autokey_config" {
 resource "google_kms_key_handle" "{{$.PrimaryResourceId}}" {
   provider               = google-beta
   project                = google_project.resource_project.project_id
-  name                   = "example-key-handle" 
+  name                   = "tf-test-key-handle"
   location               = "global"
   resource_type_selector = "storage.googleapis.com/Bucket"
   depends_on             = [time_sleep.wait_autokey_config]