IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-20 11:48:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2513 from TimeIncOSS/f-aws-validation-db-subnet-group

Browse Source 
aws: Add validation for aws_db_subnet_group.name
This commit is contained in:
Paul Hinze 2015-06-26 08:46:39 -05:00
commit 4a14d83733
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builtin/providers/aws/resource_aws_db_instance.go
View File

@ -155,16 +155,16 @@ func resourceAwsDbInstance() *schema.Resource {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
ValidateFunc: func(v interface{}, k string) (ws []string, es []error) { ValidateFunc: func(v interface{}, k string) (ws []string, es []error) {
fsi := v.(string) value := v.(string)
if !regexp.MustCompile(`^[0-9A-Za-z-]+$`).MatchString(fsi) { if !regexp.MustCompile(`^[0-9A-Za-z-]+$`).MatchString(value) {
es = append(es, fmt.Errorf( es = append(es, fmt.Errorf(
"only alphanumeric characters and hyphens allowed in %s", k)) "only alphanumeric characters and hyphens allowed in %q", k))
} }
if regexp.MustCompile(`--`).MatchString(fsi) { if regexp.MustCompile(`--`).MatchString(value) {
es = append(es, fmt.Errorf("%s cannot contain two consecutive hyphens", k)) es = append(es, fmt.Errorf("%q cannot contain two consecutive hyphens", k))
} }
if regexp.MustCompile(`-$`).MatchString(fsi) { if regexp.MustCompile(`-$`).MatchString(value) {
es = append(es, fmt.Errorf("%s cannot end in a hyphen", k)) es = append(es, fmt.Errorf("%q cannot end in a hyphen", k))
} }
return return
}, },

17
builtin/providers/aws/resource_aws_db_subnet_group.go
View File

@ -3,6 +3,7 @@ package aws
import ( import (
"fmt" "fmt"
"log" "log"
"regexp"
"strings" "strings"
"time" "time"
@ -24,6 +25,22 @@ func resourceAwsDbSubnetGroup() *schema.Resource {
Type: schema.TypeString, Type: schema.TypeString,
ForceNew: true, ForceNew: true,
Required: true, Required: true,
ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
value := v.(string)
if !regexp.MustCompile(`^[0-9a-z-]+$`).MatchString(value) {
errors = append(errors, fmt.Errorf(
"only lowercase alphanumeric characters and hyphens allowed in %q", k))
}
if len(value) > 255 {
errors = append(errors, fmt.Errorf(
"%q cannot be longer than 255 characters", k))
}
if regexp.MustCompile(`(?i)^default$`).MatchString(value) {
errors = append(errors, fmt.Errorf(
"%q is not allowed as %q", "Default", k))
}
return
},
}, },
"description": &schema.Schema{ "description": &schema.Schema{