Skip to content
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

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

Merged
merged 2 commits into from Apr 16, 2024

Conversation

arankeparth
Copy link
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

Signed-off-by: parth aranke <arankeparth1912@gmail.com>
@arankeparth
Copy link
Contributor Author

Please review somebody

@arankeparth
Copy link
Contributor Author

@ndeloof please review.

Copy link
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?

loader/reset.go Outdated Show resolved Hide resolved
loader/reset.go Outdated Show resolved Hide resolved
loader/reset.go Outdated Show resolved Hide resolved
Signed-off-by: parth aranke <arankeparth1912@gmail.com>
@arankeparth
Copy link
Contributor Author

@ndeloof Addressed review comments and added test.

@arankeparth
Copy link
Contributor Author

@ndeloof how to get this merged?

@ndeloof
Copy link
Collaborator

ndeloof commented Apr 11, 2024

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

@arankeparth
Copy link
Contributor Author

@glours please review.

@arankeparth
Copy link
Contributor Author

@milas can you please review this?

@arankeparth
Copy link
Contributor Author

@jhrotko @laurazard somone please review.

@ndeloof
Copy link
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
Contributor Author

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

Sorry for that.

@ndeloof ndeloof merged commit 5422e49 into compose-spec:main Apr 16, 2024
8 checks passed
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.

None yet

3 participants