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

Jump to bottom

resource/aws_launch_configuration: Remove DescribeLaunchConfigurations retries on all errors #14260

Merged
merged 1 commit into from
Jul 22, 2020
+1 −17
Merged

resource/aws_launch_configuration: Remove DescribeLaunchConfigurations retries on all errors #14260

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
18 changes: 1 addition & 17 deletions aws/resource_aws_launch_configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,24 +503,8 @@ func resourceAwsLaunchConfigurationCreate(d *schema.ResourceData, meta interface
}

d.SetId(lcName)
log.Printf("[INFO] launch configuration ID: %s", d.Id())

// We put a Retry here since sometimes eventual consistency bites
// us and we need to retry a few times to get the LC to load properly
err = resource.Retry(30*time.Second, func() *resource.RetryError {
err := resourceAwsLaunchConfigurationRead(d, meta)
if err != nil {
return resource.RetryableError(err)
}
return nil
})
if isResourceTimeoutError(err) {
err = resourceAwsLaunchConfigurationRead(d, meta)
}
if err != nil {
return fmt.Errorf("Error reading launch configuration: %s", err)
}
return nil
return resourceAwsLaunchConfigurationRead(d, meta)
}

func resourceAwsLaunchConfigurationRead(d *schema.ResourceData, meta interface{}) error {
Expand Down