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

ansible/cli/doc.py

@@ -32,7 +32,6 @@ from ansible.errors import AnsibleError, AnsibleOptionsError, AnsibleParserError
 from ansible.module_utils.common.text.converters import to_native, to_text
 from ansible.module_utils.common.collections import is_sequence
 from ansible.module_utils.common.yaml import yaml_dump
-from ansible.module_utils.six import string_types
 from ansible.parsing.plugin_docs import read_docstub
 from ansible.parsing.yaml.dumper import AnsibleDumper
 from ansible.parsing.yaml.loader import AnsibleLoader
@@ -1265,7 +1264,7 @@ class DocCLI(CLI, RoleMixin):
 
             # description is specifically formatted and can either be string or list of strings
             if 'description' not in opt:
-                raise AnsibleError("All (sub-)options and return values must have a 'description' field")
+                raise AnsibleError("All (sub-)options and return values must have a 'description' field", obj=o)
             text.append('')
 
             # TODO: push this to top of for and sort by size, create indent on largest key?
@@ -1274,7 +1273,7 @@ class DocCLI(CLI, RoleMixin):
             sub_indent = inline_indent + extra_indent
             if is_sequence(opt['description']):
                 for entry_idx, entry in enumerate(opt['description'], 1):
-                    if not isinstance(entry, string_types):
+                    if not isinstance(entry, str):
                         raise AnsibleError("Expected string in description of %s at index %s, got %s" % (o, entry_idx, type(entry)))
                     if entry_idx == 1:
                         text.append(key + DocCLI.warp_fill(DocCLI.tty_ify(entry), limit,
@@ -1282,7 +1281,7 @@ class DocCLI(CLI, RoleMixin):
                     else:
                         text.append(DocCLI.warp_fill(DocCLI.tty_ify(entry), limit, initial_indent=sub_indent, subsequent_indent=sub_indent))
             else:
-                if not isinstance(opt['description'], string_types):
+                if not isinstance(opt['description'], str):
                     raise AnsibleError("Expected string in description of %s, got %s" % (o, type(opt['description'])))
                 text.append(key + DocCLI.warp_fill(DocCLI.tty_ify(opt['description']), limit,
                             initial_indent=inline_indent, subsequent_indent=sub_indent, initial_extra=len(extra_indent)))
@@ -1344,6 +1343,51 @@ class DocCLI(CLI, RoleMixin):
                 text.append("%s%s:" % (opt_indent, subkey))
                 DocCLI.add_fields(text, subdata, limit, opt_indent + '  ', return_values, opt_indent)
 
+    @staticmethod
+    def _add_seealso(text: list[str], seealsos: list[dict[str, t.Any]], limit: int, opt_indent: str) -> None:
+        for item in seealsos:
+            if 'module' in item:
+                text.append(DocCLI.warp_fill(DocCLI.tty_ify('Module %s' % item['module']),
+                            limit - 6, initial_indent=opt_indent[:-2] + "* ", subsequent_indent=opt_indent))
+                description = item.get('description')
+                if description is None and item['module'].startswith('ansible.builtin.'):
+                    description = 'The official documentation on the %s module.' % item['module']
+                if description is not None:
+                    text.append(DocCLI.warp_fill(DocCLI.tty_ify(description),
+                                limit - 6, initial_indent=opt_indent + '   ', subsequent_indent=opt_indent + '   '))
+                if item['module'].startswith('ansible.builtin.'):
+                    relative_url = 'collections/%s_module.html' % item['module'].replace('.', '/', 2)
+                    text.append(DocCLI.warp_fill(DocCLI.tty_ify(get_versioned_doclink(relative_url)),
+                                limit - 6, initial_indent=opt_indent + '   ', subsequent_indent=opt_indent))
+            elif 'plugin' in item and 'plugin_type' in item:
+                plugin_suffix = ' plugin' if item['plugin_type'] not in ('module', 'role') else ''
+                text.append(DocCLI.warp_fill(DocCLI.tty_ify('%s%s %s' % (item['plugin_type'].title(), plugin_suffix, item['plugin'])),
+                            limit - 6, initial_indent=opt_indent[:-2] + "* ", subsequent_indent=opt_indent))
+                description = item.get('description')
+                if description is None and item['plugin'].startswith('ansible.builtin.'):
+                    description = 'The official documentation on the %s %s%s.' % (item['plugin'], item['plugin_type'], plugin_suffix)
+                if description is not None:
+                    text.append(DocCLI.warp_fill(DocCLI.tty_ify(description),
+                                limit - 6, initial_indent=opt_indent + '   ', subsequent_indent=opt_indent + '   '))
+                if item['plugin'].startswith('ansible.builtin.'):
+                    relative_url = 'collections/%s_%s.html' % (item['plugin'].replace('.', '/', 2), item['plugin_type'])
+                    text.append(DocCLI.warp_fill(DocCLI.tty_ify(get_versioned_doclink(relative_url)),
+                                limit - 6, initial_indent=opt_indent + '   ', subsequent_indent=opt_indent))
+            elif 'name' in item and 'link' in item and 'description' in item:
+                text.append(DocCLI.warp_fill(DocCLI.tty_ify(item['name']),
+                            limit - 6, initial_indent=opt_indent[:-2] + "* ", subsequent_indent=opt_indent))
+                text.append(DocCLI.warp_fill(DocCLI.tty_ify(item['description']),
+                            limit - 6, initial_indent=opt_indent + '   ', subsequent_indent=opt_indent + '   '))
+                text.append(DocCLI.warp_fill(DocCLI.tty_ify(item['link']),
+                            limit - 6, initial_indent=opt_indent + '   ', subsequent_indent=opt_indent + '   '))
+            elif 'ref' in item and 'description' in item:
+                text.append(DocCLI.warp_fill(DocCLI.tty_ify('Ansible documentation [%s]' % item['ref']),
+                            limit - 6, initial_indent=opt_indent[:-2] + "* ", subsequent_indent=opt_indent))
+                text.append(DocCLI.warp_fill(DocCLI.tty_ify(item['description']),
+                            limit - 6, initial_indent=opt_indent + '   ', subsequent_indent=opt_indent + '   '))
+                text.append(DocCLI.warp_fill(DocCLI.tty_ify(get_versioned_doclink('/#stq=%s&stp=1' % item['ref'])),
+                            limit - 6, initial_indent=opt_indent + '   ', subsequent_indent=opt_indent + '   '))
+
     def get_role_man_text(self, role, role_json):
         """Generate text for the supplied role suitable for display.
 
@@ -1371,6 +1415,9 @@ class DocCLI(CLI, RoleMixin):
             text.append("ENTRY POINT: %s %s" % (_format(entry_point, "BOLD"), desc))
             text.append('')
 
+            if version_added := doc.pop('version_added', None):
+                text.append(_format("ADDED IN:", 'bold') + " %s\n" % DocCLI._format_version_added(version_added))
+
             if doc.get('description'):
                 if isinstance(doc['description'], list):
                     descs = doc['description']
@@ -1384,29 +1431,24 @@ class DocCLI(CLI, RoleMixin):
                 text.append(_format("Options", 'bold') + " (%s indicates it is required):" % ("=" if C.ANSIBLE_NOCOLOR else 'red'))
                 DocCLI.add_fields(text, doc.pop('options'), limit, opt_indent)
 
-            if doc.get('attributes', False):
-                display.deprecated(
-                    f'The role {role}\'s argument spec {entry_point} contains the key "attributes", '
-                    'which will not be displayed by ansible-doc in the future. '
-                    'This was unintentionally allowed when plugin attributes were added, '
-                    'but the feature does not map well to role argument specs.',
-                    version='2.20',
-                )
+            if notes := doc.pop('notes', False):
                 text.append("")
-                text.append(_format("ATTRIBUTES:", 'bold'))
-                for k in doc['attributes'].keys():
-                    text.append('')
-                    text.append(DocCLI.warp_fill(DocCLI.tty_ify(_format('%s:' % k, 'UNDERLINE')), limit - 6, initial_indent=opt_indent,
-                                                 subsequent_indent=opt_indent))
-                    text.append(DocCLI._indent_lines(DocCLI._dump_yaml(doc['attributes'][k]), opt_indent))
-                del doc['attributes']
+                text.append(_format("NOTES:", 'bold'))
+                for note in notes:
+                    text.append(DocCLI.warp_fill(DocCLI.tty_ify(note), limit - 6,
+                                                 initial_indent=opt_indent[:-2] + "* ", subsequent_indent=opt_indent))
+
+            if seealso := doc.pop('seealso', False):
+                text.append("")
+                text.append(_format("SEE ALSO:", 'bold'))
+                DocCLI._add_seealso(text, seealso, limit=limit, opt_indent=opt_indent)
 
             # generic elements we will handle identically
             for k in ('author',):
                 if k not in doc:
                     continue
                 text.append('')
-                if isinstance(doc[k], string_types):
+                if isinstance(doc[k], str):
                     text.append('%s: %s' % (k.upper(), DocCLI.warp_fill(DocCLI.tty_ify(doc[k]),
                                             limit - (len(k) + 2), subsequent_indent=opt_indent)))
                 elif isinstance(doc[k], (list, tuple)):
@@ -1418,7 +1460,7 @@ class DocCLI(CLI, RoleMixin):
             if doc.get('examples', False):
                 text.append('')
                 text.append(_format("EXAMPLES:", 'bold'))
-                if isinstance(doc['examples'], string_types):
+                if isinstance(doc['examples'], str):
                     text.append(doc.pop('examples').strip())
                 else:
                     try:
@@ -1497,49 +1539,7 @@ class DocCLI(CLI, RoleMixin):
         if doc.get('seealso', False):
             text.append("")
             text.append(_format("SEE ALSO:", 'bold'))
-            for item in doc['seealso']:
-                if 'module' in item:
-                    text.append(DocCLI.warp_fill(DocCLI.tty_ify('Module %s' % item['module']),
-                                limit - 6, initial_indent=opt_indent[:-2] + "* ", subsequent_indent=opt_indent))
-                    description = item.get('description')
-                    if description is None and item['module'].startswith('ansible.builtin.'):
-                        description = 'The official documentation on the %s module.' % item['module']
-                    if description is not None:
-                        text.append(DocCLI.warp_fill(DocCLI.tty_ify(description),
-                                    limit - 6, initial_indent=opt_indent + '   ', subsequent_indent=opt_indent + '   '))
-                    if item['module'].startswith('ansible.builtin.'):
-                        relative_url = 'collections/%s_module.html' % item['module'].replace('.', '/', 2)
-                        text.append(DocCLI.warp_fill(DocCLI.tty_ify(get_versioned_doclink(relative_url)),
-                                    limit - 6, initial_indent=opt_indent + '   ', subsequent_indent=opt_indent))
-                elif 'plugin' in item and 'plugin_type' in item:
-                    plugin_suffix = ' plugin' if item['plugin_type'] not in ('module', 'role') else ''
-                    text.append(DocCLI.warp_fill(DocCLI.tty_ify('%s%s %s' % (item['plugin_type'].title(), plugin_suffix, item['plugin'])),
-                                limit - 6, initial_indent=opt_indent[:-2] + "* ", subsequent_indent=opt_indent))
-                    description = item.get('description')
-                    if description is None and item['plugin'].startswith('ansible.builtin.'):
-                        description = 'The official documentation on the %s %s%s.' % (item['plugin'], item['plugin_type'], plugin_suffix)
-                    if description is not None:
-                        text.append(DocCLI.warp_fill(DocCLI.tty_ify(description),
-                                    limit - 6, initial_indent=opt_indent + '   ', subsequent_indent=opt_indent + '   '))
-                    if item['plugin'].startswith('ansible.builtin.'):
-                        relative_url = 'collections/%s_%s.html' % (item['plugin'].replace('.', '/', 2), item['plugin_type'])
-                        text.append(DocCLI.warp_fill(DocCLI.tty_ify(get_versioned_doclink(relative_url)),
-                                    limit - 6, initial_indent=opt_indent + '   ', subsequent_indent=opt_indent))
-                elif 'name' in item and 'link' in item and 'description' in item:
-                    text.append(DocCLI.warp_fill(DocCLI.tty_ify(item['name']),
-                                limit - 6, initial_indent=opt_indent[:-2] + "* ", subsequent_indent=opt_indent))
-                    text.append(DocCLI.warp_fill(DocCLI.tty_ify(item['description']),
-                                limit - 6, initial_indent=opt_indent + '   ', subsequent_indent=opt_indent + '   '))
-                    text.append(DocCLI.warp_fill(DocCLI.tty_ify(item['link']),
-                                limit - 6, initial_indent=opt_indent + '   ', subsequent_indent=opt_indent + '   '))
-                elif 'ref' in item and 'description' in item:
-                    text.append(DocCLI.warp_fill(DocCLI.tty_ify('Ansible documentation [%s]' % item['ref']),
-                                limit - 6, initial_indent=opt_indent[:-2] + "* ", subsequent_indent=opt_indent))
-                    text.append(DocCLI.warp_fill(DocCLI.tty_ify(item['description']),
-                                limit - 6, initial_indent=opt_indent + '   ', subsequent_indent=opt_indent + '   '))
-                    text.append(DocCLI.warp_fill(DocCLI.tty_ify(get_versioned_doclink('/#stq=%s&stp=1' % item['ref'])),
-                                limit - 6, initial_indent=opt_indent + '   ', subsequent_indent=opt_indent + '   '))
-
+            DocCLI._add_seealso(text, doc['seealso'], limit=limit, opt_indent=opt_indent)
             del doc['seealso']
 
         if doc.get('requirements', False):
@@ -1554,7 +1554,7 @@ class DocCLI(CLI, RoleMixin):
                 continue
             text.append('')
             header = _format(k.upper(), 'bold')
-            if isinstance(doc[k], string_types):
+            if isinstance(doc[k], str):
                 text.append('%s: %s' % (header, DocCLI.warp_fill(DocCLI.tty_ify(doc[k]), limit - (len(k) + 2), subsequent_indent=opt_indent)))
             elif isinstance(doc[k], (list, tuple)):
                 text.append('%s: %s' % (header, ', '.join(doc[k])))
@@ -1566,7 +1566,7 @@ class DocCLI(CLI, RoleMixin):
         if doc.get('plainexamples', False):
             text.append('')
             text.append(_format("EXAMPLES:", 'bold'))
-            if isinstance(doc['plainexamples'], string_types):
+            if isinstance(doc['plainexamples'], str):
                 text.append(doc.pop('plainexamples').strip())
             else:
                 try:
@@ -1603,7 +1603,7 @@ def _do_yaml_snippet(doc):
 
     for o in sorted(doc['options'].keys()):
         opt = doc['options'][o]
-        if isinstance(opt['description'], string_types):
+        if isinstance(opt['description'], str):
             desc = DocCLI.tty_ify(opt['description'])
         else:
             desc = DocCLI.tty_ify(" ".join(opt['description']))

ansible/cli/galaxy.py

@@ -54,7 +54,6 @@ from ansible.module_utils.common.collections import is_iterable
 from ansible.module_utils.common.yaml import yaml_dump, yaml_load
 from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
 from ansible._internal._datatag._tags import TrustedAsTemplate
-from ansible.module_utils import six
 from ansible.parsing.dataloader import DataLoader
 from ansible.playbook.role.requirement import RoleRequirement
 from ansible._internal._templating._engine import TemplateEngine
@@ -65,7 +64,6 @@ from ansible.utils.plugin_docs import get_versioned_doclink
 from ansible.utils.vars import load_extra_vars
 
 display = Display()
-urlparse = six.moves.urllib.parse.urlparse
 
 
 def with_collection_artifacts_manager(wrapped_method):
@@ -213,6 +211,18 @@ class GalaxyCLI(CLI):
         self.lazy_role_api = None
         super(GalaxyCLI, self).__init__(args)
 
+    @property
+    def collection_paths(self):
+        """
+        Exclude lib/ansible/_internal/ansible_collections/.
+        """
+        # exclude bundled collections, e.g. ansible._protomatter
+        return [
+            path
+            for path in AnsibleCollectionConfig.collection_paths
+            if path != AnsibleCollectionConfig._internal_collections
+        ]
+
     def init_parser(self):
         """ create an options parser for bin/ansible """
 
@@ -644,23 +654,10 @@ class GalaxyCLI(CLI):
             client_secret = server_options.pop('client_secret')
             token_val = server_options['token'] or NoTokenSentinel
             username = server_options['username']
-            api_version = server_options.pop('api_version')
             if server_options['validate_certs'] is None:
                 server_options['validate_certs'] = context.CLIARGS['resolved_validate_certs']
             validate_certs = server_options['validate_certs']
 
-            # This allows a user to explicitly force use of an API version when
-            # multiple versions are supported. This was added for testing
-            # against pulp_ansible and I'm not sure it has a practical purpose
-            # outside of this use case. As such, this option is not documented
-            # as of now
-            if api_version:
-                display.warning(
-                    f'The specified "api_version" configuration for the galaxy server "{server_key}" is '
-                    'not a public configuration, and may be removed at any time without warning.'
-                )
-                server_options['available_api_versions'] = {'v%s' % api_version: '/v%s' % api_version}
-
             # default case if no auth info is provided.
             server_options['token'] = None
 
@@ -687,12 +684,6 @@ class GalaxyCLI(CLI):
             ))
 
         cmd_server = context.CLIARGS['api_server']
-        if context.CLIARGS['api_version']:
-            api_version = context.CLIARGS['api_version']
-            display.warning(
-                'The --api-version is not a public argument, and may be removed at any time without warning.'
-            )
-            galaxy_options['available_api_versions'] = {'v%s' % api_version: '/v%s' % api_version}
 
         cmd_token = GalaxyToken(token=context.CLIARGS['api_key'])
 
@@ -1281,7 +1272,7 @@ class GalaxyCLI(CLI):
         """Compare checksums with the collection(s) found on the server and the installed copy. This does not verify dependencies."""
 
         collections = context.CLIARGS['args']
-        search_paths = AnsibleCollectionConfig.collection_paths
+        search_paths = self.collection_paths
         ignore_errors = context.CLIARGS['ignore_errors']
         local_verify_only = context.CLIARGS['offline']
         requirements_file = context.CLIARGS['requirements']
@@ -1423,7 +1414,7 @@ class GalaxyCLI(CLI):
         collections_path = C.COLLECTIONS_PATHS
 
         managed_paths = set(validate_collection_path(p) for p in C.COLLECTIONS_PATHS)
-        read_req_paths = set(validate_collection_path(p) for p in AnsibleCollectionConfig.collection_paths)
+        read_req_paths = set(validate_collection_path(p) for p in self.collection_paths)
 
         unexpected_path = C.GALAXY_COLLECTIONS_PATH_WARNING and not any(p.startswith(path) for p in managed_paths)
         if unexpected_path and any(p.startswith(path) for p in read_req_paths):
@@ -1639,7 +1630,7 @@ class GalaxyCLI(CLI):
         collection_name = context.CLIARGS['collection']
         default_collections_path = set(C.COLLECTIONS_PATHS)
         collections_search_paths = (
-            set(context.CLIARGS['collections_path'] or []) | default_collections_path | set(AnsibleCollectionConfig.collection_paths)
+            set(context.CLIARGS['collections_path'] or []) | default_collections_path | set(self.collection_paths)
         )
         collections_in_paths = {}
 

ansible/cli/inventory.py

@@ -44,7 +44,6 @@ class InventoryCLI(CLI):
 
     def init_parser(self):
         super(InventoryCLI, self).init_parser(
-            usage='usage: %prog [options] [group]',
             desc='Show Ansible inventory information, by default it uses the inventory script JSON format')
 
         opt_help.add_inventory_options(self.parser)

ansible/cli/playbook.py

@@ -40,7 +40,6 @@ class PlaybookCLI(CLI):
 
         # create parser for CLI options
         super(PlaybookCLI, self).init_parser(
-            usage="%prog [options] playbook.yml [playbook2 ...]",
             desc="Runs Ansible playbooks, executing the defined tasks on the targeted hosts.")
 
         opt_help.add_connect_options(self.parser)

ansible/cli/pull.py

@@ -108,7 +108,6 @@ class PullCLI(CLI):
 
         # signature is different from parent as caller should not need to add usage/desc
         super(PullCLI, self).init_parser(
-            usage='%prog -U <repository> [options] [<playbook.yml>]',
             desc="pulls playbooks from a VCS repo and executes them on target host")
 
         # Do not add check_options as there's a conflict with --checkout/-C

ansible/cli/scripts/ansible_connection_cli_stub.py

@@ -243,7 +243,7 @@ def main(args=None):
         options = pickle.loads(opts_data, encoding='bytes')
 
         play_context = PlayContext()
-        play_context.deserialize(pc_data)
+        play_context.from_attrs(pc_data)
 
     except Exception as e:
         rc = 1

ansible/config/base.yml

@@ -1215,7 +1215,6 @@ DEFAULT_TRANSPORT:
   default: ssh
   description:
     - Can be any connection plugin available to your ansible installation.
-    - There is also a (DEPRECATED) special 'smart' option, that will toggle between 'ssh' and 'paramiko' depending on controller OS and ssh versions.
   env: [{name: ANSIBLE_TRANSPORT}]
   ini:
   - {key: transport, section: defaults}
@@ -1689,12 +1688,12 @@ INTERPRETER_PYTHON:
 INTERPRETER_PYTHON_FALLBACK:
   name: Ordered list of Python interpreters to check for in discovery
   default:
+  - python3.14
   - python3.13
   - python3.12
   - python3.11
   - python3.10
   - python3.9
-  - python3.8
   - /usr/bin/python3
   - python3
   vars:
@@ -1854,29 +1853,6 @@ PAGER:
     - name: ANSIBLE_PAGER
       version_added: '2.15'
     - name: PAGER
-PARAMIKO_HOST_KEY_AUTO_ADD:
-  default: False
-  description: 'TODO: write it'
-  env: [{name: ANSIBLE_PARAMIKO_HOST_KEY_AUTO_ADD}]
-  ini:
-  - {key: host_key_auto_add, section: paramiko_connection}
-  type: boolean
-  deprecated:
-    why: This option was moved to the plugin itself
-    version: "2.20"
-    alternatives: Use the option from the plugin itself.
-PARAMIKO_LOOK_FOR_KEYS:
-  name: look for keys
-  default: True
-  description: 'TODO: write it'
-  env: [{name: ANSIBLE_PARAMIKO_LOOK_FOR_KEYS}]
-  ini:
-  - {key: look_for_keys, section: paramiko_connection}
-  type: boolean
-  deprecated:
-    why: This option was moved to the plugin itself
-    version: "2.20"
-    alternatives: Use the option from the plugin itself.
 PERSISTENT_CONTROL_PATH_DIR:
   name: Persistence socket path
   default: '{{ ANSIBLE_HOME ~ "/pc" }}'

ansible/config/manager.py

@@ -36,7 +36,6 @@ GALAXY_SERVER_DEF = [
     ('password', False, 'str'),
     ('token', False, 'str'),
     ('auth_url', False, 'str'),
-    ('api_version', False, 'int'),
     ('validate_certs', False, 'bool'),
     ('client_id', False, 'str'),
     ('client_secret', False, 'str'),
@@ -45,7 +44,6 @@ GALAXY_SERVER_DEF = [
 
 # config definition fields
 GALAXY_SERVER_ADDITIONAL = {
-    'api_version': {'default': None, 'choices': [2, 3]},
     'validate_certs': {'cli': [{'name': 'validate_certs'}]},
     'timeout': {'cli': [{'name': 'timeout'}]},
     'token': {'default': None},

ansible/executor/play_iterator.py

@@ -174,6 +174,27 @@ class PlayIterator:
             setup_task.when = self._play._included_conditional[:]
         setup_block.block = [setup_task]
 
+        validation_task = Task.load({
+            'name': f'Validating arguments against arg spec {self._play.validate_argspec}',
+            'action': 'ansible.builtin.validate_argument_spec',
+            'args': {
+                # 'provided_arguments': {},  # allow configuration via module_defaults
+                'argument_spec': self._play.argument_spec,
+                'validate_args_context': {
+                    'type': 'play',
+                    'name': self._play.validate_argspec,
+                    'argument_spec_name': self._play.validate_argspec,
+                    'path': self._play._metadata_path,
+                },
+            },
+            'tags': ['always'],
+        }, block=setup_block)
+
+        validation_task.set_loader(self._play._loader)
+        if self._play._included_conditional is not None:
+            validation_task.when = self._play._included_conditional[:]
+        setup_block.block.append(validation_task)
+
         setup_block = setup_block.filter_tagged_tasks(all_vars)
         self._blocks.append(setup_block)
 
@@ -271,35 +292,36 @@ class PlayIterator:
                 return (state, None)
 
             if state.run_state == IteratingStates.SETUP:
-                # First, we check to see if we were pending setup. If not, this is
-                # the first trip through IteratingStates.SETUP, so we set the pending_setup
-                # flag and try to determine if we do in fact want to gather facts for
-                # the specified host.
-                if not state.pending_setup:
-                    state.pending_setup = True
+                # First, we check to see if we completed both setup tasks injected
+                # during play compilation in __init__ above.
+                # If not, below we will determine if we do in fact want to gather
+                # facts or validate arguments for the specified host.
+                state.pending_setup = state.cur_regular_task < len(block.block)
+                if state.pending_setup:
+                    task = block.block[state.cur_regular_task]
 
                     # Gather facts if the default is 'smart' and we have not yet
                     # done it for this host; or if 'explicit' and the play sets
                     # gather_facts to True; or if 'implicit' and the play does
                     # NOT explicitly set gather_facts to False.
-
+                    gather_facts = bool(state.cur_regular_task == 0)
                     gathering = C.DEFAULT_GATHERING
                     implied = self._play.gather_facts is None or boolean(self._play.gather_facts, strict=False)
 
-                    if (gathering == 'implicit' and implied) or \
-                       (gathering == 'explicit' and boolean(self._play.gather_facts, strict=False)) or \
-                       (gathering == 'smart' and implied and not self._variable_manager._facts_gathered_for_host(host.name)):
-                        # The setup block is always self._blocks[0], as we inject it
-                        # during the play compilation in __init__ above.
-                        setup_block = self._blocks[0]
-                        if setup_block.has_tasks() and len(setup_block.block) > 0:
-                            task = setup_block.block[0]
-                else:
-                    # This is the second trip through IteratingStates.SETUP, so we clear
-                    # the flag and move onto the next block in the list while setting
-                    # the run state to IteratingStates.TASKS
-                    state.pending_setup = False
+                    if gather_facts and not (
+                        (gathering == 'implicit' and implied) or
+                        (gathering == 'explicit' and boolean(self._play.gather_facts, strict=False)) or
+                        (gathering == 'smart' and implied and not self._variable_manager._facts_gathered_for_host(host.name))
+                    ):
+                        task = None
+                    elif not gather_facts and not self._play.validate_argspec:
+                        task = None
 
+                    state.cur_regular_task += 1
+                else:
+                    # This is the last trip through IteratingStates.SETUP, so we
+                    # move onto the next block in the list while setting the run
+                    # state to IteratingStates.TASKS
                     state.run_state = IteratingStates.TASKS
                     if not state.did_start_at_task:
                         state.cur_block += 1

ansible/executor/playbook_executor.py

@@ -31,7 +31,6 @@ from ansible.utils.helpers import pct_to_int
 from ansible.utils.collection_loader import AnsibleCollectionConfig
 from ansible.utils.collection_loader._collection_finder import _get_collection_name_from_path, _get_collection_playbook_path
 from ansible.utils.path import makedirs_safe
-from ansible.utils.ssh_functions import set_default_transport
 from ansible.utils.display import Display
 
 
@@ -65,14 +64,6 @@ class PlaybookExecutor:
                 forks=context.CLIARGS.get('forks'),
             )
 
-        # Note: We run this here to cache whether the default ansible ssh
-        # executable supports control persist.  Sometime in the future we may
-        # need to enhance this to check that ansible_ssh_executable specified
-        # in inventory is also cached.  We can't do this caching at the point
-        # where it is used (in task_executor) because that is post-fork and
-        # therefore would be discarded after every task.
-        set_default_transport()
-
     def run(self):
         """
         Run the given playbook, based on the settings in the play which

ansible/executor/powershell/async_watchdog.ps1

@@ -67,14 +67,34 @@ try {
     $result.finished = $true
 
     if ($jobAsyncResult.IsCompleted) {
-        $jobOutput = $ps.EndInvoke($jobAsyncResult)
+        $jobOutput = @($ps.EndInvoke($jobAsyncResult) | Out-String) -join "`n"
         $jobError = $ps.Streams.Error
 
         # write success/output/error to result object
-        # TODO: cleanse leading/trailing junk
-        $moduleResult = $jobOutput | ConvertFrom-Json | Convert-JsonObject
+        $moduleResultJson = $jobOutput
+        $startJsonChar = $moduleResultJson.IndexOf([char]'{')
+        if ($startJsonChar -eq -1) {
+            throw "No start of json char found in module result"
+        }
+        $moduleResultJson = $moduleResultJson.Substring($startJsonChar)
+
+        $endJsonChar = $moduleResultJson.LastIndexOf([char]'}')
+        if ($endJsonChar -eq -1) {
+            throw "No end of json char found in module result"
+        }
+
+        $trailingJunk = $moduleResultJson.Substring($endJsonChar + 1).Trim()
+        $moduleResultJson = $moduleResultJson.Substring(0, $endJsonChar + 1)
+        $moduleResult = $moduleResultJson | ConvertFrom-Json | Convert-JsonObject
         # TODO: check for conflicting keys
         $result = $result + $moduleResult
+
+        if ($trailingJunk) {
+            if (-not $result.warnings) {
+                $result.warnings = @()
+            }
+            $result.warnings += "Module invocation had junk after the JSON data: $trailingJunk"
+        }
     }
     else {
         # We can't call Stop() as pwsh won't respond if it is busy calling a .NET
@@ -103,7 +123,7 @@ catch {
     $result.failed = $true
     $result.msg = "failure during async watchdog: $_"
     # return output back, if available, to Ansible to help with debugging errors
-    $result.stdout = $jobOutput | Out-String
+    $result.stdout = $jobOutput
     $result.stderr = $jobError | Out-String
 }
 finally {