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

Merge pull request #308 from alekstorm/aws-db-instance-db-subnet-group-name 

Rename aws_db_instance.subnet_group_name to db_subnet_group_name
This commit is contained in:
Mitchell Hashimoto 2014-10-11 12:33:58 -07:00
parent bd0cf94e89 5b806f0737
commit d8c1ee655c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@ func resource_aws_db_instance_create(
opts.PubliclyAccessible = true opts.PubliclyAccessible = true
} }
if attr = rs.Attributes["subnet_group_name"]; attr != "" { if attr = rs.Attributes["db_subnet_group_name"]; attr != "" {
opts.DBSubnetGroupName = attr opts.DBSubnetGroupName = attr
} }
@ -229,7 +229,7 @@ func resource_aws_db_instance_diff(
"username": diff.AttrTypeCreate, "username": diff.AttrTypeCreate,
"vpc_security_group_ids": diff.AttrTypeCreate, "vpc_security_group_ids": diff.AttrTypeCreate,
"security_group_names": diff.AttrTypeCreate, "security_group_names": diff.AttrTypeCreate,
"subnet_group_name": diff.AttrTypeCreate, "db_subnet_group_name": diff.AttrTypeCreate,
"skip_final_snapshot": diff.AttrTypeUpdate, "skip_final_snapshot": diff.AttrTypeUpdate,
"final_snapshot_identifier": diff.AttrTypeUpdate, "final_snapshot_identifier": diff.AttrTypeUpdate,
}, },
@ -272,7 +272,7 @@ func resource_aws_db_instance_update_state(
s.Attributes["port"] = strconv.Itoa(v.Port) s.Attributes["port"] = strconv.Itoa(v.Port)
s.Attributes["status"] = v.DBInstanceStatus s.Attributes["status"] = v.DBInstanceStatus
s.Attributes["username"] = v.MasterUsername s.Attributes["username"] = v.MasterUsername
s.Attributes["subnet_group_name"] = v.DBSubnetGroup.Name s.Attributes["db_subnet_group_name"] = v.DBSubnetGroup.Name
// Flatten our group values // Flatten our group values
toFlatten := make(map[string]interface{}) toFlatten := make(map[string]interface{})
@ -342,7 +342,7 @@ func resource_aws_db_instance_validation() *config.Validator {
"vpc_security_group_ids.*", "vpc_security_group_ids.*",
"skip_final_snapshot", "skip_final_snapshot",
"security_group_names.*", "security_group_names.*",
"subnet_group_name", "db_subnet_group_name",
}, },
} }
} }