Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Final retries for elastic beanstalk apps #9731

Merged
merged 1 commit into from
Aug 13, 2019
+13 −2
Merged

Final retries for elastic beanstalk apps #9731

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions aws/resource_aws_elastic_beanstalk_application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,9 @@ func resourceAwsElasticBeanstalkApplicationRead(d *schema.ResourceData, meta int
}
return nil
})
if isResourceTimeoutError(err) {
app, err = getBeanstalkApplication(d.Id(), conn)
}
if err != nil {
if app == nil {
log.Printf("[WARN] %s, removing from state", err)
Expand Down Expand Up @@ -258,8 +261,9 @@ func resourceAwsElasticBeanstalkApplicationDelete(d *schema.ResourceData, meta i
return err
}

return resource.Retry(10*time.Second, func() *resource.RetryError {
app, err := getBeanstalkApplication(d.Id(), meta.(*AWSClient).elasticbeanstalkconn)
var app *elasticbeanstalk.ApplicationDescription
err = resource.Retry(10*time.Second, func() *resource.RetryError {
app, err = getBeanstalkApplication(d.Id(), meta.(*AWSClient).elasticbeanstalkconn)
if err != nil {
return resource.NonRetryableError(err)
}
Expand All @@ -270,6 +274,13 @@ func resourceAwsElasticBeanstalkApplicationDelete(d *schema.ResourceData, meta i
}
return nil
})
if isResourceTimeoutError(err) {
app, err = getBeanstalkApplication(d.Id(), meta.(*AWSClient).elasticbeanstalkconn)
}
if err != nil {
return fmt.Errorf("Error deleting Beanstalk application: %s", err)
}
return nil
}

func getBeanstalkApplication(id string, conn *elasticbeanstalk.ElasticBeanstalk) (*elasticbeanstalk.ApplicationDescription, error) {
Expand Down