Skip to content

Commit

Permalink
provider/aws: Fix RDS unexpected state config
Browse files Browse the repository at this point in the history
This commit adds the `resetting-master-credentials` state to the list of
allowable pending states when creating an RDS instance. The state is
returned when creating an `aws_db_instance` from a snapshot.

Fixes #4477.
  • Loading branch information
jen20 committed Jan 4, 2016
1 parent 8458661 commit 7ae481a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions builtin/providers/aws/resource_aws_db_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error
"[INFO] Waiting for DB Instance to be available")

stateConf := &resource.StateChangeConf{
Pending: []string{"creating", "backing-up", "modifying"},
Pending: []string{"creating", "backing-up", "modifying", "resetting-master-credentials"},
Target: "available",
Refresh: resourceAwsDbInstanceStateRefreshFunc(d, meta),
Timeout: 40 * time.Minute,
Expand Down Expand Up @@ -494,7 +494,7 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error
"[INFO] Waiting for DB Instance to be available")

stateConf := &resource.StateChangeConf{
Pending: []string{"creating", "backing-up", "modifying"},
Pending: []string{"creating", "backing-up", "modifying", "resetting-master-credentials"},
Target: "available",
Refresh: resourceAwsDbInstanceStateRefreshFunc(d, meta),
Timeout: 40 * time.Minute,
Expand Down

0 comments on commit 7ae481a

Please sign in to comment.