Fixes profile merge order to match Node.js SDK #203
Merged
Conversation
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
Signed-off-by: aadityasinha-dotcom <[email protected]>
Signed-off-by: aadityasinha-dotcom <[email protected]>
Signed-off-by: aadityasinha-dotcom <[email protected]>
Signed-off-by: Aaditya Sinha <[email protected]>
Codecov ReportAttention:
... and 1 file with indirect coverage changes 📢 Thoughts on this report? Let us know!. |
| for i, (config_type, cfg) in enumerate(config_layers.items()): | ||
| loaded_cfg = always_merger.merge(loaded_cfg, cfg.profiles) |
There was a problem hiding this comment.
I did use the deepmerge library so that it can merge each layer as a whole config
There was a problem hiding this comment.
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:
- Project and Project User are deep merged into a temporary Project Merged layer
- Global and Global User are deep merged into a temporary Global Merged layer
- Add profiles to Project Merged layer which are only present in Global Merged layer
t1m0thyj
previously requested changes
Aug 10, 2023
| for i, (config_type, cfg) in enumerate(config_layers.items()): | ||
| loaded_cfg = always_merger.merge(loaded_cfg, cfg.profiles) |
There was a problem hiding this comment.
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:
- Project and Project User are deep merged into a temporary Project Merged layer
- Global and Global User are deep merged into a temporary Global Merged layer
- Add profiles to Project Merged layer which are only present in Global Merged layer
Signed-off-by: aadityasinha-dotcom <[email protected]>
Signed-off-by: Aaditya Sinha <[email protected]>
t1m0thyj
reviewed
Aug 31, 2023
Signed-off-by: Aaditya Sinha <[email protected]>
Signed-off-by: aadityasinha-dotcom <[email protected]>
Signed-off-by: Aaditya Sinha <[email protected]>
|
@t1m0thyj please review this PR |
Comment on lines
289
to
299
| # Creating copies of the usrProject and project objects | ||
| usrProjectCopy = deepcopy(usrProject) | ||
| projectCopy = deepcopy(project) | ||
| prjt = always_merger.merge(usrProject, project) | ||
|
|
||
| usrGlobal = self.global_user_config.profiles | ||
| glbal = self.global_config.profiles | ||
|
|
||
| # Creating copies of the usrGlobal and glbal objects | ||
| usrGlobalCopy = deepcopy(usrGlobal) | ||
| glbalCopy = deepcopy(glbal) |
There was a problem hiding this comment.
I have created the copies using deepcopy for the objects before getting merged
Signed-off-by: Aaditya Sinha <[email protected]>
Signed-off-by: Timothy Johnson <[email protected]>
Signed-off-by: Timothy Johnson <[email protected]>
Signed-off-by: Timothy Johnson <[email protected]>
Signed-off-by: Timothy Johnson <[email protected]>
zFernand0
approved these changes
Sep 29, 2023
traeok
approved these changes
Oct 2, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What It Does
Resolves #190
How to Test
Review Checklist
I certify that I have:
Additional Comments