ansible-core 2.19.3rc1__py3-none-any.whl → 2.20.0b2__py3-none-any.whl

ansible/playbook/taggable.py

@@ -19,11 +19,14 @@ from __future__ import annotations
 
 import typing as t
 
+from ansible._internal._templating._engine import TemplateEngine
 from ansible.errors import AnsibleError
 from ansible.module_utils.common.sentinel import Sentinel
 from ansible.module_utils._internal._datatag import AnsibleTagHelper
 from ansible.playbook.attribute import FieldAttribute
-from ansible._internal._templating._engine import TemplateEngine
+from ansible.utils.display import Display
+
+_display = Display()
 
 
 def _flatten_tags(tags: list[str | int]) -> list[str | int]:
@@ -38,17 +41,25 @@ def _flatten_tags(tags: list[str | int]) -> list[str | int]:
 
 class Taggable:
 
+    _RESERVED = frozenset(['tagged', 'all', 'untagged'])
     untagged = frozenset(['untagged'])
     tags = FieldAttribute(isa='list', default=list, listof=(str, int), extend=True)
 
     def _load_tags(self, attr, ds):
+
+        tags = None
         if isinstance(ds, list):
-            return ds
+            tags = ds
+        elif isinstance(ds, str):
+            tags = [AnsibleTagHelper.tag_copy(ds, item.strip()) for item in ds.split(',')]
+
+        if tags is None:
+            raise AnsibleError('tags must be specified as a list', obj=ds)
 
-        if isinstance(ds, str):
-            return [AnsibleTagHelper.tag_copy(ds, item.strip()) for item in ds.split(',')]
+        if found := self._RESERVED.intersection(tags):
+            _display.warning(f"Found reserved tagnames in tags: {list(found)!r}, we do not recommend doing this as it might give unexpected results", obj=ds)
 
-        raise AnsibleError('tags must be specified as a list', obj=ds)
+        return tags
 
     def _get_all_taggable_objects(self) -> t.Iterable[Taggable]:
         obj = self

ansible/playbook/task.py

@@ -25,7 +25,6 @@ from ansible.errors import AnsibleError, AnsibleParserError, AnsibleUndefinedVar
 from ansible.executor.module_common import _get_action_arg_defaults
 from ansible.module_utils.common.text.converters import to_native
 from ansible.module_utils._internal._datatag import AnsibleTagHelper
-from ansible.module_utils.six import string_types
 from ansible.parsing.mod_args import ModuleArgsParser, RAW_PARAM_MODULES
 from ansible.plugins.action import ActionBase
 from ansible.plugins.loader import action_loader, module_loader, lookup_loader
@@ -37,11 +36,10 @@ from ansible.playbook.conditional import Conditional
 from ansible.playbook.delegatable import Delegatable
 from ansible.playbook.loop_control import LoopControl
 from ansible.playbook.notifiable import Notifiable
-from ansible.playbook.role import Role
 from ansible.playbook.taggable import Taggable
 from ansible._internal import _task
 from ansible._internal._templating import _marker_behaviors
-from ansible._internal._templating._jinja_bits import is_possibly_all_template
+from ansible._internal._templating._jinja_bits import is_possibly_all_template, is_possibly_template
 from ansible._internal._templating._engine import TemplateEngine, TemplateOptions
 from ansible.utils.collection_loader import AnsibleCollectionConfig
 from ansible.utils.display import Display
@@ -101,7 +99,7 @@ class Task(Base, Conditional, Taggable, CollectionSearch, Notifiable, Delegatabl
         self._role = role
         self._parent = None
         self.implicit = False
-        self.resolved_action: str | None = None
+        self._resolved_action: str | None = None
 
         if task_include:
             self._parent = task_include
@@ -110,6 +108,38 @@ class Task(Base, Conditional, Taggable, CollectionSearch, Notifiable, Delegatabl
 
         super(Task, self).__init__()
 
+    _resolved_action_warning = (
+        "A plugin is sampling the task's resolved_action when it is not resolved. "
+        "This can be caused by callback plugins using the resolved_action attribute too "
+        "early (such as in v2_playbook_on_task_start for a task using the action/local_action "
+        "keyword), or too late (such as in v2_runner_on_ok for a task with a loop). "
+        "To maximize compatibility with user features, callback plugins should "
+        "only use this attribute in v2_runner_on_ok/v2_runner_on_failed for tasks "
+        "without a loop, and v2_runner_item_on_ok/v2_runner_item_on_failed otherwise."
+    )
+
+    @property
+    def resolved_action(self) -> str | None:
+        """The templated and resolved FQCN of the task action or None.
+
+        If the action is a template, callback plugins can only use this value in certain methods.
+        - v2_runner_on_ok and v2_runner_on_failed if there's no task loop
+        - v2_runner_item_on_ok and v2_runner_item_on_failed if there is a task loop
+        """
+        # Consider deprecating this because it's difficult to use?
+        # Moving it to the task result would improve the no-loop limitation on v2_runner_on_ok
+        # but then wouldn't be accessible to v2_playbook_on_task_start, *_on_skipped, etc.
+        if self._resolved_action is not None:
+            return self._resolved_action
+        if not is_possibly_template(self.action):
+            try:
+                return self._resolve_action(self.action)
+            except AnsibleParserError:
+                display.warning(self._resolved_action_warning, obj=self.action)
+        else:
+            display.warning(self._resolved_action_warning, obj=self.action)
+        return None
+
     def get_name(self, include_role_fqcn=True):
         """ return the name of the task """
 
@@ -129,7 +159,7 @@ class Task(Base, Conditional, Taggable, CollectionSearch, Notifiable, Delegatabl
     def _merge_kv(self, ds):
         if ds is None:
             return ""
-        elif isinstance(ds, string_types):
+        elif isinstance(ds, str):
             return ds
         elif isinstance(ds, dict):
             buf = ""
@@ -168,7 +198,7 @@ class Task(Base, Conditional, Taggable, CollectionSearch, Notifiable, Delegatabl
         else:
             module_or_action_context = action_context.plugin_load_context
 
-        self.resolved_action = module_or_action_context.resolved_fqcn
+        self._resolved_action = module_or_action_context.resolved_fqcn
 
         action_type: type[ActionBase] = action_context.object
 
@@ -282,6 +312,9 @@ class Task(Base, Conditional, Taggable, CollectionSearch, Notifiable, Delegatabl
             # But if it wasn't, we can add the yaml object now to get more detail
             raise AnsibleParserError("Error parsing task arguments.", obj=ds) from ex
 
+        if args_parser._resolved_action is not None:
+            self._resolved_action = args_parser._resolved_action
+
         new_ds['action'] = action
         new_ds['args'] = args
         new_ds['delegate_to'] = delegate_to
@@ -465,58 +498,11 @@ class Task(Base, Conditional, Taggable, CollectionSearch, Notifiable, Delegatabl
             new_me._role = self._role
 
         new_me.implicit = self.implicit
-        new_me.resolved_action = self.resolved_action
+        new_me._resolved_action = self._resolved_action
         new_me._uuid = self._uuid
 
         return new_me
 
-    def serialize(self):
-        data = super(Task, self).serialize()
-
-        if not self._squashed and not self._finalized:
-            if self._parent:
-                data['parent'] = self._parent.serialize()
-                data['parent_type'] = self._parent.__class__.__name__
-
-            if self._role:
-                data['role'] = self._role.serialize()
-
-            data['implicit'] = self.implicit
-            data['resolved_action'] = self.resolved_action
-
-        return data
-
-    def deserialize(self, data):
-
-        # import is here to avoid import loops
-        from ansible.playbook.task_include import TaskInclude
-        from ansible.playbook.handler_task_include import HandlerTaskInclude
-
-        parent_data = data.get('parent', None)
-        if parent_data:
-            parent_type = data.get('parent_type')
-            if parent_type == 'Block':
-                p = Block()
-            elif parent_type == 'TaskInclude':
-                p = TaskInclude()
-            elif parent_type == 'HandlerTaskInclude':
-                p = HandlerTaskInclude()
-            p.deserialize(parent_data)
-            self._parent = p
-            del data['parent']
-
-        role_data = data.get('role')
-        if role_data:
-            r = Role()
-            r.deserialize(role_data)
-            self._role = r
-            del data['role']
-
-        self.implicit = data.get('implicit', False)
-        self.resolved_action = data.get('resolved_action')
-
-        super(Task, self).deserialize(data)
-
     def set_loader(self, loader):
         """
         Sets the loader on this object and recursively on parent, child objects.
@@ -591,9 +577,19 @@ class Task(Base, Conditional, Taggable, CollectionSearch, Notifiable, Delegatabl
     def dump_attrs(self):
         """Override to smuggle important non-FieldAttribute values back to the controller."""
         attrs = super().dump_attrs()
-        attrs.update(resolved_action=self.resolved_action)
+        attrs.update(_resolved_action=self._resolved_action)
         return attrs
 
+    def from_attrs(self, attrs):
+        super().from_attrs(attrs)
+
+        # from_attrs is only used to create a finalized task
+        # from attrs from the Worker/TaskExecutor
+        # Those attrs are finalized and squashed in the TE
+        # and controller side use needs to reflect that
+        self._finalized = True
+        self._squashed = True
+
     def _resolve_conditional(
         self,
         conditional: list[str | bool],

ansible/plugins/action/__init__.py

@@ -29,7 +29,6 @@ from ansible.module_utils.common.arg_spec import ArgumentSpecValidator
 from ansible.module_utils.errors import UnsupportedError
 from ansible.module_utils.json_utils import _filter_non_json_lines
 from ansible.module_utils.common.json import Direction, get_module_encoder, get_module_decoder
-from ansible.module_utils.six import binary_type, string_types, text_type
 from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
 from ansible.release import __version__
 from ansible.utils.collection_loader import resource_from_fqcr
@@ -52,7 +51,7 @@ if t.TYPE_CHECKING:
 
 
 def _validate_utf8_json(d):
-    if isinstance(d, text_type):
+    if isinstance(d, str):
         # Purposefully not using to_bytes here for performance reasons
         d.encode(encoding='utf-8', errors='strict')
     elif isinstance(d, dict):
@@ -288,14 +287,6 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
                 elif leaf_module_name == 'async_status' and collection_name in rewrite_collection_names:
                     module_name = '%s.%s' % (win_collection, leaf_module_name)
 
-                # TODO: move this tweak down to the modules, not extensible here
-                # Remove extra quotes surrounding path parameters before sending to module.
-                if leaf_module_name in ['win_stat', 'win_file', 'win_copy', 'slurp'] and module_args and \
-                        hasattr(self._connection._shell, '_unquote'):
-                    for key in ('src', 'dest', 'path'):
-                        if key in module_args:
-                            module_args[key] = self._connection._shell._unquote(module_args[key])
-
             result = self._shared_loader_obj.module_loader.find_plugin_with_context(module_name, mod_type, collection_list=self._task.collections)
 
             if not result.resolved:
@@ -680,8 +671,18 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
             become_user,
             setfacl_mode)
 
-        if res['rc'] == 0:
-            return remote_paths
+        match res.get('rc'):
+            case 0:
+                return remote_paths
+            case 2:
+                # invalid syntax (for example, missing user, missing colon)
+                self._display.debug(f"setfacl command failed with an invalid syntax. Trying chmod instead. Err: {res!r}")
+            case 127:
+                # setfacl binary does not exists or we don't have permission to use it.
+                self._display.debug(f"setfacl binary does not exist or does not have permission to use it. Trying chmod instead. Err: {res!r}")
+            case _:
+                # generic debug message
+                self._display.debug(f'Failed to set facl {setfacl_mode}, got:{res!r}')
 
         # Step 3b: Set execute if we need to. We do this before anything else
         # because some of the methods below might work but not let us set
@@ -874,7 +875,7 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
         # happens sometimes when it is a dir and not on bsd
         if 'checksum' not in mystat['stat']:
             mystat['stat']['checksum'] = ''
-        elif not isinstance(mystat['stat']['checksum'], string_types):
+        elif not isinstance(mystat['stat']['checksum'], str):
             raise AnsibleError("Invalid checksum returned by stat: expected a string type but got %s" % type(mystat['stat']['checksum']))
 
         return mystat['stat']
@@ -1084,7 +1085,7 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
                 # the remote system, which can be read and parsed by the module
                 args_data = ""
                 for k, v in module_args.items():
-                    args_data += '%s=%s ' % (k, shlex.quote(text_type(v)))
+                    args_data += '%s=%s ' % (k, shlex.quote(str(v)))
                 self._transfer_data(args_file_path, args_data)
             elif module_style in ('non_native_want_json', 'binary'):
                 profile_encoder = get_module_encoder(module_bits.serialization_profile, Direction.CONTROLLER_TO_MODULE)
@@ -1169,7 +1170,7 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
             self._cleanup_remote_tmp = False
 
         # NOTE: dnf returns results .. but that made it 'compatible' with squashing, so we allow mappings, for now
-        if 'results' in data and (not isinstance(data['results'], Sequence) or isinstance(data['results'], string_types)):
+        if 'results' in data and (not isinstance(data['results'], Sequence) or isinstance(data['results'], str)):
             data['ansible_module_results'] = data['results']
             del data['results']
             display.warning("Found internal 'results' key in module return, renamed to 'ansible_module_results'.")
@@ -1322,16 +1323,16 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
 
         # stdout and stderr may be either a file-like or a bytes object.
         # Convert either one to a text type
-        if isinstance(stdout, binary_type):
+        if isinstance(stdout, bytes):
             out = to_text(stdout, errors=encoding_errors)
-        elif not isinstance(stdout, text_type):
+        elif not isinstance(stdout, str):
             out = to_text(b''.join(stdout.readlines()), errors=encoding_errors)
         else:
             out = stdout
 
-        if isinstance(stderr, binary_type):
+        if isinstance(stderr, bytes):
             err = to_text(stderr, errors=encoding_errors)
-        elif not isinstance(stderr, text_type):
+        elif not isinstance(stderr, str):
             err = to_text(b''.join(stderr.readlines()), errors=encoding_errors)
         else:
             err = stderr

ansible/plugins/action/add_host.py

@@ -21,7 +21,6 @@ from __future__ import annotations
 from collections.abc import Mapping
 
 from ansible.errors import AnsibleActionFail
-from ansible.module_utils.six import string_types
 from ansible.plugins.action import ActionBase
 from ansible.parsing.utils.addresses import parse_address
 from ansible.utils.display import Display
@@ -74,7 +73,7 @@ class ActionModule(ActionBase):
         if groups:
             if isinstance(groups, list):
                 group_list = groups
-            elif isinstance(groups, string_types):
+            elif isinstance(groups, str):
                 group_list = groups.split(",")
             else:
                 raise AnsibleActionFail("Groups must be specified as a list.", obj=groups)

ansible/plugins/action/fetch.py

@@ -20,7 +20,6 @@ import os
 import base64
 from ansible.errors import AnsibleConnectionFailure, AnsibleError, AnsibleActionFail, AnsibleActionSkip
 from ansible.module_utils.common.text.converters import to_bytes, to_text
-from ansible.module_utils.six import string_types
 from ansible.module_utils.parsing.convert_bool import boolean
 from ansible.plugins.action import ActionBase
 from ansible.utils.display import Display
@@ -52,10 +51,10 @@ class ActionModule(ActionBase):
 
             msg = ''
             # FIXME: validate source and dest are strings; use basic.py and module specs
-            if not isinstance(source, string_types):
+            if not isinstance(source, str):
                 msg = "Invalid type supplied for source option, it must be a string"
 
-            if not isinstance(dest, string_types):
+            if not isinstance(dest, str):
                 msg = "Invalid type supplied for dest option, it must be a string"
 
             if source is None or dest is None:
@@ -131,7 +130,6 @@ class ActionModule(ActionBase):
 
             # calculate the destination name
             if os.path.sep not in self._connection._shell.join_path('a', ''):
-                source = self._connection._shell._unquote(source)
                 source_local = source.replace('\\', '/')
             else:
                 source_local = source
@@ -194,7 +192,7 @@ class ActionModule(ActionBase):
                                        msg="checksum mismatch", file=source, dest=dest, remote_md5sum=None,
                                        checksum=new_checksum, remote_checksum=remote_checksum))
                 else:
-                    result.update({'changed': True, 'md5sum': new_md5, 'dest': dest,
+                    result.update({'changed': True, 'md5sum': new_md5, 'file': source, 'dest': dest,
                                    'remote_md5sum': None, 'checksum': new_checksum,
                                    'remote_checksum': remote_checksum})
             else:

ansible/plugins/action/group_by.py

@@ -17,7 +17,6 @@
 from __future__ import annotations
 
 from ansible.plugins.action import ActionBase
-from ansible.module_utils.six import string_types
 
 
 class ActionModule(ActionBase):
@@ -42,7 +41,7 @@ class ActionModule(ActionBase):
 
         group_name = self._task.args.get('key')
         parent_groups = self._task.args.get('parents', ['all'])
-        if isinstance(parent_groups, string_types):
+        if isinstance(parent_groups, str):
             parent_groups = [parent_groups]
 
         result['changed'] = False

ansible/plugins/action/include_vars.py

@@ -10,7 +10,6 @@ import pathlib
 import ansible.constants as C
 from ansible.errors import AnsibleError
 from ansible._internal._datatag._tags import SourceWasEncrypted
-from ansible.module_utils.six import string_types
 from ansible.module_utils.common.text.converters import to_native
 from ansible.plugins.action import ActionBase
 from ansible.utils.vars import combine_vars
@@ -38,14 +37,17 @@ class ActionModule(ActionBase):
         if not self.ignore_files:
             self.ignore_files = list()
 
-        if isinstance(self.ignore_files, string_types):
+        if isinstance(self.ignore_files, str):
+            self._display.deprecated(
+                msg="Specifying 'ignore_files' as a string is deprecated.",
+                version="2.24",
+                help_text="Use a list of strings instead.",
+                obj=self.ignore_files,
+            )
             self.ignore_files = self.ignore_files.split()
 
-        elif isinstance(self.ignore_files, dict):
-            return {
-                'failed': True,
-                'message': '{0} must be a list'.format(self.ignore_files)
-            }
+        if not isinstance(self.ignore_files, list):
+            raise AnsibleError("The 'ignore_files' option must be a list.", obj=self.ignore_files)
 
     def _set_args(self):
         """ Set instance variables based on the arguments that were passed """
@@ -65,11 +67,8 @@ class ActionModule(ActionBase):
         self.ignore_files = self._task.args.get('ignore_files', None)
         self.valid_extensions = self._task.args.get('extensions', self.VALID_FILE_EXTENSIONS)
 
-        # convert/validate extensions list
-        if isinstance(self.valid_extensions, string_types):
-            self.valid_extensions = list(self.valid_extensions)
         if not isinstance(self.valid_extensions, list):
-            raise AnsibleError('Invalid type for "extensions" option, it must be a list')
+            raise AnsibleError("The 'extensions' option must be a list.", obj=self.valid_extensions)
 
     def run(self, tmp=None, task_vars=None):
         """ Load yml files recursively from a directory.
@@ -93,10 +92,10 @@ class ActionModule(ActionBase):
             elif arg in self.VALID_ALL:
                 pass
             else:
-                raise AnsibleError('{0} is not a valid option in include_vars'.format(to_native(arg)))
+                raise AnsibleError(f'{arg} is not a valid option in include_vars', obj=arg)
 
         if dirs and files:
-            raise AnsibleError("You are mixing file only and dir only arguments, these are incompatible")
+            raise AnsibleError("You are mixing file only and dir only arguments, these are incompatible", obj=self._task.args)
 
         # set internal vars from args
         self._set_args()
@@ -108,13 +107,13 @@ class ActionModule(ActionBase):
             self._set_root_dir()
             if not path.exists(self.source_dir):
                 failed = True
-                err_msg = ('{0} directory does not exist'.format(to_native(self.source_dir)))
+                err_msg = f"{self.source_dir} directory does not exist"
             elif not path.isdir(self.source_dir):
                 failed = True
-                err_msg = ('{0} is not a directory'.format(to_native(self.source_dir)))
+                err_msg = f"{self.source_dir} is not a directory"
             else:
                 for root_dir, filenames in self._traverse_dir_depth():
-                    failed, err_msg, updated_results = (self._load_files_in_dir(root_dir, filenames))
+                    failed, err_msg, updated_results = self._load_files_in_dir(root_dir, filenames)
                     if failed:
                         break
                     results.update(updated_results)
@@ -175,7 +174,7 @@ class ActionModule(ActionBase):
                 self.source_dir = path.join(current_dir, self.source_dir)
 
     def _log_walk(self, error):
-        self._display.vvv('Issue with walking through "%s": %s' % (to_native(error.filename), to_native(error)))
+        self._display.vvv(f"Issue with walking through {error.filename}: {error}")
 
     def _traverse_dir_depth(self):
         """ Recursively iterate over a directory and sort the files in
@@ -204,9 +203,8 @@ class ActionModule(ActionBase):
             try:
                 if re.search(r'{0}$'.format(file_type), filename):
                     return True
-            except Exception:
-                err_msg = 'Invalid regular expression: {0}'.format(file_type)
-                raise AnsibleError(err_msg)
+            except Exception as ex:
+                raise AnsibleError(f'Invalid regular expression: {file_type!r}', obj=file_type) from ex
         return False
 
     def _is_valid_file_ext(self, source_file):
@@ -232,7 +230,7 @@ class ActionModule(ActionBase):
         err_msg = ''
         if validate_extensions and not self._is_valid_file_ext(filename):
             failed = True
-            err_msg = ('{0} does not have a valid extension: {1}'.format(to_native(filename), ', '.join(self.valid_extensions)))
+            err_msg = f"{filename!r} does not have a valid extension: {', '.join(self.valid_extensions)}"
         else:
             data = self._loader.load_from_file(filename, cache='none', trusted_as_template=True)
 
@@ -243,7 +241,7 @@ class ActionModule(ActionBase):
 
             if not isinstance(data, dict):
                 failed = True
-                err_msg = ('{0} must be stored as a dictionary/hash'.format(to_native(filename)))
+                err_msg = f"{filename!r} must be stored as a dictionary/hash"
             else:
                 self.included_files.append(filename)
                 results.update(data)

ansible/plugins/action/script.py

@@ -139,8 +139,6 @@ class ActionModule(ActionBase):
             else:
                 script_cmd = ' '.join([env_string, target_command])
 
-            script_cmd = self._connection._shell.wrap_for_exec(script_cmd)
-
             exec_data = None
             # PowerShell runs the script in a special wrapper to enable things
             # like become and environment args
@@ -149,7 +147,7 @@ class ActionModule(ActionBase):
                 pc = self._task
                 exec_data = ps_manifest._create_powershell_wrapper(
                     name=f"ansible.builtin.script.{pathlib.Path(source).stem}",
-                    module_data=to_bytes(script_cmd),
+                    module_data=to_bytes(f"& {script_cmd}; exit $LASTEXITCODE"),
                     module_path=source,
                     module_args={},
                     environment=env_dict,

ansible/plugins/action/template.py

@@ -23,7 +23,6 @@ from ansible.config.manager import ensure_type
 from ansible.errors import AnsibleError, AnsibleActionFail
 from ansible.module_utils.common.text.converters import to_bytes, to_text, to_native
 from ansible.module_utils.parsing.convert_bool import boolean
-from ansible.module_utils.six import string_types
 from ansible.plugins.action import ActionBase
 from ansible.template import trust_as_template
 from ansible._internal._templating import _template_vars
@@ -49,7 +48,7 @@ class ActionModule(ActionBase):
                        'block_end_string', 'comment_start_string', 'comment_end_string'):
             if s_type in self._task.args:
                 value = ensure_type(self._task.args[s_type], 'string')
-                if value is not None and not isinstance(value, string_types):
+                if value is not None and not isinstance(value, str):
                     raise AnsibleActionFail("%s is expected to be a string, but got %s instead" % (s_type, type(value)))
                 self._task.args[s_type] = value
 

ansible/plugins/action/uri.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 
 import collections.abc as _c
 import os
+from copy import deepcopy
 
 from ansible.errors import AnsibleActionFail
 from ansible.module_utils.parsing.convert_bool import boolean
@@ -53,7 +54,8 @@ class ActionModule(ActionBase):
                     raise AnsibleActionFail(
                         'body must be mapping, cannot be type %s' % body.__class__.__name__
                     )
-                for field, value in body.items():
+                new_body = deepcopy(body)
+                for field, value in new_body.items():
                     if not isinstance(value, _c.MutableMapping):
                         continue
                     content = value.get('content')
@@ -70,7 +72,7 @@ class ActionModule(ActionBase):
                     value['filename'] = tmp_src
                     self._transfer_file(filename, tmp_src)
                     self._fixup_perms2((self._connection._shell.tmpdir, tmp_src))
-                kwargs['body'] = body
+                kwargs['body'] = new_body
 
             new_module_args = self._task.args | kwargs
 

ansible/plugins/cache/__init__.py

@@ -162,6 +162,7 @@ class BaseFileCacheModule(BaseCacheModule):
             except OSError as ex:
                 display.error_as_warning(f"Error in {self.plugin_name!r} cache plugin while trying to write to {tmpfile_path!r}.", exception=ex)
             try:
+                os.close(tmpfile_handle)  # os.rename fails if handle is still open in WSL
                 os.rename(tmpfile_path, cachefile)
                 os.chmod(cachefile, mode=S_IRWU_RG_RO)
             except OSError as ex:

ansible/plugins/callback/__init__.py

@@ -60,9 +60,6 @@ _YAML_BREAK_CHARS = '\n\x85\u2028\u2029'  # NL, NEL, LS, PS
 _SPACE_BREAK_RE = re.compile(fr' +([{_YAML_BREAK_CHARS}])')
 
 
-_T_callable = t.TypeVar("_T_callable", bound=t.Callable)
-
-
 class _AnsibleCallbackDumper(_dumper.AnsibleDumper):
     def __init__(self, *args, lossy: bool = False, **kwargs):
         super().__init__(*args, **kwargs)
@@ -293,7 +290,11 @@ class CallbackBase(AnsiblePlugin):
         )
 
         if not indent and any(indent_conditions):
-            indent = 4
+            try:
+                indent = self.get_option('result_indentation')
+            except KeyError:
+                # Callback does not declare result_indentation nor extend result_format_callback
+                indent = 4
         if pretty_results is False:
             # pretty_results=False overrides any specified indentation
             indent = None
@@ -394,8 +395,14 @@ class CallbackBase(AnsiblePlugin):
             # Callback does not declare pretty_results nor extend result_format_callback
             pretty_results = None
 
+        try:
+            indent = self.get_option('result_indentation')
+        except KeyError:
+            # Callback does not declare result_indentation nor extend result_format_callback
+            indent = 4
+
         if result_format == 'json':
-            return json.dumps(diff, sort_keys=True, indent=4, separators=(u',', u': ')) + u'\n'
+            return json.dumps(diff, sort_keys=True, indent=indent, separators=(u',', u': ')) + u'\n'
 
         if result_format == 'yaml':
             # None is a sentinel in this case that indicates default behavior
@@ -407,7 +414,7 @@ class CallbackBase(AnsiblePlugin):
                     allow_unicode=True,
                     Dumper=functools.partial(_AnsibleCallbackDumper, lossy=lossy),
                     default_flow_style=False,
-                    indent=4,
+                    indent=indent,
                     # sort_keys=sort_keys  # This requires PyYAML>=5.1
                 ),
                 '    '