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

on lambda updates, output the returned values to ensure consistency #14578

Merged
merged 4 commits into from
Feb 18, 2021
Merged

on lambda updates, output the returned values to ensure consistency #14578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f968dc4
on lambda update that publishes, output the returned values to ensure…
Aug 11, 2020
b64f075
set qualified_arn value
Aug 11, 2020
f579cea
resource/lambda_function: Rework waiting for function update
YakDriver Feb 18, 2021
88da563
resource/lambda_function: Add changelog
YakDriver Feb 18, 2021
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
3 changes: 3 additions & 0 deletions .changelog/14578.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_lambda_function: Handle eventual consistency issues after publishing a version
```
15 changes: 13 additions & 2 deletions aws/resource_aws_lambda_function.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,8 +1179,10 @@ func resourceAwsLambdaFunctionUpdate(d *schema.ResourceData, meta interface{}) e
FunctionName: aws.String(d.Id()),
}

var output *lambda.FunctionConfiguration
err := resource.Retry(waiter.LambdaFunctionPublishTimeout, func() *resource.RetryError {
_, err := conn.PublishVersion(versionReq)
var err error
output, err = conn.PublishVersion(versionReq)

if tfawserr.ErrMessageContains(err, lambda.ErrCodeResourceConflictException, "in progress") {
log.Printf("[DEBUG] Retrying publish of Lambda function (%s) version after error: %s", d.Id(), err)
Expand All @@ -1195,12 +1197,21 @@ func resourceAwsLambdaFunctionUpdate(d *schema.ResourceData, meta interface{}) e
})

if tfresource.TimedOut(err) {
_, err = conn.PublishVersion(versionReq)
output, err = conn.PublishVersion(versionReq)
}

if err != nil {
return fmt.Errorf("error publishing Lambda Function (%s) version: %w", d.Id(), err)
}

err = conn.WaitUntilFunctionUpdated(&lambda.GetFunctionConfigurationInput{
FunctionName: output.FunctionArn,
Qualifier: output.Version,
})

if err != nil {
return fmt.Errorf("while waiting for function (%s) update: %w", d.Id(), err)
}
}

return resourceAwsLambdaFunctionRead(d, meta)
Expand Down