Remove incomplete ValidateFunc for disk type. (#5993) (#11630)

Existing ValidateFunc was missing more recent Persistent Disk types,
like pd-balanced / pd-extreme.

This change should prevent the list of valid disk type options from being stale
in the future.

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/5993.txt

@@ -0,0 +1,9 @@
+```release-note:enhancement
+compute: removed validation checking against a fixed set of persistent disk types
+```
+```release-note:enhancement
+container: removed validation checking against a fixed set of persistent disk types
+```
+```release-note:enhancement
+dataproc: removed validation checking against a fixed set of persistent disk types
+```

google/node_config.go

@@ -36,12 +36,11 @@ func schemaNodeConfig() *schema.Schema {
 				},
 
 				"disk_type": {
-					Type:         schema.TypeString,
-					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.`,
+					Type:        schema.TypeString,
+					Optional:    true,
+					Computed:    true,
+					ForceNew:    true,
+					Description: `Type of the disk attached to each node. Such as pd-standard, pd-balanced or pd-ssd`,
 				},
 
 				"guest_accelerator": {

google/resource_compute_instance.go

@@ -189,8 +189,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": {

google/resource_compute_instance_template.go

@@ -139,7 +139,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": {

google/resource_dataproc_cluster.go

@@ -401,9 +401,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".`,
 												},
 											},
 										},
@@ -734,15 +733,14 @@ 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",
+								ForceNew: true,
+								Default:  "pd-standard",
 							},
 						},
 					},

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,

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}`,

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,