Extend win_psmodule

.github/BOTMETA.yml

@@ -481,6 +481,34 @@ files:
     maintainers: resmo felixfontein
   $module_utils/basic.py:
     support: core
+  $module_utils/urls.py:
+    support: core
+  $module_utils/six:
+    support: core
+  $module_utils/common:
+    support: core
+  $module_utils/compat:
+    support: core
+  $module_utils/_text.py:
+    support: core
+  $module_utils/parsing:
+    support: core
+  $module_utils/splitter.py:
+    support: core
+  $module_utils/yumdnf.py:
+    support: core
+  $module_utils/ansible_release.py:
+    support: core
+  $module_utils/distro:
+    support: core
+  $module_utils/ismount.py:
+    support: core
+  $module_utils/json_utils.py:
+    support: core
+  $module_utils/pycompat24.py:
+    support: core
+  $module_utils/service.py:
+    support: core
   $module_utils/cloudstack.py:
     maintainers: $team_cloudstack
     labels: cloudstack

bin/ansible

@@ -29,6 +29,7 @@ import shutil
 import sys
 import traceback
 
+from ansible import context
 from ansible.errors import AnsibleError, AnsibleOptionsError, AnsibleParserError
 from ansible.module_utils._text import to_text
 
@@ -106,7 +107,6 @@ if __name__ == '__main__':
             exit_code = 6
         else:
             cli = mycli(args)
-            cli.parse()
             exit_code = cli.run()
 
     except AnsibleOptionsError as e:
@@ -134,9 +134,9 @@ if __name__ == '__main__':
             # Show raw stacktraces in debug mode, It also allow pdb to
             # enter post mortem mode.
             raise
-        have_cli_options = cli is not None and cli.options is not None
+        have_cli_options = bool(context.CLIARGS)
         display.error("Unexpected Exception, this is probably a bug: %s" % to_text(e), wrap_text=False)
-        if not have_cli_options or have_cli_options and cli.options.verbosity > 2:
+        if not have_cli_options or have_cli_options and context.CLIARGS['verbosity'] > 2:
             log_only = False
             if hasattr(e, 'orig_exc'):
                 display.vvv('\nexception type: %s' % to_text(type(e.orig_exc)))

changelogs/fragments/34209-template-lookup-vault-support.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+  - Allow for vaulted templates in template lookup (https://github.com/ansible/ansible/issues/34209)

changelogs/fragments/49688-docker_secret-config-base64-data.yml

@@ -0,0 +1,3 @@
+minor_changes:
+- "docker_secret - ``data`` can now accept Base64-encoded data via the new ``data_is_b64`` option.
+   This allows to pass binary data or JSON data in unmodified form. (https://github.com/ansible/ansible/issues/35119)"

changelogs/fragments/50322-openssl-path-error.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- "openssl_* - fix error when ``path`` contains a file name without path."

changelogs/fragments/50337-fix-vultr_server-ssh_keys-handling.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - vultr_server - fixed multiple ssh keys were not handled.

changelogs/fragments/50361-openssl_csr-idempotency.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- "openssl_csr - fix problem with idempotency of keyUsage option."

changelogs/fragments/50483-docker_swarm_service-option-typo.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- "docker_swarm_service - fixing wrong option type for ``update_order`` which prevented using that option."

changelogs/fragments/ansible-template-error.yml

@@ -0,0 +1,3 @@
+bugfixes:
+- Add new ``AnsibleTemplateError`` that various templating related exceptions inherit from,
+  making it easier to catch them without enumerating. (https://github.com/ansible/ansible/issues/50154)

changelogs/fragments/change_failed_when_example.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+- Add examples in documentation to explain how to handle multiple conditions in changed_when and failed_when.

changelogs/fragments/cli-refactor.yaml

@@ -0,0 +1,6 @@
+---
+minor_changes:
+- Refactored the CLI code to parse the CLI arguments and then save them into
+  a non-mutatable global singleton.  This should make it easier to modify.
+- Removed the private ``_options`` attribute of ``CallbackBase``.  See the porting
+  guide if you need access to the command line arguments in a callback plugin.

changelogs/fragments/dnf-conf-file.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- dnf - fix issue where ``conf_file`` was not being loaded properly

changelogs/fragments/dnf-ignore-weak-deps.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+- dnf - added the module option ``install_weak_deps`` to control whether DNF will install weak dependencies

changelogs/fragments/dnf-update-cache-broken-transaction.yaml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - "dnf - fix update_cache combined with install operation to not cause dnf transaction failure"

changelogs/fragments/firewalld-missing-port-protocol.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - fix handling of firewalld port if protocol is missing

changelogs/fragments/include_tasks_parent_templating.yml

@@ -0,0 +1,3 @@
+bugfixes:
+- include_tasks - Ensure we give IncludedFile the same context as TaskExecutor when templating the parent include path
+  allowing for lookups in the included file path (https://github.com/ansible/ansible/issues/49969)

changelogs/fragments/platform-dist-to-nir0s-distro.yaml

@@ -1,5 +1,7 @@
 ---
 minor_changes:
 - Python-3.8 removes platform.dist() from the standard library. To maintain
-  compatibility we've switched to an alternative library, nir0s/distro to
-  detect the distribution for fact gathering.
+  compatibility we've switched to an alternative library, nir0s/distro, to
+  detect the distribution for fact gathering.  Distributions facts may change
+  slightly as nir0s/distro has bugfixes which the standard library's
+  platform.dist() has lacked.

changelogs/fragments/playbook-order-reverse_inventory.yaml

@@ -0,0 +1,3 @@
+bugfixes:
+- host execution order - Fix ``reverse_inventory`` not to change the order of
+  the items before reversing on python2 and to not backtrace on python3

changelogs/fragments/pure_facts_fix.yaml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+- purefa_facts and purefb_facts now correctly adds facts into main ansible_fact dictionary (https://github.com/ansible/ansible/pull/50349)

changelogs/fragments/template-lookup-searchpath-fix.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+  - Fix searchpath in the template lookup to work the same way as in the template module.

docs/docsite/_extensions/pygments_lexer.py

@@ -4,6 +4,7 @@
 # Copyright 2006-2017 by the Pygments team, see AUTHORS at
 # https://bitbucket.org/birkenfeld/pygments-main/raw/7941677dc77d4f2bf0bbd6140ade85a9454b8b80/AUTHORS
 # Copyright by Kirill Simonov (original author of YAML lexer).
+# Copyright by Norman Richards (original author of JSON lexer).
 #
 # Licensed under BSD license:
 #
@@ -35,8 +36,8 @@
 
 from __future__ import absolute_import, print_function
 
-from pygments.lexer import LexerContext, ExtendedRegexLexer, DelegatingLexer, bygroups, include
-from pygments.lexers import DjangoLexer
+from pygments.lexer import LexerContext, ExtendedRegexLexer, DelegatingLexer, RegexLexer, bygroups, include
+from pygments.lexers import DjangoLexer, DiffLexer
 from pygments import token
 
 
@@ -476,6 +477,124 @@ def __init__(self, **options):
         super(AnsibleYamlJinjaLexer, self).__init__(AnsibleYamlLexer, DjangoLexer, **options)
 
 
+class AnsibleOutputPrimaryLexer(RegexLexer):
+    name = 'Ansible-output-primary'
+
+    # The following definitions are borrowed from Pygment's JSON lexer.
+    # It has been originally authored by Norman Richards.
+
+    # integer part of a number
+    int_part = r'-?(0|[1-9]\d*)'
+
+    # fractional part of a number
+    frac_part = r'\.\d+'
+
+    # exponential part of a number
+    exp_part = r'[eE](\+|-)?\d+'
+
+    tokens = {
+        # #########################################
+        # # BEGIN: states from JSON lexer #########
+        # #########################################
+        'whitespace': [
+            (r'\s+', token.Text),
+        ],
+
+        # represents a simple terminal value
+        'simplevalue': [
+            (r'(true|false|null)\b', token.Keyword.Constant),
+            (('%(int_part)s(%(frac_part)s%(exp_part)s|'
+              '%(exp_part)s|%(frac_part)s)') % vars(),
+             token.Number.Float),
+            (int_part, token.Number.Integer),
+            (r'"(\\\\|\\"|[^"])*"', token.String),
+        ],
+
+
+        # the right hand side of an object, after the attribute name
+        'objectattribute': [
+            include('value'),
+            (r':', token.Punctuation),
+            # comma terminates the attribute but expects more
+            (r',', token.Punctuation, '#pop'),
+            # a closing bracket terminates the entire object, so pop twice
+            (r'\}', token.Punctuation, '#pop:2'),
+        ],
+
+        # a json object - { attr, attr, ... }
+        'objectvalue': [
+            include('whitespace'),
+            (r'"(\\\\|\\"|[^"])*"', token.Name.Tag, 'objectattribute'),
+            (r'\}', token.Punctuation, '#pop'),
+        ],
+
+        # json array - [ value, value, ... }
+        'arrayvalue': [
+            include('whitespace'),
+            include('value'),
+            (r',', token.Punctuation),
+            (r'\]', token.Punctuation, '#pop'),
+        ],
+
+        # a json value - either a simple value or a complex value (object or array)
+        'value': [
+            include('whitespace'),
+            include('simplevalue'),
+            (r'\{', token.Punctuation, 'objectvalue'),
+            (r'\[', token.Punctuation, 'arrayvalue'),
+        ],
+        # #########################################
+        # # END: states from JSON lexer ###########
+        # #########################################
+
+        'host-postfix': [
+            (r'\n', token.Text, '#pop:3'),
+            (r'( )(=>)( )(\{)',
+                bygroups(token.Text, token.Punctuation, token.Text, token.Punctuation),
+                'objectvalue'),
+        ],
+
+        'host-error': [
+            (r'(?:( )(UNREACHABLE|FAILED)(!))?',
+                bygroups(token.Text, token.Keyword, token.Punctuation),
+                'host-postfix'),
+            (r'', token.Text, 'host-postfix'),
+        ],
+
+        'host-name': [
+            (r'(\[)([^ \]]+)(?:( )(=>)( )([^\]]+))?(\])',
+                bygroups(token.Punctuation, token.Name.Variable, token.Text, token.Punctuation, token.Text, token.Name.Variable, token.Punctuation),
+                'host-error')
+        ],
+
+        'host-result': [
+            (r'\n', token.Text, '#pop'),
+            (r'( +)(ok|changed|failed|skipped|unreachable)(=)([0-9]+)',
+                bygroups(token.Text, token.Keyword, token.Punctuation, token.Number.Integer)),
+        ],
+
+        'root': [
+            (r'(PLAY|TASK|PLAY RECAP)(?:( )(\[)([^\]]+)(\]))?( )(\*+)(\n)',
+                bygroups(token.Keyword, token.Text, token.Punctuation, token.Literal, token.Punctuation, token.Text, token.Name.Variable, token.Text)),
+            (r'(fatal|ok|changed|skipping)(:)( )',
+                bygroups(token.Keyword, token.Punctuation, token.Text),
+                'host-name'),
+            (r'([^ ]+)( +)(:)',
+                bygroups(token.Name, token.Text, token.Punctuation),
+                'host-result'),
+            (r'.*\n', token.Other),
+        ],
+    }
+
+
+class AnsibleOutputLexer(DelegatingLexer):
+    name = 'Ansible-output'
+    aliases = ['ansible-output']
+
+    def __init__(self, **options):
+        super(AnsibleOutputLexer, self).__init__(DiffLexer, AnsibleOutputPrimaryLexer, **options)
+
+
 # ####################################################################################################
 # # Sphinx plugin ####################################################################################
 # ####################################################################################################
@@ -490,7 +609,7 @@ def setup(app):
     """ Initializer for Sphinx extension API.
         See http://www.sphinx-doc.org/en/stable/extdev/index.html#dev-extensions.
     """
-    for lexer in [AnsibleYamlLexer(startinline=True), AnsibleYamlJinjaLexer(startinline=True)]:
+    for lexer in [AnsibleYamlLexer(startinline=True), AnsibleYamlJinjaLexer(startinline=True), AnsibleOutputLexer(startinline=True)]:
         app.add_lexer(lexer.name, lexer)
         for alias in lexer.aliases:
             app.add_lexer(alias, lexer)

docs/docsite/rst/installation_guide/intro_configuration.rst

@@ -24,8 +24,8 @@ Paths where configuration file is searched are listed in :ref:`reference documen
 Getting the latest configuration
 --------------------------------
 
-If installing Ansible from a package manager, the latest ansible.cfg file should be present in /etc/ansible, possibly
-as a ".rpmnew" file (or other) as appropriate in the case of updates.
+If installing Ansible from a package manager, the latest ``ansible.cfg`` file should be present in ``/etc/ansible``, possibly
+as a ``.rpmnew`` file (or other) as appropriate in the case of updates.
 
 If you installed Ansible from pip or from source, you may want to create this file in order to override
 default settings in Ansible.

docs/docsite/rst/porting_guides/porting_guide_2.8.rst

@@ -17,7 +17,15 @@ This document is part of a collection on porting. The complete list of porting g
 Playbook
 ========
 
-No notable changes.
+Distribution Facts
+------------------
+
+The information returned for the ``ansible_distribution_*`` group of facts may have changed
+slightly.  Ansible 2.8 uses a new backend library for information about distributions: `nir0s/distro <https://github.com/nir0s/distro>`_. This library runs on Python-3.8 and fixes many bugs, including correcting release and version names.
+
+The two facts used in playbooks most often, ``ansible_distribution`` and ``ansible_distribution_major_version``, should not change. If you discover a change in these facts, please file a bug so we can address the
+difference.  However, other facts like ``ansible_distribution_release`` and
+``ansible_distribution_version`` may change as erroneous information gets corrected.
 
 
 Command Line
@@ -148,6 +156,21 @@ Plugins
 
 * Order of enabled inventory plugins (:ref:`INVENTORY_ENABLED`) has been updated, :ref:`auto <auto_inventory>` is now before :ref:`yaml <yaml_inventory>` and :ref:`ini <ini_inventory>`.
 
+* The private ``_options`` attribute has been removed from the ``CallbackBase`` class of callback
+  plugins.  If you have a third-party callback plugin which needs to access the command line arguments,
+  use code like the following instead of trying to use ``self._options``:
+
+  .. code-block:: python
+
+     from ansible import context
+     [...]
+     tags = context.CLIARGS['tags']
+
+  ``context.CLIARGS`` is a read-only dictionary so normal dictionary retrieval methods like
+  ``CLIARGS.get('tags')`` and ``CLIARGS['tags']`` work as expected but you won't be able to modify
+  the cli arguments at all.
+
+
 Porting custom scripts
 ======================
 

docs/docsite/rst/reference_appendices/galaxy.rst

@@ -168,6 +168,8 @@ Content of the *webserver.yml* file:
     - src: git+https://bitbucket.org/willthames/git-ansible-galaxy
       version: v1.4
 
+.. _galaxy_dependencies:
+
 Dependencies
 ============
 

docs/docsite/rst/scenario_guides/guide_gce.rst

@@ -127,16 +127,24 @@ GCE Dynamic Inventory
 
 The best way to interact with your hosts is to use the gcp_compute inventory plugin, which dynamically queries GCE and tells Ansible what nodes can be managed.
 
-To use the gcp_compute inventory plugin, create a file that ends in .gcp.yml file in your root directory. The gcp_compute inventory script takes in the same authentication
-information as any module.
+To be able to use this GCE dynamic inventory plugin, you need to enable it first by specifying the following in the ``ansible.cfg`` file:
+
+.. code-block:: ini
+
+  [inventory]
+  enable_plugins = gcp_compute
+
+Then, create a file that ends in ``.gcp.yml`` in your root directory.
+
+The gcp_compute inventory script takes in the same authentication information as any module.
 
 Here's an example of a valid inventory file:
 
 .. code-block:: yaml
 
     plugin: gcp_compute
     projects:
-      - google.com:graphite-playground
+      - graphite-playground
     filters:
     auth_kind: serviceaccount
     service_account_file: /home/alexstephen/my_account.json

docs/docsite/rst/user_guide/become.rst

@@ -360,7 +360,9 @@ task::
     - win_whoami:
       become: yes
 
-The output will look something similar to the below::
+The output will look something similar to the below:
+
+.. code-block:: ansible-output
 
     ok: [windows] => {
         "account": {