fix: resolve Service Catalog portfolio sharing race condition#914
Open
jtaylortech wants to merge 1 commit intoawslabs:release/v1.13.1from
Open
fix: resolve Service Catalog portfolio sharing race condition#914jtaylortech wants to merge 1 commit intoawslabs:release/v1.13.1from
jtaylortech wants to merge 1 commit intoawslabs:release/v1.13.1from
Conversation
Fix InvalidStateException errors when sharing portfolios with multiple organizational units by implementing two complementary solutions: 1. Sequential Processing: Add CDK resource dependencies to ensure portfolio shares are created one at a time, preventing concurrent operations that trigger InvalidStateException. 2. Retry Logic: Implement exponential backoff retry mechanism for InvalidStateException in create/update/delete operations, providing resilience if race conditions still occur. These changes replace the unreliable random delay approach with proper error handling and resource orchestration, ensuring portfolio shares are created reliably even when targeting multiple OUs. Fixes awslabs#601
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue, #601
This PR fixes the InvalidStateException errors that occur when sharing Service Catalog portfolios with multiple organizational units.
Problem:
The existing implementation uses a random delay to prevent concurrent portfolio share operations, which is unreliable and still results in failures when multiple OUs are targeted. When failures occur, the lambda returns SUCCESS to CloudFormation despite the error, causing silent failures.
Solution:
This PR implements two complementary approaches as suggested in the issue:
Sequential Processing via CDK Dependencies:
share-portfolio-with-org.tsto add CloudFormation dependencies between portfolio share resourcesRetry Logic for InvalidStateException:
createPortfolioShare(),updatePortfolioShare(), anddeletePortfolioShare()functionsInvalidStateExceptionand retries with increasing delays (2s, 4s, 8s, 10s, 10s)Changes:
share-portfolio-with-org.ts: Added resource dependencies to enforce sequential creationshare-portfolio-with-org/index.ts:Testing:
Benefits:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.