-
Notifications
You must be signed in to change notification settings - Fork 61
fix: prevent atom exhaustion in merge_projects mix task
#3973
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 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
f08d69e
fix: prevent atom exhaustion in merge_projects mix task
elias-ba eca8f3f
refactor: remove unnecessary comments
elias-ba d28fe5e
test: remove unreliable security test
elias-ba 172e011
refactor: simplify atomize_keys with inline conditional
elias-ba 3206067
fix: complete atom exhaustion protection in merge_projects task
elias-ba 8406705
Merge branch 'main' into 3615-fix-atom-exhaustion
elias-ba 82af592
refactor: remove duplicate merge test
elias-ba 655c8fc
refactor: clarify test name for standalone execution
elias-ba 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 |
|---|---|---|
|
|
@@ -89,30 +89,34 @@ defmodule Mix.Tasks.Lightning.MergeProjects do | |
| write_output(output, output_path) | ||
| end | ||
|
|
||
| defp perform_merge(source_project, target_project) do | ||
| defp perform_merge(source_data, target_data) do | ||
| source_project = atomize_keys(source_data) | ||
| target_project = atomize_keys(target_data) | ||
|
|
||
| MergeProjects.merge_project(source_project, target_project) | ||
| rescue | ||
| e in KeyError -> | ||
| ArgumentError -> | ||
rorymckinley marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| Mix.raise(""" | ||
| Failed to merge projects - missing required field: #{inspect(e.key)} | ||
|
|
||
| #{Exception.message(e)} | ||
| Failed to merge projects - encountered unknown field in JSON | ||
|
|
||
| This may indicate incompatible or corrupted project state files. | ||
| Please verify both files are valid Lightning project exports. | ||
| This may indicate the JSON contains invalid or unexpected fields. | ||
| Please ensure both files are valid Lightning project exports. | ||
| """) | ||
| end | ||
|
|
||
| e -> | ||
| Mix.raise(""" | ||
| Failed to merge projects | ||
|
|
||
| #{Exception.message(e)} | ||
| defp atomize_keys(data) when is_map(data) do | ||
| Map.new(data, fn {key, value} -> | ||
| atom_key = if is_binary(key), do: String.to_existing_atom(key), else: key | ||
rorymckinley marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| {atom_key, atomize_keys(value)} | ||
rorymckinley marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| end) | ||
| end | ||
|
|
||
| This may indicate incompatible project structures or corrupted data. | ||
| Please verify both files are valid Lightning project exports. | ||
| """) | ||
| defp atomize_keys(data) when is_list(data) do | ||
|
||
| Enum.map(data, &atomize_keys/1) | ||
| end | ||
|
|
||
| defp atomize_keys(data), do: data | ||
|
|
||
| defp encode_json(project) do | ||
| Jason.encode!(project, pretty: true) | ||
| rescue | ||
|
|
||
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
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.
Uh oh!
There was an error while loading. Please reload this page.