ansible-core 2.18.1rc1__py3-none-any.whl → 2.18.2__py3-none-any.whl

ansible/cli/vault.py

@@ -138,11 +138,12 @@ class VaultCLI(CLI):
             raise AnsibleOptionsError("At most one input file may be used with the --output option")
 
         if options.action == 'encrypt_string':
-            if '-' in options.args or not options.args or options.encrypt_string_stdin_name:
+            if '-' in options.args or options.encrypt_string_stdin_name or (not options.args and not options.encrypt_string_prompt):
+                # prompting from stdin and reading from stdin are mutually exclusive, if stdin is still provided, it is ignored
                 self.encrypt_string_read_stdin = True
 
-            # TODO: prompting from stdin and reading from stdin seem mutually exclusive, but verify that.
             if options.encrypt_string_prompt and self.encrypt_string_read_stdin:
+                # should only trigger if prompt + either - or encrypt string stdin name were provided
                 raise AnsibleOptionsError('The --prompt option is not supported if also reading input from stdin')
 
         return options

ansible/executor/action_write_locks.py

@@ -19,7 +19,7 @@ from __future__ import annotations
 
 import multiprocessing.synchronize
 
-from multiprocessing import Lock
+from ansible.utils.multiprocessing import context as multiprocessing_context
 
 from ansible.module_utils.facts.system.pkg_mgr import PKG_MGRS
 
@@ -32,7 +32,7 @@ if 'action_write_locks' not in globals():
     # Below is a Lock for use when we weren't expecting a named module.  It gets used when an action
     # plugin invokes a module whose name does not match with the action's name.  Slightly less
     # efficient as all processes with unexpected module names will wait on this lock
-    action_write_locks[None] = Lock()
+    action_write_locks[None] = multiprocessing_context.Lock()
 
     # These plugins are known to be called directly by action plugins with names differing from the
     # action plugin name.  We precreate them here as an optimization.
@@ -41,4 +41,4 @@ if 'action_write_locks' not in globals():
 
     mods.update(('copy', 'file', 'setup', 'slurp', 'stat'))
     for mod_name in mods:
-        action_write_locks[mod_name] = Lock()
+        action_write_locks[mod_name] = multiprocessing_context.Lock()

ansible/executor/task_executor.py

@@ -1073,18 +1073,6 @@ class TaskExecutor:
         option_vars = C.config.get_plugin_vars('connection', self._connection._load_name)
         varnames.extend(option_vars)
 
-        # create dict of 'templated vars'
-        options = {'_extras': {}}
-        for k in option_vars:
-            if k in variables:
-                options[k] = templar.template(variables[k])
-
-        # add extras if plugin supports them
-        if getattr(self._connection, 'allow_extras', False):
-            for k in variables:
-                if k.startswith('ansible_%s_' % self._connection.extras_prefix) and k not in options:
-                    options['_extras'][k] = templar.template(variables[k])
-
         task_keys = self._task.dump_attrs()
 
         # The task_keys 'timeout' attr is the task's timeout, not the connection timeout.
@@ -1102,7 +1090,8 @@ class TaskExecutor:
         del task_keys['retries']
 
         # set options with 'templated vars' specific to this plugin and dependent ones
-        self._connection.set_options(task_keys=task_keys, var_options=options)
+        var_options = self._connection._resolve_option_variables(variables, templar)
+        self._connection.set_options(task_keys=task_keys, var_options=var_options)
         varnames.extend(self._set_plugin_options('shell', variables, templar, task_keys))
 
         if self._connection.become is not None:

ansible/executor/task_queue_manager.py

@@ -39,7 +39,6 @@ from ansible.plugins.loader import callback_loader, strategy_loader, module_load
 from ansible.plugins.callback import CallbackBase
 from ansible.template import Templar
 from ansible.vars.hostvars import HostVars
-from ansible.vars.reserved import warn_if_reserved
 from ansible.utils.display import Display
 from ansible.utils.lock import lock_decorator
 from ansible.utils.multiprocessing import context as multiprocessing_context
@@ -282,7 +281,6 @@ class TaskQueueManager:
 
         all_vars = self._variable_manager.get_vars(play=play)
         templar = Templar(loader=self._loader, variables=all_vars)
-        warn_if_reserved(all_vars, templar.environment.globals.keys())
 
         new_play = play.copy()
         new_play.post_validate(templar)

ansible/module_utils/ansible_release.py

@@ -17,6 +17,6 @@
 
 from __future__ import annotations
 
-__version__ = '2.18.1rc1'
+__version__ = '2.18.2'
 __author__ = 'Ansible, Inc.'
 __codename__ = "Fool in the Rain"

ansible/module_utils/csharp/Ansible.Basic.cs

@@ -1210,7 +1210,7 @@ namespace Ansible.Basic
                 object val = requiredCheck[1];
                 IList requirements = (IList)requiredCheck[2];
 
-                if (ParseStr(param[key]) != ParseStr(val))
+                if (param[key] == null || ParseStr(param[key]) != ParseStr(val))
                     continue;
 
                 string term = "all";

ansible/module_utils/facts/ansible_collector.py

@@ -113,7 +113,13 @@ class CollectorMetaDataCollector(collector.BaseFactCollector):
         self.module_setup = module_setup
 
     def collect(self, module=None, collected_facts=None):
+        # NOTE: deprecate/remove once DT lands
+        # we can return this data, but should not be top level key
         meta_facts = {'gather_subset': self.gather_subset}
+
+        # NOTE: this is just a boolean indicator that 'facts were gathered'
+        # and should be moved to the 'gather_facts' action plugin
+        # probably revised to handle modules/subsets combos
         if self.module_setup:
             meta_facts['module_setup'] = self.module_setup
         return meta_facts

ansible/playbook/play.py

@@ -31,7 +31,6 @@ from ansible.playbook.helpers import load_list_of_blocks, load_list_of_roles
 from ansible.playbook.role import Role
 from ansible.playbook.task import Task
 from ansible.playbook.taggable import Taggable
-from ansible.vars.manager import preprocess_vars
 from ansible.utils.display import Display
 
 display = Display()
@@ -227,6 +226,9 @@ class Play(Base, Taggable, CollectionSearch):
         return self.roles
 
     def _load_vars_prompt(self, attr, ds):
+        # avoid circular dep
+        from ansible.vars.manager import preprocess_vars
+
         new_ds = preprocess_vars(ds)
         vars_prompts = []
         if new_ds is not None:

ansible/plugins/action/copy.py

@@ -26,7 +26,7 @@ import tempfile
 import traceback
 
 from ansible import constants as C
-from ansible.errors import AnsibleError, AnsibleFileNotFound
+from ansible.errors import AnsibleError, AnsibleActionFail, AnsibleFileNotFound
 from ansible.module_utils.basic import FILE_COMMON_ARGUMENTS
 from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
 from ansible.module_utils.parsing.convert_bool import boolean
@@ -414,6 +414,11 @@ class ActionModule(ActionBase):
         result = super(ActionModule, self).run(tmp, task_vars)
         del tmp  # tmp no longer has any effect
 
+        # ensure user is not setting internal parameters
+        for internal in ('_original_basename', '_diff_peek'):
+            if self._task.args.get(internal, None) is not None:
+                raise AnsibleActionFail(f'Invalid parameter specified: "{internal}"')
+
         source = self._task.args.get('src', None)
         content = self._task.args.get('content', None)
         dest = self._task.args.get('dest', None)

ansible/plugins/action/gather_facts.py

@@ -8,6 +8,7 @@ import time
 import typing as t
 
 from ansible import constants as C
+from ansible.errors import AnsibleActionFail
 from ansible.executor.module_common import get_action_args_with_defaults
 from ansible.module_utils.parsing.convert_bool import boolean
 from ansible.plugins.action import ActionBase
@@ -61,6 +62,7 @@ class ActionModule(ActionBase):
         return mod_args
 
     def _combine_task_result(self, result: dict[str, t.Any], task_result: dict[str, t.Any]) -> dict[str, t.Any]:
+        """ builds the final result to return """
         filtered_res = {
             'ansible_facts': task_result.get('ansible_facts', {}),
             'warnings': task_result.get('warnings', []),
@@ -70,6 +72,33 @@ class ActionModule(ActionBase):
         # on conflict the last plugin processed wins, but try to do deep merge and append to lists.
         return merge_hash(result, filtered_res, list_merge='append_rp')
 
+    def _handle_smart(self, modules: list, task_vars: dict[str, t.Any]):
+        """ Updates the module list when 'smart' is used, lookup network os mappings or use setup, warn when things seem inconsistent """
+
+        if 'smart' not in modules:
+            return
+
+        modules.pop(modules.index('smart'))  # remove as this will cause 'module not found' errors
+        network_os = self._task.args.get('network_os', task_vars.get('ansible_network_os', task_vars.get('ansible_facts', {}).get('network_os')))
+
+        if network_os:
+
+            connection_map = C.config.get_config_value('CONNECTION_FACTS_MODULES', variables=task_vars)
+            if network_os in connection_map:
+                modules.append(connection_map[network_os])
+            elif not modules:
+                raise AnsibleActionFail(f"No fact modules available and we could not find a fact module for your network OS ({network_os}), "
+                                        "try setting one via the `FACTS_MODULES` configuration.")
+
+            if set(modules).intersection(set(C._ACTION_SETUP)):
+                # most don't realize how setup works with networking connection plugins (forced_local)
+                self._display.warning("Detected 'setup' module and a network OS is set, the output when running it will reflect 'localhost'"
+                                      " and not the target when a netwoking connection plugin is used.")
+
+        elif not set(modules).difference(set(C._ACTION_SETUP)):
+            # no network OS and setup not in list, add setup by default since 'smart'
+            modules.append('ansible.legacy.setup')
+
     def run(self, tmp: t.Optional[str] = None, task_vars: t.Optional[dict[str, t.Any]] = None) -> dict[str, t.Any]:
 
         result = super(ActionModule, self).run(tmp, task_vars)
@@ -77,13 +106,9 @@ class ActionModule(ActionBase):
 
         # copy the value with list() so we don't mutate the config
         modules = list(C.config.get_config_value('FACTS_MODULES', variables=task_vars))
+        self._handle_smart(modules, task_vars)
 
         parallel = task_vars.pop('ansible_facts_parallel', self._task.args.pop('parallel', None))
-        if 'smart' in modules:
-            connection_map = C.config.get_config_value('CONNECTION_FACTS_MODULES', variables=task_vars)
-            network_os = self._task.args.get('network_os', task_vars.get('ansible_network_os', task_vars.get('ansible_facts', {}).get('network_os')))
-            modules.extend([connection_map.get(network_os or self._connection.ansible_name, 'ansible.legacy.setup')])
-            modules.pop(modules.index('smart'))
 
         failed = {}
         skipped = {}

ansible/plugins/connection/__init__.py

@@ -285,6 +285,27 @@ class ConnectionBase(AnsiblePlugin):
                 display.debug('Set connection var {0} to {1}'.format(varname, value))
                 variables[varname] = value
 
+    def _resolve_option_variables(self, variables, templar):
+        """
+        Return a dict of variable -> templated value, for any variables that
+        that match options registered by this plugin.
+        """
+        # create dict of 'templated vars'
+        var_options = {
+            '_extras': {},
+        }
+        for var_name in C.config.get_plugin_vars('connection', self._load_name):
+            if var_name in variables:
+                var_options[var_name] = templar.template(variables[var_name])
+
+        # add extras if plugin supports them
+        if getattr(self, 'allow_extras', False):
+            for var_name in variables:
+                if var_name.startswith(f'ansible_{self.extras_prefix}_') and var_name not in var_options:
+                    var_options['_extras'][var_name] = templar.template(variables[var_name])
+
+        return var_options
+
 
 class NetworkConnectionBase(ConnectionBase):
     """

ansible/plugins/connection/ssh.py

@@ -389,7 +389,7 @@ from ansible.errors import (
 from ansible.module_utils.six import PY3, text_type, binary_type
 from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
 from ansible.plugins.connection import ConnectionBase, BUFSIZE
-from ansible.plugins.shell.powershell import _parse_clixml
+from ansible.plugins.shell.powershell import _replace_stderr_clixml
 from ansible.utils.display import Display
 from ansible.utils.path import unfrackpath, makedirs_safe
 
@@ -1327,8 +1327,8 @@ class Connection(ConnectionBase):
         (returncode, stdout, stderr) = self._run(cmd, in_data, sudoable=sudoable)
 
         # When running on Windows, stderr may contain CLIXML encoded output
-        if getattr(self._shell, "_IS_WINDOWS", False) and stderr.startswith(b"#< CLIXML"):
-            stderr = _parse_clixml(stderr)
+        if getattr(self._shell, "_IS_WINDOWS", False):
+            stderr = _replace_stderr_clixml(stderr)
 
         return (returncode, stdout, stderr)
 

ansible/plugins/filter/regex_search.yml

@@ -8,6 +8,9 @@ DOCUMENTATION:
     - Maps to Python's C(re.search).
     - 'The substring matched by the group is accessible via the symbolic group name or
       the ``\{number}`` special sequence. See examples section.'
+    - The return for no match will be C(None) in most cases, depending on whether it is used with other filters/tests or not.
+      It also depends on the Jinja version used and whether native is enabled.
+    - "For a more complete explanation see U(https://docs.ansible.com/ansible-core/devel/reference_appendices/faq.html#why-does-the-regex-search-filter-return-none-instead-of-an-empty-string)."
   positional: _input, _regex
   options:
     _input:
@@ -52,5 +55,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Matched string or empty string if no match.
+    description: Matched string or if no match a C(None) or an empty string (see notes)
     type: str

ansible/plugins/shell/powershell.py

@@ -26,13 +26,85 @@ from ansible.module_utils.common.text.converters import to_bytes, to_text
 from ansible.plugins.shell import ShellBase
 
 # This is weird, we are matching on byte sequences that match the utf-16-be
-# matches for '_x(a-fA-F0-9){4}_'. The \x00 and {8} will match the hex sequence
-# when it is encoded as utf-16-be.
-_STRING_DESERIAL_FIND = re.compile(rb"\x00_\x00x([\x00(a-fA-F0-9)]{8})\x00_")
+# matches for '_x(a-fA-F0-9){4}_'. The \x00 and {4} will match the hex sequence
+# when it is encoded as utf-16-be byte sequence.
+_STRING_DESERIAL_FIND = re.compile(rb"\x00_\x00x((?:\x00[a-fA-F0-9]){4})\x00_")
 
 _common_args = ['PowerShell', '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Unrestricted']
 
 
+def _replace_stderr_clixml(stderr: bytes) -> bytes:
+    """Replace CLIXML with stderr data.
+
+    Tries to replace an embedded CLIXML string with the actual stderr data. If
+    it fails to parse the CLIXML data, it will return the original data. This
+    will replace any line inside the stderr string that contains a valid CLIXML
+    sequence.
+
+    :param bytes stderr: The stderr to try and decode.
+
+    :returns: The stderr with the decoded CLIXML data or the original data.
+    """
+    clixml_header = b"#< CLIXML\r\n"
+
+    if stderr.find(clixml_header) == -1:
+        return stderr
+
+    lines: list[bytes] = []
+    is_clixml = False
+    for line in stderr.splitlines(True):
+        if is_clixml:
+            is_clixml = False
+
+            # If the line does not contain the closing CLIXML tag, we just
+            # add the found header line and this line without trying to parse.
+            end_idx = line.find(b"</Objs>")
+            if end_idx == -1:
+                lines.append(clixml_header)
+                lines.append(line)
+                continue
+
+            clixml = line[: end_idx + 7]
+            remaining = line[end_idx + 7 :]
+
+            # While we expect the stderr to be UTF-8 encoded, we fallback to
+            # the most common "ANSI" codepage used by Windows cp437 if it is
+            # not valid UTF-8.
+            try:
+                clixml.decode("utf-8")
+            except UnicodeDecodeError:
+                # cp427 can decode any sequence and once we have the string, we
+                # can encode any cp427 chars to UTF-8.
+                clixml_text = clixml.decode("cp437")
+                clixml = clixml_text.encode("utf-8")
+
+            try:
+                decoded_clixml = _parse_clixml(clixml)
+                lines.append(decoded_clixml)
+                if remaining:
+                    lines.append(remaining)
+
+            except Exception:
+                # Any errors and we just add the original CLIXML header and
+                # line back in.
+                lines.append(clixml_header)
+                lines.append(line)
+
+        elif line == clixml_header:
+            # The next line should contain the full CLIXML data.
+            is_clixml = True
+
+        else:
+            lines.append(line)
+
+    # This should never happen but if there was a CLIXML header without a newline
+    # following it, we need to add it back.
+    if is_clixml:
+        lines.append(clixml_header)
+
+    return b"".join(lines)
+
+
 def _parse_clixml(data: bytes, stream: str = "Error") -> bytes:
     """
     Takes a byte string like '#< CLIXML\r\n<Objs...' and extracts the stream

ansible/plugins/strategy/__init__.py

@@ -28,7 +28,7 @@ import time
 import typing as t
 
 from collections import deque
-from multiprocessing import Lock
+
 
 from jinja2.exceptions import UndefinedError
 
@@ -55,6 +55,7 @@ from ansible.utils.fqcn import add_internal_fqcns
 from ansible.utils.unsafe_proxy import wrap_var
 from ansible.utils.sentinel import Sentinel
 from ansible.utils.vars import combine_vars
+from ansible.utils.multiprocessing import context as multiprocessing_context
 from ansible.vars.clean import strip_internal_keys, module_response_deepcopy
 
 display = Display()
@@ -365,7 +366,7 @@ class StrategyBase:
 
         if task.action not in action_write_locks.action_write_locks:
             display.debug('Creating lock for %s' % task.action)
-            action_write_locks.action_write_locks[task.action] = Lock()
+            action_write_locks.action_write_locks[task.action] = multiprocessing_context.Lock()
 
         # create a templar and template things we need later for the queuing process
         templar = Templar(loader=self._loader, variables=task_vars)
@@ -1068,7 +1069,8 @@ class StrategyBase:
                 del self._active_connections[target_host]
             else:
                 connection = plugin_loader.connection_loader.get(play_context.connection, play_context, os.devnull)
-                connection.set_options(task_keys=task.dump_attrs(), var_options=all_vars)
+                var_options = connection._resolve_option_variables(all_vars, templar)
+                connection.set_options(task_keys=task.dump_attrs(), var_options=var_options)
                 play_context.set_attributes_from_plugin(connection)
 
             if connection:

ansible/release.py

@@ -17,6 +17,6 @@
 
 from __future__ import annotations
 
-__version__ = '2.18.1rc1'
+__version__ = '2.18.2'
 __author__ = 'Ansible, Inc.'
 __codename__ = "Fool in the Rain"

ansible/vars/manager.py

@@ -39,6 +39,7 @@ from ansible.utils.vars import combine_vars, load_extra_vars, load_options_vars
 from ansible.utils.unsafe_proxy import wrap_var
 from ansible.vars.clean import namespace_facts, clean_facts
 from ansible.vars.plugins import get_vars_from_inventory_sources, get_vars_from_path
+from ansible.vars.reserved import warn_if_reserved
 
 display = Display()
 
@@ -415,6 +416,9 @@ class VariableManager:
         # extra vars
         all_vars = _combine_and_track(all_vars, self._extra_vars, "extra vars")
 
+        # before we add 'reserved vars', check we didn't add any reserved vars
+        warn_if_reserved(all_vars.keys())
+
         # magic variables
         all_vars = _combine_and_track(all_vars, magic_variables, "magic vars")
 
@@ -560,6 +564,7 @@ class VariableManager:
         if not isinstance(facts, Mapping):
             raise AnsibleAssertionError("the type of 'facts' to set for host_facts should be a Mapping but is a %s" % type(facts))
 
+        warn_if_reserved(facts.keys())
         try:
             host_cache = self._fact_cache[host]
         except KeyError:
@@ -583,15 +588,18 @@ class VariableManager:
         if not isinstance(facts, Mapping):
             raise AnsibleAssertionError("the type of 'facts' to set for nonpersistent_facts should be a Mapping but is a %s" % type(facts))
 
+        warn_if_reserved(facts.keys())
         try:
             self._nonpersistent_fact_cache[host] |= facts
         except KeyError:
             self._nonpersistent_fact_cache[host] = facts
 
     def set_host_variable(self, host, varname, value):
-        '''
+        """
         Sets a value in the vars_cache for a host.
-        '''
+        """
+
+        warn_if_reserved(varname)
         if host not in self._vars_cache:
             self._vars_cache[host] = dict()
         if varname in self._vars_cache[host] and isinstance(self._vars_cache[host][varname], MutableMapping) and isinstance(value, MutableMapping):

ansible/vars/reserved.py

@@ -21,15 +21,17 @@ from ansible.playbook import Play
 from ansible.playbook.block import Block
 from ansible.playbook.role import Role
 from ansible.playbook.task import Task
+from ansible.template import Templar
 from ansible.utils.display import Display
 
 display = Display()
 
 
-def get_reserved_names(include_private=True):
-    ''' this function returns the list of reserved names associated with play objects'''
+def get_reserved_names(include_private: bool = True) -> set[str]:
+    """ this function returns the list of reserved names associated with play objects"""
 
-    public = set()
+    templar = Templar(loader=None)
+    public = set(templar.environment.globals.keys())
     private = set()
     result = set()
 
@@ -58,11 +60,15 @@ def get_reserved_names(include_private=True):
     else:
         result = public
 
+    # due to Collectors always adding, need to ignore this
+    # eventually should remove after we deprecate it in setup.py
+    result.remove('gather_subset')
+
     return result
 
 
-def warn_if_reserved(myvars, additional=None):
-    ''' this function warns if any variable passed conflicts with internally reserved names '''
+def warn_if_reserved(myvars: list[str], additional: list[str] | None = None) -> None:
+    """ this function warns if any variable passed conflicts with internally reserved names """
 
     if additional is None:
         reserved = _RESERVED_NAMES
@@ -75,7 +81,7 @@ def warn_if_reserved(myvars, additional=None):
         display.warning('Found variable using reserved name: %s' % varname)
 
 
-def is_reserved_name(name):
+def is_reserved_name(name: str) -> bool:
     return name in _RESERVED_NAMES
 
 

{ansible_core-2.18.1rc1.dist-info → ansible_core-2.18.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: ansible-core
-Version: 2.18.1rc1
+Version: 2.18.2
 Summary: Radically simple IT automation
 Author: Ansible Project
 Project-URL: Homepage, https://ansible.com/

{ansible_core-2.18.1rc1.dist-info → ansible_core-2.18.2.dist-info}/RECORD

@@ -3,7 +3,7 @@ ansible/__main__.py,sha256=24j-7-YT4lZ2fmV80JD-VRoYBnxR7YoP_VP-orJtDt0,796
 ansible/constants.py,sha256=dSgbrzNsmhYc4GQOWZvRm4XKgf--_MUWcMa_9_7l5Pc,9757
 ansible/context.py,sha256=oKYyfjfWpy8vDeProtqfnqSmuij_t75_5e5t0U_hQ1g,1933
 ansible/keyword_desc.yml,sha256=xD-MRMB8mSRaj2ADwRnjIEbOwJKbc6BYadouGPfS0mI,7462
-ansible/release.py,sha256=0ZMgTOTRKMyYnQWknncQyldpI2t8HSHVuMmm_U-K_sE,839
+ansible/release.py,sha256=U-5xX-4Rd1AukTzNrukHD-Qk_UrpbV4_Z-oIFaTMD0A,836
 ansible/_vendor/__init__.py,sha256=2QBeBwT7uG7M3Aw-pIdCpt6XPtHMCpbEKfACYKA7xIg,2033
 ansible/cli/__init__.py,sha256=e0KjeLfG1Ketbwl-uOmQ-zXoq3_El80LnHTGu80d1gs,28111
 ansible/cli/adhoc.py,sha256=quJ9WzRzf3dz_dtDGmahNMffqyNVy1jzQCMo21YL5Qg,8194
@@ -14,7 +14,7 @@ ansible/cli/galaxy.py,sha256=KXTPM-hXtamDZUZXHRPGs2BPpIaf3HztlgyH9wOys7Q,95000
 ansible/cli/inventory.py,sha256=TTVyNM1G2IkTthmISmTGqlr4KjZKGrRVOh9gIJfjGtk,16765
 ansible/cli/playbook.py,sha256=d0x_X0BXjxYjPJ-qc6JcyGxR6IzxdvnSjoT4tUtaGKQ,10865
 ansible/cli/pull.py,sha256=g3PsUQ2UTj2L9IRKhHXRNzJ7X-uzwmk4plpRHxZrWtM,17287
-ansible/cli/vault.py,sha256=pwrXBRpVjcz7T_0UdzG63lQuwhMHdGtSOVj4ZEDYBaw,22954
+ansible/cli/vault.py,sha256=dICxhXQMRMTguu7gJW8qhGohiNdGn1Xxubt1kf2fRBc,23118
 ansible/cli/arguments/__init__.py,sha256=_4taT82hZKKTzhdXKmIgqxWwuG21XZxF874V2k1e3us,168
 ansible/cli/arguments/option_helpers.py,sha256=YiiGDtsXIwFg8mZPeQnYHsEUgsjUfeLCRrpks8hUc_Q,18488
 ansible/cli/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -31,14 +31,14 @@ ansible/config/manager.py,sha256=27_GXGb3SxX0Shqf5YtHvDSoycinzsDAjaPqwPsbY5o,291
 ansible/errors/__init__.py,sha256=Dd-jh7JVwfweicHg6irB9ugrK66vHATv9eiRbEep4dM,14943
 ansible/errors/yaml_strings.py,sha256=fKfgD3rC017dyMackTpu-LkvbsdnsfBAKCxMH-fDtIg,3858
 ansible/executor/__init__.py,sha256=mRvbCJPA-_veSG5ka3v04G5vsarLVDeB3EWFsu6geSI,749
-ansible/executor/action_write_locks.py,sha256=Up2n3cwFCr4T4IvttHpe3QOxRBF_9NgWJ1tFm9CHpfM,1915
+ansible/executor/action_write_locks.py,sha256=DcjCvRELlz5dyUDxCjCZCVjy4-j4u0y-YNgY90dvbG0,2007
 ansible/executor/interpreter_discovery.py,sha256=z0ekwq9rND1wAZChHOYNfav7ycTvnkgVFPEek8aXj-I,9975
 ansible/executor/module_common.py,sha256=4pVfjMgCle9ttAZTeuwSx3Kdi0rljagyHC11i4VnCl4,65755
 ansible/executor/play_iterator.py,sha256=Oazd9aWy4zB67uy27sYg4BveFx_Uf_tIsbhD76hMc28,32496
 ansible/executor/playbook_executor.py,sha256=qurZBiWjAWWRYcHb3ti4sBI8_WotOYvTRDar4JC3leE,14764
 ansible/executor/stats.py,sha256=gcBhJQrZTgE95737d6lArJ3FpTlbAfVt6GMhEqs5ZPU,3180
-ansible/executor/task_executor.py,sha256=99oxT0B787aRpw7B8OssXWuzltcfiraGISnIpHTo7U4,61338
-ansible/executor/task_queue_manager.py,sha256=fC404XkveICb7hRwIVu4PvRNgFkFLCNihsGsUDHVFzg,18640
+ansible/executor/task_executor.py,sha256=bGD5I1sKTY2zKMhGarTBEvOg3nscPo8ZJTFwWN_Fy-g,60913
+ansible/executor/task_queue_manager.py,sha256=hBnT_wAeS9GNclT8IXJmXm6lMVQKkhyj2ShCi66W_VA,18518
 ansible/executor/task_result.py,sha256=48zZWpxCiM0Z_MVG9zGQGCxHLNzs1horT68Qmfa-v_8,5696
 ansible/executor/discovery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ansible/executor/discovery/python_target.py,sha256=GW0tFmxr75vyFxKAIznJDEfjfSz1HaGbqRpUUif1LT4,1181
@@ -141,7 +141,7 @@ ansible/inventory/host.py,sha256=PDb5OTplhfpUIvdHiP2BckUOB1gUl302N-3sW0_sTyg,503
 ansible/inventory/manager.py,sha256=45mHgZTAkQ3IjAtrgsNzJXvynC-HIEor-JJE-V3xXN4,29454
 ansible/module_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ansible/module_utils/_text.py,sha256=VkWgAnSNVCbTQqZgllUObBFsH3uM4EUW5srl1UR9t1g,544
-ansible/module_utils/ansible_release.py,sha256=0ZMgTOTRKMyYnQWknncQyldpI2t8HSHVuMmm_U-K_sE,839
+ansible/module_utils/ansible_release.py,sha256=U-5xX-4Rd1AukTzNrukHD-Qk_UrpbV4_Z-oIFaTMD0A,836
 ansible/module_utils/api.py,sha256=r4wd6XZGhUnxMF416Ry6ebgq8BIhjCPSPOvO2ZtrYxE,5785
 ansible/module_utils/basic.py,sha256=fogfpo_l7JtS34WvgwwOebmPfMhFjQaJN5CwjKgUJVE,86291
 ansible/module_utils/connection.py,sha256=8TviwCucQ7d_JILwaUHE4tCuNfR3U1WFkmxLMxWa8Rw,7671
@@ -185,7 +185,7 @@ ansible/module_utils/compat/selinux.py,sha256=9bq2UMTE_PILEHdvUsXPk_84oWfKiMppyr
 ansible/module_utils/compat/typing.py,sha256=J_K9Ru1-f0KSKO_WhWGRCh0WBNWl6jUmQK1_0yYYZOs,736
 ansible/module_utils/compat/version.py,sha256=ifck3MH9LhxMENpZXOrntEqX6b7X8shknt3Fweg6AzQ,12734
 ansible/module_utils/csharp/Ansible.AccessToken.cs,sha256=TIOpRx4lv9FlhMyWfHS30CIMRtM3uqR8-u6Rv0X1HWE,16390
-ansible/module_utils/csharp/Ansible.Basic.cs,sha256=xp1pMZNhib3vhR3Wdc5JlDv1SORo4dIGjc17LmnLr1g,78845
+ansible/module_utils/csharp/Ansible.Basic.cs,sha256=fzeoQXu21SAPWE5MSw33T_6-iZDoTDkH2qdEV1Xf2ww,78867
 ansible/module_utils/csharp/Ansible.Become.cs,sha256=g0FyAMO3kl186IGhgACQhNAMP8o2UHNzXVUv0Enau2w,32793
 ansible/module_utils/csharp/Ansible.Privilege.cs,sha256=7e46na6k6ygdRwN53bzfIS8O-IwfM1TF_q5DeFH2Z80,19398
 ansible/module_utils/csharp/Ansible.Process.cs,sha256=bON6hExhSB-SR2p2ryFZj6kU3a5TxonFv498wg2Je98,19452
@@ -193,7 +193,7 @@ ansible/module_utils/csharp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 ansible/module_utils/distro/__init__.py,sha256=m0TmpmCD9JjwUo-kjnGQbW-qMBzZ2zir-QaQRQcc2Vs,1943
 ansible/module_utils/distro/_distro.py,sha256=AuS5qgpCjnm1SMJjQ8eUkZBR_P57NRYrsz1xXhbXD8s,49584
 ansible/module_utils/facts/__init__.py,sha256=Vyndmo-7rUjG-SX3hQHGoviksC_DeKSijZ2tFDESIAQ,1890
-ansible/module_utils/facts/ansible_collector.py,sha256=TGc3uEaOx0u-ucNM5_pt0HQTG-mN8zlQJLYPZXoeEFw,6566
+ansible/module_utils/facts/ansible_collector.py,sha256=CdvWuu2_JV1zkXP-Das8P6qMM_Ch56idq2OTaaTut-4,6883
 ansible/module_utils/facts/collector.py,sha256=gU4L-zklNx3pS-G1ROx8nkbvrAKT3LPX-nQSLoeSOeQ,14716
 ansible/module_utils/facts/compat.py,sha256=jX8FsMTpZcdrFxIYsxaVrHYn69Pu7hWqehU97ncaC2A,4062
 ansible/module_utils/facts/default_collectors.py,sha256=iKefVeINbQuhXok28HxuT-MNhDHMHDQdNGvgD2SqmoQ,8376
@@ -382,7 +382,7 @@ ansible/playbook/helpers.py,sha256=jFUM97igAQastlBo8x0-SmwsTVGO1f0SPY5896aMgPg,1
 ansible/playbook/included_file.py,sha256=-Pd20gvOv2FZW6ReaoicjjIlZiJ1Sc607rFnwtrqycY,11735
 ansible/playbook/loop_control.py,sha256=F9ch4fIcYkhbvuMKZVqGqzxzujDUcciXoDoX7RK44To,2022
 ansible/playbook/notifiable.py,sha256=MQz4VZuOga35VLcdUxVd9FQVzFg-djtQZhs09DS2juA,299
-ansible/playbook/play.py,sha256=KJ5m0bpIWFz-rSy0WjSH4DhtsYAu4oMlIRvD0REKGik,15525
+ansible/playbook/play.py,sha256=FjDa5dZiYM031gTW_4LSbgdZXMSZxfUjA4z4A5zbW_k,15563
 ansible/playbook/play_context.py,sha256=BEOXI3xfqFw5AD_reKbJulpxJGgwYG-jLvs8RY4SQbg,13846
 ansible/playbook/playbook_include.py,sha256=IqdVFE5F7eEnCtl7839c_rh9yuc4A4Oz5iIyG1DtptU,7492
 ansible/playbook/role_include.py,sha256=NCgDHtXlOltJ0XXSgGTTxDVrLC6IBe_d9SgNGXtsI20,7575
@@ -403,12 +403,12 @@ ansible/plugins/action/assemble.py,sha256=feMs3r2BAgQGQnpPmzJIGI7BSfOUl0eiyTVwln
 ansible/plugins/action/assert.py,sha256=mAPHyQ03Qb6nxIFuFiUHWGR56bTw0tA61fYX22_2OTI,5103
 ansible/plugins/action/async_status.py,sha256=Cv6dLt94Z6YIPZpPIDhS_yC7yqKtT13HyDdaIONMUCU,1726
 ansible/plugins/action/command.py,sha256=N09Vf2QypBMZ6NSptQGbf6EAN-kfqLCROGPkOSgV3SY,1069
-ansible/plugins/action/copy.py,sha256=5gEcEtSkZ3FXljZY9lldsS_g6e1DgAyEXTgHjNnlvn0,27446
+ansible/plugins/action/copy.py,sha256=VKn_OMPz-_B8KaKl4htlJedn95RMrpmGO_tWOFIg6ys,27735
 ansible/plugins/action/debug.py,sha256=vPmHIfMAbuqpHb2aq0QS7M_g7Fu5pFTwMoYjCKCAa2E,3472
 ansible/plugins/action/dnf.py,sha256=N10UXOlFgqzwQgoQfzlqpXIAgHB69OZvfwoC-m2-geM,3667
 ansible/plugins/action/fail.py,sha256=_1JuS0Z8Y8EB4FKG1u7KdP6xMuLobRHJsmtzmvN2CkU,1457
 ansible/plugins/action/fetch.py,sha256=cQAmUWEGMDjfVfHGviNtsT4i06rnoubL3EgrOlUZbLw,10188
-ansible/plugins/action/gather_facts.py,sha256=JFkrn3_78A7eUw0I3DsfUoe3Pu3wVLkhLUiOJ7Oyk0A,7863
+ansible/plugins/action/gather_facts.py,sha256=yNUrBPdzdJoA6euqy6k-gWpS_6yS0m-iBNq438PsbKk,9186
 ansible/plugins/action/group_by.py,sha256=97d4TF9o7vS5y0s1HfGgvh70l2gkQ2uUGxy0knlok5Y,1894
 ansible/plugins/action/include_vars.py,sha256=_xPrP_BeGqbhvpJYQFDUkREL9UzZ6Y4q_AnCshvsn1A,11573
 ansible/plugins/action/normal.py,sha256=cCHrZ3z2kB_wnnSNkmJHJWcJNRgdoxnLUNeHex-P8DE,1854
@@ -441,11 +441,11 @@ ansible/plugins/callback/minimal.py,sha256=51pTYXwnCAm4Z4TYbWTu-wq8gKpYCeq1AuSD8
 ansible/plugins/callback/oneline.py,sha256=FkE0lEoH_sZoxSgjeAvc0eH6Rt4k0Qi6fV9Pte8WYxQ,3450
 ansible/plugins/callback/tree.py,sha256=LRR7Aq0xYGZ0fQGCaenEoslEd5669yK259UQs7ai4tI,3014
 ansible/plugins/cliconf/__init__.py,sha256=gmcmxY7ssnbeMSRNO8d3qag_QmqM9vkcdBT42AKMy1E,22719
-ansible/plugins/connection/__init__.py,sha256=7B9UmhcM4divUhg-RsurhOOGQiCVeLGGh0Zp_zCvK4w,17947
+ansible/plugins/connection/__init__.py,sha256=z3FcfUSemloUoUQokC8GBe6uTUvfBed6vIFAzbpIDyw,18825
 ansible/plugins/connection/local.py,sha256=A-XQy_wIky16xrgkm2KW2jyZLpzmcUPjNOPtoQQnDJg,8339
 ansible/plugins/connection/paramiko_ssh.py,sha256=w86LCVdqICCLqFtTPxUUMqXCzQEW_06rLCAFYHxCHlU,27195
 ansible/plugins/connection/psrp.py,sha256=VgDVeSVFANMrm4SN5m_JEsRanPJ-V08aoxXVs5RAixc,33543
-ansible/plugins/connection/ssh.py,sha256=QRfQjIg4omxqOyhamxRyDPsxdFGM7HG6071SODdgMf4,62224
+ansible/plugins/connection/ssh.py,sha256=gyAJNb0sjkdZLoAQ1heEm_SjZR9ohz4bLsVgv2aKE6Y,62206
 ansible/plugins/connection/winrm.py,sha256=XLeUlCxhePUsDKXUrq_yqN1Ydu4Re8RsbZWTxdy8Muc,42188
 ansible/plugins/doc_fragments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ansible/plugins/doc_fragments/action_common_attributes.py,sha256=OaP2is2r9wm_f8gbLZhDDDwccg1joXMvJM72vbgcbIo,2442
@@ -510,7 +510,7 @@ ansible/plugins/filter/realpath.yml,sha256=9r5FyANyU3sAEgEiKui69Kphy-aeos6FukqAV
 ansible/plugins/filter/regex_escape.yml,sha256=L1c6OrzqOYpkRmdWJ_ZTalY07lojcYItzdciAaBmBoI,688
 ansible/plugins/filter/regex_findall.yml,sha256=KyKpce7oAF0ok3044sQS2w15UbF4o7u3QwbqFtP56ao,1425
 ansible/plugins/filter/regex_replace.yml,sha256=gopa5TURn49Xg-W1VcJ9GNTMWhB_wqN6vqHqNoB-2Cg,2421
-ansible/plugins/filter/regex_search.yml,sha256=ue74lf9chJW_y72XuTpxneyE5BSk9NTtO6Le_WSJOcU,2019
+ansible/plugins/filter/regex_search.yml,sha256=-2eBaW3ifvoFW1c2CI2xSPqYZCfnpmli475GIzg4E6U,2445
 ansible/plugins/filter/rekey_on_member.yml,sha256=IIVoLQemrn9BZMLygkGA6CPP4eLPHmRblOT2-TnWh70,921
 ansible/plugins/filter/relpath.yml,sha256=8-Kg_vFBeL6rwMQyyQMZaehB8LUa5h5cJEEr7_8qyi4,758
 ansible/plugins/filter/root.yml,sha256=sT1tsUZ5NBX7LjrPc-08Omg__szm9kOlamivlflJJ88,617
@@ -581,9 +581,9 @@ ansible/plugins/lookup/vars.py,sha256=W9at2j3xBk6z4IXfSutTEHqdzbiTI1B1tuYOLdd1BM
 ansible/plugins/netconf/__init__.py,sha256=50w1g2rhUo6L-xtiMT20jbR8WyOnhwNSRd2IRNSjNX4,17094
 ansible/plugins/shell/__init__.py,sha256=8pc3ab91OGbnvzk3oQ-sU8uXMXNoNbjtdCbdXmZYTWY,8985
 ansible/plugins/shell/cmd.py,sha256=kPCSKrJJFH5XTkmteEI3P1Da6WfPSXxDnV39VFpgD-A,2170
-ansible/plugins/shell/powershell.py,sha256=-AR5n5Yr2HPM-V5ogAwvLeLehfc1XrrhqmX85ZtXHFU,13134
+ansible/plugins/shell/powershell.py,sha256=cgAg1HFhiP_caInzUm0VBSaKzoBNfwEWOh0Y1ADjPII,15619
 ansible/plugins/shell/sh.py,sha256=wblaY2EGdA2O00gNuTVZVgVV08RH0e_g4V_AkE50Iws,3884
-ansible/plugins/strategy/__init__.py,sha256=v-aMyfOUmBSULxmtqxwMCb8Uu_VKdM6XcpAtepAkKG4,57493
+ansible/plugins/strategy/__init__.py,sha256=rkfyXtvBqvQIXgL8T4XChQTRMaiLnliTZj5cL_PY4yY,57651
 ansible/plugins/strategy/debug.py,sha256=yMmfT-lQHfR2y9bQcqrSPzqHuWZMo7V9y4ZWOXoboRE,1205
 ansible/plugins/strategy/free.py,sha256=WNrpfg2B8fVcYC5qvBhn4uEH0Cc1-UmFzBH6Hhs3u_I,16728
 ansible/plugins/strategy/host_pinned.py,sha256=GrDDQCtohmmJn3t9VOPb0lUZK_nUWy0s__z5Tq_rHfI,1875
@@ -684,9 +684,9 @@ ansible/vars/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ansible/vars/clean.py,sha256=X2WMksJMWITQ9FsM-Fb_YxT_hAGDqJ3urSTJzYBEdAk,5999
 ansible/vars/fact_cache.py,sha256=M57vMhkQ2DrzvNaZkfaCmKQJUqP1Rn_A31_X-5YBfzQ,1903
 ansible/vars/hostvars.py,sha256=o11xrzDVYn23renGbb3lx3R-nH9qOjLFju5IYJanDxg,5324
-ansible/vars/manager.py,sha256=nFJcvbhanUQO7loAUiFHEnGCuRpxsmYXCj8e9XVJTYc,30972
+ansible/vars/manager.py,sha256=yksGRuDjOQnbTV1B0ot3gLSMtjCazIEmNjY5H_z1iw8,31258
 ansible/vars/plugins.py,sha256=PocWZPMqFl1LoNgWlGFNxwg9nZnUzhQmlXO4g7bcP2A,4503
-ansible/vars/reserved.py,sha256=kZiQMPvaFin35006gLwDpX16w-9xlu6EaL4LSTKP40U,2531
+ansible/vars/reserved.py,sha256=Tsc4m2UwVce3dOvSWrjT2wB3lpNJtUyNZn45zNhsW0I,2869
 ansible_test/__init__.py,sha256=20VPOj11c6Ut1Av9RaurgwJvFhMqkWG3vAvcCbecNKw,66
 ansible_test/_data/ansible.cfg,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ansible_test/_data/coveragerc,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -824,7 +824,7 @@ ansible_test/_internal/cli/parsers/host_config_parsers.py,sha256=CYkTBciLYR1DWaE
 ansible_test/_internal/cli/parsers/key_value_parsers.py,sha256=GBpyOMBkPuycyWYjK5ePwZTDgzdSlfSHhYpLJWPrmkE,9570
 ansible_test/_internal/cli/parsers/value_parsers.py,sha256=ALoTjbmDr8IGWYbEEPUy082nFIb6kbekDJD5JFQp4Bc,6060
 ansible_test/_internal/commands/__init__.py,sha256=oRNkU8riDVtUFvIOyQlxiWinOWDUUKb-uEaC_GaE-PQ,88
-ansible_test/_internal/commands/coverage/__init__.py,sha256=XJDpIfim37RtN-Jluqw4fG6yhTfOcywtDoKlbSImgpo,14408
+ansible_test/_internal/commands/coverage/__init__.py,sha256=kuIFvKUJpXLB0YB7afO4pP-1TGpnUUuK-Bf4cX73lio,14408
 ansible_test/_internal/commands/coverage/combine.py,sha256=eQslZpo2AUl4HOKYLaKqauKSES7XsWTxjexX8AVnzGI,11950
 ansible_test/_internal/commands/coverage/erase.py,sha256=CJL1BDKOM-OUBINwLJoDlWHwzkH3FB51StM2P0MZ56Q,915
 ansible_test/_internal/commands/coverage/html.py,sha256=66H-4TYmqpUe51XJEQ7URfDeHDUDD52Alta_Ug7tifw,1319
@@ -980,13 +980,13 @@ ansible_test/config/cloud-config-vultr.ini.template,sha256=XLKHk3lg_8ReQMdWfZzhh
 ansible_test/config/config.yml,sha256=1zdGucnIl6nIecZA7ISIANvqXiHWqq6Dthsk_6MUwNc,2642
 ansible_test/config/inventory.networking.template,sha256=bFNSk8zNQOaZ_twaflrY0XZ9mLwUbRLuNT0BdIFwvn4,1335
 ansible_test/config/inventory.winrm.template,sha256=1QU8W-GFLnYEw8yY9bVIvUAVvJYPM3hyoijf6-M7T00,1098
-ansible_core-2.18.1rc1.dist-info/Apache-License.txt,sha256=y16Ofl9KOYjhBjwULGDcLfdWBfTEZRXnduOspt-XbhQ,11325
-ansible_core-2.18.1rc1.dist-info/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ansible_core-2.18.1rc1.dist-info/METADATA,sha256=xerWczD5k1pQDFa0-MXY3saZd-FsBLqEmJDkPzkktsM,7671
-ansible_core-2.18.1rc1.dist-info/MIT-license.txt,sha256=jLXp2XurnyZKbye40g9tfmLGtVlxh3pPD4n8xNqX8xc,1023
-ansible_core-2.18.1rc1.dist-info/PSF-license.txt,sha256=g7BC_H1qyg8Q1o5F76Vrm8ChSWYI5-dyj-CdGlNKBUo,2484
-ansible_core-2.18.1rc1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ansible_core-2.18.1rc1.dist-info/entry_points.txt,sha256=S9yJij5Im6FgRQxzkqSCnPQokC7PcWrDW_NSygZczJU,451
-ansible_core-2.18.1rc1.dist-info/simplified_bsd.txt,sha256=8R5R7R7sOa0h1Fi6RNgFgHowHBfun-OVOMzJ4rKAk2w,1237
-ansible_core-2.18.1rc1.dist-info/top_level.txt,sha256=IFbRLjAvih1DYzJWg3_F6t4sCzEMxRO7TOMNs6GkYHo,21
-ansible_core-2.18.1rc1.dist-info/RECORD,,
+ansible_core-2.18.2.dist-info/Apache-License.txt,sha256=y16Ofl9KOYjhBjwULGDcLfdWBfTEZRXnduOspt-XbhQ,11325
+ansible_core-2.18.2.dist-info/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ansible_core-2.18.2.dist-info/METADATA,sha256=Cg9WFxRolEkSO_EFlMIPEHI68issQS76-gOeSyoVxIo,7668
+ansible_core-2.18.2.dist-info/MIT-license.txt,sha256=jLXp2XurnyZKbye40g9tfmLGtVlxh3pPD4n8xNqX8xc,1023
+ansible_core-2.18.2.dist-info/PSF-license.txt,sha256=g7BC_H1qyg8Q1o5F76Vrm8ChSWYI5-dyj-CdGlNKBUo,2484
+ansible_core-2.18.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ansible_core-2.18.2.dist-info/entry_points.txt,sha256=S9yJij5Im6FgRQxzkqSCnPQokC7PcWrDW_NSygZczJU,451
+ansible_core-2.18.2.dist-info/simplified_bsd.txt,sha256=8R5R7R7sOa0h1Fi6RNgFgHowHBfun-OVOMzJ4rKAk2w,1237
+ansible_core-2.18.2.dist-info/top_level.txt,sha256=IFbRLjAvih1DYzJWg3_F6t4sCzEMxRO7TOMNs6GkYHo,21
+ansible_core-2.18.2.dist-info/RECORD,,

{ansible_core-2.18.1rc1.dist-info → ansible_core-2.18.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

ansible_test/_internal/commands/coverage/__init__.py

@@ -293,6 +293,11 @@ def sanitize_filename(
         new_name = re.sub('^.*/ansible_modlib.zip/ansible/', ansible_path, filename)
         display.info('%s -> %s' % (filename, new_name), verbosity=3)
         filename = new_name
+    elif integration_temp_path in filename:
+        # Rewrite the path of code running from an integration test temporary directory.
+        new_name = re.sub(r'^.*' + re.escape(integration_temp_path) + '[^/]+/', root_path, filename)
+        display.info('%s -> %s' % (filename, new_name), verbosity=3)
+        filename = new_name
     elif collection_search_re and collection_search_re.search(filename):
         new_name = os.path.abspath(collection_sub_re.sub('', filename))
         display.info('%s -> %s' % (filename, new_name), verbosity=3)
@@ -328,11 +333,6 @@ def sanitize_filename(
         new_name = re.sub('^(/.*?)?/root/ansible/', root_path, filename)
         display.info('%s -> %s' % (filename, new_name), verbosity=3)
         filename = new_name
-    elif integration_temp_path in filename:
-        # Rewrite the path of code running from an integration test temporary directory.
-        new_name = re.sub(r'^.*' + re.escape(integration_temp_path) + '[^/]+/', root_path, filename)
-        display.info('%s -> %s' % (filename, new_name), verbosity=3)
-        filename = new_name
 
     filename = os.path.abspath(filename)  # make sure path is absolute (will be relative if previously exported)