Feature/organization caching #789
Open
Conversation
This file contains 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
sbkok
requested changes
Feb 28, 2025
Comment on lines
+73
to
+76
| if cache is not None: | ||
| self.cache = cache | ||
| else: | ||
| self.cache = Cache() |
There was a problem hiding this comment.
Suggested change
| if cache is not None: | |
| self.cache = cache | |
| else: | |
| self.cache = Cache() | |
| self.cache = cache or Cache() |
| @@ -256,14 +256,14 @@ def worker_thread( | |||
|
|
|||
| organizations = Organizations( | |||
| role=boto3, | |||
| account_id=account_id | |||
| account_id=account_id, | |||
| cache=cache | |||
There was a problem hiding this comment.
Suggested change
| cache=cache | |
| cache=cache, |
| self.account_id = account_id | ||
| self.root_id = None |
There was a problem hiding this comment.
For those who wonder, this wasn't used externally, hence we agreed to refactor it.
| return organizational_units | ||
|
|
||
| def list_organizational_units_for_parent(self, parent_ou): | ||
| print(f'looking for children in {parent_ou}') |
There was a problem hiding this comment.
Suggested change
| print(f'looking for children in {parent_ou}') | |
| LOGGER.debug(f'Looking for children in {parent_ou}') |
| current.get("Id"), | ||
| self.describe_ou_name(current.get("Id")), | ||
| ) | ||
| ou_name = cache.get(current.get("Id")) | ||
| ou_name = self.cache.get(current.get("Id")) |
There was a problem hiding this comment.
We don't need to cache this at this layer anymore, as you added caching in the describe_ou_name function 👍
Hence, this would suffice:
Suggested change
| ou_name = self.cache.get(current.get("Id")) | |
| ou_name = self.describe_ou_name(current.get("Id")) |
Comment on lines
+429
to
433
| if not self.cache.exists(current.get("Id")): | ||
| self.cache.add( | ||
| current.get("Id"), | ||
| self.describe_ou_name(current.get("Id")), | ||
| ) |
There was a problem hiding this comment.
This is not required, see next comment.
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.
Why?
With version 4.0, we noticed an increase in the number of Organizations API Calls that are performed during account management and bootstrap, leading to errors or longer execution times.
*Issue #788, #784, #781
What?
Description of changes:
Now Organizations class always use the Cache object, even when it's not passed to the constructor. If passed in the constructor, allow the user of the class to share the same cache with different instances of Organizations. This happens for example in the bootstrap pipeline, where a worker thread for each account is created.
The following methods now make use of Cache:
By submitting this pull request, I confirm that you can use, modify, copy, and
redistribute this contribution, under the terms of your choice.