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

Using timeout schema helper for RDS cluster resource lifecycle mgmt

This commit is contained in:
Andy Chan 2017-05-10 16:06:13 -07:00 committed by Paul Stack
parent 4c8b382936
commit cb1b2acc97
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
builtin/providers/aws/resource_aws_rds_cluster.go
View File

@ -24,6 +24,12 @@ func resourceAwsRDSCluster() *schema.Resource {
State: resourceAwsRdsClusterImport, State: resourceAwsRdsClusterImport,
}, },
Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(120 * time.Minute),
Update: schema.DefaultTimeout(120 * time.Minute),
Delete: schema.DefaultTimeout(120 * time.Minute),
},
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"availability_zones": { "availability_zones": {
@ -305,9 +311,9 @@ func resourceAwsRDSClusterCreate(d *schema.ResourceData, meta interface{}) error
Pending: []string{"creating", "backing-up", "modifying"}, Pending: []string{"creating", "backing-up", "modifying"},
Target: []string{"available"}, Target: []string{"available"},
Refresh: resourceAwsRDSClusterStateRefreshFunc(d, meta), Refresh: resourceAwsRDSClusterStateRefreshFunc(d, meta),
Timeout: 120 * time.Minute, Timeout: d.Timeout(schema.TimeoutCreate),
MinTimeout: 3 * time.Second, MinTimeout: 10 * time.Second,
Delay: 30 * time.Second, // Wait 30 secs before starting Delay: 30 * time.Second,
} }
// Wait, catching any errors // Wait, catching any errors
@ -458,8 +464,9 @@ func resourceAwsRDSClusterCreate(d *schema.ResourceData, meta interface{}) error
Pending: []string{"creating", "backing-up", "modifying"}, Pending: []string{"creating", "backing-up", "modifying"},
Target: []string{"available"}, Target: []string{"available"},
Refresh: resourceAwsRDSClusterStateRefreshFunc(d, meta), Refresh: resourceAwsRDSClusterStateRefreshFunc(d, meta),
Timeout: 120 * time.Minute, Timeout: d.Timeout(schema.TimeoutCreate),
MinTimeout: 3 * time.Second, MinTimeout: 10 * time.Second,
Delay: 30 * time.Second,
} }
// Wait, catching any errors // Wait, catching any errors
@ -660,8 +667,9 @@ func resourceAwsRDSClusterDelete(d *schema.ResourceData, meta interface{}) error
Pending: []string{"available", "deleting", "backing-up", "modifying"}, Pending: []string{"available", "deleting", "backing-up", "modifying"},
Target: []string{"destroyed"}, Target: []string{"destroyed"},
Refresh: resourceAwsRDSClusterStateRefreshFunc(d, meta), Refresh: resourceAwsRDSClusterStateRefreshFunc(d, meta),
Timeout: 15 * time.Minute, Timeout: d.Timeout(schema.TimeoutDelete),
MinTimeout: 3 * time.Second, MinTimeout: 10 * time.Second,
Delay: 30 * time.Second,
} }
// Wait, catching any errors // Wait, catching any errors