mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-03 01:01:06 +00:00
Fix validation of spanner instance ID length (#3048)
Signed-off-by: Modular Magician <magic-modules@google.com>
This commit is contained in:
parent
bf10d4f553
commit
8bf6871696
@ -49,7 +49,7 @@ func resourceSpannerDatabase() *schema.Resource {
|
|||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Required: true,
|
Required: true,
|
||||||
ForceNew: true,
|
ForceNew: true,
|
||||||
ValidateFunc: validateRegexp(`^(?:[a-z](?:[-_a-z0-9]{0,28}[a-z0-9])?)$`),
|
ValidateFunc: validateRegexp(`^[a-z][a-z0-9_\-]*[a-z0-9]$`),
|
||||||
},
|
},
|
||||||
"ddl": {
|
"ddl": {
|
||||||
Type: schema.TypeList,
|
Type: schema.TypeList,
|
||||||
|
@ -54,14 +54,13 @@ func resourceSpannerInstance() *schema.Resource {
|
|||||||
"display_name": {
|
"display_name": {
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Required: true,
|
Required: true,
|
||||||
ValidateFunc: validateRegexp(`^(?:[a-zA-Z](?:[- _a-zA-Z0-9]{2,28}[a-zA-Z0-9])?)$`),
|
|
||||||
},
|
},
|
||||||
"name": {
|
"name": {
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Computed: true,
|
Computed: true,
|
||||||
Optional: true,
|
Optional: true,
|
||||||
ForceNew: true,
|
ForceNew: true,
|
||||||
ValidateFunc: validateRegexp(`^(?:[a-z](?:[-_a-z0-9]{4,28}[a-z0-9])?)$`),
|
ValidateFunc: validateRegexp(`^[a-z][-a-z0-9]*[a-z0-9]$`),
|
||||||
},
|
},
|
||||||
"labels": {
|
"labels": {
|
||||||
Type: schema.TypeMap,
|
Type: schema.TypeMap,
|
||||||
|
Loading…
Reference in New Issue
Block a user