Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Promote enable_confidential_compute for disks to v1. #6842

Merged
merged 1 commit into from
Jan 10, 2024
Merged

Promote enable_confidential_compute for disks to v1. #6842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changelog/9789.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
```release-note:enhancement
compute: promoted `google_compute_disk.enable_confidential_compute` to GA
```
```release-note:enhancement
compute: added `enable_confidential_compute` field to `google_compute_instance.boot_disk.initialize_params`
```
9 changes: 6 additions & 3 deletions google-beta/services/compute/resource_compute_disk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,12 +558,15 @@ func TestAccComputeDisk_encryptionKMS(t *testing.T) {
}

func TestAccComputeDisk_pdHyperDiskEnableConfidentialCompute(t *testing.T) {
t.Skip()
t.Parallel()

context := map[string]interface{}{
"random_suffix": acctest.RandString(t, 10),
"kms": acctest.BootstrapKMSKey(t).CryptoKey.Name, // global KMS key
"random_suffix": acctest.RandString(t, 10),
"kms": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(
t,
"ENCRYPT_DECRYPT",
"us-central1",
"tf-bootstrap-hyperdisk-key1").CryptoKey.Name, // regional KMS key
"disk_size": 64,
"confidential_compute": true,
}
Expand Down
2 changes: 1 addition & 1 deletion google-beta/services/compute/resource_compute_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7053,7 +7053,7 @@ resource "google_kms_crypto_key_iam_member" "crypto_key" {

resource "google_compute_instance" "foobar" {
name = "%{instance_name}"
machine_type = "n2-standard-2"
machine_type = "h3-standard-88"
zone = "%{zone}"

boot_disk {
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/compute_disk.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ The following arguments are supported:
to allow for updating the resource policy attached to the disk.

* `enable_confidential_compute` -
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
(Optional)
Whether this disk is using confidential compute mode.
Note: Only supported on hyperdisk skus, disk_encryption_key is required when setting to true

Expand Down
3 changes: 3 additions & 0 deletions website/docs/r/compute_instance.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,9 @@ is desired, you will need to modify your state file manually using
recreate the disk, hyperdisk allows for an update of throughput every 4 hours.
To update your hyperdisk more frequently, you'll need to manually delete and recreate it.

* `enable_confidential_compute` - (Optional) Whether this disk is using confidential compute mode.
Note: Only supported on hyperdisk skus, disk_encryption_key is required when setting to true.

<a name="nested_scratch_disk"></a>The `scratch_disk` block supports:

* `interface` - (Required) The disk interface to use for attaching this disk; either SCSI or NVME.
Expand Down