diff --git a/.changelog/5285.txt b/.changelog/5285.txt new file mode 100644 index 00000000000..8981298c9d6 --- /dev/null +++ b/.changelog/5285.txt @@ -0,0 +1,3 @@ +```release-note:deprecation +compute: deprecated the `enable_display` field in `google_compute_instance_template` in the `google` (GA) provider. It will only be available in the `google-beta` provider in a future release, as the underlying feature is in beta. +``` diff --git a/google/resource_compute_instance_template.go b/google/resource_compute_instance_template.go index 076b6181f07..d8eb6fd7fa4 100644 --- a/google/resource_compute_instance_template.go +++ b/google/resource_compute_instance_template.go @@ -250,6 +250,7 @@ func resourceComputeInstanceTemplate() *schema.Resource { Type: schema.TypeBool, Optional: true, ForceNew: true, + Deprecated: "This attribute is currently in beta and will be removed from the google provider. Please use the google-beta provider to continue using this attribute.", Description: `Enable Virtual Displays on this instance. Note: allow_stopping_for_update must be set to true in order to update this field.`, }, diff --git a/website/docs/guides/version_4_upgrade.html.markdown b/website/docs/guides/version_4_upgrade.html.markdown index 53523ab01b8..20fb6be4a59 100644 --- a/website/docs/guides/version_4_upgrade.html.markdown +++ b/website/docs/guides/version_4_upgrade.html.markdown @@ -173,6 +173,13 @@ This field was incorrectly included in the GA `google` provider in past releases In order to continue to use the feature, add `provider = google-beta` to your resource definition. +## Resource: `google_compute_instance_template` + +### `enable_display` is removed from the GA provider + +This field was incorrectly included in the GA `google` provider in past releases. +In order to continue to use the feature, add `provider = google-beta` to your +resource definition. ## Resource: `google_container_cluster` diff --git a/website/docs/r/compute_instance_template.html.markdown b/website/docs/r/compute_instance_template.html.markdown index 7e163818e51..fd55fd5fc1c 100644 --- a/website/docs/r/compute_instance_template.html.markdown +++ b/website/docs/r/compute_instance_template.html.markdown @@ -277,8 +277,8 @@ The following arguments are supported: * `shielded_instance_config` - (Optional) Enable [Shielded VM](https://cloud.google.com/security/shielded-cloud/shielded-vm) on this instance. Shielded VM provides verifiable integrity to prevent against malware and rootkits. Defaults to disabled. Structure is documented below. **Note**: [`shielded_instance_config`](#shielded_instance_config) can only be used with boot images with shielded vm support. See the complete list [here](https://cloud.google.com/compute/docs/images#shielded-images). -* `enable_display` - (Optional) Enable [Virtual Displays](https://cloud.google.com/compute/docs/instances/enable-instance-virtual-display#verify_display_driver) on this instance. -**Note**: [`allow_stopping_for_update`](#allow_stopping_for_update) must be set to true in order to update this field. +* `enable_display` - (Optional)) Enable [Virtual Displays](https://cloud.google.com/compute/docs/instances/enable-instance-virtual-display#verify_display_driver) on this instance. +**Note**: [`allow_stopping_for_update`](#allow_stopping_for_update) must be set to true in order to update this field. Note: This attribute is currently in beta and will be removed from the google provider. Please use the google-beta provider to continue using this attribute. * `confidential_instance_config` (Optional) - Enable [Confidential Mode](https://cloud.google.com/compute/confidential-vm/docs/about-cvm) on this VM.