Added improved merging of staging dicts #692
Merged
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.
Added
deepmerge
as a dependency, wrote a custom merge strategy which merges dicts and overrides lists, and replaced_local_data | self._staging
with the deep merge.Chose to override lists as the deduplication for alerts and tags is handled by the run, so dont need to append them. Also decided with Andrew that for metadata it would be better to overwrite, eg:
Should return
{"test": [3,4]}
, not{"test": [1,2,3,4]}
Closes #691