Skip to content

refs issue:11706 Resolving the Alias value of Alias type node#618

Merged
ndeloof merged 2 commits intocompose-spec:mainfrom
arankeparth:fix_ignore_overwrite
Apr 16, 2024
Merged

refs issue:11706 Resolving the Alias value of Alias type node#618
ndeloof merged 2 commits intocompose-spec:mainfrom
arankeparth:fix_ignore_overwrite

Conversation

@arankeparth
Copy link
Copy Markdown
Contributor

Changes:

  1. If the node is of Alias kind, we need to preserve the current path and process the Alias value separately.
  2. By doing this, the !overwrite tag won't be ignored.

Testing:

  1. Created setup that mentioned on this issue: [BUG] extends with YAML merge anchors will ignore !override and !reset docker/compose#11706
  2. Results:

containers are spawned successfully:

2024-04-11 (1)

Here, we can see in the configs section for y that there is only one entry for configs

2024-04-11

@arankeparth arankeparth requested a review from ndeloof as a code owner April 11, 2024 02:28
@arankeparth arankeparth force-pushed the fix_ignore_overwrite branch from e374cdd to e40521f Compare April 11, 2024 02:30
Signed-off-by: parth aranke <arankeparth1912@gmail.com>
@arankeparth
Copy link
Copy Markdown
Contributor Author

Please review somebody

@arankeparth
Copy link
Copy Markdown
Contributor Author

@ndeloof please review.

Copy link
Copy Markdown
Collaborator

@ndeloof ndeloof left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please add a test case to demonstrate this actually fixes the merge issue?

Signed-off-by: parth aranke <arankeparth1912@gmail.com>
@arankeparth arankeparth force-pushed the fix_ignore_overwrite branch from f94bcd7 to 1e1af29 Compare April 11, 2024 11:12
@arankeparth
Copy link
Copy Markdown
Contributor Author

@ndeloof Addressed review comments and added test.

@arankeparth
Copy link
Copy Markdown
Contributor Author

@ndeloof how to get this merged?

@ndeloof
Copy link
Copy Markdown
Collaborator

ndeloof commented Apr 11, 2024

@arankeparth let's wait for a second review, then I think we can merge

@arankeparth
Copy link
Copy Markdown
Contributor Author

@glours please review.

@arankeparth
Copy link
Copy Markdown
Contributor Author

@milas can you please review this?

@arankeparth
Copy link
Copy Markdown
Contributor Author

@jhrotko @laurazard somone please review.

@ndeloof
Copy link
Copy Markdown
Collaborator

ndeloof commented Apr 12, 2024

@arankeparth please don't push pressure on the team, will be reviewed once we get bandwidth to review

@arankeparth
Copy link
Copy Markdown
Contributor Author

@arankeparth please don't push pressure on the team, will be reviewed once we get bandwidth to review

Sorry for that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants