provider/aws: Increase timeouts for Route Table retries (#14345)
This commit is contained in:
parent
15f4976743
commit
6b4643fbdc
|
@ -120,7 +120,7 @@ func resourceAwsRouteTableCreate(d *schema.ResourceData, meta interface{}) error
|
||||||
Pending: []string{"pending"},
|
Pending: []string{"pending"},
|
||||||
Target: []string{"ready"},
|
Target: []string{"ready"},
|
||||||
Refresh: resourceAwsRouteTableStateRefreshFunc(conn, d.Id()),
|
Refresh: resourceAwsRouteTableStateRefreshFunc(conn, d.Id()),
|
||||||
Timeout: 2 * time.Minute,
|
Timeout: 5 * time.Minute,
|
||||||
}
|
}
|
||||||
if _, err := stateConf.WaitForState(); err != nil {
|
if _, err := stateConf.WaitForState(); err != nil {
|
||||||
return fmt.Errorf(
|
return fmt.Errorf(
|
||||||
|
@ -353,7 +353,7 @@ func resourceAwsRouteTableUpdate(d *schema.ResourceData, meta interface{}) error
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Printf("[INFO] Creating route for %s: %#v", d.Id(), opts)
|
log.Printf("[INFO] Creating route for %s: %#v", d.Id(), opts)
|
||||||
err := resource.Retry(1*time.Minute, func() *resource.RetryError {
|
err := resource.Retry(5*time.Minute, func() *resource.RetryError {
|
||||||
_, err := conn.CreateRoute(&opts)
|
_, err := conn.CreateRoute(&opts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if awsErr, ok := err.(awserr.Error); ok {
|
if awsErr, ok := err.(awserr.Error); ok {
|
||||||
|
@ -439,7 +439,7 @@ func resourceAwsRouteTableDelete(d *schema.ResourceData, meta interface{}) error
|
||||||
Pending: []string{"ready"},
|
Pending: []string{"ready"},
|
||||||
Target: []string{},
|
Target: []string{},
|
||||||
Refresh: resourceAwsRouteTableStateRefreshFunc(conn, d.Id()),
|
Refresh: resourceAwsRouteTableStateRefreshFunc(conn, d.Id()),
|
||||||
Timeout: 2 * time.Minute,
|
Timeout: 5 * time.Minute,
|
||||||
}
|
}
|
||||||
if _, err := stateConf.WaitForState(); err != nil {
|
if _, err := stateConf.WaitForState(); err != nil {
|
||||||
return fmt.Errorf(
|
return fmt.Errorf(
|
||||||
|
|
|
@ -49,7 +49,7 @@ func resourceAwsRouteTableAssociationCreate(d *schema.ResourceData, meta interfa
|
||||||
|
|
||||||
var resp *ec2.AssociateRouteTableOutput
|
var resp *ec2.AssociateRouteTableOutput
|
||||||
var err error
|
var err error
|
||||||
err = resource.Retry(2*time.Minute, func() *resource.RetryError {
|
err = resource.Retry(5*time.Minute, func() *resource.RetryError {
|
||||||
resp, err = conn.AssociateRouteTable(&associationOpts)
|
resp, err = conn.AssociateRouteTable(&associationOpts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if awsErr, ok := err.(awserr.Error); ok {
|
if awsErr, ok := err.(awserr.Error); ok {
|
||||||
|
|
|
@ -137,7 +137,7 @@ func setTags(conn *ec2.EC2, d *schema.ResourceData) error {
|
||||||
|
|
||||||
// Set tags
|
// Set tags
|
||||||
if len(remove) > 0 {
|
if len(remove) > 0 {
|
||||||
err := resource.Retry(2*time.Minute, func() *resource.RetryError {
|
err := resource.Retry(5*time.Minute, func() *resource.RetryError {
|
||||||
log.Printf("[DEBUG] Removing tags: %#v from %s", remove, d.Id())
|
log.Printf("[DEBUG] Removing tags: %#v from %s", remove, d.Id())
|
||||||
_, err := conn.DeleteTags(&ec2.DeleteTagsInput{
|
_, err := conn.DeleteTags(&ec2.DeleteTagsInput{
|
||||||
Resources: []*string{aws.String(d.Id())},
|
Resources: []*string{aws.String(d.Id())},
|
||||||
|
@ -157,7 +157,7 @@ func setTags(conn *ec2.EC2, d *schema.ResourceData) error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if len(create) > 0 {
|
if len(create) > 0 {
|
||||||
err := resource.Retry(2*time.Minute, func() *resource.RetryError {
|
err := resource.Retry(5*time.Minute, func() *resource.RetryError {
|
||||||
log.Printf("[DEBUG] Creating tags: %s for %s", create, d.Id())
|
log.Printf("[DEBUG] Creating tags: %s for %s", create, d.Id())
|
||||||
_, err := conn.CreateTags(&ec2.CreateTagsInput{
|
_, err := conn.CreateTags(&ec2.CreateTagsInput{
|
||||||
Resources: []*string{aws.String(d.Id())},
|
Resources: []*string{aws.String(d.Id())},
|
||||||
|
|
Loading…
Reference in New Issue