From 05783ca0445a8b160714132e70d121d0ceeb6a9b Mon Sep 17 00:00:00 2001 From: Dennis Webb Date: Fri, 21 Oct 2016 11:28:48 -0500 Subject: [PATCH] limiting subnetgroup name to alphanumeric and hyphens --- .../providers/aws/resource_aws_redshift_subnet_group.go | 4 ++-- .../aws/resource_aws_redshift_subnet_group_test.go | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/builtin/providers/aws/resource_aws_redshift_subnet_group.go b/builtin/providers/aws/resource_aws_redshift_subnet_group.go index 5b119ed7f..7a26265d8 100644 --- a/builtin/providers/aws/resource_aws_redshift_subnet_group.go +++ b/builtin/providers/aws/resource_aws_redshift_subnet_group.go @@ -174,9 +174,9 @@ func subnetIdsToSlice(subnetIds []*redshift.Subnet) []string { func validateRedshiftSubnetGroupName(v interface{}, k string) (ws []string, errors []error) { value := v.(string) - if !regexp.MustCompile(`^[0-9a-z-_]+$`).MatchString(value) { + if !regexp.MustCompile(`^[0-9a-z-]+$`).MatchString(value) { errors = append(errors, fmt.Errorf( - "only lowercase alphanumeric characters, hyphens, underscores, and periods allowed in %q", k)) + "only lowercase alphanumeric characters and hyphens allowed in %q", k)) } if len(value) > 255 { errors = append(errors, fmt.Errorf( diff --git a/builtin/providers/aws/resource_aws_redshift_subnet_group_test.go b/builtin/providers/aws/resource_aws_redshift_subnet_group_test.go index 282fc15e4..d0865ec87 100644 --- a/builtin/providers/aws/resource_aws_redshift_subnet_group_test.go +++ b/builtin/providers/aws/resource_aws_redshift_subnet_group_test.go @@ -79,6 +79,14 @@ func TestResourceAWSRedshiftSubnetGroupNameValidation(t *testing.T) { Value: "TestingSG", ErrCount: 1, }, + { + Value: "testing_123", + ErrCount: 1, + }, + { + Value: "testing.123", + ErrCount: 1, + }, { Value: randomString(256), ErrCount: 1,