@@ -2075,31 +2075,31 @@ func TestAccComputeInstanceConfidentialInstanceConfigMain(t *testing.T) {
2075
2075
}
2076
2076
2077
2077
func TestAccComputeInstance_confidentialHyperDiskBootDisk(t *testing.T) {
2078
- // Currently failing
2079
- acctest.SkipIfVcr(t)
2080
2078
t.Parallel()
2081
2079
kms := acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-bootstrap-hyperdisk-key1")
2082
2080
2083
2081
context_1 := map[string]interface{}{
2084
- "instance_name": fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10)),
2085
- "confidential_compute": true,
2086
- "key_ring": kms.KeyRing.Name,
2087
- "key_name": kms.CryptoKey.Name,
2088
- "zone": "us-central1-a",
2089
- "machine_type": "n2-standard-16",
2090
-
2082
+ "instance_name": fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10)),
2083
+ "confidential_compute": true,
2084
+ "key_ring": kms.KeyRing.Name,
2085
+ "key_name": kms.CryptoKey.Name,
2086
+ "zone": "us-central1-a",
2087
+ "machine_type": "n2d-standard-16",
2088
+ "confidential_instance_config": "confidential_instance_config { \n \t enable_confidential_compute = true \n }",
2089
+ "min_cpu_platform": "AMD Milan",
2091
2090
}
2092
2091
2093
2092
context_2 := map[string]interface{}{
2094
- "instance_name": context_1["instance_name"],
2095
- "confidential_compute": false,
2096
- "key_ring" : context_1["key_ring"],
2097
- "key_name": context_1["key_name"],
2098
- "zone": context_1["zone"],
2099
- "machine_type": "c3d-standard-16",
2093
+ "instance_name": context_1["instance_name"],
2094
+ "confidential_compute": false,
2095
+ "key_ring": context_1["key_ring"],
2096
+ "key_name": context_1["key_name"],
2097
+ "zone": context_1["zone"],
2098
+ "machine_type": "c3d-standard-16",
2099
+ "confidential_instance_config": "", //having enable_confidential_compute = false will cause permadiff.
2100
+ "min_cpu_platform": "AMD Genoa",
2100
2101
}
2101
2102
2102
-
2103
2103
acctest.VcrTest(t, resource.TestCase{
2104
2104
PreCheck: func() { acctest.AccTestPreCheck(t) },
2105
2105
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
@@ -8472,10 +8472,18 @@ resource "google_kms_crypto_key_iam_member" "crypto_key" {
8472
8472
member = "serviceAccount:${data.google_project.project.number}
[email protected] "
8473
8473
}
8474
8474
8475
+ resource "google_kms_crypto_key_iam_member" "crypto_key_2" {
8476
+ crypto_key_id = "%{key_name}"
8477
+ role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
8478
+ member = "serviceAccount:service-${data.google_project.project.number}@compute-system.iam.gserviceaccount.com"
8479
+ }
8480
+
8475
8481
resource "google_compute_instance" "foobar" {
8476
8482
name = "%{instance_name}"
8477
8483
machine_type = "%{machine_type}"
8478
8484
zone = "%{zone}"
8485
+ %{confidential_instance_config}
8486
+ min_cpu_platform = "%{min_cpu_platform}"
8479
8487
8480
8488
boot_disk {
8481
8489
0 commit comments