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

Using the new time schema helper for RDS Instance lifecycle management (https://github.com/hashicorp/terraform/pull/12311)

This commit is contained in:
Andy Chan 2017-05-10 15:53:42 -07:00 committed by Paul Stack
parent 21af9995e9
commit 4c8b382936
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,12 @@ func resourceAwsRDSClusterInstance() *schema.Resource {
State: schema.ImportStatePassthrough, State: schema.ImportStatePassthrough,
}, },
Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(90 * time.Minute),
Update: schema.DefaultTimeout(90 * time.Minute),
Delete: schema.DefaultTimeout(90 * time.Minute),
},
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"identifier": { "identifier": {
Type: schema.TypeString, Type: schema.TypeString,
@ -214,9 +220,9 @@ func resourceAwsRDSClusterInstanceCreate(d *schema.ResourceData, meta interface{
Pending: []string{"creating", "backing-up", "modifying"}, Pending: []string{"creating", "backing-up", "modifying"},
Target: []string{"available"}, Target: []string{"available"},
Refresh: resourceAwsDbInstanceStateRefreshFunc(d, meta), Refresh: resourceAwsDbInstanceStateRefreshFunc(d, meta),
Timeout: 40 * time.Minute, Timeout: d.Timeout(schema.TimeoutCreate),
MinTimeout: 10 * time.Second, MinTimeout: 10 * time.Second,
Delay: 10 * time.Second, Delay: 30 * time.Second,
} }
// Wait, catching any errors // Wait, catching any errors
@ -378,9 +384,9 @@ func resourceAwsRDSClusterInstanceUpdate(d *schema.ResourceData, meta interface{
Pending: []string{"creating", "backing-up", "modifying"}, Pending: []string{"creating", "backing-up", "modifying"},
Target: []string{"available"}, Target: []string{"available"},
Refresh: resourceAwsDbInstanceStateRefreshFunc(d, meta), Refresh: resourceAwsDbInstanceStateRefreshFunc(d, meta),
Timeout: 40 * time.Minute, Timeout: d.Timeout(schema.TimeoutUpdate),
MinTimeout: 10 * time.Second, MinTimeout: 10 * time.Second,
Delay: 10 * time.Second, Delay: 30 * time.Second, // Wait 30 secs before starting
} }
// Wait, catching any errors // Wait, catching any errors
@ -418,8 +424,9 @@ func resourceAwsRDSClusterInstanceDelete(d *schema.ResourceData, meta interface{
Pending: []string{"modifying", "deleting"}, Pending: []string{"modifying", "deleting"},
Target: []string{}, Target: []string{},
Refresh: resourceAwsDbInstanceStateRefreshFunc(d, meta), Refresh: resourceAwsDbInstanceStateRefreshFunc(d, meta),
Timeout: 40 * time.Minute, Timeout: d.Timeout(schema.TimeoutDelete),
MinTimeout: 10 * time.Second, MinTimeout: 10 * time.Second,
Delay: 30 * time.Second, // Wait 30 secs before starting
} }
if _, err := stateConf.WaitForState(); err != nil { if _, err := stateConf.WaitForState(); err != nil {