ansible-core 2.19.0b2__py3-none-any.whl → 2.19.0b3__py3-none-any.whl

ansible/_internal/_ansiballz.py

@@ -42,7 +42,6 @@ def _ansiballz_main(
     module_fqn: str,
     params: str,
     profile: str,
-    plugin_info_dict: dict[str, object],
     date_time: datetime.datetime,
     coverage_config: str | None,
     coverage_output: str | None,
@@ -142,7 +141,6 @@ def _ansiballz_main(
         run_module(
             json_params=json_params,
             profile=profile,
-            plugin_info_dict=plugin_info_dict,
             module_fqn=module_fqn,
             modlib_path=modlib_path,
             coverage_config=coverage_config,
@@ -230,13 +228,12 @@ def _ansiballz_main(
             run_module(
                 json_params=json_params,
                 profile=profile,
-                plugin_info_dict=plugin_info_dict,
                 module_fqn=module_fqn,
                 modlib_path=modlib_path,
             )
 
         else:
-            print('WARNING: Unknown debug command.  Doing nothing.')
+            print(f'FATAL: Unknown debug command {command!r}.  Doing nothing.')
 
     #
     # See comments in the debug() method for information on debugging

ansible/_internal/_templating/_datatag.py

@@ -12,7 +12,6 @@ from ansible.utils.display import Display
 from ._access import NotifiableAccessContextBase
 from ._utils import TemplateContext
 
-
 display = Display()
 
 
@@ -57,10 +56,10 @@ class DeprecatedAccessAuditContext(NotifiableAccessContextBase):
             display._deprecated_with_plugin_info(
                 msg=msg,
                 help_text=item.deprecated.help_text,
-                version=item.deprecated.removal_version,
-                date=item.deprecated.removal_date,
+                version=item.deprecated.version,
+                date=item.deprecated.date,
                 obj=item.template,
-                plugin=item.deprecated.plugin,
+                deprecator=item.deprecated.deprecator,
             )
 
         return result

ansible/_internal/_templating/_engine.py

@@ -566,7 +566,12 @@ class TemplateEngine:
         )
 
         if _TemplateConfig.allow_broken_conditionals:
-            _display.deprecated(msg=msg, obj=conditional, help_text=self._BROKEN_CONDITIONAL_ALLOWED_FRAGMENT, version='2.23')
+            _display.deprecated(
+                msg=msg,
+                obj=conditional,
+                help_text=self._BROKEN_CONDITIONAL_ALLOWED_FRAGMENT,
+                version='2.23',
+            )
 
             return bool_result
 

ansible/_internal/_templating/_jinja_plugins.py

@@ -9,7 +9,6 @@ import functools
 import typing as t
 
 from ansible.module_utils._internal._ambient_context import AmbientContextBase
-from ansible.module_utils._internal._plugin_exec_context import PluginExecContext
 from ansible.module_utils.common.collections import is_sequence
 from ansible.module_utils._internal._datatag import AnsibleTagHelper
 from ansible._internal._datatag._tags import TrustedAsTemplate
@@ -111,7 +110,7 @@ class JinjaPluginIntercept(c.MutableMapping):
                 return first_marker
 
         try:
-            with JinjaCallContext(accept_lazy_markers=instance.accept_lazy_markers), PluginExecContext(executing_plugin=instance):
+            with JinjaCallContext(accept_lazy_markers=instance.accept_lazy_markers):
                 return instance.j2_function(*lazify_container_args(args), **lazify_container_kwargs(kwargs))
         except MarkerError as ex:
             return ex.source
@@ -212,10 +211,7 @@ def _invoke_lookup(*, plugin_name: str, lookup_terms: list, lookup_kwargs: dict[
     wantlist = lookup_kwargs.pop('wantlist', False)
     errors = lookup_kwargs.pop('errors', 'strict')
 
-    with (
-        JinjaCallContext(accept_lazy_markers=instance.accept_lazy_markers),
-        PluginExecContext(executing_plugin=instance),
-    ):
+    with JinjaCallContext(accept_lazy_markers=instance.accept_lazy_markers):
         try:
             if _TemplateConfig.allow_embedded_templates:
                 # for backwards compat, only trust constant templates in lookup terms

ansible/cli/__init__.py

@@ -10,7 +10,6 @@ import os
 import signal
 import sys
 
-
 # We overload the ``ansible`` adhoc command to provide the functionality for
 # ``SSH_ASKPASS``. This code is here, and not in ``adhoc.py`` to bypass
 # unnecessary code. The program provided to ``SSH_ASKPASS`` can only be invoked
@@ -106,6 +105,7 @@ except Exception as ex:
 
 
 from ansible import context
+from ansible.utils import display as _display
 from ansible.cli.arguments import option_helpers as opt_help
 from ansible.inventory.manager import InventoryManager
 from ansible.module_utils.six import string_types
@@ -122,6 +122,7 @@ from ansible.utils.collection_loader import AnsibleCollectionConfig
 from ansible.utils.collection_loader._collection_finder import _get_collection_name_from_path
 from ansible.utils.path import unfrackpath
 from ansible.vars.manager import VariableManager
+from ansible.module_utils._internal import _deprecator
 
 try:
     import argcomplete
@@ -257,7 +258,7 @@ class CLI(ABC):
         else:
             display.v(u"No config file found; using defaults")
 
-        C.handle_config_noise(display)
+        _display._report_config_warnings(_deprecator.ANSIBLE_CORE_DEPRECATOR)
 
     @staticmethod
     def split_vault_id(vault_id):

ansible/cli/arguments/option_helpers.py

@@ -56,7 +56,10 @@ class DeprecatedArgument:
 
         from ansible.utils.display import Display
 
-        Display().deprecated(f'The {option!r} argument is deprecated.', version=self.version)
+        Display().deprecated(  # pylint: disable=ansible-invalid-deprecated-version
+            msg=f'The {option!r} argument is deprecated.',
+            version=self.version,
+        )
 
 
 class ArgumentParser(argparse.ArgumentParser):

ansible/cli/doc.py

@@ -1335,7 +1335,6 @@ class DocCLI(CLI, RoleMixin):
                     'This was unintentionally allowed when plugin attributes were added, '
                     'but the feature does not map well to role argument specs.',
                     version='2.20',
-                    collection_name='ansible.builtin',
                 )
                 text.append("")
                 text.append(_format("ATTRIBUTES:", 'bold'))

ansible/config/manager.py

@@ -480,9 +480,9 @@ class ConfigManager(object):
         else:
             ret = self._plugins.get(plugin_type, {}).get(name, {})
 
-        if ignore_private:
+        if ignore_private:  # ignore 'test' config entries, they should not change runtime behaviors
             for cdef in list(ret.keys()):
-                if cdef.startswith('_'):
+                if cdef.startswith('_Z_'):
                     del ret[cdef]
         return ret
 

ansible/constants.py

@@ -10,9 +10,7 @@ from string import ascii_letters, digits
 
 from ansible.config.manager import ConfigManager
 from ansible.module_utils.common.text.converters import to_text
-from ansible.module_utils.common.collections import Sequence
 from ansible.module_utils.parsing.convert_bool import BOOLEANS_TRUE
-from ansible.release import __version__
 from ansible.utils.fqcn import add_internal_fqcns
 
 # initialize config manager/config data to read/store global settings
@@ -20,68 +18,11 @@ from ansible.utils.fqcn import add_internal_fqcns
 config = ConfigManager()
 
 
-def _warning(msg):
-    """ display is not guaranteed here, nor it being the full class, but try anyways, fallback to sys.stderr.write """
-    try:
-        from ansible.utils.display import Display
-        Display().warning(msg)
-    except Exception:
-        import sys
-        sys.stderr.write(' [WARNING] %s\n' % (msg))
-
-
-def _deprecated(msg, version):
-    """ display is not guaranteed here, nor it being the full class, but try anyways, fallback to sys.stderr.write """
-    try:
-        from ansible.utils.display import Display
-        Display().deprecated(msg, version=version)
-    except Exception:
-        import sys
-        sys.stderr.write(' [DEPRECATED] %s, to be removed in %s\n' % (msg, version))
-
-
-def handle_config_noise(display=None):
-
-    if display is not None:
-        w = display.warning
-        d = display.deprecated
-    else:
-        w = _warning
-        d = _deprecated
-
-    while config.WARNINGS:
-        warn = config.WARNINGS.pop()
-        w(warn)
-
-    while config.DEPRECATED:
-        # tuple with name and options
-        dep = config.DEPRECATED.pop(0)
-        msg = config.get_deprecated_msg_from_config(dep[1])
-        # use tabs only for ansible-doc?
-        msg = msg.replace("\t", "")
-        d(f"{dep[0]} option. {msg}", version=dep[1]['version'])
-
-
 def set_constant(name, value, export=vars()):
     """ sets constants and returns resolved options dict """
     export[name] = value
 
 
-class _DeprecatedSequenceConstant(Sequence):
-    def __init__(self, value, msg, version):
-        self._value = value
-        self._msg = msg
-        self._version = version
-
-    def __len__(self):
-        _deprecated(self._msg, self._version)
-        return len(self._value)
-
-    def __getitem__(self, y):
-        _deprecated(self._msg, self._version)
-        return self._value[y]
-
-
 # CONSTANTS ### yes, actual ones
 
 # The following are hard-coded action names
@@ -245,6 +186,3 @@ MAGIC_VARIABLE_MAPPING = dict(
 # POPULATE SETTINGS FROM CONFIG ###
 for setting in config.get_configuration_definitions():
     set_constant(setting, config.get_config_value(setting, variables=vars()))
-
-# emit any warnings or deprecations
-handle_config_noise()

ansible/errors/__init__.py

@@ -18,6 +18,9 @@ from ..module_utils.datatag import native_type_name
 from ansible._internal._datatag import _tags
 from .._internal._errors import _utils
 
+if t.TYPE_CHECKING:
+    from ansible.plugins import loader as _t_loader
+
 
 class ExitCode(enum.IntEnum):
     SUCCESS = 0  # used by TQM, must be bit-flag safe
@@ -374,8 +377,9 @@ class _AnsibleActionDone(AnsibleAction):
 class AnsiblePluginError(AnsibleError):
     """Base class for Ansible plugin-related errors that do not need AnsibleError contextual data."""
 
-    def __init__(self, message=None, plugin_load_context=None):
-        super(AnsiblePluginError, self).__init__(message)
+    def __init__(self, message: str | None = None, plugin_load_context: _t_loader.PluginLoadContext | None = None, help_text: str | None = None) -> None:
+        super(AnsiblePluginError, self).__init__(message, help_text=help_text)
+
         self.plugin_load_context = plugin_load_context
 
 

ansible/executor/module_common.py

@@ -39,7 +39,6 @@ from io import BytesIO
 from ansible._internal import _locking
 from ansible._internal._datatag import _utils
 from ansible.module_utils._internal import _dataclass_validation
-from ansible.module_utils.common.messages import PluginInfo
 from ansible.module_utils.common.yaml import yaml_load
 from ansible._internal._datatag._tags import Origin
 from ansible.module_utils.common.json import Direction, get_module_encoder
@@ -56,6 +55,7 @@ from ansible.template import Templar
 from ansible.utils.collection_loader._collection_finder import _get_collection_metadata, _nested_dict_get
 from ansible.module_utils._internal import _json, _ansiballz
 from ansible.module_utils import basic as _basic
+from ansible.module_utils.common import messages as _messages
 
 if t.TYPE_CHECKING:
     from ansible import template as _template
@@ -434,7 +434,13 @@ class ModuleUtilLocatorBase:
             else:
                 msg += '.'
 
-            display.deprecated(msg, removal_version, removed, removal_date, self._collection_name)
+            display.deprecated(  # pylint: disable=ansible-deprecated-date-not-permitted,ansible-deprecated-unnecessary-collection-name
+                msg=msg,
+                version=removal_version,
+                removed=removed,
+                date=removal_date,
+                deprecator=_messages.PluginInfo._from_collection_name(self._collection_name),
+            )
         if 'redirect' in routing_entry:
             self.redirected = True
             source_pkg = '.'.join(name_parts)
@@ -944,7 +950,6 @@ class _CachedModule:
 def _find_module_utils(
         *,
         module_name: str,
-        plugin: PluginInfo,
         b_module_data: bytes,
         module_path: str,
         module_args: dict[object, object],
@@ -1020,7 +1025,9 @@ def _find_module_utils(
         # People should start writing collections instead of modules in roles so we
         # may never fix this
         display.debug('ANSIBALLZ: Could not determine module FQN')
-        remote_module_fqn = 'ansible.modules.%s' % module_name
+        # FIXME: add integration test to validate that builtins and legacy modules with the same name are tracked separately by the caching mechanism
+        # FIXME: surrogate FQN should be unique per source path- role-packaged modules with name collisions can still be aliased
+        remote_module_fqn = 'ansible.legacy.%s' % module_name
 
     if module_substyle == 'python':
         date_time = datetime.datetime.now(datetime.timezone.utc)
@@ -1126,7 +1133,6 @@ def _find_module_utils(
             module_fqn=remote_module_fqn,
             params=encoded_params,
             profile=module_metadata.serialization_profile,
-            plugin_info_dict=dataclasses.asdict(plugin),
             date_time=date_time,
             coverage_config=coverage_config,
             coverage_output=coverage_output,
@@ -1236,7 +1242,6 @@ def _extract_interpreter(b_module_data):
 def modify_module(
         *,
         module_name: str,
-        plugin: PluginInfo,
         module_path,
         module_args,
         templar,
@@ -1277,7 +1282,6 @@ def modify_module(
 
     module_bits = _find_module_utils(
         module_name=module_name,
-        plugin=plugin,
         b_module_data=b_module_data,
         module_path=module_path,
         module_args=module_args,

ansible/executor/task_executor.py

@@ -22,8 +22,7 @@ from ansible.errors import (
 )
 from ansible.executor.task_result import _RawTaskResult
 from ansible._internal._datatag import _utils
-from ansible.module_utils._internal._plugin_exec_context import PluginExecContext
-from ansible.module_utils.common.messages import Detail, WarningSummary, DeprecationSummary
+from ansible.module_utils.common.messages import Detail, WarningSummary, DeprecationSummary, PluginInfo
 from ansible.module_utils.datatag import native_type_name
 from ansible._internal._datatag._tags import TrustedAsTemplate
 from ansible.module_utils.parsing.convert_bool import boolean
@@ -640,8 +639,8 @@ class TaskExecutor:
                 if self._task.timeout:
                     old_sig = signal.signal(signal.SIGALRM, task_timeout)
                     signal.alarm(self._task.timeout)
-                with PluginExecContext(self._handler):
-                    result = self._handler.run(task_vars=vars_copy)
+
+                result = self._handler.run(task_vars=vars_copy)
 
             # DTFIX-RELEASE: nuke this, it hides a lot of error detail- remove the active exception propagation hack from AnsibleActionFail at the same time
             except (AnsibleActionFail, AnsibleActionSkip) as e:
@@ -844,13 +843,12 @@ class TaskExecutor:
                     if not isinstance(deprecation, DeprecationSummary):
                         # translate non-DeprecationMessageDetail message dicts
                         try:
-                            if deprecation.pop('collection_name', ...) is not ...:
+                            if (collection_name := deprecation.pop('collection_name', ...)) is not ...:
                                 # deprecated: description='enable the deprecation message for collection_name' core_version='2.23'
+                                # CAUTION: This deprecation cannot be enabled until the replacement (deprecator) has been documented, and the schema finalized.
                                 # self.deprecated('The `collection_name` key in the `deprecations` dictionary is deprecated.', version='2.27')
-                                pass
+                                deprecation.update(deprecator=PluginInfo._from_collection_name(collection_name))
 
-                            # DTFIX-RELEASE: when plugin isn't set, do it at the boundary where we receive the module/action results
-                            #                that may even allow us to never set it in modules/actions directly and to populate it at the boundary
                             deprecation = DeprecationSummary(
                                 details=(
                                     Detail(msg=deprecation.pop('msg')),

ansible/galaxy/api.py

@@ -138,7 +138,7 @@ def g_connect(versions):
                     'The v2 Ansible Galaxy API is deprecated and no longer supported. '
                     'Ensure that you have configured the ansible-galaxy CLI to utilize an '
                     'updated and supported version of Ansible Galaxy.',
-                    version='2.20'
+                    version='2.20',
                 )
 
             return method(self, *args, **kwargs)

ansible/galaxy/collection/__init__.py

@@ -201,9 +201,9 @@ class CollectionSignatureError(Exception):
 
 # FUTURE: expose actual verify result details for a collection on this object, maybe reimplement as dataclass on py3.8+
 class CollectionVerifyResult:
-    def __init__(self, collection_name):  # type: (str) -> None
-        self.collection_name = collection_name  # type: str
-        self.success = True  # type: bool
+    def __init__(self, collection_name: str) -> None:
+        self.collection_name = collection_name
+        self.success = True
 
 
 def verify_local_collection(local_collection, remote_collection, artifacts_manager):

ansible/module_utils/_internal/_ansiballz.py

@@ -6,7 +6,6 @@
 from __future__ import annotations
 
 import atexit
-import dataclasses
 import importlib.util
 import json
 import os
@@ -15,17 +14,14 @@ import sys
 import typing as t
 
 from . import _errors
-from ._plugin_exec_context import PluginExecContext, HasPluginInfo
 from .. import basic
 from ..common.json import get_module_encoder, Direction
-from ..common.messages import PluginInfo
 
 
 def run_module(
     *,
     json_params: bytes,
     profile: str,
-    plugin_info_dict: dict[str, object],
     module_fqn: str,
     modlib_path: str,
     init_globals: dict[str, t.Any] | None = None,
@@ -38,7 +34,6 @@ def run_module(
         _run_module(
             json_params=json_params,
             profile=profile,
-            plugin_info_dict=plugin_info_dict,
             module_fqn=module_fqn,
             modlib_path=modlib_path,
             init_globals=init_globals,
@@ -80,7 +75,6 @@ def _run_module(
     *,
     json_params: bytes,
     profile: str,
-    plugin_info_dict: dict[str, object],
     module_fqn: str,
     modlib_path: str,
     init_globals: dict[str, t.Any] | None = None,
@@ -92,12 +86,11 @@ def _run_module(
     init_globals = init_globals or {}
     init_globals.update(_module_fqn=module_fqn, _modlib_path=modlib_path)
 
-    with PluginExecContext(_ModulePluginWrapper(PluginInfo._from_dict(plugin_info_dict))):
-        # Run the module. By importing it as '__main__', it executes as a script.
-        runpy.run_module(mod_name=module_fqn, init_globals=init_globals, run_name='__main__', alter_sys=True)
+    # Run the module. By importing it as '__main__', it executes as a script.
+    runpy.run_module(mod_name=module_fqn, init_globals=init_globals, run_name='__main__', alter_sys=True)
 
-        # An Ansible module must print its own results and exit. If execution reaches this point, that did not happen.
-        raise RuntimeError('New-style module did not handle its own exit.')
+    # An Ansible module must print its own results and exit. If execution reaches this point, that did not happen.
+    raise RuntimeError('New-style module did not handle its own exit.')
 
 
 def _handle_exception(exception: BaseException, profile: str) -> t.NoReturn:
@@ -112,22 +105,3 @@ def _handle_exception(exception: BaseException, profile: str) -> t.NoReturn:
     print(json.dumps(result, cls=encoder))  # pylint: disable=ansible-bad-function
 
     sys.exit(1)  # pylint: disable=ansible-bad-function
-
-
-@dataclasses.dataclass(frozen=True)
-class _ModulePluginWrapper(HasPluginInfo):
-    """Modules aren't plugin instances; this adapter implements the `HasPluginInfo` protocol to allow `PluginExecContext` infra to work with modules."""
-
-    plugin: PluginInfo
-
-    @property
-    def _load_name(self) -> str:
-        return self.plugin.requested_name
-
-    @property
-    def ansible_name(self) -> str:
-        return self.plugin.resolved_name
-
-    @property
-    def plugin_type(self) -> str:
-        return self.plugin.type

ansible/module_utils/_internal/_datatag/_tags.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import dataclasses
-import datetime
 import typing as t
 
 from ansible.module_utils.common import messages as _messages
@@ -12,27 +11,6 @@ from ansible.module_utils._internal import _datatag
 class Deprecated(_datatag.AnsibleDatatagBase):
     msg: str
     help_text: t.Optional[str] = None
-    removal_date: t.Optional[datetime.date] = None
-    removal_version: t.Optional[str] = None
-    plugin: t.Optional[_messages.PluginInfo] = None
-
-    @classmethod
-    def _from_dict(cls, d: t.Dict[str, t.Any]) -> Deprecated:
-        source = d
-        removal_date = source.get('removal_date')
-
-        if removal_date is not None:
-            source = source.copy()
-            source['removal_date'] = datetime.date.fromisoformat(removal_date)
-
-        return cls(**source)
-
-    def _as_dict(self) -> t.Dict[str, t.Any]:
-        # deprecated: description='no-args super() with slotted dataclass requires 3.14+' python_version='3.13'
-        # see: https://github.com/python/cpython/pull/124455
-        value = super(Deprecated, self)._as_dict()
-
-        if self.removal_date is not None:
-            value['removal_date'] = self.removal_date.isoformat()
-
-        return value
+    date: t.Optional[str] = None
+    version: t.Optional[str] = None
+    deprecator: t.Optional[_messages.PluginInfo] = None

ansible/module_utils/_internal/_deprecator.py

@@ -0,0 +1,134 @@
+from __future__ import annotations
+
+import inspect
+import re
+import pathlib
+import sys
+import typing as t
+
+from ansible.module_utils.common.messages import PluginInfo
+
+_ansible_module_base_path: t.Final = pathlib.Path(sys.modules['ansible'].__file__).parent
+"""Runtime-detected base path of the `ansible` Python package to distinguish between Ansible-owned and external code."""
+
+ANSIBLE_CORE_DEPRECATOR: t.Final = PluginInfo._from_collection_name('ansible.builtin')
+"""Singleton `PluginInfo` instance for ansible-core callers where the plugin can/should not be identified in messages."""
+
+INDETERMINATE_DEPRECATOR: t.Final = PluginInfo(resolved_name='indeterminate', type='indeterminate')
+"""Singleton `PluginInfo` instance for indeterminate deprecator."""
+
+_DEPRECATOR_PLUGIN_TYPES = frozenset(
+    {
+        'action',
+        'become',
+        'cache',
+        'callback',
+        'cliconf',
+        'connection',
+        # doc_fragments - no code execution
+        # filter - basename inadequate to identify plugin
+        'httpapi',
+        'inventory',
+        'lookup',
+        'module',  # only for collections
+        'netconf',
+        'shell',
+        'strategy',
+        'terminal',
+        # test - basename inadequate to identify plugin
+        'vars',
+    }
+)
+"""Plugin types which are valid for identifying a deprecator for deprecation purposes."""
+
+_AMBIGUOUS_DEPRECATOR_PLUGIN_TYPES = frozenset(
+    {
+        'filter',
+        'test',
+    }
+)
+"""Plugin types for which basename cannot be used to identify the plugin name."""
+
+
+def get_best_deprecator(*, deprecator: PluginInfo | None = None, collection_name: str | None = None) -> PluginInfo:
+    """Return the best-available `PluginInfo` for the caller of this method."""
+    _skip_stackwalk = True
+
+    if deprecator and collection_name:
+        raise ValueError('Specify only one of `deprecator` or `collection_name`.')
+
+    return deprecator or PluginInfo._from_collection_name(collection_name) or get_caller_plugin_info() or INDETERMINATE_DEPRECATOR
+
+
+def get_caller_plugin_info() -> PluginInfo | None:
+    """Try to get `PluginInfo` for the caller of this method, ignoring marked infrastructure stack frames."""
+    _skip_stackwalk = True
+
+    if frame_info := next((frame_info for frame_info in inspect.stack() if '_skip_stackwalk' not in frame_info.frame.f_locals), None):
+        return _path_as_core_plugininfo(frame_info.filename) or _path_as_collection_plugininfo(frame_info.filename)
+
+    return None  # pragma: nocover
+
+
+def _path_as_core_plugininfo(path: str) -> PluginInfo | None:
+    """Return a `PluginInfo` instance if the provided `path` refers to a core plugin."""
+    try:
+        relpath = str(pathlib.Path(path).relative_to(_ansible_module_base_path))
+    except ValueError:
+        return None  # not ansible-core
+
+    namespace = 'ansible.builtin'
+
+    if match := re.match(r'plugins/(?P<plugin_type>\w+)/(?P<plugin_name>\w+)', relpath):
+        plugin_name = match.group("plugin_name")
+        plugin_type = match.group("plugin_type")
+
+        if plugin_type not in _DEPRECATOR_PLUGIN_TYPES:
+            # The plugin type isn't a known deprecator type, so we have to assume the caller is intermediate code.
+            # We have no way of knowing if the intermediate code is deprecating its own feature, or acting on behalf of another plugin.
+            # Callers in this case need to identify the deprecating plugin name, otherwise only ansible-core will be reported.
+            # Reporting ansible-core is never wrong, it just may be missing an additional detail (plugin name) in the "on behalf of" case.
+            return ANSIBLE_CORE_DEPRECATOR
+    elif match := re.match(r'modules/(?P<module_name>\w+)', relpath):
+        # AnsiballZ Python package for core modules
+        plugin_name = match.group("module_name")
+        plugin_type = "module"
+    elif match := re.match(r'legacy/(?P<module_name>\w+)', relpath):
+        # AnsiballZ Python package for non-core library/role modules
+        namespace = 'ansible.legacy'
+
+        plugin_name = match.group("module_name")
+        plugin_type = "module"
+    else:
+        return ANSIBLE_CORE_DEPRECATOR  # non-plugin core path, safe to use ansible-core for the same reason as the non-deprecator plugin type case above
+
+    name = f'{namespace}.{plugin_name}'
+
+    return PluginInfo(resolved_name=name, type=plugin_type)
+
+
+def _path_as_collection_plugininfo(path: str) -> PluginInfo | None:
+    """Return a `PluginInfo` instance if the provided `path` refers to a collection plugin."""
+    if not (match := re.search(r'/ansible_collections/(?P<ns>\w+)/(?P<coll>\w+)/plugins/(?P<plugin_type>\w+)/(?P<plugin_name>\w+)', path)):
+        return None
+
+    plugin_type = match.group('plugin_type')
+
+    if plugin_type in _AMBIGUOUS_DEPRECATOR_PLUGIN_TYPES:
+        # We're able to detect the namespace, collection and plugin type -- but we have no way to identify the plugin name currently.
+        # To keep things simple we'll fall back to just identifying the namespace and collection.
+        # In the future we could improve the detection and/or make it easier for a caller to identify the plugin name.
+        return PluginInfo._from_collection_name('.'.join((match.group('ns'), match.group('coll'))))
+
+    if plugin_type == 'modules':
+        plugin_type = 'module'
+
+    if plugin_type not in _DEPRECATOR_PLUGIN_TYPES:
+        # The plugin type isn't a known deprecator type, so we have to assume the caller is intermediate code.
+        # We have no way of knowing if the intermediate code is deprecating its own feature, or acting on behalf of another plugin.
+        # Callers in this case need to identify the deprecator to avoid ambiguity, since it could be the same collection or another collection.
+        return INDETERMINATE_DEPRECATOR
+
+    name = '.'.join((match.group('ns'), match.group('coll'), match.group('plugin_name')))
+
+    return PluginInfo(resolved_name=name, type=plugin_type)