Skip to content

Commit 16dd741

Browse files
Allow guest OS validation to be handled by GCE APIs (#10856) (#18331)
[upstream:c227f3fe6b2fc8c9bdae8b105f86fa82ef13399e] Signed-off-by: Modular Magician <[email protected]>
1 parent a8f7e8f commit 16dd741

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

google/services/compute/resource_compute_disk.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333

3434
"github.com/hashicorp/terraform-provider-google/google/tpgresource"
3535
transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
36-
"github.com/hashicorp/terraform-provider-google/google/verify"
3736
)
3837

3938
// diffsupress for hyperdisk provisioned_iops
@@ -755,11 +754,10 @@ func computeDiskGuestOsFeaturesSchema() *schema.Resource {
755754
return &schema.Resource{
756755
Schema: map[string]*schema.Schema{
757756
"type": {
758-
Type: schema.TypeString,
759-
Required: true,
760-
ForceNew: true,
761-
ValidateFunc: verify.ValidateEnum([]string{"MULTI_IP_SUBNET", "SECURE_BOOT", "SEV_CAPABLE", "UEFI_COMPATIBLE", "VIRTIO_SCSI_MULTIQUEUE", "WINDOWS", "GVNIC", "SEV_LIVE_MIGRATABLE", "SEV_SNP_CAPABLE", "SUSPEND_RESUME_COMPATIBLE", "TDX_CAPABLE", "SEV_LIVE_MIGRATABLE_V2"}),
762-
Description: `The type of supported feature. Read [Enabling guest operating system features](https://cloud.google.com/compute/docs/images/create-delete-deprecate-private-images#guest-os-features) to see a list of available options. Possible values: ["MULTI_IP_SUBNET", "SECURE_BOOT", "SEV_CAPABLE", "UEFI_COMPATIBLE", "VIRTIO_SCSI_MULTIQUEUE", "WINDOWS", "GVNIC", "SEV_LIVE_MIGRATABLE", "SEV_SNP_CAPABLE", "SUSPEND_RESUME_COMPATIBLE", "TDX_CAPABLE", "SEV_LIVE_MIGRATABLE_V2"]`,
757+
Type: schema.TypeString,
758+
Required: true,
759+
ForceNew: true,
760+
Description: `The type of supported feature. Read [Enabling guest operating system features](https://cloud.google.com/compute/docs/images/create-delete-deprecate-private-images#guest-os-features) to see a list of available options.`,
763761
},
764762
},
765763
}

website/docs/r/compute_disk.html.markdown

-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ The following arguments are supported:
326326
* `type` -
327327
(Required)
328328
The type of supported feature. Read [Enabling guest operating system features](https://cloud.google.com/compute/docs/images/create-delete-deprecate-private-images#guest-os-features) to see a list of available options.
329-
Possible values are: `MULTI_IP_SUBNET`, `SECURE_BOOT`, `SEV_CAPABLE`, `UEFI_COMPATIBLE`, `VIRTIO_SCSI_MULTIQUEUE`, `WINDOWS`, `GVNIC`, `SEV_LIVE_MIGRATABLE`, `SEV_SNP_CAPABLE`, `SUSPEND_RESUME_COMPATIBLE`, `TDX_CAPABLE`, `SEV_LIVE_MIGRATABLE_V2`.
330329

331330
<a name="nested_source_image_encryption_key"></a>The `source_image_encryption_key` block supports:
332331

0 commit comments

Comments
 (0)