diff --git a/mmv1/third_party/terraform/resources/resource_compute_instance.go.erb b/mmv1/third_party/terraform/resources/resource_compute_instance.go.erb index 802cc0df6b86..822699a514ae 100644 --- a/mmv1/third_party/terraform/resources/resource_compute_instance.go.erb +++ b/mmv1/third_party/terraform/resources/resource_compute_instance.go.erb @@ -194,8 +194,7 @@ func resourceComputeInstance() *schema.Resource { AtLeastOneOf: initializeParamsKeys, Computed: true, ForceNew: true, - ValidateFunc: validation.StringInSlice([]string{"pd-standard", "pd-ssd", "pd-balanced"}, false), - Description: `The Google Compute Engine disk type. One of pd-standard, pd-ssd or pd-balanced.`, + Description: `The Google Compute Engine disk type. Such as pd-standard, pd-ssd or pd-balanced.`, }, "image": { diff --git a/mmv1/third_party/terraform/resources/resource_compute_instance_template.go.erb b/mmv1/third_party/terraform/resources/resource_compute_instance_template.go.erb index 5cd62e722abf..ff677a832f05 100644 --- a/mmv1/third_party/terraform/resources/resource_compute_instance_template.go.erb +++ b/mmv1/third_party/terraform/resources/resource_compute_instance_template.go.erb @@ -145,7 +145,7 @@ func resourceComputeInstanceTemplate() *schema.Resource { Optional: true, ForceNew: true, Computed: true, - Description: `The Google Compute Engine disk type. Can be either "pd-ssd", "local-ssd", "pd-balanced" or "pd-standard".`, + Description: `The Google Compute Engine disk type. Such as "pd-ssd", "local-ssd", "pd-balanced" or "pd-standard".`, }, "labels": { diff --git a/mmv1/third_party/terraform/resources/resource_dataproc_cluster.go.erb b/mmv1/third_party/terraform/resources/resource_dataproc_cluster.go.erb index 7a47afc50837..96ad3dec98ff 100644 --- a/mmv1/third_party/terraform/resources/resource_dataproc_cluster.go.erb +++ b/mmv1/third_party/terraform/resources/resource_dataproc_cluster.go.erb @@ -411,9 +411,8 @@ func resourceDataprocCluster() *schema.Resource { Optional: true, AtLeastOneOf: preemptibleWorkerDiskConfigKeys, ForceNew: true, - ValidateFunc: validation.StringInSlice([]string{"pd-standard", "pd-ssd", ""}, false), Default: "pd-standard", - Description: `The disk type of the primary disk attached to each preemptible worker node. One of "pd-ssd" or "pd-standard". Defaults to "pd-standard".`, + Description: `The disk type of the primary disk attached to each preemptible worker node. Such as "pd-ssd" or "pd-standard". Defaults to "pd-standard".`, }, }, }, @@ -825,14 +824,13 @@ func instanceConfigSchema(parent string) *schema.Schema { "boot_disk_type": { Type: schema.TypeString, Optional: true, - Description: `The disk type of the primary disk attached to each node. One of "pd-ssd" or "pd-standard". Defaults to "pd-standard".`, + Description: `The disk type of the primary disk attached to each node. Such as "pd-ssd" or "pd-standard". Defaults to "pd-standard".`, AtLeastOneOf: []string{ "cluster_config.0." + parent + ".0.disk_config.0.num_local_ssds", "cluster_config.0." + parent + ".0.disk_config.0.boot_disk_size_gb", "cluster_config.0." + parent + ".0.disk_config.0.boot_disk_type", }, ForceNew: true, - ValidateFunc: validation.StringInSlice([]string{"pd-standard", "pd-ssd", ""}, false), Default: "pd-standard", }, }, diff --git a/mmv1/third_party/terraform/utils/node_config.go.erb b/mmv1/third_party/terraform/utils/node_config.go.erb index 8a725e00b17d..4bfbf1a2149e 100644 --- a/mmv1/third_party/terraform/utils/node_config.go.erb +++ b/mmv1/third_party/terraform/utils/node_config.go.erb @@ -49,8 +49,7 @@ func schemaNodeConfig() *schema.Schema { Optional: true, Computed: true, ForceNew: true, - ValidateFunc: validation.StringInSlice([]string{"pd-standard", "pd-balanced", "pd-ssd"}, false), - Description: `Type of the disk attached to each node.`, + Description: `Type of the disk attached to each node. Such as pd-standard, pd-balanced or pd-ssd`, }, "guest_accelerator": &schema.Schema{ diff --git a/mmv1/third_party/terraform/website/docs/d/compute_instance_template.html.markdown b/mmv1/third_party/terraform/website/docs/d/compute_instance_template.html.markdown index 34b74e27c344..a79164ef3493 100644 --- a/mmv1/third_party/terraform/website/docs/d/compute_instance_template.html.markdown +++ b/mmv1/third_party/terraform/website/docs/d/compute_instance_template.html.markdown @@ -153,8 +153,8 @@ The following arguments are supported: of the disk (such as those managed by `google_compute_disk`) to attach. ~> **Note:** Either `source` or `source_image` is **required** in a disk block unless the disk type is `local-ssd`. Check the API [docs](https://cloud.google.com/compute/docs/reference/rest/v1/instanceTemplates/insert) for details. -* `disk_type` - The GCE disk type. Can be either `"pd-ssd"`, - `"local-ssd"`, `"pd-balanced"` or `"pd-standard"`. +* `disk_type` - The GCE disk type. Such as `"pd-ssd"`, `"local-ssd"`, + `"pd-balanced"` or `"pd-standard"`. * `disk_size_gb` - The size of the image in gigabytes. If not specified, it will inherit the size of its base image. For SCRATCH disks, diff --git a/mmv1/third_party/terraform/website/docs/r/compute_instance.html.markdown b/mmv1/third_party/terraform/website/docs/r/compute_instance.html.markdown index 5ab9730e3c26..a3c4b9f5e324 100644 --- a/mmv1/third_party/terraform/website/docs/r/compute_instance.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/compute_instance.html.markdown @@ -221,7 +221,7 @@ is desired, you will need to modify your state file manually using * `size` - (Optional) The size of the image in gigabytes. If not specified, it will inherit the size of its base image. -* `type` - (Optional) The GCE disk type. May be set to pd-standard, pd-balanced or pd-ssd. +* `type` - (Optional) The GCE disk type. Such as pd-standard, pd-balanced or pd-ssd. * `image` - (Optional) The image from which to initialize this disk. This can be one of: the image's `self_link`, `projects/{project}/global/images/{image}`, diff --git a/mmv1/third_party/terraform/website/docs/r/compute_instance_template.html.markdown b/mmv1/third_party/terraform/website/docs/r/compute_instance_template.html.markdown index d4c158806cea..947a53ced6d7 100644 --- a/mmv1/third_party/terraform/website/docs/r/compute_instance_template.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/compute_instance_template.html.markdown @@ -399,8 +399,8 @@ The following arguments are supported: of the disk (such as those managed by `google_compute_disk`) to attach. ~> **Note:** Either `source` or `source_image` is **required** in a disk block unless the disk type is `local-ssd`. Check the API [docs](https://cloud.google.com/compute/docs/reference/rest/v1/instanceTemplates/insert) for details. -* `disk_type` - (Optional) The GCE disk type. Can be either `"pd-ssd"`, - `"local-ssd"`, `"pd-balanced"` or `"pd-standard"`. +* `disk_type` - (Optional) The GCE disk type. Such as `"pd-ssd"`, `"local-ssd"`, + `"pd-balanced"` or `"pd-standard"`. * `disk_size_gb` - (Optional) The size of the image in gigabytes. If not specified, it will inherit the size of its base image. For SCRATCH disks,