From f710b268552480aee618ef738c1882b9f29293a1 Mon Sep 17 00:00:00 2001 From: Leonardo Romanini <97033241+romanini-ciandt@users.noreply.github.com> Date: Fri, 4 Oct 2024 17:08:40 -0300 Subject: [PATCH] fix: Make key handle sweepable (#11905) --- mmv1/products/kms/KeyHandle.yaml | 3 ++- .../templates/terraform/examples/kms_key_handle_basic.tf.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mmv1/products/kms/KeyHandle.yaml b/mmv1/products/kms/KeyHandle.yaml index e9d4e39d0dd2..e4648a16f889 100644 --- 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 index 2c87c30cb825..b67930b88d11 100644 --- 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]