combine - merge two identical vars when list_merge=append or list_merge=prepend#79312
Closed
R37ribution wants to merge 3 commits into
Closed
combine - merge two identical vars when list_merge=append or list_merge=prepend#79312R37ribution wants to merge 3 commits into
R37ribution wants to merge 3 commits into
Conversation
ansibot
added
affects_2.15
bug
bcoca
requested changes
Nov 4, 2022
Member
There was a problem hiding this comment.
tests and changelog? https://docs.ansible.com/ansible/latest/community/contributions.html
ansibot
added
the
needs_revision
ansibot
added
the
WIP
R37ribution
added a commit
to R37ribution/ansible
that referenced
this pull request
Nov 4, 2022
…when-vars-are-equal.yml - add changelog fragment for PR ansible#79312
R37ribution
added a commit
to R37ribution/ansible
that referenced
this pull request
Nov 4, 2022
…when-vars-are-equal.yml - add changelog fragment for PR ansible#79312
R37ribution
force-pushed
the
R37ribution/issue-79293
branch
from
d8d1573 to
70bf94b
Compare
Author
@bcoca I believe I have resolved your concerns. Can you have another look? Thanks, Aaron |
ansibot
removed
the
WIP
bcoca
reviewed
Nov 8, 2022
| # (this `if` can be remove without impact on the function | ||
| # except performance) | ||
| if x == {} or x == y: | ||
| if x == {} or (x == y and list_merge != 'append' and list_merge != 'prepend'): |
Member
There was a problem hiding this comment.
list_merge not in ('append', 'prepend')
Member
There was a problem hiding this comment.
can you also add a test to prevent regressions?
Author
There was a problem hiding this comment.
I thought you might ask about not in - I'll get it added.
Author
There was a problem hiding this comment.
Hey @bcoca, I made the code change. As far as the test goes, I'll need to dig into that as I'm not familiar with the creation of tests yet in this repo.
Author
There was a problem hiding this comment.
can you also add a test to prevent regressions?
@bcoca Do you have any guides on how to create regression tests?
bcoca
requested changes
Nov 8, 2022
| # (this `if` can be remove without impact on the function | ||
| # except performance) | ||
| if x == {} or x == y: | ||
| if x == {} or (x == y and list_merge != 'append' and list_merge != 'prepend'): |
Member
There was a problem hiding this comment.
can you also add a test to prevent regressions?
Member
|
note: not for this PR, but perpend_unique/append_unique might be worth adding to keep the case in which the preexisting behavior is desired. |
ansibot
added
needs_revision
ansibot
added
stale_ci
ansibot
removed
needs_revision
ansibot
added
the
stale_review
R37ribution
force-pushed
the
R37ribution/issue-79293
branch
from
6401f65 to
f7d8137
Compare
ansibot
removed
ci_verified
R37ribution
force-pushed
the
R37ribution/issue-79293
branch
2 times, most recently
from
f7d8137 to
016f134
Compare
R37ribution
added a commit
to R37ribution/ansible
that referenced
this pull request
Jul 18, 2024
…when-vars-are-equal.yml - add changelog fragment for PR ansible#79312
Author
@webknjaz I have rebased with ... |
Author
@bcoca I have ran the following tests according to the guide...
|
Member
|
FTR the VyOS failure is unrelated. |
Member
|
This needs to be rebased to unblock the CI. |
…when-vars-are-equal.yml - add changelog fragment for PR ansible#79312
R37ribution
force-pushed
the
R37ribution/issue-79293
branch
from
016f134 to
c1219c9
Compare
ansibot
removed
the
needs_revision
This comment was marked as abuse.
This comment was marked as abuse.
Author
done! |
Author
|
The last piece to getting this completed AFAIK is getting the regression test in place that @bcoca requested. If someone has a guide or even an example of a similar regression test, I can get that implemented in this PR. |
ansibot
added
the
stale_ci
ansibot
added
the
stale_pr
Member
diff --git a/test/integration/targets/filter_core/tasks/main.yml b/test/integration/targe
ts/filter_core/tasks/main.yml
index 4f538cf12ca..b2d6f25714e 100644
--- a/test/integration/targets/filter_core/tasks/main.yml
+++ b/test/integration/targets/filter_core/tasks/main.yml
@@ -209,6 +209,16 @@
- "'aHR0cHM6Ly93d3cucHl0aG9uLm9yZy9leGFtcGxlLTE=' | b64decode(urlsafe=True) == 'http
s://www.python.org/example-1'"
- set_fact:
+ foo_data:
+ profile_list:
+ - "test"
+ bar_data:
+ profile_list:
+ - "test"
+ result_data:
+ profile_list:
+ - "test"
+ - "test"
x:
x: x
key: x
@@ -271,6 +281,8 @@
- name: Verify combine filter
assert:
that:
+ - "foo_data | combine(bar_data, list_merge='append') == result_data"
+ - "foo_data | combine(bar_data, list_merge='prepend') == result_data"
- "([x] | combine) == x" |
Akasurde
added
the
needs_info
Akasurde
reviewed
Feb 19, 2026
| @@ -0,0 +1,2 @@ | |||
| bugfixes: | |||
| - combine - ``combine()`` filter did not merge two identical vars when using options ``list_merge='append'`` or ``list_merge='prepend'``. fix for ``def merge_hash`` function, defined in ``lib/ansible/utils/vars.py`` which is used by ``combine()``, to now append / prepend when merging vars which are equal (https://github.com/ansible/ansible/issues/79293). | |||
Member
There was a problem hiding this comment.
Suggested change
| - combine - ``combine()`` filter did not merge two identical vars when using options ``list_merge='append'`` or ``list_merge='prepend'``. fix for ``def merge_hash`` function, defined in ``lib/ansible/utils/vars.py`` which is used by ``combine()``, to now append / prepend when merging vars which are equal (https://github.com/ansible/ansible/issues/79293). | |
| - filters - merge two identical vars when using ``combine`` options ``list_merge='append'`` or ``list_merge='prepend'`` (https://github.com/ansible/ansible/issues/79293). |
Akasurde
changed the title
Contributor
|
@R37ribution This PR is waiting for your response. Please respond or the PR will be closed. |
Contributor
|
@R37ribution You have not responded to information requests in this PR so we will assume it no longer affects you. If you are still interested in this, please create a new PR with the requested information. |
Author
|
Can someone help with reopening this? I'll get the tests that @Akasurde provided examples of integrated into the PR next week. I would rather not open a new PR and loose the history in this one. |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 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.
SUMMARY
Resolves #79293
ISSUE TYPE
COMPONENT NAME
resolves
combine()filter plugin not appending / prepending properly when the two vars to be combined are equalADDITIONAL INFORMATION
test.yaml playbook used to reproduce issue
Before change:
After change: