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

Merge pull request #1907 from PeopleNet/rds-update 

provider/aws: Closes #1906. Only submit modification requests if there is a change
This commit is contained in:
Mitchell Hashimoto 2015-05-11 16:38:02 -07:00
parent 32336e812a 1798df8e03
commit e1627883b2
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -435,49 +435,61 @@ func resourceAwsDbInstanceUpdate(d *schema.ResourceData, meta interface{}) error
} }
d.SetPartial("apply_immediately") d.SetPartial("apply_immediately")
requestUpdate := false
if d.HasChange("allocated_storage") { if d.HasChange("allocated_storage") {
d.SetPartial("allocated_storage") d.SetPartial("allocated_storage")
req.AllocatedStorage = aws.Long(int64(d.Get("allocated_storage").(int))) req.AllocatedStorage = aws.Long(int64(d.Get("allocated_storage").(int)))
requestUpdate = true
} }
if d.HasChange("backup_retention_period") { if d.HasChange("backup_retention_period") {
d.SetPartial("backup_retention_period") d.SetPartial("backup_retention_period")
req.BackupRetentionPeriod = aws.Long(int64(d.Get("backup_retention_period").(int))) req.BackupRetentionPeriod = aws.Long(int64(d.Get("backup_retention_period").(int)))
requestUpdate = true
} }
if d.HasChange("instance_class") { if d.HasChange("instance_class") {
d.SetPartial("instance_class") d.SetPartial("instance_class")
req.DBInstanceClass = aws.String(d.Get("instance_class").(string)) req.DBInstanceClass = aws.String(d.Get("instance_class").(string))
requestUpdate = true
} }
if d.HasChange("parameter_group_name") { if d.HasChange("parameter_group_name") {
d.SetPartial("parameter_group_name") d.SetPartial("parameter_group_name")
req.DBParameterGroupName = aws.String(d.Get("parameter_group_name").(string)) req.DBParameterGroupName = aws.String(d.Get("parameter_group_name").(string))
requestUpdate = true
} }
if d.HasChange("engine_version") { if d.HasChange("engine_version") {
d.SetPartial("engine_version") d.SetPartial("engine_version")
req.EngineVersion = aws.String(d.Get("engine_version").(string)) req.EngineVersion = aws.String(d.Get("engine_version").(string))
requestUpdate = true
} }
if d.HasChange("iops") { if d.HasChange("iops") {
d.SetPartial("iops") d.SetPartial("iops")
req.IOPS = aws.Long(int64(d.Get("iops").(int))) req.IOPS = aws.Long(int64(d.Get("iops").(int)))
requestUpdate = true
} }
if d.HasChange("backup_window") { if d.HasChange("backup_window") {
d.SetPartial("backup_window") d.SetPartial("backup_window")
req.PreferredBackupWindow = aws.String(d.Get("backup_window").(string)) req.PreferredBackupWindow = aws.String(d.Get("backup_window").(string))
requestUpdate = true
} }
if d.HasChange("maintenance_window") { if d.HasChange("maintenance_window") {
d.SetPartial("maintenance_window") d.SetPartial("maintenance_window")
req.PreferredMaintenanceWindow = aws.String(d.Get("maintenance_window").(string)) req.PreferredMaintenanceWindow = aws.String(d.Get("maintenance_window").(string))
requestUpdate = true
} }
if d.HasChange("password") { if d.HasChange("password") {
d.SetPartial("password") d.SetPartial("password")
req.MasterUserPassword = aws.String(d.Get("password").(string)) req.MasterUserPassword = aws.String(d.Get("password").(string))
requestUpdate = true
} }
if d.HasChange("multi_az") { if d.HasChange("multi_az") {
d.SetPartial("multi_az") d.SetPartial("multi_az")
req.MultiAZ = aws.Boolean(d.Get("multi_az").(bool)) req.MultiAZ = aws.Boolean(d.Get("multi_az").(bool))
requestUpdate = true
} }
if d.HasChange("storage_type") { if d.HasChange("storage_type") {
d.SetPartial("storage_type") d.SetPartial("storage_type")
req.StorageType = aws.String(d.Get("storage_type").(string)) req.StorageType = aws.String(d.Get("storage_type").(string))
requestUpdate = true
} }
if d.HasChange("vpc_security_group_ids") { if d.HasChange("vpc_security_group_ids") {
@ -488,6 +500,7 @@ func resourceAwsDbInstanceUpdate(d *schema.ResourceData, meta interface{}) error
} }
req.VPCSecurityGroupIDs = s req.VPCSecurityGroupIDs = s
} }
requestUpdate = true
} }
if d.HasChange("vpc_security_group_ids") { if d.HasChange("vpc_security_group_ids") {
@ -498,13 +511,17 @@ func resourceAwsDbInstanceUpdate(d *schema.ResourceData, meta interface{}) error
} }
req.DBSecurityGroups = s req.DBSecurityGroups = s
} }
requestUpdate = true
} }
log.Printf("[DEBUG] Send DB Instance Modification request: %#v", requestUpdate)
if requestUpdate {
log.Printf("[DEBUG] DB Instance Modification request: %#v", req) log.Printf("[DEBUG] DB Instance Modification request: %#v", req)
_, err := conn.ModifyDBInstance(req) _, err := conn.ModifyDBInstance(req)
if err != nil { if err != nil {
return fmt.Errorf("Error modifying DB Instance %s: %s", d.Id(), err) return fmt.Errorf("Error modifying DB Instance %s: %s", d.Id(), err)
} }
}
if arn, err := buildRDSARN(d, meta); err == nil { if arn, err := buildRDSARN(d, meta); err == nil {
if err := setTagsRDS(conn, d, arn); err != nil { if err := setTagsRDS(conn, d, arn); err != nil {