Fix bootstrapping accounts in non-protected OUs only #590
Conversation
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
**Why?** While running the `adf-build/main.py` script: 1. It would get the list of accounts of this specific AWS Organization. 2. Spin up a thread for any of the non-deployment accounts. 3. In the thread, check if the account is in the root or in a protected OU. If so, it would stop the thread. If not, it would deploy the bootstrap templates. So far so good. 4. When invoking the Step Function to enable the cross-account access, it would use the list of account ids it retrieved before. However, this list is unfiltered. Therefore, the Step Function State Machine would try to enable the cross account access on accounts that were in the root and/or in protected organization units. **What?** We would only need to bootstrap accounts that are: * Active, * Not in the AWS Organization root, and * Not in an AWS Organization OU that is listed as protected. ADF should also fix the cross-account access in those accounts only. As the others don't have a bootstrap template deployed that needs to be updated any way. Thus, instead of introducing the same logic in the Step Function. This change set moved the responsibility for filtering the accounts based on their state and location in the Organizations class. Tests were added to validate that this works correctly. Additionally, fixes were introduced to reduce the line lengths where needed.
javydekoning
approved these changes
Jan 13, 2023
StewartW
approved these changes
Jan 18, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Why?
While running the
adf-build/main.pyscript:Therefore, the Step Function State Machine would try to enable the cross account access on accounts that were in the root and/or in protected organization units.
What?
We would only need to bootstrap accounts that are:
ADF should also fix the cross-account access in those accounts only. As the others don't have a bootstrap template deployed that needs to be updated any way.
Thus, instead of introducing the same logic in the Step Function. This change set moved the responsibility for filtering the accounts based on their state and location in the Organizations class.
Tests were added to validate that this works correctly.
Additionally, fixes were introduced to reduce the line lengths where needed.
By submitting this pull request, I confirm that you can use, modify, copy, and
redistribute this contribution, under the terms of your choice.