ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow dots in the name of aws_db_subnet_group 

The RDS API reference doesn't say dots are allowed, but they are. For
the sake of people who have preexisting resources with dots in the
names, we should allow them also. Fixes #2664.
This commit is contained in:
Phil Frost 2015-07-09 09:09:01 -04:00
parent 108076ddcb
commit fb1226321c
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,9 +27,9 @@ func resourceAwsDbSubnetGroup() *schema.Resource {
Required: true, Required: true,
ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) { ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
value := v.(string) value := v.(string)
if !regexp.MustCompile(`^[0-9A-Za-z-_]+$`).MatchString(value) { if !regexp.MustCompile(`^[.0-9A-Za-z-_]+$`).MatchString(value) {
errors = append(errors, fmt.Errorf( errors = append(errors, fmt.Errorf(
"only alphanumeric characters, hyphens and underscores allowed in %q", k)) "only alphanumeric characters, hyphens, underscores, and periods allowed in %q", k))
} }
if len(value) > 255 { if len(value) > 255 {
errors = append(errors, fmt.Errorf( errors = append(errors, fmt.Errorf(

19
builtin/providers/aws/resource_aws_db_subnet_group_test.go
View File

@ -36,7 +36,8 @@ func TestAccAWSDBSubnetGroup_basic(t *testing.T) {
}) })
} }
// Regression test for https://github.com/hashicorp/terraform/issues/2603 // Regression test for https://github.com/hashicorp/terraform/issues/2603 and
// https://github.com/hashicorp/terraform/issues/2664
func TestAccAWSDBSubnetGroup_withUnderscores(t *testing.T) { func TestAccAWSDBSubnetGroup_withUnderscores(t *testing.T) {
var v rds.DBSubnetGroup var v rds.DBSubnetGroup
@ -50,10 +51,12 @@ func TestAccAWSDBSubnetGroup_withUnderscores(t *testing.T) {
CheckDestroy: testAccCheckDBSubnetGroupDestroy, CheckDestroy: testAccCheckDBSubnetGroupDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
resource.TestStep{ resource.TestStep{
Config: testAccDBSubnetGroupConfig_withUnderscores, Config: testAccDBSubnetGroupConfig_withUnderscoresAndPeriods,
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckDBSubnetGroupExists( testAccCheckDBSubnetGroupExists(
"aws_db_subnet_group.bar", &v), "aws_db_subnet_group.underscores", &v),
testAccCheckDBSubnetGroupExists(
"aws_db_subnet_group.periods", &v),
testCheck, testCheck,
), ),
}, },
@ -150,7 +153,7 @@ resource "aws_db_subnet_group" "foo" {
} }
` `
const testAccDBSubnetGroupConfig_withUnderscores = ` const testAccDBSubnetGroupConfig_withUnderscoresAndPeriods = `
resource "aws_vpc" "main" { resource "aws_vpc" "main" {
cidr_block = "192.168.0.0/16" cidr_block = "192.168.0.0/16"
} }
@ -167,9 +170,15 @@ resource "aws_subnet" "backend" {
cidr_block = "192.168.2.0/24" cidr_block = "192.168.2.0/24"
} }
resource "aws_db_subnet_group" "bar" { resource "aws_db_subnet_group" "underscores" {
name = "with_underscores" name = "with_underscores"
description = "Our main group of subnets" description = "Our main group of subnets"
subnet_ids = ["${aws_subnet.frontend.id}", "${aws_subnet.backend.id}"] subnet_ids = ["${aws_subnet.frontend.id}", "${aws_subnet.backend.id}"]
} }
resource "aws_db_subnet_group" "periods" {
name = "with.periods"
description = "Our main group of subnets"
subnet_ids = ["${aws_subnet.frontend.id}", "${aws_subnet.backend.id}"]
}
` `