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.

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

Add retry for lambda update conflict #10049

Conversation

julienduchesne
Copy link
Contributor

Fixes #5154

The issue was fixed on the lambda_permission resource's side but not on the lambda_function side. So if you only update the permissions, you're fine but if you modify the lambda itself as well as the permissions, it crashes

@julienduchesne julienduchesne requested a review from a team September 9, 2019 18:25
@ghost ghost added size/S Managed by automation to categorize the size of a PR. service/lambda Issues and PRs that pertain to the lambda service. labels Sep 9, 2019
Base automatically changed from master to main January 23, 2021 00:56
@breathingdust breathingdust requested a review from a team as a code owner January 23, 2021 00:56
@ghost ghost added size/XS Managed by automation to categorize the size of a PR. and removed size/S Managed by automation to categorize the size of a PR. labels Feb 25, 2021
@ewbankkit
Copy link
Contributor

This same error code is handled similarly in aws/resource_aws_lambda_event_source_mapping.go.

@zhelding
Copy link
Contributor

Pull request #21306 has significantly refactored the AWS Provider codebase. As a result, most PRs opened prior to the refactor now have merge conflicts that must be resolved before proceeding.

Specifically, PR #21306 relocated the code for all AWS resources and data sources from a single aws directory to a large number of separate directories in internal/service, each corresponding to a particular AWS service. This separation of code has also allowed for us to simplify the names of underlying functions -- while still avoiding namespace collisions.

We recognize that many pull requests have been open for some time without yet being addressed by our maintainers. Therefore, we want to make it clear that resolving these conflicts in no way affects the prioritization of a particular pull request. Once a pull request has been prioritized for review, the necessary changes will be made by a maintainer -- either directly or in collaboration with the pull request author.

For a more complete description of this refactor, including examples of how old filepaths and function names correspond to their new counterparts: please refer to issue #20000.

For a quick guide on how to amend your pull request to resolve the merge conflicts resulting from this refactor and bring it in line with our new code patterns: please refer to our Service Package Refactor Pull Request Guide.

@anGie44 anGie44 added the enhancement Requests to existing resources that expand the functionality or scope. label Mar 25, 2022
@anGie44
Copy link
Contributor

anGie44 commented Mar 25, 2022

Hi @julienduchesne , thank you for raising this PR. Changes LGTM, only thing is we need to rebase this PR and unfortunately i do not have read/write access to the remote repo this PR was made from. To get this merged, I'm going to close this one and open a new PR with these changes.

@github-actions
Copy link

github-actions bot commented May 5, 2022

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 5, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
enhancement Requests to existing resources that expand the functionality or scope. service/lambda Issues and PRs that pertain to the lambda service. size/XS Managed by automation to categorize the size of a PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

aws_lambda_function ResourceConflictException due to a concurrent update operation
6 participants