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

Merge pull request #2728 from hashicorp/b-aws-db-param-bug 

provider/aws: Fix issue with detecting differences in DB Parameters
This commit is contained in:
Clint 2015-07-20 12:38:17 -05:00
parent 670b2a722f 7756bf3aef
commit 60305cb879
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/providers/aws/resource_aws_db_parameter_group.go
View File

@ -166,7 +166,7 @@ func resourceAwsDbParameterGroupUpdate(d *schema.ResourceData, meta interface{})
Parameters: parameters, Parameters: parameters,
} }
log.Printf("[DEBUG] Modify DB Parameter Group: %#v", modifyOpts) log.Printf("[DEBUG] Modify DB Parameter Group: %s", modifyOpts)
_, err = rdsconn.ModifyDBParameterGroup(&modifyOpts) _, err = rdsconn.ModifyDBParameterGroup(&modifyOpts)
if err != nil { if err != nil {
return fmt.Errorf("Error modifying DB Parameter Group: %s", err) return fmt.Errorf("Error modifying DB Parameter Group: %s", err)

6
builtin/providers/aws/structure.go
View File

@ -186,13 +186,17 @@ func expandIPPerms(
// Takes the result of flatmap.Expand for an array of parameters and // Takes the result of flatmap.Expand for an array of parameters and
// returns Parameter API compatible objects // returns Parameter API compatible objects
func expandParameters(configured []interface{}) ([]*rds.Parameter, error) { func expandParameters(configured []interface{}) ([]*rds.Parameter, error) {
parameters := make([]*rds.Parameter, 0, len(configured)) var parameters []*rds.Parameter
// Loop over our configured parameters and create // Loop over our configured parameters and create
// an array of aws-sdk-go compatabile objects // an array of aws-sdk-go compatabile objects
for _, pRaw := range configured { for _, pRaw := range configured {
data := pRaw.(map[string]interface{}) data := pRaw.(map[string]interface{})
if data["name"].(string) == "" {
continue
}
p := &rds.Parameter{ p := &rds.Parameter{
ApplyMethod: aws.String(data["apply_method"].(string)), ApplyMethod: aws.String(data["apply_method"].(string)),
ParameterName: aws.String(data["name"].(string)), ParameterName: aws.String(data["name"].(string)),