Skip to content

Commit 12b6a23

Browse files
Add IDPF support for the google_compute_instance and google_compute_image.guest_os_features (#12256) (#8664)
[upstream:f1195ea345722ec1ee5ddc1db5d3021a78ac9e5f] Signed-off-by: Modular Magician <[email protected]>
1 parent cce6847 commit 12b6a23

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

.changelog/12256.txt

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
```release-note:enhancement
2+
compute: Added the `IDPF` tag to the list of `guestOsFeatures`
3+
```
4+
```release-note:enhancement
5+
compute: Added `IDPF` as a possible `nic_type` for the `google_compute_instance.network_interface`
6+
```

google-beta/services/compute/resource_compute_image.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ func computeImageGuestOsFeaturesSchema() *schema.Resource {
291291
Type: schema.TypeString,
292292
Required: true,
293293
ForceNew: true,
294-
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"}),
295-
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"]`,
294+
ValidateFunc: verify.ValidateEnum([]string{"MULTI_IP_SUBNET", "SECURE_BOOT", "SEV_CAPABLE", "UEFI_COMPATIBLE", "VIRTIO_SCSI_MULTIQUEUE", "WINDOWS", "GVNIC", "IDPF", "SEV_LIVE_MIGRATABLE", "SEV_SNP_CAPABLE", "SUSPEND_RESUME_COMPATIBLE", "TDX_CAPABLE", "SEV_LIVE_MIGRATABLE_V2"}),
295+
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", "IDPF", "SEV_LIVE_MIGRATABLE", "SEV_SNP_CAPABLE", "SUSPEND_RESUME_COMPATIBLE", "TDX_CAPABLE", "SEV_LIVE_MIGRATABLE_V2"]`,
296296
},
297297
},
298298
}

google-beta/services/compute/resource_compute_instance.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -459,8 +459,8 @@ func ResourceComputeInstance() *schema.Resource {
459459
Type: schema.TypeString,
460460
Optional: true,
461461
ForceNew: true,
462-
ValidateFunc: validation.StringInSlice([]string{"GVNIC", "VIRTIO_NET"}, false),
463-
Description: `The type of vNIC to be used on this interface. Possible values:GVNIC, VIRTIO_NET`,
462+
ValidateFunc: validation.StringInSlice([]string{"GVNIC", "VIRTIO_NET", "IDPF"}, false),
463+
Description: `The type of vNIC to be used on this interface. Possible values:GVNIC, VIRTIO_NET, IDPF`,
464464
},
465465
"access_config": {
466466
Type: schema.TypeList,

website/docs/r/compute_image.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ The following arguments are supported:
254254
* `type` -
255255
(Required)
256256
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.
257-
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`.
257+
Possible values are: `MULTI_IP_SUBNET`, `SECURE_BOOT`, `SEV_CAPABLE`, `UEFI_COMPATIBLE`, `VIRTIO_SCSI_MULTIQUEUE`, `WINDOWS`, `GVNIC`, `IDPF`, `SEV_LIVE_MIGRATABLE`, `SEV_SNP_CAPABLE`, `SUSPEND_RESUME_COMPATIBLE`, `TDX_CAPABLE`, `SEV_LIVE_MIGRATABLE_V2`.
258258

259259
<a name="nested_image_encryption_key"></a>The `image_encryption_key` block supports:
260260

website/docs/r/compute_instance.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ is desired, you will need to modify your state file manually using
395395
array of alias IP ranges for this network interface. Can only be specified for network
396396
interfaces on subnet-mode networks. Structure [documented below](#nested_alias_ip_range).
397397

398-
* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET.
398+
* `nic_type` - (Optional) The type of vNIC to be used on this interface. Possible values: GVNIC, VIRTIO_NET, IDPF.
399399

400400
* `network_attachment` - (Optional) [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html) The URL of the network attachment that this interface should connect to in the following format: `projects/{projectNumber}/regions/{region_name}/networkAttachments/{network_attachment_name}`.
401401

0 commit comments

Comments
 (0)