Fix merge config file not available issue#1493
Merged
abhishekkumams merged 10 commits intomainfrom May 18, 2023
Merged
Conversation
abhishekkumams
requested review from
Aniruddh25,
JelteF,
Mathos1432,
aaronburtle,
aaronpowell,
ayush3797,
gledis69,
mbhaskar,
milismsft,
ravishetye,
seantleonard,
severussundar and
tarazou9
as code owners
abhishekkumams
changed the title
Aniruddh25
reviewed
May 16, 2023
Aniruddh25
approved these changes
May 16, 2023
Collaborator
Aniruddh25
left a comment
Aniruddh25
left a comment
There was a problem hiding this comment.
LGTM, thanks for catching this scenario!
seantleonard
previously requested changes
May 16, 2023
Contributor
seantleonard
left a comment
seantleonard
left a comment
There was a problem hiding this comment.
some considerations
severussundar
approved these changes
May 18, 2023
Contributor
severussundar
left a comment
severussundar
left a comment
There was a problem hiding this comment.
Thanks for spotting this and pushing a fix
abhishekkumams
added a commit
that referenced
this pull request
May 18, 2023
## What is the issue? - This issue occurs specifically when the environment variable is set and `environmentBasedConfigFile` is not present and the user tries to do `dab start`. It will search for the merged file and fail directly if the merged file is not present. Ideally it should not and rather look for the default file. - Even though the merging was not happening and the method `TryMergeConfigsIfAvailable` was returning false, the out file was not empty and it was containing the name of expected mergeConfigFile. ## Why make this change? - the merge config file name is generated and set as the config to be used even if the merged config file is not available. - This will make sure merge config file name is not used if it is not available ## What is this change? - Moving the line which creates the merged file name inside the validation check for existence of the base and environment config. ## How was this tested? - [x] Unit Tests
Merged
abhishekkumams
added a commit
that referenced
this pull request
May 19, 2023
## Why make this change? - To include the fix for the issue with merge config issue. #1493 - Also include the fix for broken schema links/path in test configs ## What is this change? - cherry-picking fix for bugs found in 0.7 --------- Co-authored-by: Shyam Sundar J <[email protected]>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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 is the issue?
environmentBasedConfigFileis not present and the user tries to dodab start. It will search for the merged file and fail directly if the merged file is not present. Ideally it should not and rather look for the default file.TryMergeConfigsIfAvailablewas returning false, the out file was not empty and it was containing the name of expected mergeConfigFile.Why make this change?
What is this change?
How was this tested?