Release 4.8.9.

(cherry picked from commit 90ac53d150)

.azure-pipelines/azure-pipelines.yml

@@ -25,13 +25,12 @@ schedules:
     branches:
       include:
         - stable-5
-        - stable-4
   - cron: 0 11 * * 0
     displayName: Weekly (old stable branches)
     always: true
     branches:
       include:
-        - stable-3
+        - stable-4
 
 variables:
   - name: checkoutPath
@@ -54,14 +53,14 @@ pool: Standard
 
 stages:
 ### Sanity
-  - stage: Sanity_devel
-    displayName: Sanity devel
+  - stage: Sanity_2_14
+    displayName: Sanity 2.14
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Test {0}
-          testFormat: devel/sanity/{0}
+          testFormat: 2.14/sanity/{0}
           targets:
             - test: 1
             - test: 2
@@ -107,15 +106,41 @@ stages:
             - test: 2
             - test: 3
             - test: 4
+  - stage: Sanity_2_10
+    displayName: Sanity 2.10
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Test {0}
+          testFormat: 2.10/sanity/{0}
+          targets:
+            - test: 1
+            - test: 2
+            - test: 3
+            - test: 4
+  - stage: Sanity_2_9
+    displayName: Sanity 2.9
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Test {0}
+          testFormat: 2.9/sanity/{0}
+          targets:
+            - test: 1
+            - test: 2
+            - test: 3
+            - test: 4
 ### Units
-  - stage: Units_devel
-    displayName: Units devel
+  - stage: Units_2_14
+    displayName: Units 2.14
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: devel/units/{0}/1
+          testFormat: 2.14/units/{0}/1
           targets:
             - test: 2.7
             - test: 3.5
@@ -161,17 +186,38 @@ stages:
             - test: 2.6
             - test: 2.7
             - test: 3.5
-            - test: 3.6
             - test: 3.9
-
-## Remote
-  - stage: Remote_devel
-    displayName: Remote devel
+  - stage: Units_2_10
+    displayName: Units 2.10
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: devel/{0}
+          nameFormat: Python {0}
+          testFormat: 2.10/units/{0}/1
+          targets:
+            - test: 2.7
+            - test: 3.6
+  - stage: Units_2_9
+    displayName: Units 2.9
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Python {0}
+          testFormat: 2.9/units/{0}/1
+          targets:
+            - test: 2.6
+            - test: 3.5
+
+## Remote
+  - stage: Remote_2_14
+    displayName: Remote 2.14
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.14/{0}
           targets:
             - name: macOS 12.0
               test: macos/12.0
@@ -220,7 +266,6 @@ stages:
           groups:
             - 1
             - 2
-            - 3
   - stage: Remote_2_11
     displayName: Remote 2.11
     dependsOn: []
@@ -238,21 +283,50 @@ stages:
           groups:
             - 1
             - 2
-            - 3
-
-### Docker
-  - stage: Docker_devel
-    displayName: Docker devel
+  - stage: Remote_2_10
+    displayName: Remote 2.10
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: devel/linux/{0}
+          testFormat: 2.10/{0}
+          targets:
+            - name: OS X 10.11
+              test: osx/10.11
+            - name: macOS 10.15
+              test: macos/10.15
+          groups:
+            - 1
+            - 2
+  - stage: Remote_2_9
+    displayName: Remote 2.9
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.9/{0}
+          targets:
+            - name: RHEL 8.2
+              test: rhel/8.2
+            - name: RHEL 7.8
+              test: rhel/7.8
+            #- name: FreeBSD 12.0
+            #  test: freebsd/12.0
+          groups:
+            - 1
+            - 2
+
+### Docker
+  - stage: Docker_2_14
+    displayName: Docker 2.14
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.14/linux/{0}
           targets:
             - name: CentOS 7
               test: centos7
-            - name: Fedora 35
-              test: fedora35
             - name: Fedora 36
               test: fedora36
             - name: openSUSE 15
@@ -311,25 +385,50 @@ stages:
         parameters:
           testFormat: 2.11/linux/{0}
           targets:
-            - name: Fedora 32
-              test: fedora32
             - name: Fedora 33
               test: fedora33
             - name: Alpine 3
               test: alpine3
           groups:
-            - 1
             - 2
             - 3
-
-### Community Docker
-  - stage: Docker_community_devel
-    displayName: Docker (community images) devel
+  - stage: Docker_2_10
+    displayName: Docker 2.10
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: devel/linux-community/{0}
+          testFormat: 2.10/linux/{0}
+          targets:
+            - name: Fedora 32
+              test: fedora32
+            - name: Ubuntu 16.04
+              test: ubuntu1604
+          groups:
+            - 2
+            - 3
+  - stage: Docker_2_9
+    displayName: Docker 2.9
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.9/linux/{0}
+          targets:
+            - name: Fedora 31
+              test: fedora31
+          groups:
+            - 2
+            - 3
+
+### Community Docker
+  - stage: Docker_community_2_14
+    displayName: Docker (community images) 2.14
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.14/linux-community/{0}
           targets:
             - name: Debian Bullseye
               test: debian-bullseye/3.9
@@ -343,14 +442,14 @@ stages:
             - 3
 
 ### Cloud
-  - stage: Cloud_devel
-    displayName: Cloud devel
+  - stage: Cloud_2_14
+    displayName: Cloud 2.14
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: devel/cloud/{0}/1
+          testFormat: 2.14/cloud/{0}/1
           targets:
             - test: 2.7
             - test: '3.10'
@@ -383,30 +482,58 @@ stages:
           nameFormat: Python {0}
           testFormat: 2.11/cloud/{0}/1
           targets:
-            - test: 2.7
+            - test: 3.6
+  - stage: Cloud_2_10
+    displayName: Cloud 2.10
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Python {0}
+          testFormat: 2.10/cloud/{0}/1
+          targets:
             - test: 3.5
-
+  - stage: Cloud_2_9
+    displayName: Cloud 2.9
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Python {0}
+          testFormat: 2.9/cloud/{0}/1
+          targets:
+            - test: 2.7
   - stage: Summary
     condition: succeededOrFailed()
     dependsOn:
-      - Sanity_devel
+      - Sanity_2_14
+      - Sanity_2_9
+      - Sanity_2_10
       - Sanity_2_11
       - Sanity_2_12
       - Sanity_2_13
-      - Units_devel
+      - Units_2_14
+      - Units_2_9
+      - Units_2_10
       - Units_2_11
       - Units_2_12
       - Units_2_13
-      - Remote_devel
+      - Remote_2_14
+      - Remote_2_9
+      - Remote_2_10
       - Remote_2_11
       - Remote_2_12
       - Remote_2_13
-      - Docker_devel
+      - Docker_2_14
+      - Docker_2_9
+      - Docker_2_10
       - Docker_2_11
       - Docker_2_12
       - Docker_2_13
-      - Docker_community_devel
-      - Cloud_devel
+      - Docker_community_2_14
+      - Cloud_2_14
+      - Cloud_2_9
+      - Cloud_2_10
       - Cloud_2_11
       - Cloud_2_12
       - Cloud_2_13

.azure-pipelines/scripts/aggregate-coverage.sh

@@ -9,6 +9,10 @@ PATH="${PWD}/bin:${PATH}"
 
 mkdir "${agent_temp_directory}/coverage/"
 
+if [[ "$(ansible --version)" =~ \ 2\.9\. ]]; then
+    exit
+fi
+
 options=(--venv --venv-system-site-packages --color -v)
 
 ansible-test coverage combine --group-by command --export "${agent_temp_directory}/coverage/" "${options[@]}"

.azure-pipelines/scripts/report-coverage.sh

@@ -5,6 +5,10 @@ set -o pipefail -eu
 
 PATH="${PWD}/bin:${PATH}"
 
+if [[ "$(ansible --version)" =~ \ 2\.9\. ]]; then
+    exit
+fi
+
 if ! ansible-test --help >/dev/null 2>&1; then
     # Install the devel version of ansible-test for generating code coverage reports.
     # This is only used by Ansible Collections, which are typically tested against multiple Ansible versions (in separate jobs).

.github/BOTMETA.yml

@@ -126,7 +126,9 @@ files:
     maintainers: giner
   $filters/from_csv.py:
     maintainers: Ajpantuso
-  $filters/groupby_as_dict.py:
+  $filters/groupby.py:
+    maintainers: felixfontein
+  $filters/groupby_as_dict.yml:
     maintainers: felixfontein
   $filters/hashids.py:
     maintainers: Ajpantuso
@@ -137,8 +139,12 @@ files:
   $filters/jc.py:
     maintainers: kellyjonbrazil
   $filters/json_query.py: {}
-  $filters/lists_mergeby.py:
+  $filters/list.py:
     maintainers: vbotka
+  $filters/lists_mergeby.yml:
+    maintainers: vbotka
+  $filters/path_join_shim.py:
+    maintainers: felixfontein
   $filters/random_mac.py: {}
   $filters/time.py:
     maintainers: resmo
@@ -197,8 +203,6 @@ files:
   $inventories/virtualbox.py: {}
   $lookups/:
     labels: lookups
-  $lookups/bitwarden.py:
-    maintainers: lungj
   $lookups/cartesian.py: {}
   $lookups/chef_databag.py: {}
   $lookups/collection_version.py:
@@ -216,7 +220,8 @@ files:
   $lookups/dnstxt.py:
     maintainers: jpmens
   $lookups/dsv.py:
-    maintainers: amigus endlesstrax delineaKrehl tylerezimmerman
+    maintainers: delineaKrehl tylerezimmerman
+    ignore: amigus
   $lookups/etcd3.py:
     maintainers: eric-belhomme
   $lookups/etcd.py:
@@ -253,12 +258,10 @@ files:
     maintainers: RevBits
   $lookups/shelvefile.py: {}
   $lookups/tss.py:
-    maintainers: amigus endlesstrax delineaKrehl tylerezimmerman
+    maintainers: delineaKrehl tylerezimmerman
+    ignore: amigus
   $module_utils/:
     labels: module_utils
-  $module_utils/gconftool2.py:
-    maintainers: russoz
-    labels: gconftool2
   $module_utils/gitlab.py:
     notify: jlozadad
     maintainers: $team_gitlab
@@ -306,15 +309,9 @@ files:
   $module_utils/utm_utils.py:
     maintainers: $team_e_spirit
     labels: utm_utils
-  $module_utils/wdc_redfish_utils.py:
-    maintainers: $team_wdc
-    labels: wdc_redfish_utils
   $module_utils/xenserver.py:
     maintainers: bvitnik
     labels: xenserver
-  $module_utils/xfconf.py:
-    maintainers: russoz
-    labels: xfconf
   $modules/cloud/alicloud/:
     maintainers: xiaozhu36
   $modules/cloud/atomic/atomic_container.py:
@@ -445,8 +442,6 @@ files:
     maintainers: claco
   $modules/cloud/scaleway/:
     maintainers: $team_scaleway
-  $modules/cloud/scaleway/scaleway_compute_private_network.py:
-    maintainers: pastral
   $modules/cloud/scaleway/scaleway_database_backup.py:
     maintainers: guillaume_ro_fr
   $modules/cloud/scaleway/scaleway_image_info.py:
@@ -973,10 +968,6 @@ files:
   $modules/remote_management/redfish/:
     maintainers: $team_redfish
     ignore: jose-delarosa
-  $modules/remote_management/redfish/wdc_redfish_command.py:
-    maintainers: $team_wdc
-  $modules/remote_management/redfish/wdc_redfish_info.py:
-    maintainers: $team_wdc
   $modules/remote_management/stacki/stacki_host.py:
     maintainers: bsanders bbyhuy
     labels: stacki_host
@@ -1041,7 +1032,7 @@ files:
   $modules/system/alternatives.py:
     maintainers: mulby
     labels: alternatives
-    ignore: DavidWittman jiuka
+    ignore: DavidWittman
   $modules/system/aix_lvol.py:
     maintainers: adejoux
   $modules/system/awall.py:
@@ -1069,9 +1060,6 @@ files:
   $modules/system/gconftool2.py:
     maintainers: Akasurde kevensen
     labels: gconftool2
-  $modules/system/gconftool2_info.py:
-    maintainers: russoz
-    labels: gconftool2
   $modules/system/homectl.py:
     maintainers: jameslivulpi
   $modules/system/interfaces_file.py:
@@ -1079,10 +1067,6 @@ files:
     labels: interfaces_file
   $modules/system/iptables_state.py:
     maintainers: quidame
-  $modules/system/keyring.py:
-    maintainers: ahussey-redhat
-  $modules/system/keyring_info.py:
-    maintainers: ahussey-redhat
   $modules/system/shutdown.py:
     maintainers: nitzmahone samdoran aminvakil
   $modules/system/java_cert.py:
@@ -1307,4 +1291,3 @@ macros:
   team_solaris: bcoca fishman jasperla jpdasma mator scathatheworm troy2914 xen0l
   team_suse: commel evrardjp lrupp toabctl AnderEnder alxgu andytom sealor
   team_virt: joshainglis karmab tleguern Thulium-Drake Ajpantuso
-  team_wdc: mikemoerk

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -105,7 +105,7 @@ body:
   attributes:
     label: Steps to Reproduce
     description: |
-      Describe exactly how to reproduce the problem, using a minimal test-case. It would *really* help us understand your problem if you could also passed any playbooks, configs and commands you used.
+      Describe exactly how to reproduce the problem, using a minimal test-case. It would *really* help us understand your problem if you could also pased any playbooks, configs and commands you used.
 
       **HINT:** You can paste https://gist.github.com links for larger files.
     value: |

.github/dependabot.yml

@@ -1,7 +1,6 @@
----
 version: 2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
-    schedule:
-      interval: "weekly"
+    interval:
+      schedule: "weekly"

.github/workflows/codeql-analysis.yml

@@ -4,21 +4,14 @@ on:
   schedule:
     - cron: '26 19 * * 1'
 
-permissions:
-  contents: read
-
 jobs:
   CodeQL-Build:
 
-    permissions:
-      actions: read  # for github/codeql-action/init to get workflow details
-      contents: read  # for actions/checkout to fetch code
-      security-events: write  # for github/codeql-action/autobuild to send a status report
     runs-on: ubuntu-latest
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
@@ -31,7 +24,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v1
       # Override language selection by uncommenting this and choosing your languages
       # with:
       #   languages: go, javascript, csharp, python, cpp, java
@@ -39,7 +32,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v1
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -53,4 +46,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v1

.pre-commit-config.yaml

@@ -1,19 +0,0 @@
----
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
-    hooks:
-      - id: trailing-whitespace
-      - id: end-of-file-fixer
-      - id: mixed-line-ending
-        args: [--fix=lf]
-      - id: fix-encoding-pragma
-      - id: check-ast
-      - id: check-merge-conflict
-      - id: check-symlinks
-  - repo: https://github.com/pre-commit/pygrep-hooks
-    rev: v1.9.0
-    hooks:
-      - id: rst-backticks
-        types: [file]
-        files: changelogs/fragments/.*\.(yml|yaml)$

CONTRIBUTING.md

@@ -106,15 +106,9 @@ Creating new modules and plugins requires a bit more work than other Pull Reques
    - Make sure that new plugins and modules have tests (unit tests, integration tests, or both); it is preferable to have some tests
      which run in CI.
 
-4. For modules and action plugins, make sure to create your module/plugin in the correct subdirectory, and add a redirect entry
-   in `meta/runtime.yml`. For example, for the `aerospike_migrations` module located in
-   `plugins/modules/database/aerospike/aerospike_migrations.py`, you need to create the following entry:
-   ```.yaml
-       aerospike_migrations:
-         redirect: community.general.database.aerospike.aerospike_migrations
-   ```
-   Here, the relative path `database/aerospike/` is inserted into the module's FQCN (Fully Qualified Collection Name) after the
-   collection's name and before the module's name. This must not be done for other plugin types but modules and action plugins!
+4. For modules and action plugins, make sure to create your module/plugin in the correct subdirectory, and create a symbolic link
+   from `plugins/modules/` respectively `plugins/action/` to the actual module/plugin code. (Other plugin types should not use
+   subdirectories.)
 
    - Action plugins need to be accompanied by a module, even if the module file only contains documentation
      (`DOCUMENTATION`, `EXAMPLES` and `RETURN`). The module must have the same name and directory path in `plugins/modules/`
@@ -125,19 +119,3 @@ Creating new modules and plugins requires a bit more work than other Pull Reques
    listed as `maintainers` will be pinged for new issues and PRs that modify the module/plugin or its tests.
 
    When you add a new plugin/module, we expect that you perform maintainer duty for at least some time after contributing it.
-
-## pre-commit
-
-To help ensure high-quality contributions this repository includes a [pre-commit](https://pre-commit.com) configuration which
-corrects and tests against common issues that would otherwise cause CI to fail. To begin using these pre-commit hooks see
-the [Installation](#installation) section below.
-
-This is optional and not required to contribute to this repository.
-
-### Installation
-
-Follow the [instructions](https://pre-commit.com/#install) provided with pre-commit and run `pre-commit install` under the repository base. If for any reason you would like to disable the pre-commit hooks run `pre-commit uninstall`.
-
-This is optional to run it locally.
-
-You can trigger it locally with `pre-commit run --all-files` or even to run only for a given file `pre-commit run --files YOUR_FILE`.

MIT-license.txt

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,6 +1,6 @@
 # Community General Collection
 
-[![Build Status](https://dev.azure.com/ansible/community.general/_apis/build/status/CI?branchName=stable-5)](https://dev.azure.com/ansible/community.general/_build?definitionId=31)
+[![Build Status](https://dev.azure.com/ansible/community.general/_apis/build/status/CI?branchName=stable-4)](https://dev.azure.com/ansible/community.general/_build?definitionId=31)
 [![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/community.general)](https://codecov.io/gh/ansible-collections/community.general)
 
 This repository contains the `community.general` Ansible Collection. The collection is a part of the Ansible package and includes many modules and plugins supported by Ansible community which are not part of more specialized community collections.
@@ -17,9 +17,7 @@ If you encounter abusive behavior violating the [Ansible Code of Conduct](https:
 
 ## Tested with Ansible
 
-Tested with the current ansible-core 2.11, ansible-core 2.12, ansible-core 2.13 releases and the current development version of ansible-core. Ansible-core versions before 2.11.0 are not supported. This includes all ansible-base 2.10 and Ansible 2.9 releases.
-
-Parts of this collection will not work with ansible-core 2.11 on Python 3.12+.
+Tested with the current Ansible 2.9, ansible-base 2.10, ansible-core 2.11, ansible-core 2.12, ansible-core 2.13, and ansible-core 2.14 releases of ansible-core. Ansible versions before 2.9.10 are not supported.
 
 ## External requirements
 
@@ -66,13 +64,13 @@ We are actively accepting new contributors.
 
 All types of contributions are very welcome.
 
-You don't know how to start? Refer to our [contribution guide](https://github.com/ansible-collections/community.general/blob/main/CONTRIBUTING.md)!
+You don't know how to start? Refer to our [contribution guide](https://github.com/ansible-collections/community.general/blob/stable-4/CONTRIBUTING.md)!
 
-The current maintainers are listed in the [commit-rights.md](https://github.com/ansible-collections/community.general/blob/main/commit-rights.md#people) file. If you have questions or need help, feel free to mention them in the proposals.
+The current maintainers are listed in the [commit-rights.md](https://github.com/ansible-collections/community.general/blob/stable-4/commit-rights.md#people) file. If you have questions or need help, feel free to mention them in the proposals.
 
 You can find more information in the [developer guide for collections](https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#contributing-to-collections), and in the [Ansible Community Guide](https://docs.ansible.com/ansible/latest/community/index.html).
 
-Also for some notes specific to this collection see [our CONTRIBUTING documentation](https://github.com/ansible-collections/community.general/blob/main/CONTRIBUTING.md).
+Also for some notes specific to this collection see [our CONTRIBUTING documentation](https://github.com/ansible-collections/community.general/blob/stable-4/CONTRIBUTING.md).
 
 ### Running tests
 
@@ -82,7 +80,7 @@ See [here](https://docs.ansible.com/ansible/devel/dev_guide/developing_collectio
 
 To learn how to maintain / become a maintainer of this collection, refer to:
 
-* [Committer guidelines](https://github.com/ansible-collections/community.general/blob/main/commit-rights.md).
+* [Committer guidelines](https://github.com/ansible-collections/community.general/blob/stable-4/commit-rights.md).
 * [Maintainer guidelines](https://github.com/ansible/community-docs/blob/main/maintaining.rst).
 
 It is necessary for maintainers of this collection to be subscribed to:
@@ -110,7 +108,7 @@ See the [Releasing guidelines](https://github.com/ansible/community-docs/blob/ma
 
 ## Release notes
 
-See the [changelog](https://github.com/ansible-collections/community.general/blob/stable-5/CHANGELOG.rst).
+See the [changelog](https://github.com/ansible-collections/community.general/blob/stable-4/CHANGELOG.rst).
 
 ## Roadmap
 

galaxy.yml

@@ -1,6 +1,6 @@
 namespace: community
 name: general
-version: 5.4.0
+version: 4.8.9
 readme: README.md
 authors:
   - Ansible (https://github.com/ansible)

plugins/action/iptables_state.py

@@ -0,0 +1 @@
+./system/iptables_state.py

plugins/action/shutdown.py

@@ -0,0 +1 @@
+./system/shutdown.py

plugins/become/machinectl.py

@@ -66,46 +66,15 @@ DOCUMENTATION = '''
             ini:
               - section: machinectl_become_plugin
                 key: password
-    notes:
-      - When not using this plugin with user C(root), it only works correctly with a polkit rule which will alter
-        the behaviour of machinectl. This rule must alter the prompt behaviour to ask directly for the user credentials,
-        if the user is allowed to perform the action (take a look at the examples section).
-        If such a rule is not present the plugin only work if it is used in context with the root user,
-        because then no further prompt will be shown by machinectl.
 '''
 
-EXAMPLES = r'''
-# A polkit rule needed to use the module with a non-root user.
-# See the Notes section for details.
-60-machinectl-fast-user-auth.rules: |
-    polkit.addRule(function(action, subject) {
-        if(action.id == "org.freedesktop.machine1.host-shell" && subject.isInGroup("wheel")) {
-            return polkit.Result.AUTH_SELF_KEEP;
-        }
-    });
-'''
-
-from re import compile as re_compile
-
 from ansible.plugins.become import BecomeBase
-from ansible.module_utils._text import to_bytes
-
-
-ansi_color_codes = re_compile(to_bytes(r'\x1B\[[0-9;]+m'))
 
 
 class BecomeModule(BecomeBase):
 
     name = 'community.general.machinectl'
 
-    prompt = 'Password: '
-    fail = ('==== AUTHENTICATION FAILED ====',)
-    success = ('==== AUTHENTICATION COMPLETE ====',)
-
-    @staticmethod
-    def remove_ansi_codes(line):
-        return ansi_color_codes.sub(b"", line)
-
     def build_become_command(self, cmd, shell):
         super(BecomeModule, self).build_become_command(cmd, shell)
 
@@ -117,15 +86,3 @@ class BecomeModule(BecomeBase):
         flags = self.get_option('become_flags')
         user = self.get_option('become_user')
         return '%s -q shell %s %s@ %s' % (become, flags, user, cmd)
-
-    def check_success(self, b_output):
-        b_output = self.remove_ansi_codes(b_output)
-        return super().check_success(b_output)
-
-    def check_incorrect_password(self, b_output):
-        b_output = self.remove_ansi_codes(b_output)
-        return super().check_incorrect_password(b_output)
-
-    def check_missing_password(self, b_output):
-        b_output = self.remove_ansi_codes(b_output)
-        return super().check_missing_password(b_output)

plugins/become/pfexec.py

@@ -101,4 +101,4 @@ class BecomeModule(BecomeBase):
 
         flags = self.get_option('become_flags')
         noexe = not self.get_option('wrap_exe')
-        return '%s %s "%s"' % (exe, flags, self._build_success_command(cmd, shell, noexe=noexe))
+        return '%s %s %s' % (exe, flags, self._build_success_command(cmd, shell, noexe=noexe))

plugins/cache/memcached.py

@@ -176,11 +176,20 @@ class CacheModule(BaseCacheModule):
     def __init__(self, *args, **kwargs):
         connection = ['127.0.0.1:11211']
 
-        super(CacheModule, self).__init__(*args, **kwargs)
-        if self.get_option('_uri'):
-            connection = self.get_option('_uri')
-        self._timeout = self.get_option('_timeout')
-        self._prefix = self.get_option('_prefix')
+        try:
+            super(CacheModule, self).__init__(*args, **kwargs)
+            if self.get_option('_uri'):
+                connection = self.get_option('_uri')
+            self._timeout = self.get_option('_timeout')
+            self._prefix = self.get_option('_prefix')
+        except KeyError:
+            # TODO: remove once we no longer support Ansible 2.9
+            if not ansible_base_version.startswith('2.9.'):
+                raise AnsibleError("Do not import CacheModules directly. Use ansible.plugins.loader.cache_loader instead.")
+            if C.CACHE_PLUGIN_CONNECTION:
+                connection = C.CACHE_PLUGIN_CONNECTION.split(',')
+            self._timeout = C.CACHE_PLUGIN_TIMEOUT
+            self._prefix = C.CACHE_PLUGIN_PREFIX
 
         if not HAS_MEMCACHE:
             raise AnsibleError("python-memcached is required for the memcached fact cache")

plugins/cache/redis.py

@@ -99,13 +99,23 @@ class CacheModule(BaseCacheModule):
     def __init__(self, *args, **kwargs):
         uri = ''
 
-        super(CacheModule, self).__init__(*args, **kwargs)
-        if self.get_option('_uri'):
-            uri = self.get_option('_uri')
-        self._timeout = float(self.get_option('_timeout'))
-        self._prefix = self.get_option('_prefix')
-        self._keys_set = self.get_option('_keyset_name')
-        self._sentinel_service_name = self.get_option('_sentinel_service_name')
+        try:
+            super(CacheModule, self).__init__(*args, **kwargs)
+            if self.get_option('_uri'):
+                uri = self.get_option('_uri')
+            self._timeout = float(self.get_option('_timeout'))
+            self._prefix = self.get_option('_prefix')
+            self._keys_set = self.get_option('_keyset_name')
+            self._sentinel_service_name = self.get_option('_sentinel_service_name')
+        except KeyError:
+            # TODO: remove once we no longer support Ansible 2.9
+            if not ansible_base_version.startswith('2.9.'):
+                raise AnsibleError("Do not import CacheModules directly. Use ansible.plugins.loader.cache_loader instead.")
+            if C.CACHE_PLUGIN_CONNECTION:
+                uri = C.CACHE_PLUGIN_CONNECTION
+            self._timeout = float(C.CACHE_PLUGIN_TIMEOUT)
+            self._prefix = C.CACHE_PLUGIN_PREFIX
+            self._keys_set = 'ansible_cache_keys'
 
         if not HAS_REDIS:
             raise AnsibleError("The 'redis' python module (version 2.4.5 or newer) is required for the redis fact cache, 'pip install redis'")

plugins/callback/dense.py

@@ -232,13 +232,13 @@ class CallbackModule(CallbackModule_default):
         # Remove non-essential attributes
         for attr in self.removed_attributes:
             if attr in result:
-                del(result[attr])
+                del result[attr]
 
         # Remove empty attributes (list, dict, str)
         for attr in result.copy():
             if isinstance(result[attr], (MutableSequence, MutableMapping, binary_type, text_type)):
                 if not result[attr]:
-                    del(result[attr])
+                    del result[attr]
 
     def _handle_exceptions(self, result):
         if 'exception' in result:

plugins/callback/opentelemetry.py

@@ -24,10 +24,6 @@ DOCUMENTATION = '''
           - Hide the arguments for a task.
         env:
           - name: ANSIBLE_OPENTELEMETRY_HIDE_TASK_ARGUMENTS
-        ini:
-          - section: callback_opentelemetry
-            key: hide_task_arguments
-            version_added: 5.3.0
       enable_from_environment:
         type: str
         description:
@@ -38,10 +34,6 @@ DOCUMENTATION = '''
             and if set to true this plugin will be enabled.
         env:
           - name: ANSIBLE_OPENTELEMETRY_ENABLE_FROM_ENVIRONMENT
-        ini:
-          - section: callback_opentelemetry
-            key: enable_from_environment
-            version_added: 5.3.0
         version_added: 3.8.0
       otel_service_name:
         default: ansible
@@ -50,10 +42,6 @@ DOCUMENTATION = '''
           - The service name resource attribute.
         env:
           - name: OTEL_SERVICE_NAME
-        ini:
-          - section: callback_opentelemetry
-            key: otel_service_name
-            version_added: 5.3.0
       traceparent:
         default: None
         type: str
@@ -73,14 +61,11 @@ examples: |
   Enable the plugin in ansible.cfg:
     [defaults]
     callbacks_enabled = community.general.opentelemetry
-    [callback_opentelemetry]
-    enable_from_environment = ANSIBLE_OPENTELEMETRY_ENABLED
 
   Set the environment variable:
     export OTEL_EXPORTER_OTLP_ENDPOINT=<your endpoint (OTLP/HTTP)>
     export OTEL_EXPORTER_OTLP_HEADERS="authorization=Bearer your_otel_token"
     export OTEL_SERVICE_NAME=your_service_name
-    export ANSIBLE_OPENTELEMETRY_ENABLED=true
 '''
 
 import getpass
@@ -109,13 +94,32 @@ try:
     from opentelemetry.sdk.trace.export import (
         BatchSpanProcessor
     )
-    from opentelemetry.util._time import _time_ns
+
+    # Support for opentelemetry-api <= 1.12
+    try:
+        from opentelemetry.util._time import _time_ns
+    except ImportError as imp_exc:
+        OTEL_LIBRARY_TIME_NS_ERROR = imp_exc
+    else:
+        OTEL_LIBRARY_TIME_NS_ERROR = None
+
 except ImportError as imp_exc:
     OTEL_LIBRARY_IMPORT_ERROR = imp_exc
+    OTEL_LIBRARY_TIME_NS_ERROR = imp_exc
 else:
     OTEL_LIBRARY_IMPORT_ERROR = None
 
 
+if sys.version_info >= (3, 7):
+    time_ns = time.time_ns
+elif not OTEL_LIBRARY_TIME_NS_ERROR:
+    time_ns = _time_ns
+else:
+    def time_ns():
+        # Support versions older than 3.7 with opentelemetry-api > 1.12
+        return int(time.time() * 1e9)
+
+
 class TaskData:
     """
     Data about an individual task.
@@ -127,10 +131,7 @@ class TaskData:
         self.path = path
         self.play = play
         self.host_data = OrderedDict()
-        if sys.version_info >= (3, 7):
-            self.start = time.time_ns()
-        else:
-            self.start = _time_ns()
+        self.start = time_ns()
         self.action = action
         self.args = args
 
@@ -155,10 +156,7 @@ class HostData:
         self.name = name
         self.status = status
         self.result = result
-        if sys.version_info >= (3, 7):
-            self.finish = time.time_ns()
-        else:
-            self.finish = _time_ns()
+        self.finish = time_ns()
 
 
 class OpenTelemetrySource(object):

plugins/callback/osx_say.py

@@ -0,0 +1 @@
+say.py

plugins/callback/syslog_json.py

@@ -15,7 +15,7 @@ DOCUMENTATION = '''
     short_description: sends JSON events to syslog
     description:
       - This plugin logs ansible-playbook and ansible runs to a syslog server in JSON format
-      - Before Ansible 2.9 only environment variables were available for configuration
+      - Before 2.9 only environment variables were available for configuration
     options:
       server:
         description: syslog server that will receive the event

plugins/connection/funcd.py

@@ -63,7 +63,7 @@ class Connection(ConnectionBase):
         self.client = fc.Client(self.host)
         return self
 
-    def exec_command(self, cmd, become_user=None, sudoable=False, executable='/bin/sh', in_data=None):
+    def exec_command(self, cmd, in_data=None, sudoable=True):
         """ run a command on the remote minion """
 
         if in_data:

plugins/doc_fragments/influxdb.py

@@ -42,6 +42,7 @@ options:
     - The path on which InfluxDB server is accessible
     - Only available when using python-influxdb >= 5.1.0
     type: str
+    default: ''
     version_added: '0.2.0'
   validate_certs:
     description:
@@ -79,4 +80,5 @@ options:
     description:
     - HTTP(S) proxy to use for Requests to connect to InfluxDB server.
     type: dict
+    default: {}
 '''

plugins/doc_fragments/keycloak.py

@@ -68,10 +68,4 @@ options:
         type: int
         default: 10
         version_added: 4.5.0
-    http_agent:
-        description:
-            - Configures the HTTP User-Agent header.
-        type: str
-        default: Ansible
-        version_added: 5.4.0
 '''

plugins/doc_fragments/ldap.py

@@ -22,6 +22,7 @@ options:
     description:
       - The password to use with I(bind_dn).
     type: str
+    default: ''
   dn:
     required: true
     description:

plugins/doc_fragments/utm.py

@@ -16,6 +16,7 @@ options:
           - Is needed for some modules
         type: dict
         required: false
+        default: {}
     utm_host:
         description:
           - The REST Endpoint of the Sophos UTM.

plugins/filter/counter.py

@@ -21,7 +21,7 @@ DOCUMENTATION = '''
 '''
 
 EXAMPLES = '''
-- name: Count occurrences
+- name: Count occurences
   ansible.builtin.debug:
     msg: >-
       {{ [1, 'a', 2, 2, 'a', 'b', 'a'] | community.general.counter }}
@@ -30,7 +30,7 @@ EXAMPLES = '''
 
 RETURN = '''
   _value:
-    description: A dictionary with the elements of the sequence as keys, and their number of occurrences in the sequence as values.
+    description: A dictionary with the elements of the sequence as keys, and their number of occurance in the sequence as values.
     type: dictionary
 '''
 

plugins/filter/groupby.py

@@ -5,52 +5,6 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-DOCUMENTATION = '''
-  name: groupby_as_dict
-  short_description: Transform a sequence of dictionaries to a dictionary where the dictionaries are indexed by an attribute
-  version_added: 3.1.0
-  author: Felix Fontein (@felixfontein)
-  description:
-    - Transform a sequence of dictionaries to a dictionary where the dictionaries are indexed by an attribute.
-  positional: attribute
-  options:
-    _input:
-      description: A list of dictionaries
-      type: list
-      elements: dictionary
-      required: true
-    attribute:
-      description: The attribute to use as the key.
-      type: str
-      required: true
-'''
-
-EXAMPLES = '''
-- name: Arrange a list of dictionaries as a dictionary of dictionaries
-  ansible.builtin.debug:
-    msg: "{{ sequence | community.general.groupby_as_dict('key') }}"
-  vars:
-    sequence:
-      - key: value
-        foo: bar
-      - key: other_value
-        baz: bar
-  # Produces the following nested structure:
-  #
-  #  value:
-  #    key: value
-  #    foo: bar
-  #  other_value:
-  #    key: other_value
-  #    baz: bar
-'''
-
-RETURN = '''
-  _value:
-    description: A dictionary containing the dictionaries from the list as values.
-    type: dictionary
-'''
-
 from ansible.errors import AnsibleFilterError
 from ansible.module_utils.common._collections_compat import Mapping, Sequence
 

plugins/filter/groupby_as_dict.yml

@@ -0,0 +1,42 @@
+DOCUMENTATION:
+  name: groupby_as_dict
+  short_description: Transform a sequence of dictionaries to a dictionary where the dictionaries are indexed by an attribute
+  version_added: 3.1.0
+  author: Felix Fontein (@felixfontein)
+  description:
+    - Transform a sequence of dictionaries to a dictionary where the dictionaries are indexed by an attribute.
+  positional: attribute
+  options:
+    _input:
+      description: A list of dictionaries
+      type: list
+      elements: dictionary
+      required: true
+    attribute:
+      description: The attribute to use as the key.
+      type: str
+      required: true
+
+EXAMPLES: |
+  - name: Arrange a list of dictionaries as a dictionary of dictionaries
+    ansible.builtin.debug:
+      msg: "{{ sequence | community.general.groupby_as_dict('key') }}"
+    vars:
+      sequence:
+        - key: value
+          foo: bar
+        - key: other_value
+          baz: bar
+    # Produces the following nested structure:
+    #
+    #  value:
+    #    key: value
+    #    foo: bar
+    #  other_value:
+    #    key: other_value
+    #    baz: bar
+
+RETURN:
+  _value:
+    description: A dictionary containing the dictionaries from the list as values.
+    type: dictionary

plugins/filter/jc.py

@@ -38,7 +38,7 @@ DOCUMENTATION = '''
     parser:
       description:
         - The correct parser for the input data.
-        - For example C(ifconfig).
+        - For exmaple C(ifconfig).
         - See U(https://github.com/kellyjonbrazil/jc#parsers) for the latest list of parsers.
       type: string
       required: true
@@ -51,10 +51,16 @@ DOCUMENTATION = '''
       type: boolean
       default: false
   requirements:
-    - jc (https://github.com/kellyjonbrazil/jc)
+    - jc installed as a Python library (U(https://pypi.org/project/jc/))
 '''
 
 EXAMPLES = '''
+- name: Install the prereqs of the jc filter (jc Python package) on the Ansible controller
+  delegate_to: localhost
+  ansible.builtin.pip:
+    name: jc
+    state: present
+
 - name: Run command
   ansible.builtin.command: uname -a
   register: result
@@ -107,15 +113,19 @@ def jc(data, parser, quiet=True, raw=False):
         dictionary or list of dictionaries
 
     Example:
-
         - name: run date command
           hosts: ubuntu
           tasks:
-          - shell: date
+          - name: install the prereqs of the jc filter (jc Python package) on the Ansible controller
+            delegate_to: localhost
+            ansible.builtin.pip:
+              name: jc
+              state: present
+          - ansible.builtin.shell: date
             register: result
-          - set_fact:
+          - ansible.builtin.set_fact:
               myvar: "{{ result.stdout | community.general.jc('date') }}"
-          - debug:
+          - ansible.builtin.debug:
               msg: "{{ myvar }}"
 
         produces:
@@ -137,7 +147,7 @@ def jc(data, parser, quiet=True, raw=False):
     """
 
     if not HAS_LIB:
-        raise AnsibleError('You need to install "jc" prior to running jc filter')
+        raise AnsibleError('You need to install "jc" as a Python library on the Ansible controller prior to running jc filter')
 
     try:
         jc_parser = importlib.import_module('jc.parsers.' + parser)

plugins/filter/list.py

@@ -5,98 +5,6 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-DOCUMENTATION = '''
-  name: lists_mergeby
-  short_description: Merge two or more lists of dictionaries by a given attribute
-  version_added: 2.0.0
-  author: Vladimir Botka (@vbotka)
-  description:
-    - Merge two or more lists by attribute I(index). Optional parameters 'recursive' and 'list_merge'
-      control the merging of the lists in values. The function merge_hash from ansible.utils.vars
-      is used. To learn details on how to use the parameters 'recursive' and 'list_merge' see
-      Ansible User's Guide chapter "Using filters to manipulate data" section "Combining
-      hashes/dictionaries".
-  positional: another_list, index
-  options:
-    _input:
-      description: A list of dictionaries.
-      type: list
-      elements: dictionary
-      required: true
-    another_list:
-      description: Another list of dictionaries. This parameter can be specified multiple times.
-      type: list
-      elements: dictionary
-    index:
-      description:
-        - The dictionary key that must be present in every dictionary in every list that is used to
-          merge the lists.
-      type: string
-      required: true
-    recursive:
-      description:
-        - Should the combine recursively merge nested dictionaries (hashes).
-        - "B(Note:) It does not depend on the value of the C(hash_behaviour) setting in C(ansible.cfg)."
-      type: boolean
-      default: false
-    list_merge:
-      description:
-        - Modifies the behaviour when the dictionaries (hashes) to merge contain arrays/lists.
-      type: string
-      default: replace
-      choices:
-        - replace
-        - keep
-        - append
-        - prepend
-        - append_rp
-        - prepend_rp
-'''
-
-EXAMPLES = '''
-- name: Merge two lists
-  ansible.builtin.debug:
-    msg: >-
-      {{ list1 | community.general.lists_mergeby(
-                    list2,
-                    'index',
-                    recursive=True,
-                    list_merge='append'
-                 ) }}"
-  vars:
-    list1:
-      - index: a
-        value: 123
-      - index: b
-        value: 42
-    list2:
-      - index: a
-        foo: bar
-      - index: c
-        foo: baz
-  # Produces the following list of dictionaries:
-  #   {
-  #     "index": "a",
-  #     "foo": "bar",
-  #     "value": 123
-  #   },
-  #   {
-  #     "index": "b",
-  #     "value": 42
-  #   },
-  #   {
-  #     "index": "c",
-  #     "foo": "baz"
-  #   }
-'''
-
-RETURN = '''
-  _value:
-    description: The merged list.
-    type: list
-    elements: dictionary
-'''
-
 from ansible.errors import AnsibleFilterError
 from ansible.module_utils.six import string_types
 from ansible.module_utils.common._collections_compat import Mapping, Sequence
@@ -108,6 +16,22 @@ from collections import defaultdict
 from operator import itemgetter
 
 
+def merge_hash_wrapper(x, y, recursive=False, list_merge='replace'):
+    ''' Wrapper of the function merge_hash from ansible.utils.vars. Only 2 paramaters are allowed
+        for Ansible 2.9 and lower.'''
+
+    if LooseVersion(ansible_version) < LooseVersion('2.10'):
+        if list_merge != 'replace' or recursive:
+            msg = ("Non default options of list_merge(default=replace) or recursive(default=False) "
+                   "are not allowed in Ansible version 2.9 or lower. Ansible version is %s, "
+                   "recursive=%s, and list_merge=%s.")
+            raise AnsibleFilterError(msg % (ansible_version, recursive, list_merge))
+        else:
+            return merge_hash(x, y)
+    else:
+        return merge_hash(x, y, recursive, list_merge)
+
+
 def list_mergeby(x, y, index, recursive=False, list_merge='replace'):
     ''' Merge 2 lists by attribute 'index'. The function merge_hash from ansible.utils.vars is used.
         This function is used by the function lists_mergeby.
@@ -120,7 +44,7 @@ def list_mergeby(x, y, index, recursive=False, list_merge='replace'):
                 msg = "Elements of list arguments for lists_mergeby must be dictionaries. %s is %s"
                 raise AnsibleFilterError(msg % (elem, type(elem)))
             if index in elem.keys():
-                d[elem[index]].update(merge_hash(d[elem[index]], elem, recursive, list_merge))
+                d[elem[index]].update(merge_hash_wrapper(d[elem[index]], elem, recursive, list_merge))
     return sorted(d.values(), key=itemgetter(index))
 
 

plugins/filter/lists_mergeby.yml

@@ -0,0 +1,88 @@
+DOCUMENTATION:
+  name: lists_mergeby
+  short_description: Merge two or more lists of dictionaries by a given attribute
+  version_added: 2.0.0
+  author: Vladimir Botka (@vbotka)
+  description:
+    - Merge two or more lists by attribute I(index). Optional parameters 'recursive' and 'list_merge'
+      control the merging of the lists in values. The function merge_hash from ansible.utils.vars
+      is used. To learn details on how to use the parameters 'recursive' and 'list_merge' see
+      Ansible User's Guide chapter "Using filters to manipulate data" section "Combining
+      hashes/dictionaries".
+  positional: another_list, index
+  options:
+    _input:
+      description: A list of dictionaries.
+      type: list
+      elements: dictionary
+      required: true
+    another_list:
+      description: Another list of dictionaries. This parameter can be specified multiple times.
+      type: list
+      elements: dictionary
+    index:
+      description:
+        - The dictionary key that must be present in every dictionary in every list that is used to
+          merge the lists.
+      type: string
+      required: true
+    recursive:
+      description:
+        - Should the combine recursively merge nested dictionaries (hashes).
+        - "B(Note:) It does not depend on the value of the C(hash_behaviour) setting in C(ansible.cfg)."
+      type: boolean
+      default: false
+    list_merge:
+      description:
+        - Modifies the behaviour when the dictionaries (hashes) to merge contain arrays/lists.
+      type: string
+      default: replace
+      choices:
+        - replace
+        - keep
+        - append
+        - prepend
+        - append_rp
+        - prepend_rp
+
+EXAMPLES: |
+  - name: Merge two lists
+    ansible.builtin.debug:
+      msg: >-
+        {{ list1 | community.general.lists_mergeby(
+                      list2,
+                      'index',
+                      recursive=True,
+                      list_merge='append'
+                   ) }}"
+    vars:
+      list1:
+        - index: a
+          value: 123
+        - index: b
+          value: 42
+      list2:
+        - index: a
+          foo: bar
+        - index: c
+          foo: baz
+    # Produces the following list of dictionaries:
+    #   {
+    #     "index": "a",
+    #     "foo": "bar",
+    #     "value": 123
+    #   },
+    #   {
+    #     "index": "b",
+    #     "value": 42
+    #   },
+    #   {
+    #     "index": "c",
+    #     "foo": "baz"
+    #   }
+
+RETURN:
+  _value:
+    description: The merged list.
+    type: list
+    elements: dictionary

plugins/filter/path_join_shim.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+# Copyright: (c) 2020-2021, Felix Fontein <felix@fontein.de>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
+
+import os.path
+
+
+def path_join(list):
+    '''Join list of paths.
+
+    This is a minimal shim for ansible.builtin.path_join included in ansible-base 2.10.
+    This should only be called by Ansible 2.9 or earlier. See meta/runtime.yml for details.
+    '''
+    return os.path.join(*list)
+
+
+class FilterModule(object):
+    '''Ansible jinja2 filters'''
+
+    def filters(self):
+        return {
+            'path_join': path_join,
+        }

plugins/filter/time.py

@@ -46,11 +46,6 @@ def multiply(factors):
 
 def to_time_unit(human_time, unit='ms', **kwargs):
     ''' Return a time unit from a human readable string '''
-
-    # No need to handle 0
-    if human_time == "0":
-        return 0
-
     unit_to_short_form = UNIT_TO_SHORT_FORM
     unit_factors = UNIT_FACTORS
 

plugins/inventory/cobbler.py

@@ -213,7 +213,7 @@ class InventoryModule(BaseInventoryPlugin, Cacheable):
                         self.inventory.add_child(parent_group_name, group_name)
             else:
                 self.display.vvvv('Processing profile %s without parent\n' % profile['name'])
-                # Create a hierarchy of profile names
+                # Create a heirarchy of profile names
                 profile_elements = profile['name'].split('-')
                 i = 0
                 while i < len(profile_elements) - 1:

plugins/inventory/lxd.py

@@ -522,7 +522,7 @@ class InventoryModule(BaseInventoryPlugin):
         """Helper to save data
 
         Helper to save the data in self.data
-        Detect if data is already in branch and use dict_merge() to prevent that branch is overwritten.
+        Detect if data is allready in branch and use dict_merge() to prevent that branch is overwritten.
 
         Args:
             str(instance_name): name of instance

plugins/inventory/proxmox.py

@@ -92,21 +92,9 @@ DOCUMENTATION = '''
         default: proxmox_
         type: str
       want_facts:
-        description:
-          - Gather LXC/QEMU configuration facts.
-          - When I(want_facts) is set to C(true) more details about QEMU VM status are possible, besides the running and stopped states.
-            Currently if the VM is running and it is suspended, the status will be running and the machine will be in C(running) group,
-            but its actual state will be paused. See I(qemu_extended_statuses) for how to retrieve the real status.
+        description: Gather LXC/QEMU configuration facts.
         default: no
         type: bool
-      qemu_extended_statuses:
-        description:
-          - Requires I(want_facts) to be set to C(true) to function. This will allow you to differentiate betweend C(paused) and C(prelaunch)
-            statuses of the QEMU VMs.
-          - This introduces multiple groups [prefixed with I(group_prefix)] C(prelaunch) and C(paused).
-        default: no
-        type: bool
-        version_added: 5.1.0
       want_proxmox_nodes_ansible_host:
         version_added: 3.0.0
         description:
@@ -451,8 +439,6 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
     def _get_vm_status(self, properties, node, vmid, vmtype, name):
         ret = self._get_json("%s/api2/json/nodes/%s/%s/%s/status/current" % (self.proxmox_url, node, vmtype, vmid))
         properties[self._fact('status')] = ret['status']
-        if vmtype == 'qemu':
-            properties[self._fact('qmpstatus')] = ret['qmpstatus']
 
     def _get_vm_snapshots(self, properties, node, vmid, vmtype, name):
         ret = self._get_json("%s/api2/json/nodes/%s/%s/%s/snapshot" % (self.proxmox_url, node, vmtype, vmid))
@@ -511,8 +497,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
         name, vmid = item['name'], item['vmid']
 
         # get status, config and snapshots if want_facts == True
-        want_facts = self.get_option('want_facts')
-        if want_facts:
+        if self.get_option('want_facts'):
             self._get_vm_status(properties, node, vmid, ittype, name)
             self._get_vm_config(properties, node, vmid, ittype, name)
             self._get_vm_snapshots(properties, node, vmid, ittype, name)
@@ -526,13 +511,10 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
         node_type_group = self._group('%s_%s' % (node, ittype))
         self.inventory.add_child(self._group('all_' + ittype), name)
         self.inventory.add_child(node_type_group, name)
-
-        item_status = item['status']
-        if item_status == 'running':
-            if want_facts and ittype == 'qemu' and self.get_option('qemu_extended_statuses'):
-                # get more details about the status of the qemu VM
-                item_status = properties.get(self._fact('qmpstatus'), item_status)
-        self.inventory.add_child(self._group('all_%s' % (item_status, )), name)
+        if item['status'] == 'stopped':
+            self.inventory.add_child(self._group('all_stopped'), name)
+        elif item['status'] == 'running':
+            self.inventory.add_child(self._group('all_running'), name)
 
         return name
 
@@ -554,14 +536,10 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
     def _populate(self):
 
         # create common groups
-        default_groups = ['lxc', 'qemu', 'running', 'stopped']
-
-        if self.get_option('qemu_extended_statuses'):
-            default_groups.extend(['prelaunch', 'paused'])
-
-        for group in default_groups:
-            self.inventory.add_group(self._group('all_%s' % (group)))
-
+        self.inventory.add_group(self._group('all_lxc'))
+        self.inventory.add_group(self._group('all_qemu'))
+        self.inventory.add_group(self._group('all_running'))
+        self.inventory.add_group(self._group('all_stopped'))
         nodes_group = self._group('nodes')
         self.inventory.add_group(nodes_group)
 
@@ -651,9 +629,6 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
         if proxmox_password is None and (proxmox_token_id is None or proxmox_token_secret is None):
             raise AnsibleError('You must specify either a password or both token_id and token_secret.')
 
-        if self.get_option('qemu_extended_statuses') and not self.get_option('want_facts'):
-            raise AnsibleError('You must set want_facts to True if you want to use qemu_extended_statuses.')
-
         self.cache_key = self.get_cache_key(path)
         self.use_cache = cache and self.get_option('cache')
         self.host_filters = self.get_option('filters')

plugins/lookup/bitwarden.py

@@ -1,118 +0,0 @@
-# -*- coding: utf-8 -*-
-# (c) 2022, Jonathan Lung <lungj@heresjono.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-DOCUMENTATION = """
-    name: bitwarden
-    author:
-      - Jonathan Lung (@lungj) <lungj@heresjono.com>
-    requirements:
-      - bw (command line utility)
-      - be logged into bitwarden
-    short_description: Retrieve secrets from Bitwarden
-    version_added: 5.4.0
-    description:
-      - Retrieve secrets from Bitwarden.
-    options:
-      _terms:
-        description: Key(s) to fetch values for from login info.
-        required: true
-        type: list
-        elements: str
-      field:
-        description: Field to fetch; leave unset to fetch whole response.
-        type: str
-"""
-
-EXAMPLES = """
-- name: "Get 'password' from Bitwarden record named 'a_test'"
-  ansible.builtin.debug:
-    msg: >-
-      {{ lookup('community.general.bitwarden', 'a_test', field='password') }}
-
-- name: "Get full Bitwarden record named 'a_test'"
-  ansible.builtin.debug:
-    msg: >-
-      {{ lookup('community.general.bitwarden', 'a_test') }}
-"""
-
-RETURN = """
-  _raw:
-    description: List of requested field or JSON object of list of matches.
-    type: list
-    elements: raw
-"""
-
-from subprocess import Popen, PIPE
-
-from ansible.errors import AnsibleError
-from ansible.module_utils.common.text.converters import to_bytes, to_text
-from ansible.parsing.ajson import AnsibleJSONDecoder
-from ansible.plugins.lookup import LookupBase
-
-
-class BitwardenException(AnsibleError):
-    pass
-
-
-class Bitwarden(object):
-
-    def __init__(self, path='bw'):
-        self._cli_path = path
-
-    @property
-    def cli_path(self):
-        return self._cli_path
-
-    @property
-    def logged_in(self):
-        out, err = self._run(['status'], stdin="")
-        decoded = AnsibleJSONDecoder().raw_decode(out)[0]
-        return decoded['status'] == 'unlocked'
-
-    def _run(self, args, stdin=None, expected_rc=0):
-        p = Popen([self.cli_path] + args, stdout=PIPE, stderr=PIPE, stdin=PIPE)
-        out, err = p.communicate(to_bytes(stdin))
-        rc = p.wait()
-        if rc != expected_rc:
-            raise BitwardenException(err)
-        return to_text(out, errors='surrogate_or_strict'), to_text(err, errors='surrogate_or_strict')
-
-    def _get_matches(self, search_value, search_field="name"):
-        """Return matching records whose search_field is equal to key.
-        """
-        out, err = self._run(['list', 'items', '--search', search_value])
-
-        # This includes things that matched in different fields.
-        initial_matches = AnsibleJSONDecoder().raw_decode(out)[0]
-
-        # Filter to only include results from the right field.
-        return [item for item in initial_matches if item[search_field] == search_value]
-
-    def get_field(self, field, search_value, search_field="name"):
-        """Return a list of the specified field for records whose search_field match search_value.
-
-        If field is None, return the whole record for each match.
-        """
-        matches = self._get_matches(search_value)
-
-        if field:
-            return [match['login'][field] for match in matches]
-
-        return matches
-
-
-class LookupModule(LookupBase):
-
-    def run(self, terms, variables=None, **kwargs):
-        self.set_options(var_options=variables, direct=kwargs)
-        field = self.get_option('field')
-        if not _bitwarden.logged_in:
-            raise AnsibleError("Not logged into Bitwarden. Run 'bw login'.")
-
-        return [_bitwarden.get_field(field, term) for term in terms]
-
-
-_bitwarden = Bitwarden()

plugins/lookup/dig.py

@@ -27,30 +27,19 @@ DOCUMENTATION = '''
         This needs to be passed-in as an additional parameter to the lookup
     options:
       _terms:
-        description: Domain(s) to query.
+        description: domain(s) to query
       qtype:
-        description:
-            - Record type to query.
-            - C(DLV) is deprecated and will be removed in community.general 6.0.0.
+        description: record type to query
         default: 'A'
         choices: [A, ALL, AAAA, CNAME, DNAME, DLV, DNSKEY, DS, HINFO, LOC, MX, NAPTR, NS, NSEC3PARAM, PTR, RP, RRSIG, SOA, SPF, SRV, SSHFP, TLSA, TXT]
       flat:
-        description: If 0 each record is returned as a dictionary, otherwise a string.
+        description: If 0 each record is returned as a dictionary, otherwise a string
         default: 1
       retry_servfail:
         description: Retry a nameserver if it returns SERVFAIL.
         default: false
         type: bool
         version_added: 3.6.0
-      fail_on_error:
-        description:
-          - Abort execution on lookup errors.
-          - The default for this option will likely change to C(true) in the future.
-            The current default, C(false), is used for backwards compatibility, and will result in empty strings
-            or the string C(NXDOMAIN) in the result in case of errors.
-        default: false
-        type: bool
-        version_added: 5.4.0
     notes:
       - ALL is not a record per-se, merely the listed fields are available for any record results you retrieve in the form of a dictionary.
       - While the 'dig' lookup plugin supports anything which dnspython supports out of the box, only a subset can be converted into a dictionary.
@@ -174,7 +163,6 @@ RETURN = """
 from ansible.errors import AnsibleError
 from ansible.plugins.lookup import LookupBase
 from ansible.module_utils.common.text.converters import to_native
-from ansible.utils.display import Display
 import socket
 
 try:
@@ -190,9 +178,6 @@ except ImportError:
     HAVE_DNS = False
 
 
-display = Display()
-
-
 def make_rdata_dict(rdata):
     ''' While the 'dig' lookup plugin supports anything which dnspython supports
         out of the box, the following supported_types list describes which
@@ -288,7 +273,6 @@ class LookupModule(LookupBase):
         domain = None
         qtype = 'A'
         flat = True
-        fail_on_error = False
         rdclass = dns.rdataclass.from_text('IN')
 
         for t in terms:
@@ -327,8 +311,6 @@ class LookupModule(LookupBase):
                         raise AnsibleError("dns lookup illegal CLASS: %s" % to_native(e))
                 elif opt == 'retry_servfail':
                     myres.retry_servfail = bool(arg)
-                elif opt == 'fail_on_error':
-                    fail_on_error = bool(arg)
 
                 continue
 
@@ -344,11 +326,6 @@ class LookupModule(LookupBase):
 
         ret = []
 
-        if qtype.upper() == 'DLV':
-            display.deprecated('The DLV record type has been decommissioned in 2017 and support for'
-                               ' it will be removed from community.general 6.0.0',
-                               version='6.0.0', collection_name='community.general')
-
         if qtype.upper() == 'PTR':
             try:
                 n = dns.reversename.from_address(domain)
@@ -376,24 +353,16 @@ class LookupModule(LookupBase):
                         rd['class'] = dns.rdataclass.to_text(rdata.rdclass)
 
                         ret.append(rd)
-                    except Exception as err:
-                        if fail_on_error:
-                            raise AnsibleError("Lookup failed: %s" % str(err))
-                        ret.append(str(err))
+                    except Exception as e:
+                        ret.append(str(e))
 
-        except dns.resolver.NXDOMAIN as err:
-            if fail_on_error:
-                raise AnsibleError("Lookup failed: %s" % str(err))
+        except dns.resolver.NXDOMAIN:
             ret.append('NXDOMAIN')
-        except dns.resolver.NoAnswer as err:
-            if fail_on_error:
-                raise AnsibleError("Lookup failed: %s" % str(err))
+        except dns.resolver.NoAnswer:
             ret.append("")
-        except dns.resolver.Timeout as err:
-            if fail_on_error:
-                raise AnsibleError("Lookup failed: %s" % str(err))
+        except dns.resolver.Timeout:
             ret.append('')
-        except dns.exception.DNSException as err:
-            raise AnsibleError("dns.resolver unhandled exception %s" % to_native(err))
+        except dns.exception.DNSException as e:
+            raise AnsibleError("dns.resolver unhandled exception %s" % to_native(e))
 
         return ret

plugins/lookup/lastpass.py

@@ -11,24 +11,21 @@ DOCUMENTATION = '''
       - Andrew Zenk (!UNKNOWN) <azenk@umn.edu>
     requirements:
       - lpass (command line utility)
-      - must have already logged into LastPass
-    short_description: fetch data from LastPass
+      - must have already logged into lastpass
+    short_description: fetch data from lastpass
     description:
-      - Use the lpass command line utility to fetch specific fields from LastPass.
+      - use the lpass command line utility to fetch specific fields from lastpass
     options:
       _terms:
-        description: Key from which you want to retrieve the field.
-        required: true
-        type: list
-        elements: str
+        description: key from which you want to retrieve the field
+        required: True
       field:
-        description: Field to return from LastPass.
+        description: field to return from lastpass
         default: 'password'
-        type: str
 '''
 
 EXAMPLES = """
-- name: get 'custom_field' from LastPass entry 'entry-name'
+- name: get 'custom_field' from lastpass entry 'entry-name'
   ansible.builtin.debug:
     msg: "{{ lookup('community.general.lastpass', 'entry-name', field='custom_field') }}"
 """
@@ -91,14 +88,12 @@ class LPass(object):
 class LookupModule(LookupBase):
 
     def run(self, terms, variables=None, **kwargs):
-        self.set_options(var_options=variables, direct=kwargs)
-        field = self.get_option('field')
-
         lp = LPass()
 
         if not lp.logged_in:
-            raise AnsibleError("Not logged into LastPass: please run 'lpass login' first")
+            raise AnsibleError("Not logged into lastpass: please run 'lpass login' first")
 
+        field = kwargs.get('field', 'password')
         values = []
         for term in terms:
             values.append(lp.get_field(term, field))

plugins/lookup/passwordstore.py

@@ -21,14 +21,8 @@ DOCUMENTATION = '''
         description: query key.
         required: True
       passwordstore:
-        description:
-          - Location of the password store.
-          - 'The value is decided by checking the following in order:'
-          - If set, this value is used.
-          - If C(directory) is set, that value will be used.
-          - If I(backend=pass), then C(~/.password-store) is used.
-          - If I(backend=gopass), then the C(path) field in C(~/.config/gopass/config.yml) is used,
-            falling back to C(~/.local/share/gopass/stores/root) if not defined.
+        description: location of the password store.
+        default: '~/.password-store'
       directory:
         description: The directory of the password store.
         env:
@@ -112,22 +106,6 @@ DOCUMENTATION = '''
         type: str
         default: 15m
         version_added: 4.5.0
-      backend:
-        description:
-          - Specify which backend to use.
-          - Defaults to C(pass), passwordstore.org's original pass utility.
-          - C(gopass) support is incomplete.
-        ini:
-          - section: passwordstore_lookup
-            key: backend
-        vars:
-          - name: passwordstore_backend
-        type: str
-        default: pass
-        choices:
-          - pass
-          - gopass
-        version_added: 5.2.0
 '''
 EXAMPLES = """
 ansible.cfg: |
@@ -253,24 +231,6 @@ def check_output2(*popenargs, **kwargs):
 
 
 class LookupModule(LookupBase):
-    def __init__(self, loader=None, templar=None, **kwargs):
-
-        super(LookupModule, self).__init__(loader, templar, **kwargs)
-        self.realpass = None
-
-    def is_real_pass(self):
-        if self.realpass is None:
-            try:
-                passoutput = to_text(
-                    check_output2([self.pass_cmd, "--version"], env=self.env),
-                    errors='surrogate_or_strict'
-                )
-                self.realpass = 'pass: the standard unix password manager' in passoutput
-            except (subprocess.CalledProcessError) as e:
-                raise AnsibleError(e)
-
-        return self.realpass
-
     def parse_params(self, term):
         # I went with the "traditional" param followed with space separated KV pairs.
         # Waiting for final implementation of lookup parameter parsing.
@@ -310,12 +270,10 @@ class LookupModule(LookupBase):
             self.env = os.environ.copy()
             self.env['LANGUAGE'] = 'C'  # make sure to get errors in English as required by check_output2
 
-            if self.backend == 'gopass':
-                self.env['GOPASS_NO_REMINDER'] = "YES"
-            elif os.path.isdir(self.paramvals['directory']):
-                # Set PASSWORD_STORE_DIR
+            # Set PASSWORD_STORE_DIR
+            if os.path.isdir(self.paramvals['directory']):
                 self.env['PASSWORD_STORE_DIR'] = self.paramvals['directory']
-            elif self.is_real_pass():
+            else:
                 raise AnsibleError('Passwordstore directory \'{0}\' does not exist'.format(self.paramvals['directory']))
 
             # Set PASSWORD_STORE_UMASK if umask is set
@@ -330,8 +288,7 @@ class LookupModule(LookupBase):
     def check_pass(self):
         try:
             self.passoutput = to_text(
-                check_output2([self.pass_cmd, 'show'] +
-                              [self.passname], env=self.env),
+                check_output2(["pass", "show", self.passname], env=self.env),
                 errors='surrogate_or_strict'
             ).splitlines()
             self.password = self.passoutput[0]
@@ -345,10 +302,8 @@ class LookupModule(LookupBase):
                     if ':' in line:
                         name, value = line.split(':', 1)
                         self.passdict[name.strip()] = value.strip()
-            if (self.backend == 'gopass' or
-                    os.path.isfile(os.path.join(self.paramvals['directory'], self.passname + ".gpg"))
-                    or not self.is_real_pass()):
-                # When using real pass, only accept password as found if there is a .gpg file for it (might be a tree node otherwise)
+            if os.path.isfile(os.path.join(self.paramvals['directory'], self.passname + ".gpg")):
+                # Only accept password as found, if there a .gpg file for it (might be a tree node otherwise)
                 return True
         except (subprocess.CalledProcessError) as e:
             # 'not in password store' is the expected error if a password wasn't found
@@ -384,7 +339,7 @@ class LookupModule(LookupBase):
         if self.paramvals['backup']:
             msg += "lookup_pass: old password was {0} (Updated on {1})\n".format(self.password, datetime)
         try:
-            check_output2([self.pass_cmd, 'insert', '-f', '-m', self.passname], input=msg, env=self.env)
+            check_output2(['pass', 'insert', '-f', '-m', self.passname], input=msg, env=self.env)
         except (subprocess.CalledProcessError) as e:
             raise AnsibleError(e)
         return newpass
@@ -396,7 +351,7 @@ class LookupModule(LookupBase):
         datetime = time.strftime("%d/%m/%Y %H:%M:%S")
         msg = newpass + '\n' + "lookup_pass: First generated by ansible on {0}\n".format(datetime)
         try:
-            check_output2([self.pass_cmd, 'insert', '-f', '-m', self.passname], input=msg, env=self.env)
+            check_output2(['pass', 'insert', '-f', '-m', self.passname], input=msg, env=self.env)
         except (subprocess.CalledProcessError) as e:
             raise AnsibleError(e)
         return newpass
@@ -425,30 +380,17 @@ class LookupModule(LookupBase):
             yield
 
     def setup(self, variables):
-        self.backend = self.get_option('backend')
-        self.pass_cmd = self.backend  # pass and gopass are commands as well
         self.locked = None
         timeout = self.get_option('locktimeout')
         if not re.match('^[0-9]+[smh]$', timeout):
             raise AnsibleError("{0} is not a correct value for locktimeout".format(timeout))
         unit_to_seconds = {"s": 1, "m": 60, "h": 3600}
         self.lock_timeout = int(timeout[:-1]) * unit_to_seconds[timeout[-1]]
-
-        directory = variables.get('passwordstore', os.environ.get('PASSWORD_STORE_DIR', None))
-
-        if directory is None:
-            if self.backend == 'gopass':
-                try:
-                    with open(os.path.expanduser('~/.config/gopass/config.yml')) as f:
-                        directory = yaml.safe_load(f)['path']
-                except (FileNotFoundError, KeyError, yaml.YAMLError):
-                    directory = os.path.expanduser('~/.local/share/gopass/stores/root')
-            else:
-                directory = os.path.expanduser('~/.password-store')
-
         self.paramvals = {
             'subkey': 'password',
-            'directory': directory,
+            'directory': variables.get('passwordstore', os.environ.get(
+                                       'PASSWORD_STORE_DIR',
+                                       os.path.expanduser('~/.password-store'))),
             'create': False,
             'returnall': False,
             'overwrite': False,
@@ -460,7 +402,6 @@ class LookupModule(LookupBase):
         }
 
     def run(self, terms, variables, **kwargs):
-        self.set_options(var_options=variables, direct=kwargs)
         self.setup(variables)
         result = []
 

plugins/lookup/tss.py

@@ -170,19 +170,29 @@ try:
 
     HAS_TSS_SDK = True
 except ImportError:
-    SecretServer = None
-    SecretServerError = None
-    HAS_TSS_SDK = False
+    try:
+        from delinea.secrets.server import SecretServer, SecretServerError
+
+        HAS_TSS_SDK = True
+    except ImportError:
+        SecretServer = None
+        SecretServerError = None
+        HAS_TSS_SDK = False
 
 try:
     from thycotic.secrets.server import PasswordGrantAuthorizer, DomainPasswordGrantAuthorizer, AccessTokenAuthorizer
 
     HAS_TSS_AUTHORIZER = True
 except ImportError:
-    PasswordGrantAuthorizer = None
-    DomainPasswordGrantAuthorizer = None
-    AccessTokenAuthorizer = None
-    HAS_TSS_AUTHORIZER = False
+    try:
+        from delinea.secrets.server import PasswordGrantAuthorizer, DomainPasswordGrantAuthorizer, AccessTokenAuthorizer
+
+        HAS_TSS_AUTHORIZER = True
+    except ImportError:
+        PasswordGrantAuthorizer = None
+        DomainPasswordGrantAuthorizer = None
+        AccessTokenAuthorizer = None
+        HAS_TSS_AUTHORIZER = False
 
 
 display = Display()

plugins/module_utils/_mount.py

@@ -3,7 +3,51 @@
 # This particular file snippet, and this file snippet only, is based on
 # Lib/posixpath.py of cpython
 # It is licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
-# (See PSF-license.txt in this collection)
+#
+# 1. This LICENSE AGREEMENT is between the Python Software Foundation
+# ("PSF"), and the Individual or Organization ("Licensee") accessing and
+# otherwise using this software ("Python") in source or binary form and
+# its associated documentation.
+#
+# 2. Subject to the terms and conditions of this License Agreement, PSF hereby
+# grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+# analyze, test, perform and/or display publicly, prepare derivative works,
+# distribute, and otherwise use Python alone or in any derivative version,
+# provided, however, that PSF's License Agreement and PSF's notice of copyright,
+# i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011, 2012, 2013, 2014, 2015 Python Software Foundation; All Rights Reserved"
+# are retained in Python alone or in any derivative version prepared by Licensee.
+#
+# 3. In the event Licensee prepares a derivative work that is based on
+# or incorporates Python or any part thereof, and wants to make
+# the derivative work available to others as provided herein, then
+# Licensee hereby agrees to include in any such work a brief summary of
+# the changes made to Python.
+#
+# 4. PSF is making Python available to Licensee on an "AS IS"
+# basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+# IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+# DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+# FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+# INFRINGE ANY THIRD PARTY RIGHTS.
+#
+# 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+# FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+# A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+# OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+#
+# 6. This License Agreement will automatically terminate upon a material
+# breach of its terms and conditions.
+#
+# 7. Nothing in this License Agreement shall be deemed to create any
+# relationship of agency, partnership, or joint venture between PSF and
+# Licensee.  This License Agreement does not grant permission to use PSF
+# trademarks or trade name in a trademark sense to endorse or promote
+# products or services of Licensee, or any third party.
+#
+# 8. By copying, installing or otherwise using Python, Licensee
+# agrees to be bound by the terms and conditions of this License
+# Agreement.
 
 from __future__ import absolute_import, division, print_function
 

plugins/module_utils/_version.py

@@ -0,0 +1,343 @@
+# Vendored copy of distutils/version.py from CPython 3.9.5
+#
+# Implements multiple version numbering conventions for the
+# Python Module Distribution Utilities.
+#
+# PSF License (see PSF-license.txt or https://opensource.org/licenses/Python-2.0)
+#
+
+"""Provides classes to represent module version numbers (one class for
+each style of version numbering).  There are currently two such classes
+implemented: StrictVersion and LooseVersion.
+
+Every version number class implements the following interface:
+  * the 'parse' method takes a string and parses it to some internal
+    representation; if the string is an invalid version number,
+    'parse' raises a ValueError exception
+  * the class constructor takes an optional string argument which,
+    if supplied, is passed to 'parse'
+  * __str__ reconstructs the string that was passed to 'parse' (or
+    an equivalent string -- ie. one that will generate an equivalent
+    version number instance)
+  * __repr__ generates Python code to recreate the version number instance
+  * _cmp compares the current instance with either another instance
+    of the same class or a string (which will be parsed to an instance
+    of the same class, thus must follow the same rules)
+"""
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+import re
+
+try:
+    RE_FLAGS = re.VERBOSE | re.ASCII
+except AttributeError:
+    RE_FLAGS = re.VERBOSE
+
+
+class Version:
+    """Abstract base class for version numbering classes.  Just provides
+    constructor (__init__) and reproducer (__repr__), because those
+    seem to be the same for all version numbering classes; and route
+    rich comparisons to _cmp.
+    """
+
+    def __init__(self, vstring=None):
+        if vstring:
+            self.parse(vstring)
+
+    def __repr__(self):
+        return "%s ('%s')" % (self.__class__.__name__, str(self))
+
+    def __eq__(self, other):
+        c = self._cmp(other)
+        if c is NotImplemented:
+            return c
+        return c == 0
+
+    def __lt__(self, other):
+        c = self._cmp(other)
+        if c is NotImplemented:
+            return c
+        return c < 0
+
+    def __le__(self, other):
+        c = self._cmp(other)
+        if c is NotImplemented:
+            return c
+        return c <= 0
+
+    def __gt__(self, other):
+        c = self._cmp(other)
+        if c is NotImplemented:
+            return c
+        return c > 0
+
+    def __ge__(self, other):
+        c = self._cmp(other)
+        if c is NotImplemented:
+            return c
+        return c >= 0
+
+
+# Interface for version-number classes -- must be implemented
+# by the following classes (the concrete ones -- Version should
+# be treated as an abstract class).
+#    __init__ (string) - create and take same action as 'parse'
+#                        (string parameter is optional)
+#    parse (string)    - convert a string representation to whatever
+#                        internal representation is appropriate for
+#                        this style of version numbering
+#    __str__ (self)    - convert back to a string; should be very similar
+#                        (if not identical to) the string supplied to parse
+#    __repr__ (self)   - generate Python code to recreate
+#                        the instance
+#    _cmp (self, other) - compare two version numbers ('other' may
+#                        be an unparsed version string, or another
+#                        instance of your version class)
+
+
+class StrictVersion(Version):
+    """Version numbering for anal retentives and software idealists.
+    Implements the standard interface for version number classes as
+    described above.  A version number consists of two or three
+    dot-separated numeric components, with an optional "pre-release" tag
+    on the end.  The pre-release tag consists of the letter 'a' or 'b'
+    followed by a number.  If the numeric components of two version
+    numbers are equal, then one with a pre-release tag will always
+    be deemed earlier (lesser) than one without.
+
+    The following are valid version numbers (shown in the order that
+    would be obtained by sorting according to the supplied cmp function):
+
+        0.4       0.4.0  (these two are equivalent)
+        0.4.1
+        0.5a1
+        0.5b3
+        0.5
+        0.9.6
+        1.0
+        1.0.4a3
+        1.0.4b1
+        1.0.4
+
+    The following are examples of invalid version numbers:
+
+        1
+        2.7.2.2
+        1.3.a4
+        1.3pl1
+        1.3c4
+
+    The rationale for this version numbering system will be explained
+    in the distutils documentation.
+    """
+
+    version_re = re.compile(r'^(\d+) \. (\d+) (\. (\d+))? ([ab](\d+))?$',
+                            RE_FLAGS)
+
+    def parse(self, vstring):
+        match = self.version_re.match(vstring)
+        if not match:
+            raise ValueError("invalid version number '%s'" % vstring)
+
+        (major, minor, patch, prerelease, prerelease_num) = \
+            match.group(1, 2, 4, 5, 6)
+
+        if patch:
+            self.version = tuple(map(int, [major, minor, patch]))
+        else:
+            self.version = tuple(map(int, [major, minor])) + (0,)
+
+        if prerelease:
+            self.prerelease = (prerelease[0], int(prerelease_num))
+        else:
+            self.prerelease = None
+
+    def __str__(self):
+        if self.version[2] == 0:
+            vstring = '.'.join(map(str, self.version[0:2]))
+        else:
+            vstring = '.'.join(map(str, self.version))
+
+        if self.prerelease:
+            vstring = vstring + self.prerelease[0] + str(self.prerelease[1])
+
+        return vstring
+
+    def _cmp(self, other):
+        if isinstance(other, str):
+            other = StrictVersion(other)
+        elif not isinstance(other, StrictVersion):
+            return NotImplemented
+
+        if self.version != other.version:
+            # numeric versions don't match
+            # prerelease stuff doesn't matter
+            if self.version < other.version:
+                return -1
+            else:
+                return 1
+
+        # have to compare prerelease
+        # case 1: neither has prerelease; they're equal
+        # case 2: self has prerelease, other doesn't; other is greater
+        # case 3: self doesn't have prerelease, other does: self is greater
+        # case 4: both have prerelease: must compare them!
+
+        if (not self.prerelease and not other.prerelease):
+            return 0
+        elif (self.prerelease and not other.prerelease):
+            return -1
+        elif (not self.prerelease and other.prerelease):
+            return 1
+        elif (self.prerelease and other.prerelease):
+            if self.prerelease == other.prerelease:
+                return 0
+            elif self.prerelease < other.prerelease:
+                return -1
+            else:
+                return 1
+        else:
+            raise AssertionError("never get here")
+
+# end class StrictVersion
+
+# The rules according to Greg Stein:
+# 1) a version number has 1 or more numbers separated by a period or by
+#    sequences of letters. If only periods, then these are compared
+#    left-to-right to determine an ordering.
+# 2) sequences of letters are part of the tuple for comparison and are
+#    compared lexicographically
+# 3) recognize the numeric components may have leading zeroes
+#
+# The LooseVersion class below implements these rules: a version number
+# string is split up into a tuple of integer and string components, and
+# comparison is a simple tuple comparison.  This means that version
+# numbers behave in a predictable and obvious way, but a way that might
+# not necessarily be how people *want* version numbers to behave.  There
+# wouldn't be a problem if people could stick to purely numeric version
+# numbers: just split on period and compare the numbers as tuples.
+# However, people insist on putting letters into their version numbers;
+# the most common purpose seems to be:
+#   - indicating a "pre-release" version
+#     ('alpha', 'beta', 'a', 'b', 'pre', 'p')
+#   - indicating a post-release patch ('p', 'pl', 'patch')
+# but of course this can't cover all version number schemes, and there's
+# no way to know what a programmer means without asking him.
+#
+# The problem is what to do with letters (and other non-numeric
+# characters) in a version number.  The current implementation does the
+# obvious and predictable thing: keep them as strings and compare
+# lexically within a tuple comparison.  This has the desired effect if
+# an appended letter sequence implies something "post-release":
+# eg. "0.99" < "0.99pl14" < "1.0", and "5.001" < "5.001m" < "5.002".
+#
+# However, if letters in a version number imply a pre-release version,
+# the "obvious" thing isn't correct.  Eg. you would expect that
+# "1.5.1" < "1.5.2a2" < "1.5.2", but under the tuple/lexical comparison
+# implemented here, this just isn't so.
+#
+# Two possible solutions come to mind.  The first is to tie the
+# comparison algorithm to a particular set of semantic rules, as has
+# been done in the StrictVersion class above.  This works great as long
+# as everyone can go along with bondage and discipline.  Hopefully a
+# (large) subset of Python module programmers will agree that the
+# particular flavour of bondage and discipline provided by StrictVersion
+# provides enough benefit to be worth using, and will submit their
+# version numbering scheme to its domination.  The free-thinking
+# anarchists in the lot will never give in, though, and something needs
+# to be done to accommodate them.
+#
+# Perhaps a "moderately strict" version class could be implemented that
+# lets almost anything slide (syntactically), and makes some heuristic
+# assumptions about non-digits in version number strings.  This could
+# sink into special-case-hell, though; if I was as talented and
+# idiosyncratic as Larry Wall, I'd go ahead and implement a class that
+# somehow knows that "1.2.1" < "1.2.2a2" < "1.2.2" < "1.2.2pl3", and is
+# just as happy dealing with things like "2g6" and "1.13++".  I don't
+# think I'm smart enough to do it right though.
+#
+# In any case, I've coded the test suite for this module (see
+# ../test/test_version.py) specifically to fail on things like comparing
+# "1.2a2" and "1.2".  That's not because the *code* is doing anything
+# wrong, it's because the simple, obvious design doesn't match my
+# complicated, hairy expectations for real-world version numbers.  It
+# would be a snap to fix the test suite to say, "Yep, LooseVersion does
+# the Right Thing" (ie. the code matches the conception).  But I'd rather
+# have a conception that matches common notions about version numbers.
+
+
+class LooseVersion(Version):
+    """Version numbering for anarchists and software realists.
+    Implements the standard interface for version number classes as
+    described above.  A version number consists of a series of numbers,
+    separated by either periods or strings of letters.  When comparing
+    version numbers, the numeric components will be compared
+    numerically, and the alphabetic components lexically.  The following
+    are all valid version numbers, in no particular order:
+
+        1.5.1
+        1.5.2b2
+        161
+        3.10a
+        8.02
+        3.4j
+        1996.07.12
+        3.2.pl0
+        3.1.1.6
+        2g6
+        11g
+        0.960923
+        2.2beta29
+        1.13++
+        5.5.kw
+        2.0b1pl0
+
+    In fact, there is no such thing as an invalid version number under
+    this scheme; the rules for comparison are simple and predictable,
+    but may not always give the results you want (for some definition
+    of "want").
+    """
+
+    component_re = re.compile(r'(\d+ | [a-z]+ | \.)', re.VERBOSE)
+
+    def __init__(self, vstring=None):
+        if vstring:
+            self.parse(vstring)
+
+    def parse(self, vstring):
+        # I've given up on thinking I can reconstruct the version string
+        # from the parsed tuple -- so I just store the string here for
+        # use by __str__
+        self.vstring = vstring
+        components = [x for x in self.component_re.split(vstring) if x and x != '.']
+        for i, obj in enumerate(components):
+            try:
+                components[i] = int(obj)
+            except ValueError:
+                pass
+
+        self.version = components
+
+    def __str__(self):
+        return self.vstring
+
+    def __repr__(self):
+        return "LooseVersion ('%s')" % str(self)
+
+    def _cmp(self, other):
+        if isinstance(other, str):
+            other = LooseVersion(other)
+        elif not isinstance(other, LooseVersion):
+            return NotImplemented
+
+        if self.version == other.version:
+            return 0
+        if self.version < other.version:
+            return -1
+        if self.version > other.version:
+            return 1
+
+# end class LooseVersion

plugins/module_utils/cmd_runner.py

@@ -197,7 +197,7 @@ class CmdRunner(object):
             if mod_param_name not in self.arg_formats:
                 self.arg_formats[mod_param_name] = _Format.as_default_type(spec['type'], mod_param_name)
 
-    def __call__(self, args_order=None, output_process=None, ignore_value_none=True, check_mode_skip=False, check_mode_return=None, **kwargs):
+    def context(self, args_order=None, output_process=None, ignore_value_none=True, **kwargs):
         if output_process is None:
             output_process = _process_as_is
         if args_order is None:
@@ -209,25 +209,18 @@ class CmdRunner(object):
         return _CmdRunnerContext(runner=self,
                                  args_order=args_order,
                                  output_process=output_process,
-                                 ignore_value_none=ignore_value_none,
-                                 check_mode_skip=check_mode_skip,
-                                 check_mode_return=check_mode_return, **kwargs)
+                                 ignore_value_none=ignore_value_none, **kwargs)
 
     def has_arg_format(self, arg):
         return arg in self.arg_formats
 
-    # not decided whether to keep it or not, but if deprecating it will happen in a farther future.
-    context = __call__
-
 
 class _CmdRunnerContext(object):
-    def __init__(self, runner, args_order, output_process, ignore_value_none, check_mode_skip, check_mode_return, **kwargs):
+    def __init__(self, runner, args_order, output_process, ignore_value_none, **kwargs):
         self.runner = runner
         self.args_order = tuple(args_order)
         self.output_process = output_process
         self.ignore_value_none = ignore_value_none
-        self.check_mode_skip = check_mode_skip
-        self.check_mode_return = check_mode_return
         self.run_command_args = dict(kwargs)
 
         self.environ_update = runner.environ_update
@@ -267,8 +260,6 @@ class _CmdRunnerContext(object):
             except Exception as e:
                 raise FormatError(arg_name, value, runner.arg_formats[arg_name], e)
 
-        if self.check_mode_skip and module.check_mode:
-            return self.check_mode_return
         results = module.run_command(self.cmd, **self.run_command_args)
         self.results_rc, self.results_out, self.results_err = results
         self.results_processed = self.output_process(*results)
@@ -297,12 +288,4 @@ class _CmdRunnerContext(object):
         return False
 
 
-cmd_runner_fmt = _Format()
-
-#
-# The fmt form is deprecated and will be removed in community.general 7.0.0
-# Please use:
-#   cmd_runner_fmt
-# Or, to retain the same effect, use:
-#   from ansible_collections.community.general.plugins.module_utils.cmd_runner import cmd_runner_fmt as fmt
-fmt = cmd_runner_fmt
+fmt = _Format()

plugins/module_utils/gconftool2.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# (c) 2022, Alexei Znamensky <russoz@gmail.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt as fmt
-
-
-def gconftool2_runner(module, **kwargs):
-    return CmdRunner(
-        module,
-        command='gconftool-2',
-        arg_formats=dict(
-            key=fmt.as_list(),
-            value_type=fmt.as_opt_val("--type"),
-            value=fmt.as_list(),
-            direct=fmt.as_bool("--direct"),
-            config_source=fmt.as_opt_val("--config-source"),
-            get=fmt.as_bool("--get"),
-            set_arg=fmt.as_bool("--set"),
-            unset=fmt.as_bool("--unset"),
-        ),
-        **kwargs
-    )

plugins/module_utils/gitlab.py

@@ -13,10 +13,9 @@ from ansible.module_utils.common.text.converters import to_native
 from ansible_collections.community.general.plugins.module_utils.version import LooseVersion
 
 try:
-    from urllib import quote_plus  # Python 2.X
     from urlparse import urljoin
 except ImportError:
-    from urllib.parse import quote_plus, urljoin  # Python 3+
+    from urllib.parse import urljoin  # Python 3+
 
 import traceback
 
@@ -26,6 +25,7 @@ try:
     import requests
     HAS_GITLAB_PACKAGE = True
 except Exception:
+    gitlab = None
     GITLAB_IMP_ERR = traceback.format_exc()
     HAS_GITLAB_PACKAGE = False
 
@@ -63,6 +63,14 @@ def find_group(gitlab_instance, identifier):
     return project
 
 
+def ensure_gitlab_package(module):
+    if not HAS_GITLAB_PACKAGE:
+        module.fail_json(
+            msg=missing_required_lib("python-gitlab", url='https://python-gitlab.readthedocs.io/en/stable/'),
+            exception=GITLAB_IMP_ERR
+        )
+
+
 def gitlab_authentication(module):
     gitlab_url = module.params['api_url']
     validate_certs = module.params['validate_certs']
@@ -72,8 +80,7 @@ def gitlab_authentication(module):
     gitlab_oauth_token = module.params['api_oauth_token']
     gitlab_job_token = module.params['api_job_token']
 
-    if not HAS_GITLAB_PACKAGE:
-        module.fail_json(msg=missing_required_lib("python-gitlab"), exception=GITLAB_IMP_ERR)
+    ensure_gitlab_package(module)
 
     try:
         # python-gitlab library remove support for username/password authentication since 1.13.0

plugins/module_utils/hwc_utils.py

@@ -351,7 +351,7 @@ def wait_to_finish(target, pending, refresh, timeout, min_interval=1, delay=3):
 
             if pending and status not in pending:
                 raise HwcModuleException(
-                    "unexpect status(%s) occurred" % status)
+                    "unexpect status(%s) occured" % status)
 
         if not is_last_time:
             wait *= 2

plugins/module_utils/identity/keycloak/keycloak.py

@@ -104,7 +104,6 @@ def keycloak_argument_spec():
         validate_certs=dict(type='bool', default=True),
         connection_timeout=dict(type='int', default=10),
         token=dict(type='str', no_log=True),
-        http_agent=dict(type='str', default='Ansible'),
     )
 
 
@@ -124,7 +123,6 @@ def get_token(module_params):
     """
     token = module_params.get('token')
     base_url = module_params.get('auth_keycloak_url')
-    http_agent = module_params.get('http_agent')
 
     if not base_url.lower().startswith(('http', 'https')):
         raise KeycloakError("auth_url '%s' should either start with 'http' or 'https'." % base_url)
@@ -151,7 +149,7 @@ def get_token(module_params):
             (k, v) for k, v in temp_payload.items() if v is not None)
         try:
             r = json.loads(to_native(open_url(auth_url, method='POST',
-                                              validate_certs=validate_certs, http_agent=http_agent, timeout=connection_timeout,
+                                              validate_certs=validate_certs, timeout=connection_timeout,
                                               data=urlencode(payload)).read()))
         except ValueError as e:
             raise KeycloakError(
@@ -235,7 +233,6 @@ class KeycloakAPI(object):
         self.validate_certs = self.module.params.get('validate_certs')
         self.connection_timeout = self.module.params.get('connection_timeout')
         self.restheaders = connection_header
-        self.http_agent = self.module.params.get('http_agent')
 
     def get_realm_info_by_id(self, realm='master'):
         """ Obtain realm public info by id
@@ -246,8 +243,7 @@ class KeycloakAPI(object):
         realm_info_url = URL_REALM_INFO.format(url=self.baseurl, realm=realm)
 
         try:
-            return json.loads(to_native(open_url(realm_info_url, method='GET', http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(realm_info_url, method='GET', headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
 
         except HTTPError as e:
@@ -272,7 +268,7 @@ class KeycloakAPI(object):
         realm_url = URL_REALM.format(url=self.baseurl, realm=realm)
 
         try:
-            return json.loads(to_native(open_url(realm_url, method='GET', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(realm_url, method='GET', headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
 
         except HTTPError as e:
@@ -297,7 +293,7 @@ class KeycloakAPI(object):
         realm_url = URL_REALM.format(url=self.baseurl, realm=realm)
 
         try:
-            return open_url(realm_url, method='PUT', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(realm_url, method='PUT', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(realmrep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not update realm %s: %s' % (realm, str(e)),
@@ -311,7 +307,7 @@ class KeycloakAPI(object):
         realm_url = URL_REALMS.format(url=self.baseurl)
 
         try:
-            return open_url(realm_url, method='POST', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(realm_url, method='POST', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(realmrep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not create realm %s: %s' % (realmrep['id'], str(e)),
@@ -326,7 +322,7 @@ class KeycloakAPI(object):
         realm_url = URL_REALM.format(url=self.baseurl, realm=realm)
 
         try:
-            return open_url(realm_url, method='DELETE', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(realm_url, method='DELETE', headers=self.restheaders, timeout=self.connection_timeout,
                             validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not delete realm %s: %s' % (realm, str(e)),
@@ -344,8 +340,7 @@ class KeycloakAPI(object):
             clientlist_url += '?clientId=%s' % filter
 
         try:
-            return json.loads(to_native(open_url(clientlist_url, http_agent=self.http_agent, method='GET', headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(clientlist_url, method='GET', headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except ValueError as e:
             self.module.fail_json(msg='API returned incorrect JSON when trying to obtain list of clients for realm %s: %s'
@@ -376,8 +371,7 @@ class KeycloakAPI(object):
         client_url = URL_CLIENT.format(url=self.baseurl, realm=realm, id=id)
 
         try:
-            return json.loads(to_native(open_url(client_url, method='GET', http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(client_url, method='GET', headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
 
         except HTTPError as e:
@@ -416,7 +410,7 @@ class KeycloakAPI(object):
         client_url = URL_CLIENT.format(url=self.baseurl, realm=realm, id=id)
 
         try:
-            return open_url(client_url, method='PUT', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(client_url, method='PUT', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(clientrep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not update client %s in realm %s: %s'
@@ -431,7 +425,7 @@ class KeycloakAPI(object):
         client_url = URL_CLIENTS.format(url=self.baseurl, realm=realm)
 
         try:
-            return open_url(client_url, method='POST', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(client_url, method='POST', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(clientrep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not create client %s in realm %s: %s'
@@ -447,7 +441,7 @@ class KeycloakAPI(object):
         client_url = URL_CLIENT.format(url=self.baseurl, realm=realm, id=id)
 
         try:
-            return open_url(client_url, method='DELETE', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(client_url, method='DELETE', headers=self.restheaders, timeout=self.connection_timeout,
                             validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not delete client %s in realm %s: %s'
@@ -462,8 +456,7 @@ class KeycloakAPI(object):
         """
         client_roles_url = URL_CLIENT_ROLES.format(url=self.baseurl, realm=realm, id=cid)
         try:
-            return json.loads(to_native(open_url(client_roles_url, method="GET", http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(client_roles_url, method="GET", headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except Exception as e:
             self.module.fail_json(msg="Could not fetch rolemappings for client %s in realm %s: %s"
@@ -495,8 +488,7 @@ class KeycloakAPI(object):
         """
         rolemappings_url = URL_CLIENT_ROLEMAPPINGS.format(url=self.baseurl, realm=realm, id=gid, client=cid)
         try:
-            rolemappings = json.loads(to_native(open_url(rolemappings_url, method="GET", http_agent=self.http_agent, headers=self.restheaders,
-                                                         timeout=self.connection_timeout,
+            rolemappings = json.loads(to_native(open_url(rolemappings_url, method="GET", headers=self.restheaders, timeout=self.connection_timeout,
                                                          validate_certs=self.validate_certs).read()))
             for role in rolemappings:
                 if rid == role['id']:
@@ -516,8 +508,7 @@ class KeycloakAPI(object):
         """
         available_rolemappings_url = URL_CLIENT_ROLEMAPPINGS_AVAILABLE.format(url=self.baseurl, realm=realm, id=gid, client=cid)
         try:
-            return json.loads(to_native(open_url(available_rolemappings_url, method="GET", http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(available_rolemappings_url, method="GET", headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except Exception as e:
             self.module.fail_json(msg="Could not fetch available rolemappings for client %s in group %s, realm %s: %s"
@@ -533,8 +524,7 @@ class KeycloakAPI(object):
         """
         available_rolemappings_url = URL_CLIENT_ROLEMAPPINGS_COMPOSITE.format(url=self.baseurl, realm=realm, id=gid, client=cid)
         try:
-            return json.loads(to_native(open_url(available_rolemappings_url, method="GET", http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(available_rolemappings_url, method="GET", headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except Exception as e:
             self.module.fail_json(msg="Could not fetch available rolemappings for client %s in group %s, realm %s: %s"
@@ -551,7 +541,7 @@ class KeycloakAPI(object):
         """
         available_rolemappings_url = URL_CLIENT_ROLEMAPPINGS.format(url=self.baseurl, realm=realm, id=gid, client=cid)
         try:
-            open_url(available_rolemappings_url, method="POST", http_agent=self.http_agent, headers=self.restheaders, data=json.dumps(role_rep),
+            open_url(available_rolemappings_url, method="POST", headers=self.restheaders, data=json.dumps(role_rep),
                      validate_certs=self.validate_certs, timeout=self.connection_timeout)
         except Exception as e:
             self.module.fail_json(msg="Could not fetch available rolemappings for client %s in group %s, realm %s: %s"
@@ -568,7 +558,7 @@ class KeycloakAPI(object):
         """
         available_rolemappings_url = URL_CLIENT_ROLEMAPPINGS.format(url=self.baseurl, realm=realm, id=gid, client=cid)
         try:
-            open_url(available_rolemappings_url, method="DELETE", http_agent=self.http_agent, headers=self.restheaders,
+            open_url(available_rolemappings_url, method="DELETE", headers=self.restheaders,
                      validate_certs=self.validate_certs, timeout=self.connection_timeout)
         except Exception as e:
             self.module.fail_json(msg="Could not delete available rolemappings for client %s in group %s, realm %s: %s"
@@ -583,7 +573,7 @@ class KeycloakAPI(object):
         url = URL_CLIENTTEMPLATES.format(url=self.baseurl, realm=realm)
 
         try:
-            return json.loads(to_native(open_url(url, method='GET', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(url, method='GET', headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except ValueError as e:
             self.module.fail_json(msg='API returned incorrect JSON when trying to obtain list of client templates for realm %s: %s'
@@ -602,7 +592,7 @@ class KeycloakAPI(object):
         url = URL_CLIENTTEMPLATE.format(url=self.baseurl, id=id, realm=realm)
 
         try:
-            return json.loads(to_native(open_url(url, method='GET', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(url, method='GET', headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except ValueError as e:
             self.module.fail_json(msg='API returned incorrect JSON when trying to obtain client templates %s for realm %s: %s'
@@ -648,7 +638,7 @@ class KeycloakAPI(object):
         url = URL_CLIENTTEMPLATE.format(url=self.baseurl, realm=realm, id=id)
 
         try:
-            return open_url(url, method='PUT', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(url, method='PUT', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(clienttrep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not update client template %s in realm %s: %s'
@@ -663,7 +653,7 @@ class KeycloakAPI(object):
         url = URL_CLIENTTEMPLATES.format(url=self.baseurl, realm=realm)
 
         try:
-            return open_url(url, method='POST', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(url, method='POST', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(clienttrep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not create client template %s in realm %s: %s'
@@ -679,7 +669,7 @@ class KeycloakAPI(object):
         url = URL_CLIENTTEMPLATE.format(url=self.baseurl, realm=realm, id=id)
 
         try:
-            return open_url(url, method='DELETE', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(url, method='DELETE', headers=self.restheaders, timeout=self.connection_timeout,
                             validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not delete client template %s in realm %s: %s'
@@ -696,8 +686,7 @@ class KeycloakAPI(object):
         """
         clientscopes_url = URL_CLIENTSCOPES.format(url=self.baseurl, realm=realm)
         try:
-            return json.loads(to_native(open_url(clientscopes_url, method="GET", http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(clientscopes_url, method="GET", headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except Exception as e:
             self.module.fail_json(msg="Could not fetch list of clientscopes in realm %s: %s"
@@ -714,8 +703,7 @@ class KeycloakAPI(object):
         """
         clientscope_url = URL_CLIENTSCOPE.format(url=self.baseurl, realm=realm, id=cid)
         try:
-            return json.loads(to_native(open_url(clientscope_url, method="GET", http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(clientscope_url, method="GET", headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
 
         except HTTPError as e:
@@ -760,7 +748,7 @@ class KeycloakAPI(object):
         """
         clientscopes_url = URL_CLIENTSCOPES.format(url=self.baseurl, realm=realm)
         try:
-            return open_url(clientscopes_url, method='POST', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(clientscopes_url, method='POST', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(clientscoperep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg="Could not create clientscope %s in realm %s: %s"
@@ -775,7 +763,7 @@ class KeycloakAPI(object):
         clientscope_url = URL_CLIENTSCOPE.format(url=self.baseurl, realm=realm, id=clientscoperep['id'])
 
         try:
-            return open_url(clientscope_url, method='PUT', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(clientscope_url, method='PUT', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(clientscoperep), validate_certs=self.validate_certs)
 
         except Exception as e:
@@ -813,7 +801,7 @@ class KeycloakAPI(object):
         # should have a good cid by here.
         clientscope_url = URL_CLIENTSCOPE.format(realm=realm, id=cid, url=self.baseurl)
         try:
-            return open_url(clientscope_url, method='DELETE', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(clientscope_url, method='DELETE', headers=self.restheaders, timeout=self.connection_timeout,
                             validate_certs=self.validate_certs)
 
         except Exception as e:
@@ -831,8 +819,7 @@ class KeycloakAPI(object):
         """
         protocolmappers_url = URL_CLIENTSCOPE_PROTOCOLMAPPERS.format(id=cid, url=self.baseurl, realm=realm)
         try:
-            return json.loads(to_native(open_url(protocolmappers_url, method="GET", http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(protocolmappers_url, method="GET", headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except Exception as e:
             self.module.fail_json(msg="Could not fetch list of protocolmappers in realm %s: %s"
@@ -851,8 +838,7 @@ class KeycloakAPI(object):
         """
         protocolmapper_url = URL_CLIENTSCOPE_PROTOCOLMAPPER.format(url=self.baseurl, realm=realm, id=cid, mapper_id=pid)
         try:
-            return json.loads(to_native(open_url(protocolmapper_url, method="GET", http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(protocolmapper_url, method="GET", headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
 
         except HTTPError as e:
@@ -899,7 +885,7 @@ class KeycloakAPI(object):
         """
         protocolmappers_url = URL_CLIENTSCOPE_PROTOCOLMAPPERS.format(url=self.baseurl, id=cid, realm=realm)
         try:
-            return open_url(protocolmappers_url, method='POST', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(protocolmappers_url, method='POST', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(mapper_rep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg="Could not create protocolmapper %s in realm %s: %s"
@@ -915,7 +901,7 @@ class KeycloakAPI(object):
         protocolmapper_url = URL_CLIENTSCOPE_PROTOCOLMAPPER.format(url=self.baseurl, realm=realm, id=cid, mapper_id=mapper_rep['id'])
 
         try:
-            return open_url(protocolmapper_url, method='PUT', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(protocolmapper_url, method='PUT', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(mapper_rep), validate_certs=self.validate_certs)
 
         except Exception as e:
@@ -932,8 +918,7 @@ class KeycloakAPI(object):
         """
         groups_url = URL_GROUPS.format(url=self.baseurl, realm=realm)
         try:
-            return json.loads(to_native(open_url(groups_url, method="GET", http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(groups_url, method="GET", headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except Exception as e:
             self.module.fail_json(msg="Could not fetch list of groups in realm %s: %s"
@@ -950,8 +935,7 @@ class KeycloakAPI(object):
         """
         groups_url = URL_GROUP.format(url=self.baseurl, realm=realm, groupid=gid)
         try:
-            return json.loads(to_native(open_url(groups_url, method="GET", http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(groups_url, method="GET", headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
 
         except HTTPError as e:
@@ -997,7 +981,7 @@ class KeycloakAPI(object):
         """
         groups_url = URL_GROUPS.format(url=self.baseurl, realm=realm)
         try:
-            return open_url(groups_url, method='POST', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(groups_url, method='POST', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(grouprep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg="Could not create group %s in realm %s: %s"
@@ -1012,7 +996,7 @@ class KeycloakAPI(object):
         group_url = URL_GROUP.format(url=self.baseurl, realm=realm, groupid=grouprep['id'])
 
         try:
-            return open_url(group_url, method='PUT', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(group_url, method='PUT', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(grouprep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not update group %s in realm %s: %s'
@@ -1049,7 +1033,7 @@ class KeycloakAPI(object):
         # should have a good groupid by here.
         group_url = URL_GROUP.format(realm=realm, groupid=groupid, url=self.baseurl)
         try:
-            return open_url(group_url, method='DELETE', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(group_url, method='DELETE', headers=self.restheaders, timeout=self.connection_timeout,
                             validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg="Unable to delete group %s: %s" % (groupid, str(e)))
@@ -1062,8 +1046,7 @@ class KeycloakAPI(object):
         """
         rolelist_url = URL_REALM_ROLES.format(url=self.baseurl, realm=realm)
         try:
-            return json.loads(to_native(open_url(rolelist_url, method='GET', http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(rolelist_url, method='GET', headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except ValueError as e:
             self.module.fail_json(msg='API returned incorrect JSON when trying to obtain list of roles for realm %s: %s'
@@ -1081,7 +1064,7 @@ class KeycloakAPI(object):
         """
         role_url = URL_REALM_ROLE.format(url=self.baseurl, realm=realm, name=quote(name))
         try:
-            return json.loads(to_native(open_url(role_url, method="GET", http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(role_url, method="GET", headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except HTTPError as e:
             if e.code == 404:
@@ -1101,7 +1084,7 @@ class KeycloakAPI(object):
         """
         roles_url = URL_REALM_ROLES.format(url=self.baseurl, realm=realm)
         try:
-            return open_url(roles_url, method='POST', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(roles_url, method='POST', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(rolerep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not create role %s in realm %s: %s'
@@ -1115,7 +1098,7 @@ class KeycloakAPI(object):
         """
         role_url = URL_REALM_ROLE.format(url=self.baseurl, realm=realm, name=quote(rolerep['name']))
         try:
-            return open_url(role_url, method='PUT', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(role_url, method='PUT', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(rolerep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not update role %s in realm %s: %s'
@@ -1129,7 +1112,7 @@ class KeycloakAPI(object):
         """
         role_url = URL_REALM_ROLE.format(url=self.baseurl, realm=realm, name=quote(name))
         try:
-            return open_url(role_url, method='DELETE', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(role_url, method='DELETE', headers=self.restheaders, timeout=self.connection_timeout,
                             validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Unable to delete role %s in realm %s: %s'
@@ -1148,8 +1131,7 @@ class KeycloakAPI(object):
                                       % (clientid, realm))
         rolelist_url = URL_CLIENT_ROLES.format(url=self.baseurl, realm=realm, id=cid)
         try:
-            return json.loads(to_native(open_url(rolelist_url, method='GET', http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(rolelist_url, method='GET', headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except ValueError as e:
             self.module.fail_json(msg='API returned incorrect JSON when trying to obtain list of roles for client %s in realm %s: %s'
@@ -1173,7 +1155,7 @@ class KeycloakAPI(object):
                                       % (clientid, realm))
         role_url = URL_CLIENT_ROLE.format(url=self.baseurl, realm=realm, id=cid, name=quote(name))
         try:
-            return json.loads(to_native(open_url(role_url, method="GET", http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(role_url, method="GET", headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except HTTPError as e:
             if e.code == 404:
@@ -1199,7 +1181,7 @@ class KeycloakAPI(object):
                                       % (clientid, realm))
         roles_url = URL_CLIENT_ROLES.format(url=self.baseurl, realm=realm, id=cid)
         try:
-            return open_url(roles_url, method='POST', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(roles_url, method='POST', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(rolerep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not create role %s for client %s in realm %s: %s'
@@ -1219,7 +1201,7 @@ class KeycloakAPI(object):
                                       % (clientid, realm))
         role_url = URL_CLIENT_ROLE.format(url=self.baseurl, realm=realm, id=cid, name=quote(rolerep['name']))
         try:
-            return open_url(role_url, method='PUT', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(role_url, method='PUT', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(rolerep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not update role %s for client %s in realm %s: %s'
@@ -1238,7 +1220,7 @@ class KeycloakAPI(object):
                                       % (clientid, realm))
         role_url = URL_CLIENT_ROLE.format(url=self.baseurl, realm=realm, id=cid, name=quote(name))
         try:
-            return open_url(role_url, method='DELETE', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(role_url, method='DELETE', headers=self.restheaders, timeout=self.connection_timeout,
                             validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Unable to delete role %s for client %s in realm %s: %s'
@@ -1255,8 +1237,7 @@ class KeycloakAPI(object):
             authentication_flow = {}
             # Check if the authentication flow exists on the Keycloak serveraders
             authentications = json.load(open_url(URL_AUTHENTICATION_FLOWS.format(url=self.baseurl, realm=realm), method='GET',
-                                                 http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout, validate_certs=self.validate_certs))
+                                                 headers=self.restheaders, timeout=self.connection_timeout, validate_certs=self.validate_certs))
             for authentication in authentications:
                 if authentication["alias"] == alias:
                     authentication_flow = authentication
@@ -1275,7 +1256,7 @@ class KeycloakAPI(object):
         flow_url = URL_AUTHENTICATION_FLOW.format(url=self.baseurl, realm=realm, id=id)
 
         try:
-            return open_url(flow_url, method='DELETE', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(flow_url, method='DELETE', headers=self.restheaders, timeout=self.connection_timeout,
                             validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not delete authentication flow %s in realm %s: %s'
@@ -1298,7 +1279,7 @@ class KeycloakAPI(object):
                     realm=realm,
                     copyfrom=quote(config["copyFrom"])),
                 method='POST',
-                http_agent=self.http_agent, headers=self.restheaders,
+                headers=self.restheaders,
                 data=json.dumps(new_name),
                 timeout=self.connection_timeout,
                 validate_certs=self.validate_certs)
@@ -1307,7 +1288,7 @@ class KeycloakAPI(object):
                     URL_AUTHENTICATION_FLOWS.format(url=self.baseurl,
                                                     realm=realm),
                     method='GET',
-                    http_agent=self.http_agent, headers=self.restheaders,
+                    headers=self.restheaders,
                     timeout=self.connection_timeout,
                     validate_certs=self.validate_certs))
             for flow in flow_list:
@@ -1337,7 +1318,7 @@ class KeycloakAPI(object):
                     url=self.baseurl,
                     realm=realm),
                 method='POST',
-                http_agent=self.http_agent, headers=self.restheaders,
+                headers=self.restheaders,
                 data=json.dumps(new_flow),
                 timeout=self.connection_timeout,
                 validate_certs=self.validate_certs)
@@ -1347,7 +1328,7 @@ class KeycloakAPI(object):
                         url=self.baseurl,
                         realm=realm),
                     method='GET',
-                    http_agent=self.http_agent, headers=self.restheaders,
+                    headers=self.restheaders,
                     timeout=self.connection_timeout,
                     validate_certs=self.validate_certs))
             for flow in flow_list:
@@ -1372,7 +1353,7 @@ class KeycloakAPI(object):
                     realm=realm,
                     flowalias=quote(flowAlias)),
                 method='PUT',
-                http_agent=self.http_agent, headers=self.restheaders,
+                headers=self.restheaders,
                 data=json.dumps(updatedExec),
                 timeout=self.connection_timeout,
                 validate_certs=self.validate_certs)
@@ -1393,7 +1374,7 @@ class KeycloakAPI(object):
                     realm=realm,
                     id=executionId),
                 method='POST',
-                http_agent=self.http_agent, headers=self.restheaders,
+                headers=self.restheaders,
                 data=json.dumps(authenticationConfig),
                 timeout=self.connection_timeout,
                 validate_certs=self.validate_certs)
@@ -1418,7 +1399,7 @@ class KeycloakAPI(object):
                     realm=realm,
                     flowalias=quote(flowAlias)),
                 method='POST',
-                http_agent=self.http_agent, headers=self.restheaders,
+                headers=self.restheaders,
                 data=json.dumps(newSubFlow),
                 timeout=self.connection_timeout,
                 validate_certs=self.validate_certs)
@@ -1442,7 +1423,7 @@ class KeycloakAPI(object):
                     realm=realm,
                     flowalias=quote(flowAlias)),
                 method='POST',
-                http_agent=self.http_agent, headers=self.restheaders,
+                headers=self.restheaders,
                 data=json.dumps(newExec),
                 timeout=self.connection_timeout,
                 validate_certs=self.validate_certs)
@@ -1466,7 +1447,7 @@ class KeycloakAPI(object):
                             realm=realm,
                             id=executionId),
                         method='POST',
-                        http_agent=self.http_agent, headers=self.restheaders,
+                        headers=self.restheaders,
                         timeout=self.connection_timeout,
                         validate_certs=self.validate_certs)
             elif diff < 0:
@@ -1477,7 +1458,7 @@ class KeycloakAPI(object):
                             realm=realm,
                             id=executionId),
                         method='POST',
-                        http_agent=self.http_agent, headers=self.restheaders,
+                        headers=self.restheaders,
                         timeout=self.connection_timeout,
                         validate_certs=self.validate_certs)
         except Exception as e:
@@ -1499,7 +1480,7 @@ class KeycloakAPI(object):
                         realm=realm,
                         flowalias=quote(config["alias"])),
                     method='GET',
-                    http_agent=self.http_agent, headers=self.restheaders,
+                    headers=self.restheaders,
                     timeout=self.connection_timeout,
                     validate_certs=self.validate_certs))
             for execution in executions:
@@ -1512,7 +1493,7 @@ class KeycloakAPI(object):
                                 realm=realm,
                                 id=execConfigId),
                             method='GET',
-                            http_agent=self.http_agent, headers=self.restheaders,
+                            headers=self.restheaders,
                             timeout=self.connection_timeout,
                             validate_certs=self.validate_certs))
                     execution["authenticationConfig"] = execConfig
@@ -1528,7 +1509,7 @@ class KeycloakAPI(object):
         """
         idps_url = URL_IDENTITY_PROVIDERS.format(url=self.baseurl, realm=realm)
         try:
-            return json.loads(to_native(open_url(idps_url, method='GET', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(idps_url, method='GET', headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except ValueError as e:
             self.module.fail_json(msg='API returned incorrect JSON when trying to obtain list of identity providers for realm %s: %s'
@@ -1545,7 +1526,7 @@ class KeycloakAPI(object):
         """
         idp_url = URL_IDENTITY_PROVIDER.format(url=self.baseurl, realm=realm, alias=alias)
         try:
-            return json.loads(to_native(open_url(idp_url, method="GET", http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(idp_url, method="GET", headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except HTTPError as e:
             if e.code == 404:
@@ -1565,7 +1546,7 @@ class KeycloakAPI(object):
         """
         idps_url = URL_IDENTITY_PROVIDERS.format(url=self.baseurl, realm=realm)
         try:
-            return open_url(idps_url, method='POST', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(idps_url, method='POST', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(idprep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not create identity provider %s in realm %s: %s'
@@ -1579,7 +1560,7 @@ class KeycloakAPI(object):
         """
         idp_url = URL_IDENTITY_PROVIDER.format(url=self.baseurl, realm=realm, alias=idprep['alias'])
         try:
-            return open_url(idp_url, method='PUT', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(idp_url, method='PUT', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(idprep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not update identity provider %s in realm %s: %s'
@@ -1592,7 +1573,7 @@ class KeycloakAPI(object):
         """
         idp_url = URL_IDENTITY_PROVIDER.format(url=self.baseurl, realm=realm, alias=alias)
         try:
-            return open_url(idp_url, method='DELETE', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(idp_url, method='DELETE', headers=self.restheaders, timeout=self.connection_timeout,
                             validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Unable to delete identity provider %s in realm %s: %s'
@@ -1606,8 +1587,7 @@ class KeycloakAPI(object):
         """
         mappers_url = URL_IDENTITY_PROVIDER_MAPPERS.format(url=self.baseurl, realm=realm, alias=alias)
         try:
-            return json.loads(to_native(open_url(mappers_url, method='GET', http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(mappers_url, method='GET', headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except ValueError as e:
             self.module.fail_json(msg='API returned incorrect JSON when trying to obtain list of identity provider mappers for idp %s in realm %s: %s'
@@ -1625,8 +1605,7 @@ class KeycloakAPI(object):
         """
         mapper_url = URL_IDENTITY_PROVIDER_MAPPER.format(url=self.baseurl, realm=realm, alias=alias, id=mid)
         try:
-            return json.loads(to_native(open_url(mapper_url, method="GET", http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(mapper_url, method="GET", headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except HTTPError as e:
             if e.code == 404:
@@ -1647,7 +1626,7 @@ class KeycloakAPI(object):
         """
         mappers_url = URL_IDENTITY_PROVIDER_MAPPERS.format(url=self.baseurl, realm=realm, alias=alias)
         try:
-            return open_url(mappers_url, method='POST', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(mappers_url, method='POST', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(mapper), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not create identity provider mapper %s for idp %s in realm %s: %s'
@@ -1662,7 +1641,7 @@ class KeycloakAPI(object):
         """
         mapper_url = URL_IDENTITY_PROVIDER_MAPPER.format(url=self.baseurl, realm=realm, alias=alias, id=mapper['id'])
         try:
-            return open_url(mapper_url, method='PUT', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(mapper_url, method='PUT', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(mapper), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not update mapper %s for identity provider %s in realm %s: %s'
@@ -1676,7 +1655,7 @@ class KeycloakAPI(object):
         """
         mapper_url = URL_IDENTITY_PROVIDER_MAPPER.format(url=self.baseurl, realm=realm, alias=alias, id=mid)
         try:
-            return open_url(mapper_url, method='DELETE', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(mapper_url, method='DELETE', headers=self.restheaders, timeout=self.connection_timeout,
                             validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Unable to delete mapper %s for identity provider %s in realm %s: %s'
@@ -1693,7 +1672,7 @@ class KeycloakAPI(object):
             comps_url += '?%s' % filter
 
         try:
-            return json.loads(to_native(open_url(comps_url, method='GET', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(comps_url, method='GET', headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except ValueError as e:
             self.module.fail_json(msg='API returned incorrect JSON when trying to obtain list of components for realm %s: %s'
@@ -1710,7 +1689,7 @@ class KeycloakAPI(object):
         """
         comp_url = URL_COMPONENT.format(url=self.baseurl, realm=realm, id=cid)
         try:
-            return json.loads(to_native(open_url(comp_url, method="GET", http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(comp_url, method="GET", headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except HTTPError as e:
             if e.code == 404:
@@ -1730,13 +1709,13 @@ class KeycloakAPI(object):
         """
         comps_url = URL_COMPONENTS.format(url=self.baseurl, realm=realm)
         try:
-            resp = open_url(comps_url, method='POST', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            resp = open_url(comps_url, method='POST', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(comprep), validate_certs=self.validate_certs)
             comp_url = resp.getheader('Location')
             if comp_url is None:
                 self.module.fail_json(msg='Could not create component in realm %s: %s'
                                           % (realm, 'unexpected response'))
-            return json.loads(to_native(open_url(comp_url, method="GET", http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return json.loads(to_native(open_url(comp_url, method="GET", headers=self.restheaders, timeout=self.connection_timeout,
                                                  validate_certs=self.validate_certs).read()))
         except Exception as e:
             self.module.fail_json(msg='Could not create component in realm %s: %s'
@@ -1753,7 +1732,7 @@ class KeycloakAPI(object):
             self.module.fail_json(msg='Cannot update component without id')
         comp_url = URL_COMPONENT.format(url=self.baseurl, realm=realm, id=cid)
         try:
-            return open_url(comp_url, method='PUT', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(comp_url, method='PUT', headers=self.restheaders, timeout=self.connection_timeout,
                             data=json.dumps(comprep), validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Could not update component %s in realm %s: %s'
@@ -1766,7 +1745,7 @@ class KeycloakAPI(object):
         """
         comp_url = URL_COMPONENT.format(url=self.baseurl, realm=realm, id=cid)
         try:
-            return open_url(comp_url, method='DELETE', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
+            return open_url(comp_url, method='DELETE', headers=self.restheaders, timeout=self.connection_timeout,
                             validate_certs=self.validate_certs)
         except Exception as e:
             self.module.fail_json(msg='Unable to delete component %s in realm %s: %s'

plugins/module_utils/ilo_redfish_utils.py

@@ -91,7 +91,7 @@ class iLORedfishUtils(RedfishUtils):
         data = response['data']
 
         ntp_list = data[setkey]
-        if(len(ntp_list) == 2):
+        if len(ntp_list) == 2:
             ntp_list.pop(0)
 
         ntp_list.append(mgr_attributes['mgr_attr_value'])

plugins/module_utils/memset.py

@@ -78,7 +78,7 @@ def memset_api_call(api_key, api_method, payload=None):
     if msg is None:
         msg = response.json()
 
-    return(has_failed, msg, response)
+    return has_failed, msg, response
 
 
 def check_zone_domain(data, domain):
@@ -92,7 +92,7 @@ def check_zone_domain(data, domain):
             if zone_domain['domain'] == domain:
                 exists = True
 
-    return(exists)
+    return exists
 
 
 def check_zone(data, name):
@@ -109,7 +109,7 @@ def check_zone(data, name):
         if counter == 1:
             exists = True
 
-    return(exists, counter)
+    return exists, counter
 
 
 def get_zone_id(zone_name, current_zones):
@@ -135,4 +135,4 @@ def get_zone_id(zone_name, current_zones):
         zone_id = None
         msg = 'Zone ID could not be returned as duplicate zone names were detected'
 
-    return(zone_exists, msg, counter, zone_id)
+    return zone_exists, msg, counter, zone_id

plugins/module_utils/mh/base.py

@@ -14,9 +14,6 @@ from ansible_collections.community.general.plugins.module_utils.mh.deco import m
 class ModuleHelperBase(object):
     module = None
     ModuleHelperException = _MHE
-    _delegated_to_module = (
-        'check_mode', 'get_bin_path', 'warn', 'deprecate',
-    )
 
     def __init__(self, module=None):
         self._changed = False
@@ -27,22 +24,6 @@ class ModuleHelperBase(object):
         if not isinstance(self.module, AnsibleModule):
             self.module = AnsibleModule(**self.module)
 
-    @property
-    def diff_mode(self):
-        return self.module._diff
-
-    @property
-    def verbosity(self):
-        return self.module._verbosity
-
-    def do_raise(self, *args, **kwargs):
-        raise _MHE(*args, **kwargs)
-
-    def __getattr__(self, attr):
-        if attr in self._delegated_to_module:
-            return getattr(self.module, attr)
-        raise AttributeError("ModuleHelperBase has no attribute '%s'" % (attr, ))
-
     def __init_module__(self):
         pass
 

plugins/module_utils/mh/mixins/cmd.py

@@ -128,7 +128,8 @@ class CmdMixin(object):
         for param in param_list:
             if isinstance(param, dict):
                 if len(param) != 1:
-                    self.do_raise("run_command parameter as a dict must contain only one key: {0}".format(param))
+                    raise self.ModuleHelperException("run_command parameter as a dict must "
+                                                     "contain only one key: {0}".format(param))
                 _param = list(param.keys())[0]
                 fmt = find_format(_param)
                 value = param[_param]
@@ -140,9 +141,9 @@ class CmdMixin(object):
                     fmt = find_format(param)
                     value = extra_params[param]
                 else:
-                    self.do_raise('Cannot determine value for parameter: {0}'.format(param))
+                    raise self.ModuleHelperException('Cannot determine value for parameter: {0}'.format(param))
             else:
-                self.do_raise("run_command parameter must be either a str or a dict: {0}".format(param))
+                raise self.ModuleHelperException("run_command parameter must be either a str or a dict: {0}".format(param))
             cmd_args = add_arg_formatted_param(cmd_args, fmt, value)
 
         return cmd_args

plugins/module_utils/mh/module_helper.py

@@ -44,8 +44,7 @@ class ModuleHelper(DeprecateAttrsMixin, VarsMixin, DependencyMixin, ModuleHelper
             version="6.0.0",
             collection_name="community.general",
             target=ModuleHelper,
-            module=self.module,
-        )
+            module=self.module)
 
     def update_output(self, **kwargs):
         self.update_vars(meta={"output": True}, **kwargs)
@@ -66,7 +65,7 @@ class ModuleHelper(DeprecateAttrsMixin, VarsMixin, DependencyMixin, ModuleHelper
             facts = self.vars.facts()
             if facts is not None:
                 result['ansible_facts'] = {self.facts_name: facts}
-        if self.diff_mode:
+        if self.module._diff:
             diff = result.get('diff', {})
             vars_diff = self.vars.diff() or {}
             result['diff'] = dict_merge(dict(diff), vars_diff)

plugins/module_utils/opennebula.py

@@ -83,12 +83,12 @@ class OpenNebulaModule:
         if self.module.params.get("api_username"):
             username = self.module.params.get("api_username")
         else:
-            self.fail("Either api_username or the environment variable ONE_USERNAME must be provided")
+            self.fail("Either api_username or the environment vairable ONE_USERNAME must be provided")
 
         if self.module.params.get("api_password"):
             password = self.module.params.get("api_password")
         else:
-            self.fail("Either api_password or the environment variable ONE_PASSWORD must be provided")
+            self.fail("Either api_password or the environment vairable ONE_PASSWORD must be provided")
 
         session = "%s:%s" % (username, password)
 

plugins/module_utils/oracle/oci_utils.py

@@ -691,7 +691,7 @@ def check_and_create_resource(
     :param model: Model used to create a resource.
     :param exclude_attributes: The attributes which should not be used to distinguish the resource. e.g. display_name,
      dns_label.
-    :param dead_states: List of states which can't transition to any of the usable states of the resource. This defaults
+    :param dead_states: List of states which can't transition to any of the usable states of the resource. This deafults
     to ["TERMINATING", "TERMINATED", "FAULTY", "FAILED", "DELETING", "DELETED", "UNKNOWN_ENUM_VALUE"]
     :param default_attribute_values: A dictionary containing default values for attributes.
     :return: A dictionary containing the resource & the "changed" status. e.g. {"vcn":{x:y}, "changed":True}
@@ -1189,7 +1189,7 @@ def are_dicts_equal(
 
 
 def should_dict_attr_be_excluded(map_option_name, option_key, exclude_list):
-    """An entry for the Exclude list for excluding a map's key is specified as a dict with the map option name as the
+    """An entry for the Exclude list for excluding a map's key is specifed as a dict with the map option name as the
     key, and the value as a list of keys to be excluded within that map. For example, if the keys "k1" and "k2" of a map
     option named "m1" needs to be excluded, the exclude list must have an entry {'m1': ['k1','k2']} """
     for exclude_item in exclude_list:

plugins/module_utils/proxmox.py

@@ -122,7 +122,14 @@ class ProxmoxAnsible(object):
 
             self.module.fail_json(msg='No VM with name %s found' % name)
         elif len(vms) > 1:
-            self.module.fail_json(msg='Multiple VMs with name %s found, provide vmid instead' % name)
+            if choose_first_if_multiple:
+                self.module.deprecate(
+                    'Multiple VMs with name %s found, choosing the first one. ' % name +
+                    'This will be an error in the future. To ensure the correct VM is used, ' +
+                    'also pass the vmid parameter.',
+                    version='5.0.0', collection_name='community.general')
+            else:
+                self.module.fail_json(msg='Multiple VMs with name %s found, provide vmid instead' % name)
 
         return vms[0]
 

plugins/module_utils/rax.py

@@ -122,8 +122,7 @@ def rax_find_image(module, rax_module, image, exit=True):
     except ValueError:
         try:
             image = cs.images.find(human_id=image)
-        except(cs.exceptions.NotFound,
-               cs.exceptions.NoUniqueMatch):
+        except (cs.exceptions.NotFound, cs.exceptions.NoUniqueMatch):
             try:
                 image = cs.images.find(name=image)
             except (cs.exceptions.NotFound,

plugins/module_utils/redfish_utils.py

@@ -188,12 +188,7 @@ class RedfishUtils(object):
                 body = error.read().decode('utf-8')
                 data = json.loads(body)
                 ext_info = data['error']['@Message.ExtendedInfo']
-                # if the ExtendedInfo contains a user friendly message send it
-                # otherwise try to send the entire contents of ExtendedInfo
-                try:
-                    msg = ext_info[0]['Message']
-                except Exception:
-                    msg = str(data['error']['@Message.ExtendedInfo'])
+                msg = ext_info[0]['Message']
             except Exception:
                 pass
         return msg
@@ -2060,7 +2055,7 @@ class RedfishUtils(object):
             if property in data:
                 nic[property] = data[property]
         result['entries'] = nic
-        return(result)
+        return result
 
     def get_nic_inventory(self, resource_uri):
         result = {}
@@ -2186,8 +2181,9 @@ class RedfishUtils(object):
             else:
                 if media_match_strict:
                     continue
-            # if ejected, 'Inserted' should be False
-            if (not data.get('Inserted', False)):
+            # if ejected, 'Inserted' should be False and 'ImageName' cleared
+            if (not data.get('Inserted', False) and
+                    not data.get('ImageName')):
                 return uri, data
         return None, None
 
@@ -2223,7 +2219,7 @@ class RedfishUtils(object):
         return resources, headers
 
     @staticmethod
-    def _insert_virt_media_payload(options, param_map, data, ai, image_only=False):
+    def _insert_virt_media_payload(options, param_map, data, ai):
         payload = {
             'Image': options.get('image_url')
         }
@@ -2237,24 +2233,17 @@ class RedfishUtils(object):
                                        options.get(option), option,
                                        allowable)}
                 payload[param] = options.get(option)
-
-        # Some hardware (such as iLO 4 or Supermicro) only supports the Image property
-        # Inserted and WriteProtected are not writable
-        if image_only:
-            del payload['Inserted']
-            del payload['WriteProtected']
         return payload
 
-    def virtual_media_insert_via_patch(self, options, param_map, uri, data, image_only=False):
+    def virtual_media_insert_via_patch(self, options, param_map, uri, data):
         # get AllowableValues
         ai = dict((k[:-24],
                    {'AllowableValues': v}) for k, v in data.items()
                   if k.endswith('@Redfish.AllowableValues'))
         # construct payload
-        payload = self._insert_virt_media_payload(options, param_map, data, ai, image_only)
-        if 'Inserted' not in payload and not image_only:
+        payload = self._insert_virt_media_payload(options, param_map, data, ai)
+        if 'Inserted' not in payload:
             payload['Inserted'] = True
-
         # PATCH the resource
         response = self.patch_request(self.root_uri + uri, payload)
         if response['ret'] is False:
@@ -2270,7 +2259,6 @@ class RedfishUtils(object):
             'TransferProtocolType': 'transfer_protocol_type',
             'TransferMethod': 'transfer_method'
         }
-        image_only = False
         image_url = options.get('image_url')
         if not image_url:
             return {'ret': False,
@@ -2284,19 +2272,6 @@ class RedfishUtils(object):
         data = response['data']
         if 'VirtualMedia' not in data:
             return {'ret': False, 'msg': "VirtualMedia resource not found"}
-
-        # Some hardware (such as iLO 4) only supports the Image property on the PATCH operation
-        # Inserted and WriteProtected are not writable
-        if data["FirmwareVersion"].startswith("iLO 4"):
-            image_only = True
-
-        # Supermicro does also not support Inserted and WriteProtected
-        # Supermicro uses as firmware version only a number so we can't check for it because we
-        # can't be sure that this firmware version is nut used by another vendor
-        # Tested with Supermicro Firmware 01.74.02
-        if 'Supermicro' in data['Oem']:
-            image_only = True
-
         virt_media_uri = data["VirtualMedia"]["@odata.id"]
         response = self.get_request(self.root_uri + virt_media_uri)
         if response['ret'] is False:
@@ -2339,7 +2314,7 @@ class RedfishUtils(object):
                             'msg': "%s action not found and PATCH not allowed"
                             % '#VirtualMedia.InsertMedia'}
             return self.virtual_media_insert_via_patch(options, param_map,
-                                                       uri, data, image_only)
+                                                       uri, data)
 
         # get the action property
         action = data['Actions']['#VirtualMedia.InsertMedia']
@@ -2351,25 +2326,19 @@ class RedfishUtils(object):
         # get ActionInfo or AllowableValues
         ai = self._get_all_action_info_values(action)
         # construct payload
-        payload = self._insert_virt_media_payload(options, param_map, data, ai, image_only)
+        payload = self._insert_virt_media_payload(options, param_map, data, ai)
         # POST to action
         response = self.post_request(self.root_uri + action_uri, payload)
         if response['ret'] is False:
             return response
         return {'ret': True, 'changed': True, 'msg': "VirtualMedia inserted"}
 
-    def virtual_media_eject_via_patch(self, uri, image_only=False):
+    def virtual_media_eject_via_patch(self, uri):
         # construct payload
         payload = {
             'Inserted': False,
             'Image': None
         }
-
-        # Some hardware (such as iLO 4) only supports the Image property on the PATCH operation
-        # Inserted is not writable
-        if image_only:
-            del payload['Inserted']
-
         # PATCH resource
         response = self.patch_request(self.root_uri + uri, payload)
         if response['ret'] is False:
@@ -2390,16 +2359,6 @@ class RedfishUtils(object):
         data = response['data']
         if 'VirtualMedia' not in data:
             return {'ret': False, 'msg': "VirtualMedia resource not found"}
-
-        # Some hardware (such as iLO 4) only supports the Image property on the PATCH operation
-        # Inserted is not writable
-        image_only = False
-        if data["FirmwareVersion"].startswith("iLO 4"):
-            image_only = True
-
-        if 'Supermicro' in data['Oem']:
-            image_only = True
-
         virt_media_uri = data["VirtualMedia"]["@odata.id"]
         response = self.get_request(self.root_uri + virt_media_uri)
         if response['ret'] is False:
@@ -2424,7 +2383,7 @@ class RedfishUtils(object):
                         return {'ret': False,
                                 'msg': "%s action not found and PATCH not allowed"
                                        % '#VirtualMedia.EjectMedia'}
-                return self.virtual_media_eject_via_patch(uri, image_only)
+                return self.virtual_media_eject_via_patch(uri)
             else:
                 # POST to the EjectMedia Action
                 action = data['Actions']['#VirtualMedia.EjectMedia']
@@ -3028,26 +2987,3 @@ class RedfishUtils(object):
         if not result["entries"]:
             return {'ret': False, 'msg': "No HostInterface objects found"}
         return result
-
-    def get_manager_inventory(self, manager_uri):
-        result = {}
-        inventory = {}
-        # Get these entries, but does not fail if not found
-        properties = ['FirmwareVersion', 'ManagerType', 'Manufacturer', 'Model',
-                      'PartNumber', 'PowerState', 'SerialNumber', 'Status', 'UUID']
-
-        response = self.get_request(self.root_uri + manager_uri)
-        if response['ret'] is False:
-            return response
-        result['ret'] = True
-        data = response['data']
-
-        for property in properties:
-            if property in data:
-                inventory[property] = data[property]
-
-        result["entries"] = inventory
-        return result
-
-    def get_multi_manager_inventory(self):
-        return self.aggregate_managers(self.get_manager_inventory)

plugins/module_utils/redis.py

@@ -15,6 +15,7 @@ try:
     from redis import Redis
     from redis import __version__ as redis_version
     HAS_REDIS_PACKAGE = True
+    REDIS_IMP_ERR = None
 except ImportError:
     REDIS_IMP_ERR = traceback.format_exc()
     HAS_REDIS_PACKAGE = False
@@ -22,6 +23,7 @@ except ImportError:
 try:
     import certifi
     HAS_CERTIFI_PACKAGE = True
+    CERTIFI_IMPORT_ERROR = None
 except ImportError:
     CERTIFI_IMPORT_ERROR = traceback.format_exc()
     HAS_CERTIFI_PACKAGE = False

plugins/module_utils/version.py

@@ -9,13 +9,9 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 
-from ansible.module_utils.six import raise_from
+# Once we drop support for Ansible 2.9, ansible-base 2.10, and ansible-core 2.11, we can
+# remove the _version.py file, and replace the following import by
+#
+#     from ansible.module_utils.compat.version import LooseVersion
 
-try:
-    from ansible.module_utils.compat.version import LooseVersion
-except ImportError:
-    try:
-        from distutils.version import LooseVersion
-    except ImportError as exc:
-        msg = 'To use this plugin or module with ansible-core 2.11, you need to use Python < 3.12 with distutils.version present'
-        raise_from(ImportError(msg), exc)
+from ._version import LooseVersion

plugins/module_utils/wdc_redfish_utils.py

@@ -1,406 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2022 Western Digital Corporation
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-import datetime
-import re
-import time
-import tarfile
-
-from ansible.module_utils.urls import fetch_file
-from ansible_collections.community.general.plugins.module_utils.redfish_utils import RedfishUtils
-
-from ansible.module_utils.six.moves.urllib.parse import urlparse, urlunparse
-
-
-class WdcRedfishUtils(RedfishUtils):
-    """Extension to RedfishUtils to support WDC enclosures."""
-    # Status codes returned by WDC FW Update Status
-    UPDATE_STATUS_CODE_READY_FOR_FW_UPDATE = 0
-    UPDATE_STATUS_CODE_FW_UPDATE_IN_PROGRESS = 1
-    UPDATE_STATUS_CODE_FW_UPDATE_COMPLETED_WAITING_FOR_ACTIVATION = 2
-    UPDATE_STATUS_CODE_FW_UPDATE_FAILED = 3
-
-    # Status messages returned by WDC FW Update Status
-    UPDATE_STATUS_MESSAGE_READY_FOR_FW_UDPATE = "Ready for FW update"
-    UDPATE_STATUS_MESSAGE_FW_UPDATE_IN_PROGRESS = "FW update in progress"
-    UPDATE_STATUS_MESSAGE_FW_UPDATE_COMPLETED_WAITING_FOR_ACTIVATION = "FW update completed. Waiting for activation."
-    UPDATE_STATUS_MESSAGE_FW_UPDATE_FAILED = "FW update failed."
-
-    def __init__(self,
-                 creds,
-                 root_uris,
-                 timeout,
-                 module,
-                 resource_id,
-                 data_modification):
-        super(WdcRedfishUtils, self).__init__(creds=creds,
-                                              root_uri=root_uris[0],
-                                              timeout=timeout,
-                                              module=module,
-                                              resource_id=resource_id,
-                                              data_modification=data_modification)
-        # Update the root URI if we cannot perform a Redfish GET to the first one
-        self._set_root_uri(root_uris)
-
-    def _set_root_uri(self, root_uris):
-        """Set the root URI from a list of options.
-
-        If the current root URI is good, just keep it.  Else cycle through our options until we find a good one.
-        A URI is considered good if we can GET uri/redfish/v1.
-        """
-        for root_uri in root_uris:
-            uri = root_uri + "/redfish/v1"
-            response = self.get_request(uri)
-            if response['ret']:
-                self.root_uri = root_uri
-                break
-
-    def _find_updateservice_resource(self):
-        """Find the update service resource as well as additional WDC-specific resources."""
-        response = super(WdcRedfishUtils, self)._find_updateservice_resource()
-        if not response['ret']:
-            return response
-        return self._find_updateservice_additional_uris()
-
-    def _is_enclosure_multi_tenant(self):
-        """Determine if the enclosure is multi-tenant.
-
-        The serial number of a multi-tenant enclosure will end in "-A" or "-B".
-
-        :return: True/False if the enclosure is multi-tenant or not; None if unable to determine.
-        """
-        response = self.get_request(self.root_uri + self.service_root + "Chassis/Enclosure")
-        if response['ret'] is False:
-            return None
-        pattern = r".*-[A,B]"
-        data = response['data']
-        return re.match(pattern, data['SerialNumber']) is not None
-
-    def _find_updateservice_additional_uris(self):
-        """Find & set WDC-specific update service URIs"""
-        response = self.get_request(self.root_uri + self._update_uri())
-        if response['ret'] is False:
-            return response
-        data = response['data']
-        if 'Actions' not in data:
-            return {'ret': False, 'msg': 'Service does not support SimpleUpdate'}
-        if '#UpdateService.SimpleUpdate' not in data['Actions']:
-            return {'ret': False, 'msg': 'Service does not support SimpleUpdate'}
-        action = data['Actions']['#UpdateService.SimpleUpdate']
-        if 'target' not in action:
-            return {'ret': False, 'msg': 'Service does not support SimpleUpdate'}
-        self.simple_update_uri = action['target']
-
-        # Simple update status URI is not provided via GET /redfish/v1/UpdateService
-        # So we have to hard code it.
-        self.simple_update_status_uri = "{0}/Status".format(self.simple_update_uri)
-
-        # FWActivate URI
-        if 'Oem' not in data['Actions']:
-            return {'ret': False, 'msg': 'Service does not support OEM operations'}
-        if 'WDC' not in data['Actions']['Oem']:
-            return {'ret': False, 'msg': 'Service does not support WDC operations'}
-        if '#UpdateService.FWActivate' not in data['Actions']['Oem']['WDC']:
-            return {'ret': False, 'msg': 'Service does not support FWActivate'}
-        action = data['Actions']['Oem']['WDC']['#UpdateService.FWActivate']
-        if 'target' not in action:
-            return {'ret': False, 'msg': 'Service does not support FWActivate'}
-        self.firmware_activate_uri = action['target']
-        return {'ret': True}
-
-    def _simple_update_status_uri(self):
-        return self.simple_update_status_uri
-
-    def _firmware_activate_uri(self):
-        return self.firmware_activate_uri
-
-    def _update_uri(self):
-        return self.update_uri
-
-    def get_simple_update_status(self):
-        """Issue Redfish HTTP GET to return the simple update status"""
-        result = {}
-        response = self.get_request(self.root_uri + self._simple_update_status_uri())
-        if response['ret'] is False:
-            return response
-        result['ret'] = True
-        data = response['data']
-        result['entries'] = data
-        return result
-
-    def firmware_activate(self, update_opts):
-        """Perform FWActivate using Redfish HTTP API."""
-        creds = update_opts.get('update_creds')
-        payload = {}
-        if creds:
-            if creds.get('username'):
-                payload["Username"] = creds.get('username')
-            if creds.get('password'):
-                payload["Password"] = creds.get('password')
-
-        # Make sure the service supports FWActivate
-        response = self.get_request(self.root_uri + self._update_uri())
-        if response['ret'] is False:
-            return response
-        data = response['data']
-        if 'Actions' not in data:
-            return {'ret': False, 'msg': 'Service does not support FWActivate'}
-
-        response = self.post_request(self.root_uri + self._firmware_activate_uri(), payload)
-        if response['ret'] is False:
-            return response
-        return {'ret': True, 'changed': True,
-                'msg': "FWActivate requested"}
-
-    def _get_bundle_version(self,
-                            bundle_uri):
-        """Get the firmware version from a bundle file, and whether or not it is multi-tenant.
-
-        Only supports HTTP at this time.  Assumes URI exists and is a tarfile.
-        Looks for a file oobm-[version].pkg, such as 'oobm-4.0.13.pkg`.  Extracts the version number
-        from that filename (in the above example, the version number is "4.0.13".
-
-        To determine if the bundle is multi-tenant or not, it looks inside the .bin file within the tarfile,
-        and checks the appropriate byte in the file.
-
-        :param str bundle_uri:  HTTP URI of the firmware bundle.
-        :return: Firmware version number contained in the bundle, and whether or not the bundle is multi-tenant.
-        Either value will be None if unable to deterine.
-        :rtype: str or None, bool or None
-        """
-        bundle_temp_filename = fetch_file(module=self.module,
-                                          url=bundle_uri)
-        if not tarfile.is_tarfile(bundle_temp_filename):
-            return None, None
-        tf = tarfile.open(bundle_temp_filename)
-        pattern_pkg = r"oobm-(.+)\.pkg"
-        pattern_bin = r"(.*\.bin)"
-        bundle_version = None
-        is_multi_tenant = None
-        for filename in tf.getnames():
-            match_pkg = re.match(pattern_pkg, filename)
-            if match_pkg is not None:
-                bundle_version = match_pkg.group(1)
-            match_bin = re.match(pattern_bin, filename)
-            if match_bin is not None:
-                bin_filename = match_bin.group(1)
-                bin_file = tf.extractfile(bin_filename)
-                bin_file.seek(11)
-                byte_11 = bin_file.read(1)
-                is_multi_tenant = byte_11 == b'\x80'
-
-        return bundle_version, is_multi_tenant
-
-    @staticmethod
-    def uri_is_http(uri):
-        """Return True if the specified URI is http or https.
-
-        :param str uri: A URI.
-        :return: True if the URI is http or https, else False
-        :rtype: bool
-        """
-        parsed_bundle_uri = urlparse(uri)
-        return parsed_bundle_uri.scheme.lower() in ['http', 'https']
-
-    def update_and_activate(self, update_opts):
-        """Update and activate the firmware in a single action.
-
-        Orchestrates the firmware update so that everything can be done in a single command.
-        Compares the update version with the already-installed version -- skips update if they are the same.
-        Performs retries, handles timeouts as needed.
-
-        """
-        # Convert credentials to standard HTTP format
-        if update_opts.get("update_creds") is not None and "username" in update_opts["update_creds"] and "password" in update_opts["update_creds"]:
-            update_creds = update_opts["update_creds"]
-            parsed_url = urlparse(update_opts["update_image_uri"])
-            if update_creds:
-                original_netloc = parsed_url.netloc
-                parsed_url = parsed_url._replace(netloc="{0}:{1}@{2}".format(update_creds.get("username"),
-                                                                             update_creds.get("password"),
-                                                                             original_netloc))
-                update_opts["update_image_uri"] = urlunparse(parsed_url)
-                del update_opts["update_creds"]
-
-        # Make sure bundle URI is HTTP(s)
-        bundle_uri = update_opts["update_image_uri"]
-
-        if not self.uri_is_http(bundle_uri):
-            return {
-                'ret': False,
-                'msg': 'Bundle URI must be HTTP or HTTPS'
-            }
-        # Make sure IOM is ready for update
-        result = self.get_simple_update_status()
-        if result['ret'] is False:
-            return result
-        update_status = result['entries']
-        status_code = update_status['StatusCode']
-        status_description = update_status['Description']
-        if status_code not in [
-            self.UPDATE_STATUS_CODE_READY_FOR_FW_UPDATE,
-            self.UPDATE_STATUS_CODE_FW_UPDATE_FAILED
-        ]:
-            return {
-                'ret': False,
-                'msg': 'Target is not ready for FW update.  Current status: {0} ({1})'.format(
-                    status_code, status_description
-                )}
-
-        # Check the FW version in the bundle file, and compare it to what is already on the IOMs
-
-        # Bundle version number
-        bundle_firmware_version, is_bundle_multi_tenant = self._get_bundle_version(bundle_uri)
-        if bundle_firmware_version is None or is_bundle_multi_tenant is None:
-            return {
-                'ret': False,
-                'msg': 'Unable to extract bundle version or multi-tenant status from update image tarfile'
-            }
-
-        # Verify that the bundle is correctly multi-tenant or not
-        is_enclosure_multi_tenant = self._is_enclosure_multi_tenant()
-        if is_enclosure_multi_tenant != is_bundle_multi_tenant:
-            return {
-                'ret': False,
-                'msg': 'Enclosure multi-tenant is {0} but bundle multi-tenant is {1}'.format(
-                    is_enclosure_multi_tenant,
-                    is_bundle_multi_tenant,
-                )
-            }
-
-        # Version number installed on IOMs
-        firmware_inventory = self.get_firmware_inventory()
-        if not firmware_inventory["ret"]:
-            return firmware_inventory
-        firmware_inventory_dict = {}
-        for entry in firmware_inventory["entries"]:
-            firmware_inventory_dict[entry["Id"]] = entry
-        iom_a_firmware_version = firmware_inventory_dict.get("IOModuleA_OOBM", {}).get("Version")
-        iom_b_firmware_version = firmware_inventory_dict.get("IOModuleB_OOBM", {}).get("Version")
-        # If version is None, we will proceed with the update, because we cannot tell
-        # for sure that we have a full version match.
-        if is_enclosure_multi_tenant:
-            # For multi-tenant, only one of the IOMs will be affected by the firmware update,
-            # so see if that IOM already has the same firmware version as the bundle.
-            firmware_already_installed = bundle_firmware_version == self._get_installed_firmware_version_of_multi_tenant_system(
-                iom_a_firmware_version,
-                iom_b_firmware_version)
-        else:
-            # For single-tenant, see if both IOMs already have the same firmware version as the bundle.
-            firmware_already_installed = bundle_firmware_version == iom_a_firmware_version == iom_b_firmware_version
-        # If this FW already installed, return changed: False, and do not update the firmware.
-        if firmware_already_installed:
-            return {
-                'ret': True,
-                'changed': False,
-                'msg': 'Version {0} already installed'.format(bundle_firmware_version)
-            }
-
-        # Version numbers don't match the bundle -- proceed with update (unless we are in check mode)
-        if self.module.check_mode:
-            return {
-                'ret': True,
-                'changed': True,
-                'msg': 'Update not performed in check mode.'
-            }
-        update_successful = False
-        retry_interval_seconds = 5
-        max_number_of_retries = 5
-        retry_number = 0
-        while retry_number < max_number_of_retries and not update_successful:
-            if retry_number != 0:
-                time.sleep(retry_interval_seconds)
-            retry_number += 1
-
-            result = self.simple_update(update_opts)
-            if result['ret'] is not True:
-                # Sometimes a timeout error is returned even though the update actually was requested.
-                # Check the update status to see if the update is in progress.
-                status_result = self.get_simple_update_status()
-                if status_result['ret'] is False:
-                    continue
-                update_status = status_result['entries']
-                status_code = update_status['StatusCode']
-                if status_code != self.UPDATE_STATUS_CODE_FW_UPDATE_IN_PROGRESS:
-                    # Update is not in progress -- retry until max number of retries
-                    continue
-                else:
-                    update_successful = True
-            else:
-                update_successful = True
-        if not update_successful:
-            # Unable to get SimpleUpdate to work.  Return the failure from the SimpleUpdate
-            return result
-
-        # Wait for "ready to activate"
-        max_wait_minutes = 30
-        polling_interval_seconds = 30
-        status_code = self.UPDATE_STATUS_CODE_READY_FOR_FW_UPDATE
-        start_time = datetime.datetime.now()
-        # For a short time, target will still say "ready for firmware update" before it transitions
-        # to "update in progress"
-        status_codes_for_update_incomplete = [
-            self.UPDATE_STATUS_CODE_FW_UPDATE_IN_PROGRESS,
-            self.UPDATE_STATUS_CODE_READY_FOR_FW_UPDATE
-        ]
-        iteration = 0
-        while status_code in status_codes_for_update_incomplete \
-                and datetime.datetime.now() - start_time < datetime.timedelta(minutes=max_wait_minutes):
-            if iteration != 0:
-                time.sleep(polling_interval_seconds)
-            iteration += 1
-            result = self.get_simple_update_status()
-            if result['ret'] is False:
-                continue  # We may get timeouts, just keep trying until we give up
-            update_status = result['entries']
-            status_code = update_status['StatusCode']
-            status_description = update_status['Description']
-            if status_code == self.UPDATE_STATUS_CODE_FW_UPDATE_IN_PROGRESS:
-                # Once it says update in progress, "ready for update" is no longer a valid status code
-                status_codes_for_update_incomplete = [self.UPDATE_STATUS_CODE_FW_UPDATE_IN_PROGRESS]
-
-        # Update no longer in progress -- verify that it finished
-        if status_code != self.UPDATE_STATUS_CODE_FW_UPDATE_COMPLETED_WAITING_FOR_ACTIVATION:
-            return {
-                'ret': False,
-                'msg': 'Target is not ready for FW activation after update.  Current status: {0} ({1})'.format(
-                    status_code, status_description
-                )}
-
-        self.firmware_activate(update_opts)
-        return {'ret': True, 'changed': True,
-                'msg': "Firmware updated and activation initiated."}
-
-    def _get_installed_firmware_version_of_multi_tenant_system(self,
-                                                               iom_a_firmware_version,
-                                                               iom_b_firmware_version):
-        """Return the version for the active IOM on a multi-tenant system.
-
-        Only call this on a multi-tenant system.
-        Given the installed firmware versions for IOM A, B, this method will determine which IOM is active
-        for this tenanat, and return that IOM's firmware version.
-        """
-        # To determine which IOM we are on, try to GET each IOM resource
-        # The one we are on will return valid data.
-        # The other will return an error with message "IOM Module A/B cannot be read"
-        which_iom_is_this = None
-        for iom_letter in ['A', 'B']:
-            iom_uri = "Chassis/IOModule{0}FRU".format(iom_letter)
-            response = self.get_request(self.root_uri + self.service_root + iom_uri)
-            if response['ret'] is False:
-                continue
-            data = response['data']
-            if "Id" in data:  # Assume if there is an "Id", it is valid
-                which_iom_is_this = iom_letter
-                break
-        if which_iom_is_this == 'A':
-            return iom_a_firmware_version
-        elif which_iom_is_this == 'B':
-            return iom_b_firmware_version
-        else:
-            return None

plugins/module_utils/xfconf.py

@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-# (c) 2022, Alexei Znamensky <russoz@gmail.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-from ansible.module_utils.parsing.convert_bool import boolean
-from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt as fmt
-
-
-@fmt.unpack_args
-def _values_fmt(values, value_types):
-    result = []
-    for value, value_type in zip(values, value_types):
-        if value_type == 'bool':
-            value = 'true' if boolean(value) else 'false'
-        result.extend(['--type', '{0}'.format(value_type), '--set', '{0}'.format(value)])
-    return result
-
-
-def xfconf_runner(module, **kwargs):
-    runner = CmdRunner(
-        module,
-        command='xfconf-query',
-        arg_formats=dict(
-            channel=fmt.as_opt_val("--channel"),
-            property=fmt.as_opt_val("--property"),
-            force_array=fmt.as_bool("--force-array"),
-            reset=fmt.as_bool("--reset"),
-            create=fmt.as_bool("--create"),
-            list_arg=fmt.as_bool("--list"),
-            values_and_types=fmt.as_func(_values_fmt),
-        ),
-        **kwargs
-    )
-    return runner

plugins/modules/aerospike_migrations.py

@@ -0,0 +1 @@
+./database/aerospike/aerospike_migrations.py

plugins/modules/airbrake_deployment.py

@@ -0,0 +1 @@
+./monitoring/airbrake_deployment.py

plugins/modules/aix_devices.py

@@ -0,0 +1 @@
+./system/aix_devices.py

plugins/modules/aix_filesystem.py

@@ -0,0 +1 @@
+./system/aix_filesystem.py

plugins/modules/aix_inittab.py

@@ -0,0 +1 @@
+./system/aix_inittab.py

plugins/modules/aix_lvg.py

@@ -0,0 +1 @@
+./system/aix_lvg.py

plugins/modules/aix_lvol.py

@@ -0,0 +1 @@
+./system/aix_lvol.py

plugins/modules/alerta_customer.py

@@ -0,0 +1 @@
+./monitoring/alerta_customer.py

plugins/modules/ali_instance.py

@@ -0,0 +1 @@
+./cloud/alicloud/ali_instance.py

plugins/modules/ali_instance_info.py

@@ -0,0 +1 @@
+./cloud/alicloud/ali_instance_info.py

plugins/modules/alternatives.py

@@ -0,0 +1 @@
+./system/alternatives.py

plugins/modules/ansible_galaxy_install.py

@@ -0,0 +1 @@
+packaging/language/ansible_galaxy_install.py

plugins/modules/apache2_mod_proxy.py

@@ -0,0 +1 @@
+./web_infrastructure/apache2_mod_proxy.py

plugins/modules/apache2_module.py

@@ -0,0 +1 @@
+./web_infrastructure/apache2_module.py

plugins/modules/apk.py

@@ -0,0 +1 @@
+./packaging/os/apk.py

plugins/modules/apt_repo.py

@@ -0,0 +1 @@
+./packaging/os/apt_repo.py

plugins/modules/apt_rpm.py

@@ -0,0 +1 @@
+./packaging/os/apt_rpm.py

plugins/modules/archive.py

@@ -0,0 +1 @@
+./files/archive.py

plugins/modules/atomic_container.py

@@ -0,0 +1 @@
+./cloud/atomic/atomic_container.py

plugins/modules/atomic_host.py

@@ -0,0 +1 @@
+./cloud/atomic/atomic_host.py

plugins/modules/atomic_image.py

@@ -0,0 +1 @@
+./cloud/atomic/atomic_image.py

plugins/modules/awall.py

@@ -0,0 +1 @@
+./system/awall.py

plugins/modules/beadm.py

@@ -0,0 +1 @@
+./system/beadm.py

plugins/modules/bearychat.py

@@ -0,0 +1 @@
+./notification/bearychat.py

plugins/modules/bigpanda.py

@@ -0,0 +1 @@
+./monitoring/bigpanda.py

plugins/modules/bitbucket_access_key.py

@@ -0,0 +1 @@
+./source_control/bitbucket/bitbucket_access_key.py

plugins/modules/bitbucket_pipeline_key_pair.py

@@ -0,0 +1 @@
+./source_control/bitbucket/bitbucket_pipeline_key_pair.py

plugins/modules/bitbucket_pipeline_known_host.py

@@ -0,0 +1 @@
+./source_control/bitbucket/bitbucket_pipeline_known_host.py

plugins/modules/bitbucket_pipeline_variable.py

@@ -0,0 +1 @@
+./source_control/bitbucket/bitbucket_pipeline_variable.py

plugins/modules/bower.py

@@ -0,0 +1 @@
+./packaging/language/bower.py

plugins/modules/bundler.py

@@ -0,0 +1 @@
+./packaging/language/bundler.py

plugins/modules/bzr.py

@@ -0,0 +1 @@
+./source_control/bzr.py

plugins/modules/campfire.py

@@ -0,0 +1 @@
+./notification/campfire.py