Removed unused required: true from two resources' name fields to make sure it's clear that these fields are not required (#13698) (#22415)

[upstream:728992c72ec6db6f40ee034695a10de6c20a73cc]

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

Author: modular-magician

google/services/spanner/resource_spanner_instance.go

@@ -134,17 +134,6 @@ In order to obtain a valid list please consult the
 				Required: true,
 				Description: `The descriptive name for this instance as it appears in UIs. Must be
 unique per project and between 4 and 30 characters in length.`,
-			},
-			"name": {
-				Type:         schema.TypeString,
-				Computed:     true,
-				Optional:     true,
-				ForceNew:     true,
-				ValidateFunc: verify.ValidateRegexp(`^[a-z][-a-z0-9]*[a-z0-9]$`),
-				Description: `A unique identifier for the instance, which cannot be changed after
-the instance is created. The name must be between 6 and 30 characters
-in length.
-If not provided, a random string starting with 'tf-' will be selected.`,
 			},
 			"autoscaling_config": {
 				Type:     schema.TypeList,
@@ -312,6 +301,17 @@ Example: { "name": "wrench", "mass": "1.3kg", "count": "3" }.
 Please refer to the field 'effective_labels' for all of the labels present on the resource.`,
 				Elem: &schema.Schema{Type: schema.TypeString},
 			},
+			"name": {
+				Type:         schema.TypeString,
+				Computed:     true,
+				Optional:     true,
+				ForceNew:     true,
+				ValidateFunc: verify.ValidateRegexp(`^[a-z][-a-z0-9]*[a-z0-9]$`),
+				Description: `A unique identifier for the instance, which cannot be changed after
+the instance is created. The name must be between 6 and 30 characters
+in length.
+If not provided, a random string starting with 'tf-' will be selected.`,
+			},
 			"num_nodes": {
 				Type:     schema.TypeInt,
 				Computed: true,

google/services/spanner/resource_spanner_instance_config.go

@@ -109,14 +109,6 @@ func ResourceSpannerInstanceConfig() *schema.Resource {
 				Required:    true,
 				Description: `The name of this instance configuration as it appears in UIs.`,
 			},
-			"name": {
-				Type:     schema.TypeString,
-				Computed: true,
-				Optional: true,
-				ForceNew: true,
-				Description: `A unique identifier for the instance configuration. Values are of the
-form projects/<project>/instanceConfigs/[a-z][-a-z0-9]*`,
-			},
 			"replicas": {
 				Type:        schema.TypeSet,
 				Required:    true,
@@ -145,6 +137,14 @@ Example: { "name": "wrench", "mass": "1.3kg", "count": "3" }.
 Please refer to the field 'effective_labels' for all of the labels present on the resource.`,
 				Elem: &schema.Schema{Type: schema.TypeString},
 			},
+			"name": {
+				Type:     schema.TypeString,
+				Computed: true,
+				Optional: true,
+				ForceNew: true,
+				Description: `A unique identifier for the instance configuration. Values are of the
+form projects/<project>/instanceConfigs/[a-z][-a-z0-9]*`,
+			},
 			"config_type": {
 				Type:        schema.TypeString,
 				Computed:    true,

website/docs/r/spanner_instance.html.markdown

@@ -94,13 +94,6 @@ resource "google_spanner_instance" "example" {
 The following arguments are supported:
 
 
-* `name` -
-  (Required)
-  A unique identifier for the instance, which cannot be changed after
-  the instance is created. The name must be between 6 and 30 characters
-  in length.
-  If not provided, a random string starting with `tf-` will be selected.
-
 * `config` -
   (Required)
   The name of the instance's configuration (similar but not
@@ -119,6 +112,13 @@ The following arguments are supported:
 - - -
 
 
+* `name` -
+  (Optional)
+  A unique identifier for the instance, which cannot be changed after
+  the instance is created. The name must be between 6 and 30 characters
+  in length.
+  If not provided, a random string starting with `tf-` will be selected.
+
 * `num_nodes` -
   (Optional)
   The number of nodes allocated to this instance. Exactly one of either node_count or processing_units

website/docs/r/spanner_instance_config.html.markdown

@@ -60,11 +60,6 @@ resource "google_spanner_instance_config" "example" {
 The following arguments are supported:
 
 
-* `name` -
-  (Required)
-  A unique identifier for the instance configuration. Values are of the
-  form projects/<project>/instanceConfigs/[a-z][-a-z0-9]*
-
 * `display_name` -
   (Required)
   The name of this instance configuration as it appears in UIs.
@@ -96,6 +91,11 @@ The following arguments are supported:
 - - -
 
 
+* `name` -
+  (Optional)
+  A unique identifier for the instance configuration. Values are of the
+  form projects/<project>/instanceConfigs/[a-z][-a-z0-9]*
+
 * `base_config` -
   (Optional)
   Base configuration name, e.g. nam3, based on which this configuration is created.