-
Notifications
You must be signed in to change notification settings - Fork 1.5k
{CI} azdev_linter_style: ignore downloadUrl when comparing index.json entries #9358
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -179,8 +179,27 @@ def azdev_on_external_extension(index_json, azdev_type): | |
| with open(index_json, 'r') as fd: | ||
| current_extensions = json.loads(fd.read()).get("extensions") | ||
|
|
||
| def entry_equals_ignore_url(entry1, entry2): | ||
| """Compare two entries ignoring downloadUrl field""" | ||
| entry1_copy = entry1.copy() | ||
| entry2_copy = entry2.copy() | ||
| entry1_copy.pop('downloadUrl', None) | ||
| entry2_copy.pop('downloadUrl', None) | ||
| return entry1_copy == entry2_copy | ||
|
|
||
| for name in current_extensions: | ||
| modified_entries = [entry for entry in current_extensions[name] if entry not in public_extensions.get(name, [])] | ||
| public_entries = public_extensions.get(name, []) | ||
|
|
||
| # Find modified entries by comparing without downloadUrl | ||
| modified_entries = [] | ||
| for entry in current_extensions[name]: | ||
| is_modified = True | ||
| for public_entry in public_entries: | ||
| if entry_equals_ignore_url(entry, public_entry): | ||
| is_modified = False | ||
| break | ||
| if is_modified: | ||
| modified_entries.append(entry) | ||
|
Comment on lines
+195
to
+202
|
||
|
|
||
| if not modified_entries: | ||
| continue | ||
|
|
@@ -205,8 +224,7 @@ def azdev_on_external_extension(index_json, azdev_type): | |
| # azdev_extension.style() | ||
|
|
||
| logger.info('Checking service name for external extensions: %s', name) | ||
| if name != 'deploy-to-azure': | ||
| service_name.check() | ||
| service_name.check() | ||
|
|
||
| az_extension.remove() | ||
|
|
||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The function creates two full dictionary copies on every invocation. For deeply nested dictionaries, this could be inefficient. Consider comparing dictionaries directly by iterating over keys and comparing values, skipping only 'downloadUrl'.