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

ansible/playbook/task.py

@@ -227,8 +227,6 @@ class Task(Base, Conditional, Taggable, CollectionSearch, Notifiable, Delegatabl
             raise AnsibleError("you must specify a value when using %s" % k, obj=ds)
         new_ds['loop_with'] = loop_name
         new_ds['loop'] = v
-        # display.deprecated("with_ type loops are being phased out, use the 'loop' keyword instead",
-        #                    version="2.10", collection_name='ansible.builtin')
 
     def preprocess_data(self, ds):
         """

ansible/plugins/__init__.py

@@ -20,24 +20,26 @@
 from __future__ import annotations
 
 import abc
+import functools
 import types
 import typing as t
 
 from ansible import constants as C
 from ansible.errors import AnsibleError
 from ansible.utils.display import Display
+from ansible.utils import display as _display
 
-from ansible.module_utils._internal import _plugin_exec_context
+from ansible.module_utils._internal import _plugin_info
 
 display = Display()
 
 if t.TYPE_CHECKING:
-    from .loader import PluginPathContext
+    from . import loader as _t_loader
 
 # Global so that all instances of a PluginLoader will share the caches
 MODULE_CACHE = {}  # type: dict[str, dict[str, types.ModuleType]]
-PATH_CACHE = {}  # type: dict[str, list[PluginPathContext] | None]
-PLUGIN_PATH_CACHE = {}  # type: dict[str, dict[str, dict[str, PluginPathContext]]]
+PATH_CACHE = {}  # type: dict[str, list[_t_loader.PluginPathContext] | None]
+PLUGIN_PATH_CACHE = {}  # type: dict[str, dict[str, dict[str, _t_loader.PluginPathContext]]]
 
 
 def get_plugin_class(obj):
@@ -50,10 +52,10 @@ def get_plugin_class(obj):
 class _ConfigurablePlugin(t.Protocol):
     """Protocol to provide type-safe access to config for plugin-related mixins."""
 
-    def get_option(self, option: str, hostvars: dict[str, object] | None = None) -> object: ...
+    def get_option(self, option: str, hostvars: dict[str, object] | None = None) -> t.Any: ...
 
 
-class _AnsiblePluginInfoMixin(_plugin_exec_context.HasPluginInfo):
+class _AnsiblePluginInfoMixin(_plugin_info.HasPluginInfo):
     """Mixin to provide type annotations and default values for existing PluginLoader-set load-time attrs."""
     _original_path: str | None = None
     _load_name: str | None = None
@@ -102,6 +104,14 @@ class AnsiblePlugin(_AnsiblePluginInfoMixin, _ConfigurablePlugin, metaclass=abc.
             raise KeyError(str(e))
         return option_value, origin
 
+    @functools.cached_property
+    def __plugin_info(self):
+        """
+        Internal cached property to retrieve `PluginInfo` for this plugin instance.
+        Only for use by the `AnsiblePlugin` base class.
+        """
+        return _plugin_info.get_plugin_info(self)
+
     def get_option(self, option, hostvars=None):
 
         if option not in self._options:
@@ -117,7 +127,7 @@ class AnsiblePlugin(_AnsiblePluginInfoMixin, _ConfigurablePlugin, metaclass=abc.
 
     def set_option(self, option, value):
         self._options[option] = C.config.get_config_value(option, plugin_type=self.plugin_type, plugin_name=self._load_name, direct={option: value})
-        C.handle_config_noise(display)
+        _display._report_config_warnings(self.__plugin_info)
 
     def set_options(self, task_keys=None, var_options=None, direct=None):
         """
@@ -134,7 +144,7 @@ class AnsiblePlugin(_AnsiblePluginInfoMixin, _ConfigurablePlugin, metaclass=abc.
         if self.allow_extras and var_options and '_extras' in var_options:
             # these are largely unvalidated passthroughs, either plugin or underlying API will validate
             self._options['_extras'] = var_options['_extras']
-        C.handle_config_noise(display)
+        _display._report_config_warnings(self.__plugin_info)
 
     def has_option(self, option):
         if not self._options:

ansible/plugins/action/__init__.py

@@ -318,13 +318,6 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
         final_environment: dict[str, t.Any] = {}
         self._compute_environment_string(final_environment)
 
-        # `modify_module` adapts PluginInfo to allow target-side use of `PluginExecContext` since modules aren't plugins
-        plugin = PluginInfo(
-            requested_name=module_name,
-            resolved_name=result.resolved_fqcn,
-            type='module',
-        )
-
         # modify_module will exit early if interpreter discovery is required; re-run after if necessary
         for _dummy in (1, 2):
             try:
@@ -338,7 +331,6 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
                     async_timeout=self._task.async_val,
                     environment=final_environment,
                     remote_is_local=bool(getattr(self._connection, '_remote_is_local', False)),
-                    plugin=plugin,
                     become_plugin=self._connection.become,
                 )
 
@@ -649,12 +641,12 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
         # done. Make the files +x if we're asked to, and return.
         if not self._is_become_unprivileged():
             if execute:
-                # Can't depend on the file being transferred with execute permissions.
+                # Can't depend on the file being transferred with required permissions.
                 # Only need user perms because no become was used here
-                res = self._remote_chmod(remote_paths, 'u+x')
+                res = self._remote_chmod(remote_paths, 'u+rwx')
                 if res['rc'] != 0:
                     raise AnsibleError(
-                        'Failed to set execute bit on remote files '
+                        'Failed to set permissions on remote files '
                         '(rc: {0}, err: {1})'.format(
                             res['rc'],
                             to_native(res['stderr'])))
@@ -695,10 +687,10 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
             return remote_paths
 
         # Step 3b: Set execute if we need to. We do this before anything else
-        # because some of the methods below might work but not let us set +x
-        # as part of them.
+        # because some of the methods below might work but not let us set
+        # permissions as part of them.
         if execute:
-            res = self._remote_chmod(remote_paths, 'u+x')
+            res = self._remote_chmod(remote_paths, 'u+rwx')
             if res['rc'] != 0:
                 raise AnsibleError(
                     'Failed to set file mode or acl on remote temporary files '

ansible/plugins/action/gather_facts.py

@@ -28,10 +28,8 @@ class ActionModule(ActionBase):
 
             # TODO: remove in favor of controller side argspec detecting valid arguments
             # network facts modules must support gather_subset
-            try:
-                name = self._connection.ansible_name.removeprefix('ansible.netcommon.')
-            except AttributeError:
-                name = self._connection._load_name.split('.')[-1]
+            name = self._connection.ansible_name.removeprefix('ansible.netcommon.')
+
             if name not in ('network_cli', 'httpapi', 'netconf'):
                 subset = mod_args.pop('gather_subset', None)
                 if subset not in ('all', ['all'], None):