cosalib/aws: only replicate WinLI AMIs when --winli is specified #4339
Conversation
The current logic always considers the `aws-winli` buildmeta key when present, which causes WinLI AMIs to be replicated in both the standard AWS and GovCloud cases. Restore `aws_run_ore_replicate`[1] to only work on the 'amis' buildmeta key and switch to aws-winli when `--winli` is used. This ensures WinLI replication happens only when explicitly requested. Also update the CLI help text for `--winli` to clarify that it applies to replication as well as creation. [1]: coreos@a5bfbde
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request correctly modifies the AWS replication logic to only replicate Windows License Included (WinLI) AMIs when the --winli flag is specified, which resolves an issue where they were always replicated if present. The logic is now cleaner and correctly tied to the command-line flag. The update to the CLI help text is also a good clarification. I've added a few minor suggestions to improve code conciseness.
| meta_key = "amis" | ||
| # only replicate WinLI AMIs if `--winli` is used | ||
| if args.winli: | ||
| meta_key = "aws-winli" |
There was a problem hiding this comment.
For better conciseness, you can use a conditional expression to assign meta_key. The comment on line 36 can then be moved to this new line as an inline comment.
| meta_key = "amis" | |
| # only replicate WinLI AMIs if `--winli` is used | |
| if args.winli: | |
| meta_key = "aws-winli" | |
| meta_key = "aws-winli" if args.winli else "amis" |
| # only replicate WinLI AMIs if `--winli` is used | ||
| if args.winli: | ||
| meta_key = "aws-winli" | ||
| if len(buildmeta.get(meta_key, [])) < 1: |
There was a problem hiding this comment.
For checking if a list is empty, you can rely on its truthiness, which is more Pythonic and concise than checking its length.
| if len(buildmeta.get(meta_key, [])) < 1: | |
| if not buildmeta.get(meta_key): |
| "skipping listed region(s)...")) | ||
|
|
||
| region_list = list(set(args.region) - set(duplicates)) | ||
| if len(region_list) == 0: |
There was a problem hiding this comment.
For checking if a list is empty, you can rely on its truthiness, which is more Pythonic and concise than checking its length.
| if len(region_list) == 0: | |
| if not region_list: |
The current logic always considers the
aws-winlibuildmeta key when present, which causes WinLI AMIs to be replicated in both the standard AWS and GovCloud cases.Restore
aws_run_ore_replicate[1]to only work on the 'amis' buildmeta key and switch to aws-winli when--winliis used. This ensures WinLI replication happens only when explicitly requested. Also update the CLI help text for--winlito clarify that it applies to replication as well as creation.[1]: a5bfbde