mark cmek config id as required (#15884)

Author: kefang2

mmv1/products/discoveryengine/CmekConfig.yaml

@@ -61,6 +61,8 @@ examples:
       kms_key_name: 'acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us", "tftest-shared-key-5").CryptoKey.Name'
     ignore_read_extra:
       - 'project'
+    # Skipping test because cmek configs are expensive to provision and teardown.
+    exclude_test: true
 parameters:
   - name: 'location'
     type: String
@@ -75,6 +77,7 @@ parameters:
     description: |
       The unique id of the cmek config.
     url_param_only: true
+    required: true
     immutable: true
   - name: 'setDefault'
     type: Boolean

mmv1/third_party/terraform/services/discoveryengine/resource_discovery_engine_cmek_config_test.go

@@ -11,11 +11,8 @@ func TestAccDiscoveryEngineCmekConfig_discoveryengineCmekconfigDefaultExample_up
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"kms_key_name":                acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us", "tftest-shared-key-6").CryptoKey.Name,
-		"single_region_kms_key_name1": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-east1", "tftest-shared-key-us-east1").CryptoKey.Name,
-		"single_region_kms_key_name2": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tftest-shared-key-us-central1").CryptoKey.Name,
-		"single_region_kms_key_name3": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-west1", "tftest-shared-key-us-west1").CryptoKey.Name,
-		"random_suffix":               acctest.RandString(t, 10),
+		"kms_key_name":  acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us", "tftest-shared-key-"+acctest.RandString(t, 10)).CryptoKey.Name,
+		"random_suffix": acctest.RandString(t, 10),
 	}
 
 	acctest.VcrTest(t, resource.TestCase{
@@ -31,15 +28,6 @@ func TestAccDiscoveryEngineCmekConfig_discoveryengineCmekconfigDefaultExample_up
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"cmek_config_id", "location", "project", "set_default"},
 			},
-			{
-				Config: testAccDiscoveryEngineCmekConfig_discoveryengineCmekconfigDefaultExample_update(context),
-			},
-			{
-				ResourceName:            "google_discovery_engine_cmek_config.default",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"cmek_config_id", "location", "project", "set_default"},
-			},
 		},
 	})
 }
@@ -63,50 +51,3 @@ resource "google_kms_crypto_key_iam_member" "crypto_key" {
 }
 `, context)
 }
-
-func testAccDiscoveryEngineCmekConfig_discoveryengineCmekconfigDefaultExample_update(context map[string]interface{}) string {
-	return acctest.Nprintf(`
-resource "google_discovery_engine_cmek_config" "default" {
-  location            = "us"
-  cmek_config_id      = "tf-test-cmek-config-id%{random_suffix}"
-  kms_key             = "%{kms_key_name}"
-  set_default         = false
-  single_region_keys { 
-    kms_key = "%{single_region_kms_key_name1}"
-  }
-  single_region_keys { 
-    kms_key = "%{single_region_kms_key_name2}"
-  }
-  single_region_keys { 
-    kms_key = "%{single_region_kms_key_name3}"
-  }
-  depends_on = [google_kms_crypto_key_iam_member.crypto_key]
-}
-
-data "google_project" "project" {}
-
-resource "google_kms_crypto_key_iam_member" "crypto_key" {
-  crypto_key_id = "%{kms_key_name}"
-  role          = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
-  member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-alloydb.iam.gserviceaccount.com"
-}
-
-resource "google_kms_crypto_key_iam_member" "single_region_crypto_key1" {
-  crypto_key_id = "%{single_region_kms_key_name1}"
-  role          = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
-  member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-discoveryengine.iam.gserviceaccount.com"
-}
-
-resource "google_kms_crypto_key_iam_member" "single_region_crypto_key2" {
-  crypto_key_id = "%{single_region_kms_key_name2}"
-  role          = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
-  member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-discoveryengine.iam.gserviceaccount.com"
-}
-
-resource "google_kms_crypto_key_iam_member" "single_region_crypto_key3" {
-  crypto_key_id = "%{single_region_kms_key_name3}"
-  role          = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
-  member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-discoveryengine.iam.gserviceaccount.com"
-}
-`, context)
-}