-
Notifications
You must be signed in to change notification settings - Fork 28
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
Fixes profile merge order to match Node.js SDK #203
Merged
+228
−204
Merged
Changes from 5 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
dd43e62
added functionality to merge layers than load profile props
aadityasinha-dotcom ba35bd3
Merge branch 'main' into merge_layer
aadityasinha-dotcom e5a754f
added changelog
aadityasinha-dotcom 86538df
requirements.txt updated
aadityasinha-dotcom 268a232
Merge branch 'main' into merge_layer
aadityasinha-dotcom 45c3684
refactored the merging logic for profile properties
aadityasinha-dotcom df3ff66
Merge branch 'main' into merge_layer
aadityasinha-dotcom 3782a02
Merge branch 'main' into merge_layer
aadityasinha-dotcom 70234f0
Merge branch 'main' into merge_layer
aadityasinha-dotcom 49221bd
created copies using deepcopy before performing merge
aadityasinha-dotcom b0668ea
Merge branch 'main' into merge_layer
aadityasinha-dotcom 41bbe7e
Merge branch 'main' into merge_layer
aadityasinha-dotcom 1f4821a
WIP Update profile merging to match Node SDK
t1m0thyj 5da5f80
Merge branch 'main' into merge_layer
t1m0thyj ae02364
Fix secure property loading and update unit tests
t1m0thyj 248f6d2
Test saving profile with nested secure property
t1m0thyj 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 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
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
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
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.
I did use the
deepmerge
library so that it can merge each layer as a wholeconfig
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.
Not all config layers can be merged with the same merger function. See the Node.js SDK for how profiles of each layer should be merged: