Fix the module redirect_list for action plugins #73864
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
WIP
s-hertel
removed
the
needs_triage
s-hertel
force-pushed
the
fix_action_plugin_module_defaults
branch
from
2dedc67
to
63a4ea1
Compare
s-hertel
changed the title
ansibot
added
needs_revision
s-hertel
force-pushed
the
fix_action_plugin_module_defaults
branch
from
d1c4f3f
to
6d8c08b
Compare
This comment has been minimized.
This comment has been minimized.
ansibot
added
needs_revision
s-hertel
force-pushed
the
fix_action_plugin_module_defaults
branch
from
6d8c08b
to
4261a5a
Compare
ansibot
added
core_review
ansibot
added
stale_ci
Fix using unqualified names for facts module in module_defaults
s-hertel
force-pushed
the
fix_action_plugin_module_defaults
branch
from
4261a5a
to
ddcec0f
Compare
ansibot
added
the
needs_revision
nitzmahone
requested changes
May 26, 2021
| @@ -41,7 +41,16 @@ def _get_module_args(self, fact_module, task_vars): | |||
| mod_args = dict((k, v) for k, v in mod_args.items() if v is not None) | |||
|
|
|||
| # handle module defaults | |||
| mod_args = get_action_args_with_defaults(fact_module, mod_args, self._task.module_defaults, self._templar, self._task._ansible_internal_redirect_list) | |||
| if fact_module == 'ansible.legacy.setup' and self._use_setup_defaults: | |||
There was a problem hiding this comment.
I think probably all the changes to the actions can go away if you were to change get_action_args_with_defaults to say:
- if
actionis prefixed withansible.legacy.and the sameansible.legacy-prefixed action appears in the redirect list, remove the prefix from both places before looping over to apply module_defautls
ansibot
added
needs_ci
s-hertel
force-pushed
the
fix_action_plugin_module_defaults
branch
from
5886120
to
7d70f08
Compare
… fully qualified ansible.legacy actions ci_complete
s-hertel
force-pushed
the
fix_action_plugin_module_defaults
branch
from
7d70f08
to
f3ec6bd
Compare
ansibot
added
needs_revision
nitzmahone
approved these changes
May 27, 2021
ansibot
added
core_review
ansibot
added
needs_revision
|
Thanks for the reviews! |
s-hertel
added a commit
to s-hertel/ansible
that referenced
this pull request
May 27, 2021
…ansible#73864) * Fix module-specific defaults in the gather_facts, package, and service action plugins. * Handle ansible.legacy actions better in get_action_args_with_defaults * Add tests for each action plugin * Changelog Fixes ansible#72918 (cherry picked from commit 5640093)
s-hertel
added a commit
to s-hertel/ansible
that referenced
this pull request
May 27, 2021
…ansible#73864) * Fix module-specific defaults in the gather_facts, package, and service action plugins. * Handle ansible.legacy actions better in get_action_args_with_defaults * Add tests for each action plugin * Changelog Fixes ansible#72918 (cherry picked from commit 5640093)
This was referenced May 27, 2021
tsabirgaliev
added a commit
to tsabirgaliev/kubespray
that referenced
this pull request
May 30, 2021
revert after these patches are shipped in ansible releases: ansible/ansible#73864 ansible/ansible#74850 ansible/ansible#74849
relrod
pushed a commit
that referenced
this pull request
Jun 14, 2021
…74850) * Use the module redirect_list when getting defaults for action plugins (#73864) * Fix module-specific defaults in the gather_facts, package, and service action plugins. * Handle ansible.legacy actions better in get_action_args_with_defaults * Add tests for each action plugin * Changelog Fixes #72918 (cherry picked from commit 5640093) * Fix tests for < 3.8 (cherry picked from commit 267b721)
relrod
pushed a commit
that referenced
this pull request
Jun 14, 2021
…74849) * Use the module redirect_list when getting defaults for action plugins (#73864) * Fix module-specific defaults in the gather_facts, package, and service action plugins. * Handle ansible.legacy actions better in get_action_args_with_defaults * Add tests for each action plugin * Changelog Fixes #72918 (cherry picked from commit 5640093) * Fix tests for < 3.8
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
Fixes #72918
Might separate gather_facts into its own PR or move it to #73863 as it's kind of broken anyway and I'm not sure it should be backported. Fixing it will probably be kind of be featureish for the other action plugins so I'm not sure if that should be backported either. This still needs tests and changelog.I fixed gather_facts without adding anything new by just checking if the source of the value was 'default'.
ISSUE TYPE
COMPONENT NAME
gather_facts
package
service