ansible-core 2.19.2rc1__py3-none-any.whl → 2.20.0b1__py3-none-any.whl

ansible/plugins/filter/encryption.py

@@ -13,25 +13,13 @@ from ansible.utils.display import Display
 display = Display()
 
 
-def do_vault(data, secret, salt=None, vault_id='filter_default', wrap_object=False, vaultid=None):
+def do_vault(data, secret, salt=None, vault_id='filter_default', wrap_object=False):
     if not isinstance(secret, (str, bytes)):
         raise TypeError(f"Secret passed is required to be a string, instead we got {type(secret)}.")
 
     if not isinstance(data, (str, bytes)):
         raise TypeError(f"Can only vault strings, instead we got {type(data)}.")
 
-    if vaultid is not None:
-        display.deprecated(
-            msg="Use of undocumented `vaultid`.",
-            version="2.20",
-            help_text="Use `vault_id` instead.",
-        )
-
-        if vault_id == 'filter_default':
-            vault_id = vaultid
-        else:
-            display.warning("Ignoring vaultid as vault_id is already set.")
-
     vs = VaultSecret(to_bytes(secret))
     vl = VaultLib()
     try:
@@ -48,11 +36,11 @@ def do_vault(data, secret, salt=None, vault_id='filter_default', wrap_object=Fal
 
 
 @_template.accept_args_markers
-def do_unvault(vault, secret, vault_id='filter_default', vaultid=None):
+def do_unvault(vault, secret, vault_id='filter_default'):
     if isinstance(vault, VaultExceptionMarker):
         vault = vault._disarm()
 
-    if (first_marker := _template.get_first_marker_arg((vault, secret, vault_id, vaultid), {})) is not None:
+    if (first_marker := _template.get_first_marker_arg((vault, secret, vault_id), {})) is not None:
         return first_marker
 
     if not isinstance(secret, (str, bytes)):
@@ -61,18 +49,6 @@ def do_unvault(vault, secret, vault_id='filter_default', vaultid=None):
     if not isinstance(vault, (str, bytes)):
         raise TypeError(f"Vault should be in the form of a string, instead we got {type(vault)}.")
 
-    if vaultid is not None:
-        display.deprecated(
-            msg="Use of undocumented `vaultid`.",
-            version="2.20",
-            help_text="Use `vault_id` instead.",
-        )
-
-        if vault_id == 'filter_default':
-            vault_id = vaultid
-        else:
-            display.warning("Ignoring vaultid as vault_id is already set.")
-
     vs = VaultSecret(to_bytes(secret))
     vl = VaultLib([(vault_id, vs)])
 

ansible/plugins/filter/mathstuff.py

@@ -29,7 +29,6 @@ from jinja2.filters import pass_environment
 
 from ansible.errors import AnsibleError
 from ansible.module_utils.common.text import formatters
-from ansible.module_utils.six import binary_type, text_type
 from ansible.utils.display import Display
 
 try:
@@ -180,7 +179,7 @@ def rekey_on_member(data, key, duplicates='error'):
 
     if isinstance(data, Mapping):
         iterate_over = data.values()
-    elif isinstance(data, Iterable) and not isinstance(data, (text_type, binary_type)):
+    elif isinstance(data, Iterable) and not isinstance(data, (str, bytes)):
         iterate_over = data
     else:
         raise AnsibleError("Type is not a valid list, set, or dict")

ansible/plugins/filter/to_nice_yaml.yml

@@ -1,5 +1,5 @@
 DOCUMENTATION:
-  name: to_yaml
+  name: to_nice_yaml
   author: core team
   version_added: 'historical'
   short_description: Convert variable to YAML string
@@ -20,10 +20,38 @@ DOCUMENTATION:
       description: Affects sorting of dictionary keys.
       default: True
       type: bool
-    #default_style=None, canonical=None, width=None, line_break=None, encoding=None, explicit_start=None, explicit_end=None, version=None, tags=None
+    default_style:
+      description:
+        - Indicates the style of the scalar.
+      choices:
+        - ''
+        - "'"
+        - '"'
+        - '|'
+        - '>'
+      type: string
+    canonical:
+      description:
+        - If set to V(True), export tag type to the output.
+      type: bool
+    width:
+      description: Set the preferred line width.
+      type: int
+    line_break:
+      description: Specify the line break.
+      type: string
+    encoding:
+      description: Specify the output encoding.
+      type: string
+    explicit_start:
+      description: If set to V(True), adds an explicit start using "---".
+      type: bool
+    explicit_end:
+      description: If set to V(True), adds an explicit end using "...".
+      type: bool
   notes:
     - More options may be available, see L(PyYAML documentation, https://pyyaml.org/wiki/PyYAMLDocumentation) for details.
-    - 'These parameters to C(yaml.dump) will be ignored, as they are overridden internally: I(default_flow_style)'
+    - 'These parameters to C(yaml.dump) will be ignored, as they are overridden internally: I(default_flow_style), I(allow_unicode).'
 
 EXAMPLES: |
   # dump variable in a template to create a YAML document

ansible/plugins/filter/to_yaml.yml

@@ -20,21 +20,38 @@ DOCUMENTATION:
       description: Affects sorting of dictionary keys.
       default: True
       type: bool
+    default_style:
+      description:
+        - Indicates the style of the scalar.
+      choices:
+        - ''
+        - "'"
+        - '"'
+        - '|'
+        - '>'
+      type: string
+    canonical:
+      description:
+        - If set to V(True), export tag type to the output.
+      type: bool
+    width:
+      description: Set the preferred line width.
+      type: integer
+    line_break:
+      description: Specify the line break.
+      type: string
+    encoding:
+      description: Specify the output encoding.
+      type: string
+    explicit_start:
+      description: If set to V(True), adds an explicit start using "---".
+      type: bool
+    explicit_end:
+      description: If set to V(True), adds an explicit end using "...".
+      type: bool
   notes:
     - More options may be available, see L(PyYAML documentation, https://pyyaml.org/wiki/PyYAMLDocumentation) for details.
 
-    # TODO: find docs for these
-    #default_flow_style
-    #default_style
-    #canonical=None,
-    #width=None,
-    #line_break=None,
-    #encoding=None,
-    #explicit_start=None,
-    #explicit_end=None,
-    #version=None,
-    #tags=None
-
 EXAMPLES: |
   # dump variable in a template to create a YAML document
   {{ github_workflow | to_yaml }}

ansible/plugins/inventory/__init__.py

@@ -34,7 +34,6 @@ from ansible.parsing.dataloader import DataLoader
 from ansible.plugins import AnsiblePlugin, _ConfigurablePlugin
 from ansible.plugins.cache import CachePluginAdjudicator
 from ansible.module_utils.common.text.converters import to_bytes, to_native
-from ansible.module_utils.six import string_types
 from ansible.utils.display import Display
 from ansible.utils.vars import combine_vars, load_extra_vars
 
@@ -439,7 +438,7 @@ class Constructable(_BaseInventoryPlugin):
                         new_raw_group_names = []
                         if use_default:
                             new_raw_group_names.append(default_value_name)
-                        elif isinstance(key, string_types):
+                        elif isinstance(key, str):
                             new_raw_group_names.append(key)
                         elif isinstance(key, list):
                             for name in key:

ansible/plugins/inventory/script.py

@@ -256,9 +256,10 @@ class InventoryModule(BaseInventoryPlugin):
         group = self.inventory.add_group(group)
 
         if not isinstance(data, dict):
+            original_type = native_type_name(data)
             data = {'hosts': data}
             display.deprecated(
-                msg=f"Group {group!r} was converted to {native_type_name(dict)!r} from {native_type_name(data)!r}.",
+                msg=f"Group {group!r} was converted to {native_type_name(dict)!r} from {original_type!r}.",
                 version='2.23',
                 obj=origin,
             )

ansible/plugins/inventory/toml.py

@@ -89,8 +89,6 @@ import tomllib
 from collections.abc import MutableMapping, MutableSequence
 
 from ansible.errors import AnsibleFileNotFound, AnsibleParserError
-from ansible.module_utils.common.text.converters import to_bytes, to_native
-from ansible.module_utils.six import string_types
 from ansible.plugins.inventory import BaseFileInventoryPlugin
 from ansible.utils.display import Display
 
@@ -147,11 +145,10 @@ class InventoryModule(BaseFileInventoryPlugin):
                 )
 
     def _load_file(self, file_name):
-        if not file_name or not isinstance(file_name, string_types):
-            raise AnsibleParserError("Invalid filename: '%s'" % to_native(file_name))
+        if not file_name or not isinstance(file_name, str):
+            raise AnsibleParserError("Invalid filename: '%s'" % file_name)
 
-        b_file_name = to_bytes(self.loader.path_dwim(file_name))
-        if not self.loader.path_exists(b_file_name):
+        if not self.loader.path_exists(file_name):
             raise AnsibleFileNotFound("Unable to retrieve file contents", file_name=file_name)
 
         try:

ansible/plugins/inventory/yaml.py

@@ -70,7 +70,6 @@ import os
 from collections.abc import MutableMapping
 
 from ansible.errors import AnsibleError, AnsibleParserError
-from ansible.module_utils.six import string_types
 from ansible.module_utils.common.text.converters import to_native, to_text
 from ansible.plugins.inventory import BaseFileInventoryPlugin
 
@@ -136,7 +135,7 @@ class InventoryModule(BaseFileInventoryPlugin):
                 for section in ['vars', 'children', 'hosts']:
                     if section in group_data:
                         # convert strings to dicts as these are allowed
-                        if isinstance(group_data[section], string_types):
+                        if isinstance(group_data[section], str):
                             group_data[section] = {group_data[section]: None}
 
                         if not isinstance(group_data[section], (MutableMapping, NoneType)):  # type: ignore[misc]

ansible/plugins/list.py

@@ -105,18 +105,25 @@ def _list_plugins_from_paths(ptype, dirs, collection, depth=0, docs=False):
                         ]):
                             continue
 
+                        resource_dir = to_native(os.path.dirname(full_path))
+                        resource_name = get_composite_name(collection, plugin, resource_dir, depth)
+
                         if ptype in ('test', 'filter'):
+                            # NOTE: pass the composite resource to ensure any relative
+                            # imports it contains are interpreted in the correct context
+                            if collection:
+                                resource_name = '.'.join(resource_name.split('.')[2:])
                             try:
-                                file_plugins = _list_j2_plugins_from_file(collection, full_path, ptype, plugin)
+                                file_plugins = _list_j2_plugins_from_file(collection, full_path, ptype, resource_name)
                             except KeyError as e:
                                 display.warning('Skipping file %s: %s' % (full_path, to_native(e)))
                                 continue
 
                             for plugin in file_plugins:
-                                plugin_name = get_composite_name(collection, plugin.ansible_name, os.path.dirname(to_native(full_path)), depth)
+                                plugin_name = get_composite_name(collection, plugin.ansible_name, resource_dir, depth)
                                 plugins[plugin_name] = full_path
                         else:
-                            plugin_name = get_composite_name(collection, plugin, os.path.dirname(to_native(full_path)), depth)
+                            plugin_name = resource_name
                             plugins[plugin_name] = full_path
             else:
                 display.debug("Skip listing plugins in '{0}' as it is not a directory".format(path))

ansible/plugins/loader.py

@@ -27,7 +27,6 @@ from ansible import _internal, constants as C
 from ansible.errors import AnsibleError, AnsiblePluginCircularRedirect, AnsiblePluginRemovedError, AnsibleCollectionUnsupportedVersionError
 from ansible.module_utils.common.text.converters import to_bytes, to_text, to_native
 from ansible.module_utils.datatag import deprecator_from_collection_name
-from ansible.module_utils.six import string_types
 from ansible.parsing.yaml.loader import AnsibleLoader
 from ansible._internal._yaml._loader import AnsibleInstrumentedLoader
 from ansible.plugins import get_plugin_class, MODULE_CACHE, PATH_CACHE, PLUGIN_PATH_CACHE, AnsibleJinja2Plugin
@@ -36,6 +35,7 @@ from ansible.utils.collection_loader._collection_finder import _AnsibleCollectio
 from ansible.utils.display import Display
 from ansible.utils.plugin_docs import add_fragments
 from ansible._internal._datatag import _tags
+from ansible._internal import _display_utils
 
 from . import _AnsiblePluginInfoMixin
 from .filter import AnsibleJinja2Filter
@@ -96,7 +96,7 @@ def get_shell_plugin(shell_type=None, executable=None):
 
         # mostly for backwards compat
         if executable:
-            if isinstance(executable, string_types):
+            if isinstance(executable, str):
                 shell_filename = os.path.basename(executable)
                 try:
                     shell = shell_loader.get(shell_filename)
@@ -517,7 +517,7 @@ class PluginLoader:
                 #     filename, cn = find_plugin_docfile( name, type_name, self, [os.path.dirname(path)], C.YAML_DOC_EXTENSIONS)
 
                 if dstring:
-                    add_fragments(dstring, path, fragment_loader=fragment_loader, is_module=(type_name == 'module'))
+                    add_fragments(dstring, path, fragment_loader=fragment_loader, is_module=(type_name == 'module'), section='DOCUMENTATION')
 
                     if 'options' in dstring and isinstance(dstring['options'], dict):
                         C.config.initialize_plugin_configuration_definitions(type_name, name, dstring['options'])
@@ -606,7 +606,7 @@ class PluginLoader:
                 warning_text = tombstone.get('warning_text') or ''
                 warning_plugin_type = "module" if self.type == "modules" else f'{self.type} plugin'
                 warning_text = f'The {fq_name!r} {warning_plugin_type} has been removed.{" " if warning_text else ""}{warning_text}'
-                removed_msg = display._get_deprecation_message_with_plugin_info(
+                removed_msg = _display_utils.get_deprecation_message_with_plugin_info(
                     msg=warning_text,
                     version=removal_version,
                     date=removal_date,
@@ -1411,7 +1411,7 @@ class Jinja2Loader(PluginLoader):
                 removal_version = tombstone_entry.get('removal_version')
                 warning_text = f'The {key!r} {self.type} plugin has been removed.{" " if warning_text else ""}{warning_text}'
 
-                exc_msg = display._get_deprecation_message_with_plugin_info(
+                exc_msg = _display_utils.get_deprecation_message_with_plugin_info(
                     msg=warning_text,
                     version=removal_version,
                     date=removal_date,
@@ -1674,7 +1674,7 @@ def _configure_collection_loader(prefix_collections_path=None):
 
     # insert the internal ansible._protomatter collection up front
     paths = [os.path.dirname(_internal.__file__)] + list(prefix_collections_path) + C.COLLECTIONS_PATHS
-    finder = _AnsibleCollectionFinder(paths, C.COLLECTIONS_SCAN_SYS_PATH)
+    finder = _AnsibleCollectionFinder(paths, C.COLLECTIONS_SCAN_SYS_PATH, internal_collections=paths[0])
     finder._install()
 
     # this should succeed now

ansible/plugins/lookup/password.py

@@ -134,7 +134,6 @@ import hashlib
 
 from ansible.errors import AnsibleError, AnsibleAssertionError
 from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
-from ansible.module_utils.six import string_types
 from ansible.parsing.splitter import parse_kv
 from ansible.plugins.lookup import LookupBase
 from ansible.utils.encrypt import BaseHash, do_encrypt, random_password, random_salt
@@ -335,7 +334,7 @@ class LookupModule(LookupBase):
 
         # chars still might need more
         chars = params.get('chars', self.get_option('chars'))
-        if chars and isinstance(chars, string_types):
+        if chars and isinstance(chars, str):
             tmp_chars = []
             if u',,' in chars:
                 tmp_chars.append(u',')

ansible/plugins/lookup/subelements.py

@@ -83,7 +83,6 @@ _list:
 """
 
 from ansible.errors import AnsibleError
-from ansible.module_utils.six import string_types
 from ansible.module_utils.parsing.convert_bool import boolean
 from ansible.plugins.lookup import LookupBase
 
@@ -104,7 +103,7 @@ class LookupModule(LookupBase):
             _raise_terms_error()
 
         # first term should be a list (or dict), second a string holding the subkey
-        if not isinstance(terms[0], (list, dict)) or not isinstance(terms[1], string_types):
+        if not isinstance(terms[0], (list, dict)) or not isinstance(terms[1], str):
             _raise_terms_error("first a dict or a list, second a string pointing to the subkey")
         subelements = terms[1].split(".")
 
@@ -122,7 +121,7 @@ class LookupModule(LookupBase):
         flags = {}
         if len(terms) == 3:
             flags = terms[2]
-        if not isinstance(flags, dict) and not all(isinstance(key, string_types) and key in FLAGS for key in flags):
+        if not isinstance(flags, dict) and not all(isinstance(key, str) and key in FLAGS for key in flags):
             _raise_terms_error("the optional third item must be a dict with flags %s" % FLAGS)
 
         # build_items

ansible/plugins/lookup/url.py

@@ -164,7 +164,7 @@ options:
     description:
       - SSL/TLS Ciphers to use for the request
       - 'When a list is provided, all ciphers are joined in order with C(:)'
-      - See the L(OpenSSL Cipher List Format,https://www.openssl.org/docs/manmaster/man1/openssl-ciphers.html#CIPHER-LIST-FORMAT)
+      - See the L(OpenSSL Cipher List Format,https://docs.openssl.org/master/man1/openssl-ciphers/#cipher-list-format)
         for more details.
       - The available ciphers is dependent on the Python and OpenSSL/LibreSSL versions
     type: list

ansible/plugins/lookup/varnames.py

@@ -52,7 +52,6 @@ import re
 
 from ansible.errors import AnsibleError
 from ansible.module_utils.common.text.converters import to_native
-from ansible.module_utils.six import string_types
 from ansible.plugins.lookup import LookupBase
 
 
@@ -69,7 +68,7 @@ class LookupModule(LookupBase):
         variable_names = list(variables.keys())
         for term in terms:
 
-            if not isinstance(term, string_types):
+            if not isinstance(term, str):
                 raise AnsibleError('Invalid setting identifier, "%s" is not a string, it is a %s' % (term, type(term)))
 
             try:

ansible/plugins/shell/__init__.py

@@ -24,12 +24,12 @@ import secrets
 import shlex
 import time
 
-from collections.abc import Mapping, Sequence
-
 from ansible.errors import AnsibleError
 from ansible.module_utils.common.text.converters import to_native
-from ansible.module_utils.six import text_type, string_types
 from ansible.plugins import AnsiblePlugin
+from ansible.utils.display import Display
+
+display = Display()
 
 _USER_HOME_PATH_RE = re.compile(r'^~[_.A-Za-z0-9][-_.A-Za-z0-9]*$')
 
@@ -84,7 +84,7 @@ class ShellBase(AnsiblePlugin):
         return 'ansible-tmp-%s-%s-%s' % (time.time(), os.getpid(), secrets.randbelow(2**48))
 
     def env_prefix(self, **kwargs):
-        return ' '.join(['%s=%s' % (k, self.quote(text_type(v))) for k, v in kwargs.items()])
+        return ' '.join(['%s=%s' % (k, self.quote(str(v))) for k, v in kwargs.items()])
 
     def join_path(self, *args):
         return os.path.join(*args)
@@ -272,6 +272,11 @@ class ShellBase(AnsiblePlugin):
 
     def wrap_for_exec(self, cmd):
         """wrap script execution with any necessary decoration (eg '&' for quoted powershell script paths)"""
+        display.deprecated(
+            msg='The Shell.wrap_for_exec method is deprecated.',
+            help_text="Contact plugin author to update their plugin to not use this method.",
+            version='2.24',
+        )
         return cmd
 
     def quote(self, cmd):

ansible/plugins/shell/powershell.py

@@ -192,7 +192,7 @@ class ShellModule(ShellBase):
 
     def join_path(self, *args):
         # use normpath() to remove doubled slashed and convert forward to backslashes
-        parts = [ntpath.normpath(self._unquote(arg)) for arg in args]
+        parts = [ntpath.normpath(arg) for arg in args]
 
         # Because ntpath.join treats any component that begins with a backslash as an absolute path,
         # we have to strip slashes from at least the beginning, otherwise join will ignore all previous
@@ -210,7 +210,6 @@ class ShellModule(ShellBase):
 
     def path_has_trailing_slash(self, path):
         # Allow Windows paths to be specified using either slash.
-        path = self._unquote(path)
         return path.endswith('/') or path.endswith('\\')
 
     def chmod(self, paths, mode):
@@ -223,11 +222,11 @@ class ShellModule(ShellBase):
         raise NotImplementedError('set_user_facl is not implemented for Powershell')
 
     def remove(self, path, recurse=False):
-        path = self._escape(self._unquote(path))
+        quoted_path = self._escape(path)
         if recurse:
-            return self._encode_script("""Remove-Item '%s' -Force -Recurse;""" % path)
+            return self._encode_script("""Remove-Item '%s' -Force -Recurse;""" % quoted_path)
         else:
-            return self._encode_script("""Remove-Item '%s' -Force;""" % path)
+            return self._encode_script("""Remove-Item '%s' -Force;""" % quoted_path)
 
     def mkdtemp(
         self,
@@ -240,7 +239,6 @@ class ShellModule(ShellBase):
         # compatibility in case other action plugins outside Ansible calls this.
         if not basefile:
             basefile = self.__class__._generate_temp_dir_name()
-        basefile = self._escape(self._unquote(basefile))
         basetmpdir = self._escape(tmpdir if tmpdir else self.get_option('remote_tmp'))
 
         script = f"""
@@ -263,7 +261,6 @@ class ShellModule(ShellBase):
         if not basefile:
             basefile = self.__class__._generate_temp_dir_name()
 
-        basefile = self._unquote(basefile)
         basetmpdir = tmpdir if tmpdir else self.get_option('remote_tmp')
 
         script, stdin = _bootstrap_powershell_script("powershell_mkdtemp.ps1", {
@@ -283,7 +280,6 @@ class ShellModule(ShellBase):
     ) -> str:
         # This is not called in Ansible anymore but it is kept for backwards
         # compatibility in case other actions plugins outside Ansible called this.
-        user_home_path = self._unquote(user_home_path)
         if user_home_path == '~':
             script = 'Write-Output (Get-Location).Path'
         elif user_home_path.startswith('~\\'):
@@ -297,7 +293,6 @@ class ShellModule(ShellBase):
         user_home_path: str,
         username: str = '',
     ) -> _ShellCommand:
-        user_home_path = self._unquote(user_home_path)
         script, stdin = _bootstrap_powershell_script("powershell_expand_user.ps1", {
             'Path': user_home_path,
         })
@@ -308,7 +303,7 @@ class ShellModule(ShellBase):
         )
 
     def exists(self, path):
-        path = self._escape(self._unquote(path))
+        path = self._escape(path)
         script = """
             If (Test-Path '%s')
             {
@@ -329,7 +324,7 @@ class ShellModule(ShellBase):
             version="2.23",
             help_text="Use `ActionBase._execute_remote_stat()` instead.",
         )
-        path = self._escape(self._unquote(path))
+        path = self._escape(path)
         script = """
             If (Test-Path -PathType Leaf '%(path)s')
             {
@@ -364,7 +359,7 @@ class ShellModule(ShellBase):
             if arg_path:
                 # Running a module without the exec_wrapper and with an argument
                 # file.
-                script_path = self._unquote(cmd_parts[0])
+                script_path = cmd_parts[0]
                 if not script_path.lower().endswith('.ps1'):
                     script_path += '.ps1'
 
@@ -387,7 +382,6 @@ class ShellModule(ShellBase):
             cmd_parts.insert(0, shebang[2:])
         elif not shebang:
             # The module is assumed to be a binary
-            cmd_parts[0] = self._unquote(cmd_parts[0])
             cmd_parts.append(arg_path)
         script = """
             Try
@@ -428,19 +422,9 @@ class ShellModule(ShellBase):
         return self._encode_script(script, preserve_rc=False)
 
     def wrap_for_exec(self, cmd):
+        super().wrap_for_exec(cmd)
         return '& %s; exit $LASTEXITCODE' % cmd
 
-    def _unquote(self, value):
-        """Remove any matching quotes that wrap the given value."""
-        value = to_text(value or '')
-        m = re.match(r'^\s*?\'(.*?)\'\s*?$', value)
-        if m:
-            return m.group(1)
-        m = re.match(r'^\s*?"(.*?)"\s*?$', value)
-        if m:
-            return m.group(1)
-        return value
-
     def _escape(self, value):
         """Return value escaped for use in PowerShell single quotes."""
         # There are 5 chars that need to be escaped in a single quote.

ansible/plugins/strategy/__init__.py

@@ -53,6 +53,9 @@ from ansible.utils.sentinel import Sentinel
 from ansible.utils.vars import combine_vars
 from ansible.vars.clean import strip_internal_keys, module_response_deepcopy
 
+if t.TYPE_CHECKING:
+    from ansible.playbook.role_include import IncludeRole
+
 display = Display()
 
 __all__ = ['StrategyBase']
@@ -581,7 +584,7 @@ class StrategyBase:
                         self._variable_manager.set_nonpersistent_facts(
                             original_host.name,
                             dict(
-                                ansible_failed_task=original_task.serialize(),
+                                ansible_failed_task=original_task.dump_attrs(),
                                 ansible_failed_result=task_result._return_data,
                             ),
                         )
@@ -799,7 +802,7 @@ class StrategyBase:
 
         return ret_results
 
-    def _copy_included_file(self, included_file: IncludedFile) -> IncludedFile:
+    def _copy_included_file(self, included_file: IncludedFile) -> TaskInclude | IncludeRole:
         """
         A proven safe and performant way to create a copy of an included file
         """
@@ -900,7 +903,7 @@ class StrategyBase:
         display.warning("%s task does not support when conditional" % task_name)
 
     def _execute_meta(self, task: Task, play_context, iterator, target_host: Host):
-        task.resolved_action = 'ansible.builtin.meta'  # _post_validate_args is never called for meta actions, so resolved_action hasn't been set
+        task._resolved_action = 'ansible.builtin.meta'  # _post_validate_args is never called for meta actions, so resolved_action hasn't been set
 
         # meta tasks store their args in the _raw_params field of args,
         # since they do not use k=v pairs, so get that

ansible/plugins/test/core.py

@@ -142,6 +142,9 @@ def regex(value='', pattern='', ignorecase=False, multiline=False, match_type='s
         This is likely only useful for `search` and `match` which already
         have their own filters.
     """
+    valid_match_types = ('search', 'match', 'fullmatch')
+    if match_type not in valid_match_types:
+        raise errors.AnsibleTemplatePluginError(f"Invalid match_type specified. Expected one of: {', '.join(valid_match_types)}.", obj=match_type)
     value = to_text(value, errors='surrogate_or_strict')
     flags = 0
     if ignorecase:
@@ -149,7 +152,7 @@ def regex(value='', pattern='', ignorecase=False, multiline=False, match_type='s
     if multiline:
         flags |= re.M
     _re = re.compile(pattern, flags=flags)
-    return bool(getattr(_re, match_type, 'search')(value))
+    return bool(getattr(_re, match_type)(value))
 
 
 @accept_args_markers

ansible/plugins/test/regex.yml

@@ -3,7 +3,7 @@ DOCUMENTATION:
   author: Ansible Core
   short_description: Does string match regular expression from the start
   description:
-    - Compare string against regular expression using Python's match or search functions.
+    - Compare string against regular expression using Python's match, fullmatch or search functions.
   options:
     _input:
       description: String to match.
@@ -22,14 +22,26 @@ DOCUMENTATION:
       type: boolean
       default: False
     match_type:
-      description: Decide which function to be used to do the matching.
+      description:
+        - Decide which function to be used to do the matching.
       type: string
-      choices: [match, search]
+      choices: [match, search, fullmatch]
       default: search
 
-EXAMPLES: |
-  url: "https://example.com/users/foo/resources/bar"
-  foundmatch: url is regex("example\.com/\w+/foo")
+EXAMPLES:
+  - name: check if string matches regex
+    assert:
+      that:
+        - 'url is regex("example\.com/\w+/foo")'
+    vars:
+      url: "https://example.com/users/foo/resources/bar"
+
+  - name: check if string matches regex ignoring case
+    assert:
+      that:
+        - 'url is regex("EXAMPLE\.COM/\w+/foo", ignorecase=True)'
+    vars:
+      url: "https://Example.com/users/foo/resources/bar"
 
 RETURN:
   _value: