Skip to content

Commit

Permalink
fix TestAccComputeInstance_confidentialHyperDiskBootDisk (#11615) (#8153
Browse files Browse the repository at this point in the history
)

[upstream:29a1163236a8c87f3a9bde0ee4d95d1d2909bcb4]

Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Sep 10, 2024
1 parent da1d0ed commit 84aed78
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .changelog/11615.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:note
fixed TestAccComputeInstance_confidentialHyperDiskBootDisk for `google_compute_instance`
```
38 changes: 24 additions & 14 deletions google-beta/services/compute/resource_compute_instance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2061,27 +2061,29 @@ func TestAccComputeInstanceConfidentialInstanceConfigMain(t *testing.T) {
}

func TestAccComputeInstance_confidentialHyperDiskBootDisk(t *testing.T) {
// Currently failing
acctest.SkipIfVcr(t)
t.Parallel()
kms := acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-bootstrap-hyperdisk-key1")

context_1 := map[string]interface{}{
"instance_name": fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10)),
"confidential_compute": true,
"key_ring": kms.KeyRing.Name,
"key_name": kms.CryptoKey.Name,
"zone": "us-central1-a",
"machine_type": "n2-standard-16",
"instance_name": fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10)),
"confidential_compute": true,
"key_ring": kms.KeyRing.Name,
"key_name": kms.CryptoKey.Name,
"zone": "us-central1-a",
"machine_type": "n2d-standard-16",
"confidential_instance_config": "confidential_instance_config { \n \t enable_confidential_compute = true \n }",
"min_cpu_platform": "AMD Milan",
}

context_2 := map[string]interface{}{
"instance_name": context_1["instance_name"],
"confidential_compute": false,
"key_ring": context_1["key_ring"],
"key_name": context_1["key_name"],
"zone": context_1["zone"],
"machine_type": "c3d-standard-16",
"instance_name": context_1["instance_name"],
"confidential_compute": false,
"key_ring": context_1["key_ring"],
"key_name": context_1["key_name"],
"zone": context_1["zone"],
"machine_type": "c3d-standard-16",
"confidential_instance_config": "", //having enable_confidential_compute = false will cause permadiff.
"min_cpu_platform": "AMD Genoa",
}

acctest.VcrTest(t, resource.TestCase{
Expand Down Expand Up @@ -8429,10 +8431,18 @@ resource "google_kms_crypto_key_iam_member" "crypto_key" {
member = "serviceAccount:${data.google_project.project.number}[email protected]"
}
resource "google_kms_crypto_key_iam_member" "crypto_key_2" {
crypto_key_id = "%{key_name}"
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
member = "serviceAccount:service-${data.google_project.project.number}@compute-system.iam.gserviceaccount.com"
}
resource "google_compute_instance" "foobar" {
name = "%{instance_name}"
machine_type = "%{machine_type}"
zone = "%{zone}"
%{confidential_instance_config}
min_cpu_platform = "%{min_cpu_platform}"
boot_disk {
Expand Down

0 comments on commit 84aed78

Please sign in to comment.