Use session-scoped inventory by default #55
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
Currently, Manifester syncs its inventory multiple times while generating a manifest to ensure that the inventory data matches with the corresponding data in RHSM. For some use cases, though, this behavior is not desirable. Notably, in a CI scenario in which multiple workers share the same `username_prefix` setting, syncing the inventory with RHSM prevents those workers from running `manifester delete --all` at the end of each pipeline, as this could delete allocations that are still being used by other workers. This PR addresses this issue by converting the default inventory behavior to not sync from RHSM unless a sync is explicitly invoked.
| _dump_inventory_file(inventory_path, inventory_data) | ||
| elif remove: | ||
| inv = load_inventory_file(inventory_path) | ||
| _dump_inventory_file(inventory_path, [alloc for alloc in inv if uuid not in alloc["uuid"]]) |
There was a problem hiding this comment.
The condition 'uuid not in alloc["uuid"]' should be 'uuid != alloc["uuid"]' to correctly filter out the allocation with the matching UUID.
Suggested change
| _dump_inventory_file(inventory_path, [alloc for alloc in inv if uuid not in alloc["uuid"]]) | |
| _dump_inventory_file(inventory_path, [alloc for alloc in inv if uuid != alloc["uuid"]]) |
Copilot is powered by AI, so mistakes are possible. Review output carefully before use.
JacobCallahan
requested changes
Nov 22, 2024
Comment on lines
+174
to
+185
| def _dump_inventory_file(inventory_path, inventory): | ||
| """Write inventory data to local inventory file.""" | ||
| with inventory_path.open("w") as inventory_file: | ||
| yaml.dump(inventory, inventory_file, allow_unicode=True) | ||
|
|
||
|
|
||
| def _update_inventory(inventory_path, inventory, allocation): | ||
| """Add new allocation, remove and recreate inventory file.""" | ||
| inventory.append(allocation) | ||
| inventory_path.unlink() | ||
| inventory_path.touch() | ||
| _dump_inventory_file(inventory_path, inventory) |
There was a problem hiding this comment.
could this be simplified?
Suggested change
| def _dump_inventory_file(inventory_path, inventory): | |
| """Write inventory data to local inventory file.""" | |
| with inventory_path.open("w") as inventory_file: | |
| yaml.dump(inventory, inventory_file, allow_unicode=True) | |
| def _update_inventory(inventory_path, inventory, allocation): | |
| """Add new allocation, remove and recreate inventory file.""" | |
| inventory.append(allocation) | |
| inventory_path.unlink() | |
| inventory_path.touch() | |
| _dump_inventory_file(inventory_path, inventory) | |
| def _update_inventory(inventory_path, inventory, allocation): | |
| """Add new allocation, remove and recreate inventory file.""" | |
| inventory.append(allocation) | |
| inventory_path.unlink() | |
| inventory_path.touch() | |
| yaml.dump(inventory, inventory_path, allow_unicode=True) |
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.
Currently, Manifester syncs its inventory multiple times while generating a manifest to ensure that the inventory data matches with the corresponding data in RHSM. For some use cases, though, this behavior is not desirable. Notably, in a CI scenario in which multiple workers share the same
username_prefixsetting, syncing the inventory with RHSM prevents those workers from runningmanifester delete --allat the end of each pipeline, as this could delete allocations that are still being used by other workers.This PR addresses this issue by converting the default inventory behavior to not sync from RHSM unless a sync is explicitly invoked.