Fix --diff to produce output when creating a new file #57744
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
ansibot
added
affects_2.9
s-hertel
approved these changes
Jun 12, 2019
bcoca
reviewed
Jun 12, 2019
| @@ -1104,7 +1104,7 @@ def _get_diff_data(self, destination, source, task_vars, source_file=True): | |||
|
|
|||
| if not peek_result.get('failed', False) or peek_result.get('rc', 0) == 0: | |||
|
|
|||
| if peek_result.get('state') == 'absent': | |||
| if peek_result.get('state') is None: | |||
There was a problem hiding this comment.
i would do both in ('absent', None) as there are cases in which 'absent' would be a correct return.
There was a problem hiding this comment.
I don't think there are. peek_result is a result of the file module being executed with _diff_peek=True which just checks if the file is binary and calls exit_json. From there add_path_info is only method that modifies state in the result and no longer sets absent.
Having said that doing in ('absent', None) might be more defensive, so I'd be +1 for that.
There was a problem hiding this comment.
you also have to take into account actions that have 'remote_src=true' as they might not rely on peek
ansibot
removed
the
needs_triage
mkrizek
added a commit
to mkrizek/ansible
that referenced
this pull request
Jun 12, 2019
* Fix --diff to produce output when creating a new file Fixes ansible#57618 * Make the check more defensive (cherry picked from commit 1fa7bfc)
abadger
pushed a commit
that referenced
this pull request
Jun 15, 2019
agowa
pushed a commit
to agowa/ansible-1
that referenced
this pull request
Jun 30, 2019
* Fix --diff to produce output when creating a new file Fixes ansible#57618 * Make the check more defensive
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
#51350 removed apending
state: absentfor missing files in the module's result. However_get_diff_datamethod was specifically checking forabsentin the result. This changes that to check for missingstatekey instead.This needs to be backported to
2.8if merged.Fixes #57618
ISSUE TYPE
COMPONENT NAME
lib/ansible/plugins/action/__init__.py