Release 5.8.2.

* unixy Callback: Use Ansible's config manager

In ansible-core 2.14 deprecated support was removed[1] for accessing options
of the DefaultCallback via class attributes. Use the "new" config system
instead.

[1]: dbdbfe845a

Fixes #5600.

Signed-off-by: Fabian P. Schmidt <kerel@mailbox.org>

* Update changelog fragment.

Signed-off-by: Fabian P. Schmidt <kerel@mailbox.org>
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 53da86c1a5)

Co-authored-by: Fabian P. Schmidt <kerel@mailbox.org>

.azure-pipelines/azure-pipelines.yml

@@ -29,14 +29,13 @@ schedules:
     always: true
     branches:
       include:
-        - stable-7
-        - stable-6
+        - stable-5
   - cron: 0 11 * * 0
     displayName: Weekly (old stable branches)
     always: true
     branches:
       include:
-        - stable-5
+        - stable-4
 
 variables:
   - name: checkoutPath
@@ -73,19 +72,6 @@ stages:
             - test: 3
             - test: 4
             - test: extra
-  - stage: Sanity_2_15
-    displayName: Sanity 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Test {0}
-          testFormat: 2.15/sanity/{0}
-          targets:
-            - test: 1
-            - test: 2
-            - test: 3
-            - test: 4
   - stage: Sanity_2_14
     displayName: Sanity 2.14
     dependsOn: []
@@ -112,6 +98,32 @@ stages:
             - test: 2
             - test: 3
             - test: 4
+  - stage: Sanity_2_12
+    displayName: Sanity 2.12
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Test {0}
+          testFormat: 2.12/sanity/{0}
+          targets:
+            - test: 1
+            - test: 2
+            - test: 3
+            - test: 4
+  - stage: Sanity_2_11
+    displayName: Sanity 2.11
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Test {0}
+          testFormat: 2.11/sanity/{0}
+          targets:
+            - test: 1
+            - test: 2
+            - test: 3
+            - test: 4
 ### Units
   - stage: Units_devel
     displayName: Units devel
@@ -123,23 +135,13 @@ stages:
           testFormat: devel/units/{0}/1
           targets:
             - test: 2.7
+            - test: 3.5
             - test: 3.6
             - test: 3.7
             - test: 3.8
             - test: 3.9
             - test: '3.10'
             - test: '3.11'
-  - stage: Units_2_15
-    displayName: Units 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.15/units/{0}/1
-          targets:
-            - test: 3.5
-            - test: "3.10"
   - stage: Units_2_14
     displayName: Units 2.14
     dependsOn: []
@@ -149,6 +151,7 @@ stages:
           nameFormat: Python {0}
           testFormat: 2.14/units/{0}/1
           targets:
+            - test: 2.7
             - test: 3.9
   - stage: Units_2_13
     displayName: Units 2.13
@@ -161,24 +164,30 @@ stages:
           targets:
             - test: 2.7
             - test: 3.8
-
-## Remote
-  - stage: Remote_devel_extra_vms
-    displayName: Remote devel extra VMs
+  - stage: Units_2_12
+    displayName: Units 2.12
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: devel/{0}
+          nameFormat: Python {0}
+          testFormat: 2.12/units/{0}/1
           targets:
-            - name: Alpine 3.17
-              test: alpine/3.17
-            # - name: Fedora 37
-            #   test: fedora/37
-            - name: Ubuntu 22.04
-              test: ubuntu/22.04
-          groups:
-            - vm
+            - test: 2.6
+            - test: 3.8
+  - stage: Units_2_11
+    displayName: Units 2.11
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Python {0}
+          testFormat: 2.11/units/{0}/1
+          targets:
+            - test: 2.7
+            - test: 3.5
+
+## Remote
   - stage: Remote_devel
     displayName: Remote devel
     dependsOn: []
@@ -187,28 +196,14 @@ stages:
         parameters:
           testFormat: devel/{0}
           targets:
-            - name: macOS 13.2
-              test: macos/13.2
-            - name: RHEL 9.1
-              test: rhel/9.1
-            - name: FreeBSD 13.2
-              test: freebsd/13.2
-            - name: FreeBSD 12.4
-              test: freebsd/12.4
-          groups:
-            - 1
-            - 2
-            - 3
-  - stage: Remote_2_15
-    displayName: Remote 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.15/{0}
-          targets:
+            - name: macOS 12.0
+              test: macos/12.0
             - name: RHEL 7.9
               test: rhel/7.9
+            - name: RHEL 9.0
+              test: rhel/9.0
+            - name: FreeBSD 12.3
+              test: freebsd/12.3
             - name: FreeBSD 13.1
               test: freebsd/13.1
           groups:
@@ -225,8 +220,8 @@ stages:
           targets:
             - name: RHEL 9.0
               test: rhel/9.0
-            - name: FreeBSD 12.3
-              test: freebsd/12.3
+            - name: FreeBSD 13.1
+              test: freebsd/13.1
           groups:
             - 1
             - 2
@@ -243,12 +238,44 @@ stages:
               test: macos/12.0
             - name: RHEL 8.5
               test: rhel/8.5
+          groups:
+            - 1
+            - 2
+            - 3
+  - stage: Remote_2_12
+    displayName: Remote 2.12
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.12/{0}
+          targets:
+            - name: macOS 11.1
+              test: macos/11.1
+            - name: RHEL 8.4
+              test: rhel/8.4
             - name: FreeBSD 13.0
               test: freebsd/13.0
           groups:
             - 1
             - 2
             - 3
+  - stage: Remote_2_11
+    displayName: Remote 2.11
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.11/{0}
+          targets:
+            - name: RHEL 7.9
+              test: rhel/7.9
+            - name: RHEL 8.3
+              test: rhel/8.3
+          groups:
+            - 1
+            - 2
+            - 3
 
 ### Docker
   - stage: Docker_devel
@@ -259,8 +286,10 @@ stages:
         parameters:
           testFormat: devel/linux/{0}
           targets:
-            - name: Fedora 37
-              test: fedora37
+            - name: CentOS 7
+              test: centos7
+            - name: Fedora 36
+              test: fedora36
             - name: openSUSE 15
               test: opensuse15
             - name: Ubuntu 20.04
@@ -273,20 +302,6 @@ stages:
             - 1
             - 2
             - 3
-  - stage: Docker_2_15
-    displayName: Docker 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.15/linux/{0}
-          targets:
-            - name: CentOS 7
-              test: centos7
-          groups:
-            - 1
-            - 2
-            - 3
   - stage: Docker_2_14
     displayName: Docker 2.14
     dependsOn: []
@@ -295,8 +310,8 @@ stages:
         parameters:
           testFormat: 2.14/linux/{0}
           targets:
-            - name: Fedora 36
-              test: fedora36
+            - name: Ubuntu 20.04
+              test: ubuntu2004
           groups:
             - 1
             - 2
@@ -319,6 +334,42 @@ stages:
             - 1
             - 2
             - 3
+  - stage: Docker_2_12
+    displayName: Docker 2.12
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.12/linux/{0}
+          targets:
+            - name: CentOS 6
+              test: centos6
+            - name: Fedora 34
+              test: fedora34
+            - name: Ubuntu 18.04
+              test: ubuntu1804
+          groups:
+            - 1
+            - 2
+            - 3
+  - stage: Docker_2_11
+    displayName: Docker 2.11
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        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
@@ -332,9 +383,9 @@ stages:
             - name: Debian Bullseye
               test: debian-bullseye/3.9
             - name: ArchLinux
-              test: archlinux/3.11
+              test: archlinux/3.10
             - name: CentOS Stream 8
-              test: centos-stream8/3.9
+              test: centos-stream8/3.8
           groups:
             - 1
             - 2
@@ -352,16 +403,6 @@ stages:
           targets:
             - test: 2.7
             - test: '3.11'
-  - stage: Generic_2_15
-    displayName: Generic 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.15/generic/{0}/1
-          targets:
-            - test: 3.9
   - stage: Generic_2_14
     displayName: Generic 2.14
     dependsOn: []
@@ -382,32 +423,56 @@ stages:
           testFormat: 2.13/generic/{0}/1
           targets:
             - test: 3.9
+  - stage: Generic_2_12
+    displayName: Generic 2.12
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Python {0}
+          testFormat: 2.12/generic/{0}/1
+          targets:
+            - test: 3.8
+  - stage: Generic_2_11
+    displayName: Generic 2.11
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Python {0}
+          testFormat: 2.11/generic/{0}/1
+          targets:
+            - test: 2.7
+            - test: 3.5
 
   - stage: Summary
     condition: succeededOrFailed()
     dependsOn:
       - Sanity_devel
+      - Sanity_2_11
+      - Sanity_2_12
       - Sanity_2_13
       - Sanity_2_14
-      - Sanity_2_15
       - Units_devel
+      - Units_2_11
+      - Units_2_12
       - Units_2_13
       - Units_2_14
-      - Units_2_15
-      - Remote_devel_extra_vms
       - Remote_devel
+      - Remote_2_11
+      - Remote_2_12
       - Remote_2_13
       - Remote_2_14
-      - Remote_2_15
       - Docker_devel
+      - Docker_2_11
+      - Docker_2_12
       - Docker_2_13
       - Docker_2_14
-      - Docker_2_15
       - Docker_community_devel
-# Right now all generic tests are disabled. Uncomment when at least one of them is re-enabled.
-#      - Generic_devel
-#      - Generic_2_13
-#      - Generic_2_14
-#      - Generic_2_15
+      - Generic_devel
+      - Generic_2_11
+      - Generic_2_12
+      - Generic_2_13
+      - Generic_2_14
     jobs:
       - template: templates/coverage.yml

.github/workflows/ansible-test.yml

@@ -1,240 +0,0 @@
----
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# For the comprehensive list of the inputs supported by the ansible-community/ansible-test-gh-action GitHub Action, see
-# https://github.com/marketplace/actions/ansible-test
-
-name: EOL CI
-on:
-  # Run EOL CI against all pushes (direct commits, also merged PRs), Pull Requests
-  push:
-    branches:
-      - main
-      - stable-*
-  pull_request:
-  # Run EOL CI once per day (at 10:00 UTC)
-  schedule:
-    - cron: '0 10 * * *'
-
-concurrency:
-  # Make sure there is at most one active run per PR, but do not cancel any non-PR runs
-  group: ${{ github.workflow }}-${{ (github.head_ref && github.event.number) || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  sanity:
-    name: EOL Sanity (Ⓐ${{ matrix.ansible }})
-    strategy:
-      matrix:
-        ansible:
-          - '2.11'
-          - '2.12'
-    # Ansible-test on various stable branches does not yet work well with cgroups v2.
-    # Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04
-    # image for these stable branches. The list of branches where this is necessary will
-    # shrink over time, check out https://github.com/ansible-collections/news-for-maintainers/issues/28
-    # for the latest list.
-    runs-on: >-
-      ${{ contains(fromJson(
-          '["2.9", "2.10", "2.11"]'
-      ), matrix.ansible) && 'ubuntu-20.04' || 'ubuntu-latest' }}
-    steps:
-      - name: Perform sanity testing
-        uses: felixfontein/ansible-test-gh-action@main
-        with:
-          ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }}
-          ansible-core-version: stable-${{ matrix.ansible }}
-          coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }}
-          pull-request-change-detection: 'true'
-          testing-type: sanity
-
-  units:
-    # Ansible-test on various stable branches does not yet work well with cgroups v2.
-    # Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04
-    # image for these stable branches. The list of branches where this is necessary will
-    # shrink over time, check out https://github.com/ansible-collections/news-for-maintainers/issues/28
-    # for the latest list.
-    runs-on: >-
-      ${{ contains(fromJson(
-          '["2.9", "2.10", "2.11"]'
-      ), matrix.ansible) && 'ubuntu-20.04' || 'ubuntu-latest' }}
-    name: EOL Units (Ⓐ${{ matrix.ansible }}+py${{ matrix.python }})
-    strategy:
-      # As soon as the first unit test fails, cancel the others to free up the CI queue
-      fail-fast: true
-      matrix:
-        ansible:
-          - ''
-        python:
-          - ''
-        exclude:
-          - ansible: ''
-        include:
-          - ansible: '2.11'
-            python: '2.7'
-          - ansible: '2.11'
-            python: '3.5'
-          - ansible: '2.12'
-            python: '2.6'
-          - ansible: '2.12'
-            python: '3.8'
-
-    steps:
-      - name: >-
-          Perform unit testing against
-          Ansible version ${{ matrix.ansible }}
-        uses: felixfontein/ansible-test-gh-action@main
-        with:
-          ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }}
-          ansible-core-version: stable-${{ matrix.ansible }}
-          coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }}
-          pre-test-cmd: >-
-            mkdir -p ../../ansible
-            ;
-            git clone --depth=1 --single-branch https://github.com/ansible-collections/community.internal_test_tools.git ../../community/internal_test_tools
-          pull-request-change-detection: 'true'
-          target-python-version: ${{ matrix.python }}
-          testing-type: units
-
-  integration:
-    # Ansible-test on various stable branches does not yet work well with cgroups v2.
-    # Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04
-    # image for these stable branches. The list of branches where this is necessary will
-    # shrink over time, check out https://github.com/ansible-collections/news-for-maintainers/issues/28
-    # for the latest list.
-    runs-on: >-
-      ${{ contains(fromJson(
-          '["2.9", "2.10", "2.11"]'
-      ), matrix.ansible) && 'ubuntu-20.04' || 'ubuntu-latest' }}
-    name: EOL I (Ⓐ${{ matrix.ansible }}+${{ matrix.docker }}+py${{ matrix.python }}:${{ matrix.target }})
-    strategy:
-      fail-fast: false
-      matrix:
-        ansible:
-          - ''
-        docker:
-          - ''
-        python:
-          - ''
-        target:
-          - ''
-        exclude:
-          - ansible: ''
-        include:
-          # 2.11
-          - ansible: '2.11'
-            docker: fedora32
-            python: ''
-            target: azp/posix/1/
-          - ansible: '2.11'
-            docker: fedora32
-            python: ''
-            target: azp/posix/2/
-          - ansible: '2.11'
-            docker: fedora32
-            python: ''
-            target: azp/posix/3/
-          - ansible: '2.11'
-            docker: fedora33
-            python: ''
-            target: azp/posix/1/
-          - ansible: '2.11'
-            docker: fedora33
-            python: ''
-            target: azp/posix/2/
-          - ansible: '2.11'
-            docker: fedora33
-            python: ''
-            target: azp/posix/3/
-          - ansible: '2.11'
-            docker: alpine3
-            python: ''
-            target: azp/posix/1/
-          - ansible: '2.11'
-            docker: alpine3
-            python: ''
-            target: azp/posix/2/
-          - ansible: '2.11'
-            docker: alpine3
-            python: ''
-            target: azp/posix/3/
-          # Right now all generic tests are disabled. Uncomment when at least one of them is re-enabled.
-          # - ansible: '2.11'
-          #   docker: default
-          #   python: '2.7'
-          #   target: azp/generic/1/
-          # - ansible: '2.11'
-          #   docker: default
-          #   python: '3.5'
-          #   target: azp/generic/1/
-          # 2.12
-          - ansible: '2.12'
-            docker: centos6
-            python: ''
-            target: azp/posix/1/
-          - ansible: '2.12'
-            docker: centos6
-            python: ''
-            target: azp/posix/2/
-          - ansible: '2.12'
-            docker: centos6
-            python: ''
-            target: azp/posix/3/
-          - ansible: '2.12'
-            docker: fedora34
-            python: ''
-            target: azp/posix/1/
-          - ansible: '2.12'
-            docker: fedora34
-            python: ''
-            target: azp/posix/2/
-          - ansible: '2.12'
-            docker: fedora34
-            python: ''
-            target: azp/posix/3/
-          - ansible: '2.12'
-            docker: ubuntu1804
-            python: ''
-            target: azp/posix/1/
-          - ansible: '2.12'
-            docker: ubuntu1804
-            python: ''
-            target: azp/posix/2/
-          - ansible: '2.12'
-            docker: ubuntu1804
-            python: ''
-            target: azp/posix/3/
-          # Right now all generic tests are disabled. Uncomment when at least one of them is re-enabled.
-          # - ansible: '2.12'
-          #   docker: default
-          #   python: '3.8'
-          #   target: azp/generic/1/
-
-    steps:
-      - name: >-
-          Perform integration testing against
-          Ansible version ${{ matrix.ansible }}
-          under Python ${{ matrix.python }}
-        uses: felixfontein/ansible-test-gh-action@main
-        with:
-          ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }}
-          ansible-core-version: stable-${{ matrix.ansible }}
-          coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }}
-          docker-image: ${{ matrix.docker }}
-          integration-continue-on-error: 'false'
-          integration-diff: 'false'
-          integration-retry-on-error: 'true'
-          pre-test-cmd: >-
-            mkdir -p ../../ansible
-            ;
-            git clone --depth=1 --single-branch https://github.com/ansible-collections/ansible.posix.git ../../ansible/posix
-            ;
-            git clone --depth=1 --single-branch https://github.com/ansible-collections/community.crypto.git ../../community/crypto
-            ;
-            git clone --depth=1 --single-branch https://github.com/ansible-collections/community.internal_test_tools.git ../../community/internal_test_tools
-          pull-request-change-detection: 'true'
-          target: ${{ matrix.target }}
-          target-python-version: ${{ matrix.python }}
-          testing-type: integration

.github/workflows/reuse.yml

@@ -8,8 +8,7 @@ name: Verify REUSE
 on:
   push:
     branches: [main]
-  pull_request_target:
-    types: [opened, synchronize, reopened]
+  pull_request:
     branches: [main]
   # Run CI once per day (at 07:30 UTC)
   schedule:
@@ -22,9 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha || '' }}
+      - uses: actions/checkout@v2
 
       - name: Install dependencies
         run: |

CONTRIBUTING.md

@@ -112,9 +112,19 @@ 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. 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/`
-   than the action plugin has in `plugins/action/`.
+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!
+
+   - 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/`
+     than the action plugin has in `plugins/action/`.
 
 5. Make sure to add a BOTMETA entry for your new module/plugin in `.github/BOTMETA.yml`. Search for other plugins/modules in the
    same directory to see how entries could look. You should list all authors either as `maintainers` or under `ignore`. People

README.md

@@ -6,8 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
 # Community General Collection
 
-[![Build Status](https://dev.azure.com/ansible/community.general/_apis/build/status/CI?branchName=stable-6)](https://dev.azure.com/ansible/community.general/_build?definitionId=31)
-[![EOL CI](https://github.com/ansible-collections/community.general/workflows/EOL%20CI/badge.svg?event=push)](https://github.com/ansible-collections/community.general/actions)
+[![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)
 [![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.
@@ -65,6 +64,10 @@ ansible-galaxy collection install community.general:==X.Y.Z
 
 See [Ansible Using collections](https://docs.ansible.com/ansible/latest/user_guide/collections_using.html) for more details.
 
+### FQCNs for modules and actions
+
+⚠️ The collection uses a similar directory structure for modules as the Ansible repository used for Ansible 2.9 and before. This directory structure was never exposed to the user. Due to changes in community.general 5.0.0 (using `meta/runtime.yml` redirects instead of symbolic links) some tooling started exposing the internal module names to end-users. These **internal names**, like `community.general.system.ufw` for the UFW firewall managing module, do work, but should be avoided since they are treated as an implementation detail that can change at any time, even in bugfix releases. Always use the three-component FQCN form, for example `community.general.ufw` for the UFW module. ⚠️
+
 ## Contributing to this collection
 
 The content of this collection is made by good people just like you, a community of individuals collaborating on making the world better through developing automation software.
@@ -73,13 +76,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/stable-6/CONTRIBUTING.md)!
+You don't know how to start? Refer to our [contribution guide](https://github.com/ansible-collections/community.general/blob/main/CONTRIBUTING.md)!
 
-The current maintainers are listed in the [commit-rights.md](https://github.com/ansible-collections/community.general/blob/stable-6/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/main/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/stable-6/CONTRIBUTING.md).
+Also for some notes specific to this collection see [our CONTRIBUTING documentation](https://github.com/ansible-collections/community.general/blob/main/CONTRIBUTING.md).
 
 ### Running tests
 
@@ -89,7 +92,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/stable-6/commit-rights.md).
+* [Committer guidelines](https://github.com/ansible-collections/community.general/blob/main/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:
@@ -117,7 +120,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-6/CHANGELOG.rst).
+See the [changelog](https://github.com/ansible-collections/community.general/blob/stable-5/CHANGELOG.rst).
 
 ## Roadmap
 
@@ -136,8 +139,8 @@ See [this issue](https://github.com/ansible-collections/community.general/issues
 
 This collection is primarily licensed and distributed as a whole under the GNU General Public License v3.0 or later.
 
-See [LICENSES/GPL-3.0-or-later.txt](https://github.com/ansible-collections/community.general/blob/stable-6/COPYING) for the full text.
+See [LICENSES/GPL-3.0-or-later.txt](https://github.com/ansible-collections/community.general/blob/main/COPYING) for the full text.
 
-Parts of the collection are licensed under the [BSD 2-Clause license](https://github.com/ansible-collections/community.general/blob/stable-6/LICENSES/BSD-2-Clause.txt), the [MIT license](https://github.com/ansible-collections/community.general/blob/stable-6/LICENSES/MIT.txt), and the [PSF 2.0 license](https://github.com/ansible-collections/community.general/blob/stable-6/LICENSES/PSF-2.0.txt).
+Parts of the collection are licensed under the [BSD 2-Clause license](https://github.com/ansible-collections/community.general/blob/main/LICENSES/BSD-2-Clause.txt), the [MIT license](https://github.com/ansible-collections/community.general/blob/main/LICENSES/MIT.txt), and the [PSF 2.0 license](https://github.com/ansible-collections/community.general/blob/main/LICENSES/PSF-2.0.txt).
 
 All files have a machine readable `SDPX-License-Identifier:` comment denoting its respective license(s) or an equivalent entry in an accompanying `.license` file. Only changelog fragments (which will not be part of a release) are covered by a blanket statement in `.reuse/dep5`. This conforms to the [REUSE specification](https://reuse.software/spec/).

galaxy.yml

@@ -5,7 +5,7 @@
 
 namespace: community
 name: general
-version: 6.6.2
+version: 5.8.2
 readme: README.md
 authors:
   - Ansible (https://github.com/ansible)

plugins/cache/memcached.py

@@ -52,9 +52,11 @@ import time
 from multiprocessing import Lock
 from itertools import chain
 
+from ansible import constants as C
 from ansible.errors import AnsibleError
 from ansible.module_utils.common._collections_compat import MutableSet
 from ansible.plugins.cache import BaseCacheModule
+from ansible.release import __version__ as ansible_base_version
 from ansible.utils.display import Display
 
 try:

plugins/cache/redis.py

@@ -67,10 +67,12 @@ import re
 import time
 import json
 
+from ansible import constants as C
 from ansible.errors import AnsibleError
 from ansible.module_utils.common.text.converters import to_native
 from ansible.parsing.ajson import AnsibleJSONEncoder, AnsibleJSONDecoder
 from ansible.plugins.cache import BaseCacheModule
+from ansible.release import __version__ as ansible_base_version
 from ansible.utils.display import Display
 
 try:

plugins/callback/cgroup_memory_recap.py

@@ -16,15 +16,15 @@ DOCUMENTATION = '''
       - cgroups
     short_description: Profiles maximum memory usage of tasks and full execution using cgroups
     description:
-        - This is an ansible callback plugin that profiles maximum memory usage of ansible and individual tasks, and displays a recap at the end using cgroups.
+        - This is an ansible callback plugin that profiles maximum memory usage of ansible and individual tasks, and displays a recap at the end using cgroups
     notes:
-        - Requires ansible to be run from within a cgroup, such as with C(cgexec -g memory:ansible_profile ansible-playbook ...).
-        - This cgroup should only be used by ansible to get accurate results.
-        - To create the cgroup, first use a command such as C(sudo cgcreate -a ec2-user:ec2-user -t ec2-user:ec2-user -g memory:ansible_profile).
+        - Requires ansible to be run from within a cgroup, such as with C(cgexec -g memory:ansible_profile ansible-playbook ...)
+        - This cgroup should only be used by ansible to get accurate results
+        - To create the cgroup, first use a command such as C(sudo cgcreate -a ec2-user:ec2-user -t ec2-user:ec2-user -g memory:ansible_profile)
     options:
       max_mem_file:
         required: true
-        description: Path to cgroups C(memory.max_usage_in_bytes) file. Example C(/sys/fs/cgroup/memory/ansible_profile/memory.max_usage_in_bytes).
+        description: Path to cgroups C(memory.max_usage_in_bytes) file. Example C(/sys/fs/cgroup/memory/ansible_profile/memory.max_usage_in_bytes)
         env:
           - name: CGROUP_MAX_MEM_FILE
         ini:
@@ -32,7 +32,7 @@ DOCUMENTATION = '''
             key: max_mem_file
       cur_mem_file:
         required: true
-        description: Path to C(memory.usage_in_bytes) file. Example C(/sys/fs/cgroup/memory/ansible_profile/memory.usage_in_bytes).
+        description: Path to C(memory.usage_in_bytes) file. Example C(/sys/fs/cgroup/memory/ansible_profile/memory.usage_in_bytes)
         env:
           - name: CGROUP_CUR_MEM_FILE
         ini:

plugins/callback/context_demo.py

@@ -13,8 +13,8 @@ DOCUMENTATION = '''
     type: aggregate
     short_description: demo callback that adds play/task context
     description:
-      - Displays some play and task context along with normal output.
-      - This is mostly for demo purposes.
+      - Displays some play and task context along with normal output
+      - This is mostly for demo purposes
     requirements:
       - whitelist in configuration
 '''

plugins/callback/counter_enabled.py

@@ -21,12 +21,13 @@ DOCUMENTATION = '''
     extends_documentation_fragment:
       - default_callback
     requirements:
-      - set as stdout callback in C(ansible.cfg) (C(stdout_callback = counter_enabled))
+      - set as stdout callback in ansible.cfg  (stdout_callback = counter_enabled)
 '''
 
 from ansible import constants as C
 from ansible.plugins.callback import CallbackBase
 from ansible.utils.color import colorize, hostcolor
+from ansible.template import Templar
 from ansible.playbook.task_include import TaskInclude
 
 

plugins/callback/dense.py

@@ -14,7 +14,7 @@ short_description: minimal stdout output
 extends_documentation_fragment:
 - default_callback
 description:
-- When in verbose mode it will act the same as the default callback.
+- When in verbose mode it will act the same as the default callback
 author:
 - Dag Wieers (@dagwieers)
 requirements:

plugins/callback/diy.py

@@ -786,6 +786,10 @@ playbook.yml: >
 
 import sys
 from contextlib import contextmanager
+from ansible import constants as C
+from ansible.playbook.task_include import TaskInclude
+from ansible.plugins.callback import CallbackBase
+from ansible.utils.color import colorize, hostcolor
 from ansible.template import Templar
 from ansible.vars.manager import VariableManager
 from ansible.plugins.callback.default import CallbackModule as Default

plugins/callback/jabber.py

@@ -13,10 +13,10 @@ DOCUMENTATION = '''
     type: notification
     short_description: post task events to a jabber server
     description:
-      - The chatty part of ChatOps with a Hipchat server as a target.
+      - The chatty part of ChatOps with a Hipchat server as a target
       - This callback plugin sends status updates to a HipChat channel during playbook execution.
     requirements:
-      - xmpp (Python library U(https://github.com/ArchipelProject/xmpppy))
+      - xmpp (python lib https://github.com/ArchipelProject/xmpppy)
     options:
       server:
         description: connection info to jabber server

plugins/callback/log_plays.py

@@ -13,10 +13,10 @@ DOCUMENTATION = '''
     type: notification
     short_description: write playbook output to log file
     description:
-      - This callback writes playbook output to a file per host in the C(/var/log/ansible/hosts) directory.
+      - This callback writes playbook output to a file per host in the C(/var/log/ansible/hosts) directory
     requirements:
      - Whitelist in configuration
-     - A writeable C(/var/log/ansible/hosts) directory by the user executing Ansible on the controller
+     - A writeable /var/log/ansible/hosts directory by the user executing Ansible on the controller
     options:
       log_folder:
         default: /var/log/ansible/hosts

plugins/callback/loganalytics.py

@@ -8,7 +8,7 @@ __metaclass__ = type
 
 DOCUMENTATION = '''
     name: loganalytics
-    type: notification
+    type: aggregate
     short_description: Posts task results to Azure Log Analytics
     author: "Cyrus Li (@zhcli) <cyrus1006@gmail.com>"
     description:
@@ -54,6 +54,7 @@ examples: |
 import hashlib
 import hmac
 import base64
+import logging
 import json
 import uuid
 import socket
@@ -154,7 +155,7 @@ class AzureLogAnalyticsSource(object):
 
 class CallbackModule(CallbackBase):
     CALLBACK_VERSION = 2.0
-    CALLBACK_TYPE = 'notification'
+    CALLBACK_TYPE = 'aggregate'
     CALLBACK_NAME = 'loganalytics'
     CALLBACK_NEEDS_WHITELIST = True
 

plugins/callback/logdna.py

@@ -9,17 +9,17 @@ __metaclass__ = type
 DOCUMENTATION = '''
     author: Unknown (!UNKNOWN)
     name: logdna
-    type: notification
+    type: aggregate
     short_description: Sends playbook logs to LogDNA
     description:
-      - This callback will report logs from playbook actions, tasks, and events to LogDNA (U(https://app.logdna.com)).
+      - This callback will report logs from playbook actions, tasks, and events to LogDNA (https://app.logdna.com)
     requirements:
-      - LogDNA Python Library (U(https://github.com/logdna/python))
+      - LogDNA Python Library (https://github.com/logdna/python)
       - whitelisting in configuration
     options:
       conf_key:
         required: true
-        description: LogDNA Ingestion Key.
+        description: LogDNA Ingestion Key
         type: string
         env:
           - name: LOGDNA_INGESTION_KEY
@@ -28,7 +28,7 @@ DOCUMENTATION = '''
             key: conf_key
       plugin_ignore_errors:
         required: false
-        description: Whether to ignore errors on failing or not.
+        description: Whether to ignore errors on failing or not
         type: boolean
         env:
           - name: ANSIBLE_IGNORE_ERRORS
@@ -38,7 +38,7 @@ DOCUMENTATION = '''
         default: false
       conf_hostname:
         required: false
-        description: Alternative Host Name; the current host name by default.
+        description: Alternative Host Name; the current host name by default
         type: string
         env:
           - name: LOGDNA_HOSTNAME
@@ -47,7 +47,7 @@ DOCUMENTATION = '''
             key: conf_hostname
       conf_tags:
         required: false
-        description: Tags.
+        description: Tags
         type: string
         env:
           - name: LOGDNA_TAGS
@@ -111,7 +111,7 @@ def isJSONable(obj):
 class CallbackModule(CallbackBase):
 
     CALLBACK_VERSION = 0.1
-    CALLBACK_TYPE = 'notification'
+    CALLBACK_TYPE = 'aggregate'
     CALLBACK_NAME = 'community.general.logdna'
     CALLBACK_NEEDS_WHITELIST = True
 

plugins/callback/logentries.py

@@ -13,15 +13,15 @@ DOCUMENTATION = '''
     short_description: Sends events to Logentries
     description:
       - This callback plugin will generate JSON objects and send them to Logentries via TCP for auditing/debugging purposes.
-      - Before 2.4, if you wanted to use an ini configuration, the file must be placed in the same directory as this plugin and named C(logentries.ini).
+      - Before 2.4, if you wanted to use an ini configuration, the file must be placed in the same directory as this plugin and named logentries.ini
       - In 2.4 and above you can just put it in the main Ansible configuration file.
     requirements:
       - whitelisting in configuration
-      - certifi (Python library)
-      - flatdict (Python library), if you want to use the 'flatten' option
+      - certifi (python library)
+      - flatdict (python library), if you want to use the 'flatten' option
     options:
       api:
-        description: URI to the Logentries API.
+        description: URI to the Logentries API
         env:
           - name: LOGENTRIES_API
         default: data.logentries.com
@@ -29,7 +29,7 @@ DOCUMENTATION = '''
           - section: callback_logentries
             key: api
       port:
-        description: HTTP port to use when connecting to the API.
+        description: HTTP port to use when connecting to the API
         env:
             - name: LOGENTRIES_PORT
         default: 80
@@ -37,7 +37,7 @@ DOCUMENTATION = '''
           - section: callback_logentries
             key: port
       tls_port:
-        description: Port to use when connecting to the API when TLS is enabled.
+        description: Port to use when connecting to the API when TLS is enabled
         env:
             - name: LOGENTRIES_TLS_PORT
         default: 443
@@ -45,7 +45,7 @@ DOCUMENTATION = '''
           - section: callback_logentries
             key: tls_port
       token:
-        description: The logentries C(TCP token).
+        description: The logentries "TCP token"
         env:
           - name: LOGENTRIES_ANSIBLE_TOKEN
         required: true
@@ -54,7 +54,7 @@ DOCUMENTATION = '''
             key: token
       use_tls:
         description:
-          - Toggle to decide whether to use TLS to encrypt the communications with the API server.
+          - Toggle to decide whether to use TLS to encrypt the communications with the API server
         env:
           - name: LOGENTRIES_USE_TLS
         default: false
@@ -63,7 +63,7 @@ DOCUMENTATION = '''
           - section: callback_logentries
             key: use_tls
       flatten:
-        description: Flatten complex data structures into a single dictionary with complex keys.
+        description: flatten complex data structures into a single dictionary with complex keys
         type: boolean
         default: false
         env:

plugins/callback/logstash.py

@@ -13,13 +13,13 @@ DOCUMENTATION = r'''
     type: notification
     short_description: Sends events to Logstash
     description:
-      - This callback will report facts and task events to Logstash U(https://www.elastic.co/products/logstash).
+      - This callback will report facts and task events to Logstash https://www.elastic.co/products/logstash
     requirements:
       - whitelisting in configuration
-      - logstash (Python library)
+      - logstash (python library)
     options:
       server:
-        description: Address of the Logstash server.
+        description: Address of the Logstash server
         env:
           - name: LOGSTASH_SERVER
         ini:
@@ -28,7 +28,7 @@ DOCUMENTATION = r'''
             version_added: 1.0.0
         default: localhost
       port:
-        description: Port on which logstash is listening.
+        description: Port on which logstash is listening
         env:
             - name: LOGSTASH_PORT
         ini:
@@ -37,7 +37,7 @@ DOCUMENTATION = r'''
             version_added: 1.0.0
         default: 5000
       type:
-        description: Message type.
+        description: Message type
         env:
           - name: LOGSTASH_TYPE
         ini:
@@ -54,7 +54,7 @@ DOCUMENTATION = r'''
         env:
           - name: LOGSTASH_PRE_COMMAND
       format_version:
-        description: Logging format.
+        description: Logging format
         type: str
         version_added: 2.0.0
         ini:
@@ -113,7 +113,7 @@ from ansible.plugins.callback import CallbackBase
 class CallbackModule(CallbackBase):
 
     CALLBACK_VERSION = 2.0
-    CALLBACK_TYPE = 'notification'
+    CALLBACK_TYPE = 'aggregate'
     CALLBACK_NAME = 'community.general.logstash'
     CALLBACK_NEEDS_WHITELIST = True
 

plugins/callback/mail.py

@@ -49,9 +49,8 @@ options:
   sender:
     description:
         - Mail sender.
-        - This is required since community.general 6.0.0.
+        - Note that this will be required from community.general 6.0.0 on.
     type: str
-    required: true
     ini:
         - section: callback_mail
           key: sender
@@ -79,6 +78,7 @@ import re
 import email.utils
 import smtplib
 
+from ansible.module_utils.six import string_types
 from ansible.module_utils.common.text.converters import to_bytes
 from ansible.parsing.ajson import AnsibleJSONEncoder
 from ansible.plugins.callback import CallbackBase
@@ -105,6 +105,10 @@ class CallbackModule(CallbackBase):
         super(CallbackModule, self).set_options(task_keys=task_keys, var_options=var_options, direct=direct)
 
         self.sender = self.get_option('sender')
+        if self.sender is None:
+            self._display.deprecated(
+                'The sender for the mail callback has not been specified. This will be an error in the future',
+                version='6.0.0', collection_name='community.general')
         self.to = self.get_option('to')
         self.smtphost = self.get_option('mta')
         self.smtpport = self.get_option('mtaport')

plugins/callback/nrdp.py

@@ -67,6 +67,9 @@ DOCUMENTATION = '''
             type: string
 '''
 
+import os
+import json
+
 from ansible.module_utils.six.moves.urllib.parse import urlencode
 from ansible.module_utils.common.text.converters import to_bytes
 from ansible.module_utils.urls import open_url

plugins/callback/null.py

@@ -15,7 +15,7 @@ DOCUMENTATION = '''
       - set as main display callback
     short_description: Don't display stuff to screen
     description:
-        - This callback prevents outputing events to screen.
+        - This callback prevents outputing events to screen
 '''
 
 from ansible.plugins.callback import CallbackBase

plugins/callback/say.py

@@ -14,12 +14,12 @@ DOCUMENTATION = '''
     type: notification
     requirements:
       - whitelisting in configuration
-      - the C(/usr/bin/say) command line program (standard on macOS) or C(espeak) command line program
+      - the '/usr/bin/say' command line program (standard on macOS) or 'espeak' command line program
     short_description: notify using software speech synthesizer
     description:
-      - This plugin will use the C(say) or C(espeak) program to "speak" about play events.
+      - This plugin will use the 'say' or 'espeak' program to "speak" about play events.
     notes:
-      - In Ansible 2.8, this callback has been renamed from C(osx_say) into M(community.general.say).
+      - In 2.8, this callback has been renamed from C(osx_say) into M(community.general.say).
 '''
 
 import platform

plugins/callback/selective.py

@@ -22,7 +22,7 @@ DOCUMENTATION = '''
     options:
       nocolor:
         default: false
-        description: This setting allows suppressing colorizing output.
+        description: This setting allows suppressing colorizing output
         env:
           - name: ANSIBLE_NOCOLOR
           - name: ANSIBLE_SELECTIVE_DONT_COLORIZE

plugins/callback/slack.py

@@ -18,11 +18,11 @@ DOCUMENTATION = '''
     short_description: Sends play events to a Slack channel
     description:
         - This is an ansible callback plugin that sends status updates to a Slack channel during playbook execution.
-        - Before Ansible 2.4 only environment variables were available for configuring this plugin.
+        - Before 2.4 only environment variables were available for configuring this plugin
     options:
       webhook_url:
         required: true
-        description: Slack Webhook URL.
+        description: Slack Webhook URL
         env:
           - name: SLACK_WEBHOOK_URL
         ini:
@@ -45,7 +45,7 @@ DOCUMENTATION = '''
           - section: callback_slack
             key: username
       validate_certs:
-        description: Validate the SSL certificate of the Slack server for HTTPS URLs.
+        description: validate the SSL certificate of the Slack server. (For HTTPS URLs)
         env:
           - name: SLACK_VALIDATE_CERTS
         ini:

plugins/callback/splunk.py

@@ -8,27 +8,27 @@ __metaclass__ = type
 
 DOCUMENTATION = '''
     name: splunk
-    type: notification
+    type: aggregate
     short_description: Sends task result events to Splunk HTTP Event Collector
     author: "Stuart Hirst (!UNKNOWN) <support@convergingdata.com>"
     description:
       - This callback plugin will send task results as JSON formatted events to a Splunk HTTP collector.
-      - The companion Splunk Monitoring & Diagnostics App is available here U(https://splunkbase.splunk.com/app/4023/).
+      - The companion Splunk Monitoring & Diagnostics App is available here "https://splunkbase.splunk.com/app/4023/"
       - Credit to "Ryan Currah (@ryancurrah)" for original source upon which this is based.
     requirements:
       - Whitelisting this callback plugin
       - 'Create a HTTP Event Collector in Splunk'
-      - 'Define the URL and token in C(ansible.cfg)'
+      - 'Define the url and token in ansible.cfg'
     options:
       url:
-        description: URL to the Splunk HTTP collector source.
+        description: URL to the Splunk HTTP collector source
         env:
           - name: SPLUNK_URL
         ini:
           - section: callback_splunk
             key: url
       authtoken:
-        description: Token to authenticate the connection to the Splunk HTTP collector.
+        description: Token to authenticate the connection to the Splunk HTTP collector
         env:
           - name: SPLUNK_AUTHTOKEN
         ini:
@@ -48,7 +48,7 @@ DOCUMENTATION = '''
         version_added: '1.0.0'
       include_milliseconds:
         description: Whether to include milliseconds as part of the generated timestamp field in the event
-                     sent to the Splunk HTTP collector.
+                     sent to the Splunk HTTP collector
         env:
           - name: SPLUNK_INCLUDE_MILLISECONDS
         ini:
@@ -165,7 +165,7 @@ class SplunkHTTPCollectorSource(object):
 
 class CallbackModule(CallbackBase):
     CALLBACK_VERSION = 2.0
-    CALLBACK_TYPE = 'notification'
+    CALLBACK_TYPE = 'aggregate'
     CALLBACK_NAME = 'community.general.splunk'
     CALLBACK_NEEDS_WHITELIST = True
 

plugins/callback/sumologic.py

@@ -8,18 +8,18 @@ __metaclass__ = type
 
 DOCUMENTATION = '''
 name: sumologic
-type: notification
+type: aggregate
 short_description: Sends task result events to Sumologic
 author: "Ryan Currah (@ryancurrah)"
 description:
-  - This callback plugin will send task results as JSON formatted events to a Sumologic HTTP collector source.
+  - This callback plugin will send task results as JSON formatted events to a Sumologic HTTP collector source
 requirements:
   - Whitelisting this callback plugin
   - 'Create a HTTP collector source in Sumologic and specify a custom timestamp format of C(yyyy-MM-dd HH:mm:ss ZZZZ) and a custom timestamp locator
     of C("timestamp": "(.*)")'
 options:
   url:
-    description: URL to the Sumologic HTTP collector source.
+    description: URL to the Sumologic HTTP collector source
     env:
       - name: SUMOLOGIC_URL
     ini:
@@ -28,7 +28,7 @@ options:
 '''
 
 EXAMPLES = '''
-examples: |
+examples: >
   To enable, add this to your ansible.cfg file in the defaults block
     [defaults]
     callback_whitelist = community.general.sumologic
@@ -111,7 +111,7 @@ class SumologicHTTPCollectorSource(object):
 
 class CallbackModule(CallbackBase):
     CALLBACK_VERSION = 2.0
-    CALLBACK_TYPE = 'notification'
+    CALLBACK_TYPE = 'aggregate'
     CALLBACK_NAME = 'community.general.sumologic'
     CALLBACK_NEEDS_WHITELIST = True
 

plugins/callback/syslog_json.py

@@ -15,11 +15,11 @@ DOCUMENTATION = '''
       - whitelist in configuration
     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.
+      - 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
     options:
       server:
-        description: Syslog server that will receive the event.
+        description: syslog server that will receive the event
         env:
         - name: SYSLOG_SERVER
         default: localhost
@@ -27,7 +27,7 @@ DOCUMENTATION = '''
           - section: callback_syslog_json
             key: syslog_server
       port:
-        description: Port on which the syslog server is listening.
+        description: port on which the syslog server is listening
         env:
           - name: SYSLOG_PORT
         default: 514
@@ -35,7 +35,7 @@ DOCUMENTATION = '''
           - section: callback_syslog_json
             key: syslog_port
       facility:
-        description: Syslog facility to log as.
+        description: syslog facility to log as
         env:
           - name: SYSLOG_FACILITY
         default: user
@@ -54,6 +54,9 @@ DOCUMENTATION = '''
         version_added: 4.5.0
 '''
 
+import os
+import json
+
 import logging
 import logging.handlers
 
@@ -68,7 +71,7 @@ class CallbackModule(CallbackBase):
     """
 
     CALLBACK_VERSION = 2.0
-    CALLBACK_TYPE = 'notification'
+    CALLBACK_TYPE = 'aggregate'
     CALLBACK_NAME = 'community.general.syslog_json'
     CALLBACK_NEEDS_WHITELIST = True
 

plugins/callback/unixy.py

@@ -142,7 +142,7 @@ class CallbackModule(CallbackModule_default):
             display_color = C.COLOR_CHANGED
             task_result = self._process_result_output(result, msg)
             self._display.display("  " + task_result, display_color)
-        elif self.get_option('display_ok_hosts'):
+        elif self.get('display_ok_hosts'):
             task_result = self._process_result_output(result, msg)
             self._display.display("  " + task_result, display_color)
 

plugins/callback/yaml.py

@@ -11,7 +11,7 @@ DOCUMENTATION = '''
     author: Unknown (!UNKNOWN)
     name: yaml
     type: stdout
-    short_description: YAML-ized Ansible screen output
+    short_description: yaml-ized Ansible screen output
     description:
         - Ansible output that can be quite a bit easier to read than the
           default JSON formatting.
@@ -25,10 +25,12 @@ import yaml
 import json
 import re
 import string
+import sys
 
-from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils.common.text.converters import to_bytes, to_text
+from ansible.module_utils.six import string_types
 from ansible.parsing.yaml.dumper import AnsibleDumper
-from ansible.plugins.callback import strip_internal_keys, module_response_deepcopy
+from ansible.plugins.callback import CallbackBase, strip_internal_keys, module_response_deepcopy
 from ansible.plugins.callback.default import CallbackModule as Default
 
 

plugins/connection/jail.py

@@ -22,7 +22,6 @@ DOCUMENTATION = '''
             - Path to the jail
         default: inventory_hostname
         vars:
-            - name: inventory_hostname
             - name: ansible_host
             - name: ansible_jail_host
       remote_user:

plugins/doc_fragments/attributes.py

@@ -1,93 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-
-class ModuleDocFragment(object):
-
-    # Standard documentation fragment
-    DOCUMENTATION = r'''
-options: {}
-attributes:
-    check_mode:
-      description: Can run in C(check_mode) and return changed status prediction without modifying target.
-    diff_mode:
-      description: Will return details on what has changed (or possibly needs changing in C(check_mode)), when in diff mode.
-'''
-
-    PLATFORM = r'''
-options: {}
-attributes:
-    platform:
-      description: Target OS/families that can be operated against.
-      support: N/A
-'''
-
-    # Should be used together with the standard fragment
-    INFO_MODULE = r'''
-options: {}
-attributes:
-    check_mode:
-      support: full
-      details:
-        - This action does not modify state.
-    diff_mode:
-      support: N/A
-      details:
-        - This action does not modify state.
-'''
-
-    CONN = r'''
-options: {}
-attributes:
-    become:
-      description: Is usable alongside C(become) keywords.
-    connection:
-      description: Uses the target's configured connection information to execute code on it.
-    delegation:
-      description: Can be used in conjunction with C(delegate_to) and related keywords.
-'''
-
-    FACTS = r'''
-options: {}
-attributes:
-    facts:
-      description: Action returns an C(ansible_facts) dictionary that will update existing host facts.
-'''
-
-    # Should be used together with the standard fragment and the FACTS fragment
-    FACTS_MODULE = r'''
-options: {}
-attributes:
-    check_mode:
-      support: full
-      details:
-        - This action does not modify state.
-    diff_mode:
-      support: N/A
-      details:
-        - This action does not modify state.
-    facts:
-      support: full
-'''
-
-    FILES = r'''
-options: {}
-attributes:
-    safe_file_operations:
-      description: Uses Ansible's strict file operation functions to ensure proper permissions and avoid data corruption.
-'''
-
-    FLOW = r'''
-options: {}
-attributes:
-    action:
-      description: Indicates this has a corresponding action plugin so some parts of the options can be executed on the controller.
-    async:
-      description: Supports being used with the C(async) keyword.
-'''

plugins/doc_fragments/bitbucket.py

@@ -27,10 +27,8 @@ options:
     description:
       - The username.
       - If not set the environment variable C(BITBUCKET_USERNAME) will be used.
-      - I(username) is an alias of I(user) since community.genreal 6.0.0. It was an alias of I(workspace) before.
     type: str
     version_added: 4.0.0
-    aliases: [ username ]
   password:
     description:
       - The App password.

plugins/doc_fragments/hpe3par.py

@@ -29,7 +29,8 @@ options:
       required: true
 
 requirements:
-  - hpe3par_sdk >= 1.0.2. Install using C(pip install hpe3par_sdk).
+  - hpe3par_sdk >= 1.0.2. Install using 'pip install hpe3par_sdk'
   - WSAPI service should be enabled on the 3PAR storage array.
 notes:
+  -  check_mode not supported
     '''

plugins/doc_fragments/ldap.py

@@ -24,11 +24,6 @@ options:
       - The password to use with I(bind_dn).
     type: str
     default: ''
-  ca_path:
-    description:
-      - Set the path to PEM file with CA certs.
-    type: path
-    version_added: "6.5.0"
   dn:
     required: true
     description:
@@ -65,20 +60,9 @@ options:
   sasl_class:
     description:
       - The class to use for SASL authentication.
-      - Possible choices are C(external), C(gssapi).
+      - possible choices are C(external), C(gssapi).
     type: str
     choices: ['external', 'gssapi']
     default: external
     version_added: "2.0.0"
-  xorder_discovery:
-    description:
-      - Set the behavior on how to process Xordered DNs.
-      - C(enable) will perform a C(ONELEVEL) search below the superior RDN to find the matching DN.
-      - C(disable) will always use the DN unmodified (as passed by the I(dn) parameter).
-      - C(auto) will only perform a search if the first RDN does not contain an index number (C({x})).
-      - Possible choices are C(enable), C(auto), C(disable).
-    type: str
-    choices: ['enable', 'auto', 'disable']
-    default: auto
-    version_added: "6.4.0"
 '''

plugins/filter/jc.py

@@ -80,13 +80,13 @@ from ansible.errors import AnsibleError, AnsibleFilterError
 import importlib
 
 try:
-    import jc  # noqa: F401, pylint: disable=unused-import
+    import jc
     HAS_LIB = True
 except ImportError:
     HAS_LIB = False
 
 
-def jc_filter(data, parser, quiet=True, raw=False):
+def jc(data, parser, quiet=True, raw=False):
     """Convert returned command output to JSON using the JC library
 
     Arguments:
@@ -138,14 +138,8 @@ def jc_filter(data, parser, quiet=True, raw=False):
         raise AnsibleError('You need to install "jc" as a Python library on the Ansible controller prior to running jc filter')
 
     try:
-        # new API (jc v1.18.0 and higher) allows use of plugin parsers
-        if hasattr(jc, 'parse'):
-            return jc.parse(parser, data, quiet=quiet, raw=raw)
-
-        # old API (jc v1.17.7 and lower)
-        else:
-            jc_parser = importlib.import_module('jc.parsers.' + parser)
-            return jc_parser.parse(data, quiet=quiet, raw=raw)
+        jc_parser = importlib.import_module('jc.parsers.' + parser)
+        return jc_parser.parse(data, quiet=quiet, raw=raw)
 
     except Exception as e:
         raise AnsibleFilterError('Error in jc filter plugin:  %s' % e)
@@ -156,5 +150,5 @@ class FilterModule(object):
 
     def filters(self):
         return {
-            'jc': jc_filter,
+            'jc': jc
         }

plugins/filter/lists_mergeby.py

@@ -102,6 +102,8 @@ from ansible.errors import AnsibleFilterError
 from ansible.module_utils.six import string_types
 from ansible.module_utils.common._collections_compat import Mapping, Sequence
 from ansible.utils.vars import merge_hash
+from ansible.release import __version__ as ansible_version
+from ansible_collections.community.general.plugins.module_utils.version import LooseVersion
 
 from collections import defaultdict
 from operator import itemgetter

plugins/inventory/linode.py

@@ -121,8 +121,12 @@ compose:
   ansible_host: "ipv4 | community.general.json_query('[?public==`false`].address') | first"
 '''
 
-from ansible.errors import AnsibleError
+import os
+
+from ansible.errors import AnsibleError, AnsibleParserError
+from ansible.module_utils.six import string_types
 from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
+from ansible.template import Templar
 
 
 try:
@@ -141,14 +145,22 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
     def _build_client(self, loader):
         """Build the Linode client."""
 
+        t = Templar(loader=loader)
+
         access_token = self.get_option('access_token')
-        if self.templar.is_template(access_token):
-            access_token = self.templar.template(variable=access_token, disable_lookups=False)
+        if t.is_template(access_token):
+            access_token = t.template(variable=access_token, disable_lookups=False)
+
+        if access_token is None:
+            try:
+                access_token = os.environ['LINODE_ACCESS_TOKEN']
+            except KeyError:
+                pass
 
         if access_token is None:
             raise AnsibleError((
                 'Could not retrieve Linode access token '
-                'from plugin configuration sources'
+                'from plugin configuration or environment'
             ))
 
         self.client = LinodeClient(access_token)

plugins/inventory/lxd.py

@@ -55,11 +55,6 @@ DOCUMENTATION = r'''
             type: str
             default: none
             choices: [ 'STOPPED', 'STARTING', 'RUNNING', 'none' ]
-        project:
-            description: Filter the instance according to the given project.
-            type: str
-            default: default
-            version_added: 6.2.0
         type_filter:
             description:
             - Filter the instances by type C(virtual-machine), C(container) or C(both).
@@ -145,21 +140,19 @@ groupby:
   vlan666:
     type: vlanid
     attribute: 666
-  projectInternals:
-    type: project
-    attribute: internals
 '''
 
+import binascii
 import json
 import re
 import time
 import os
+import socket
 from ansible.plugins.inventory import BaseInventoryPlugin
 from ansible.module_utils.common.text.converters import to_native, to_text
 from ansible.module_utils.common.dict_transformations import dict_merge
 from ansible.module_utils.six import raise_from
 from ansible.errors import AnsibleError, AnsibleParserError
-from ansible.module_utils.six.moves.urllib.parse import urlencode
 from ansible_collections.community.general.plugins.module_utils.lxd import LXDClient, LXDClientException
 
 try:
@@ -337,15 +330,7 @@ class InventoryModule(BaseInventoryPlugin):
         #        "status_code": 200,
         #        "type": "sync"
         #      }
-        url = '/1.0/instances'
-        if self.project:
-            url = url + '?{0}'.format(urlencode(dict(project=self.project)))
-
-        instances = self.socket.do('GET', url)
-
-        if self.project:
-            return [m.split('/')[3].split('?')[0] for m in instances['metadata']]
-
+        instances = self.socket.do('GET', '/1.0/instances')
         return [m.split('/')[3] for m in instances['metadata']]
 
     def _get_config(self, branch, name):
@@ -366,11 +351,9 @@ class InventoryModule(BaseInventoryPlugin):
             dict(config): Config of the instance"""
         config = {}
         if isinstance(branch, (tuple, list)):
-            config[name] = {branch[1]: self.socket.do(
-                'GET', '/1.0/{0}/{1}/{2}?{3}'.format(to_native(branch[0]), to_native(name), to_native(branch[1]), urlencode(dict(project=self.project))))}
+            config[name] = {branch[1]: self.socket.do('GET', '/1.0/{0}/{1}/{2}'.format(to_native(branch[0]), to_native(name), to_native(branch[1])))}
         else:
-            config[name] = {branch: self.socket.do(
-                'GET', '/1.0/{0}/{1}?{2}'.format(to_native(branch), to_native(name), urlencode(dict(project=self.project))))}
+            config[name] = {branch: self.socket.do('GET', '/1.0/{0}/{1}'.format(to_native(branch), to_native(name)))}
         return config
 
     def get_instance_data(self, names):
@@ -600,8 +583,6 @@ class InventoryModule(BaseInventoryPlugin):
             self._set_data_entry(instance_name, 'network_interfaces', self.extract_network_information_from_instance_config(instance_name))
             self._set_data_entry(instance_name, 'preferred_interface', self.get_prefered_instance_network_interface(instance_name))
             self._set_data_entry(instance_name, 'vlan_ids', self.get_instance_vlans(instance_name))
-            self._set_data_entry(instance_name, 'project', self._get_data_entry(
-                'instances/{0}/instances/metadata/project'.format(instance_name)))
 
     def build_inventory_network(self, instance_name):
         """Add the network interfaces of the instance to the inventory
@@ -705,8 +686,6 @@ class InventoryModule(BaseInventoryPlugin):
             # add VLAN_ID information
             if self._get_data_entry('inventory/{0}/vlan_ids'.format(instance_name)):
                 self.inventory.set_variable(instance_name, 'ansible_lxd_vlan_ids', self._get_data_entry('inventory/{0}/vlan_ids'.format(instance_name)))
-            # add project
-            self.inventory.set_variable(instance_name, 'ansible_lxd_project', self._get_data_entry('inventory/{0}/project'.format(instance_name)))
 
     def build_inventory_groups_location(self, group_name):
         """create group by attribute: location
@@ -782,28 +761,6 @@ class InventoryModule(BaseInventoryPlugin):
                             # Ignore invalid IP addresses returned by lxd
                             pass
 
-    def build_inventory_groups_project(self, group_name):
-        """create group by attribute: project
-
-        Args:
-            str(group_name): Group name
-        Kwargs:
-            None
-        Raises:
-            None
-        Returns:
-            None"""
-        # maybe we just want to expand one group
-        if group_name not in self.inventory.groups:
-            self.inventory.add_group(group_name)
-
-        gen_instances = [
-            instance_name for instance_name in self.inventory.hosts
-            if 'ansible_lxd_project' in self.inventory.get_host(instance_name).get_vars()]
-        for instance_name in gen_instances:
-            if self.groupby[group_name].get('attribute').lower() == self.inventory.get_host(instance_name).get_vars().get('ansible_lxd_project'):
-                self.inventory.add_child(group_name, instance_name)
-
     def build_inventory_groups_os(self, group_name):
         """create group by attribute: os
 
@@ -942,7 +899,6 @@ class InventoryModule(BaseInventoryPlugin):
                 * 'profile'
                 * 'vlanid'
                 * 'type'
-                * 'project'
 
             Args:
                 str(group_name): Group name
@@ -970,8 +926,6 @@ class InventoryModule(BaseInventoryPlugin):
                 self.build_inventory_groups_vlanid(group_name)
             elif self.groupby[group_name].get('type') == 'type':
                 self.build_inventory_groups_type(group_name)
-            elif self.groupby[group_name].get('type') == 'project':
-                self.build_inventory_groups_project(group_name)
             else:
                 raise AnsibleParserError('Unknown group type: {0}'.format(to_native(group_name)))
 
@@ -1078,7 +1032,6 @@ class InventoryModule(BaseInventoryPlugin):
         try:
             self.client_key = self.get_option('client_key')
             self.client_cert = self.get_option('client_cert')
-            self.project = self.get_option('project')
             self.debug = self.DEBUG
             self.data = {}  # store for inventory-data
             self.groupby = self.get_option('groupby')

plugins/inventory/nmap.py

@@ -30,27 +30,12 @@ DOCUMENTATION = '''
         address:
             description: Network IP or range of IPs to scan, you can use a simple range (10.2.2.15-25) or CIDR notation.
             required: true
-            env:
-                - name: ANSIBLE_NMAP_ADDRESS
-                  version_added: 6.6.0
         exclude:
-            description:
-              - List of addresses to exclude.
-              - For example C(10.2.2.15-25) or C(10.2.2.15,10.2.2.16).
+            description: list of addresses to exclude
             type: list
             elements: string
-            env:
-                - name: ANSIBLE_NMAP_EXCLUDE
-                  version_added: 6.6.0
-        port:
-            description:
-                - Only scan specific port or port range (C(-p)).
-                - For example, you could pass C(22) for a single port, C(1-65535) for a range of ports,
-                  or C(U:53,137,T:21-25,139,8080,S:9) to check port 53 with UDP, ports 21-25 with TCP, port 9 with SCTP, and ports 137, 139, and 8080 with all.
-            type: string
-            version_added: 6.5.0
         ports:
-            description: Enable/disable scanning ports.
+            description: Enable/disable scanning for open ports
             type: boolean
             default: true
         ipv4:
@@ -61,30 +46,6 @@ DOCUMENTATION = '''
             description: use IPv6 type addresses
             type: boolean
             default: true
-        udp_scan:
-            description:
-                - Scan via UDP.
-                - Depending on your system you might need I(sudo=true) for this to work.
-            type: boolean
-            default: false
-            version_added: 6.1.0
-        icmp_timestamp:
-            description:
-                - Scan via ICMP Timestamp (C(-PP)).
-                - Depending on your system you might need I(sudo=true) for this to work.
-            type: boolean
-            default: false
-            version_added: 6.1.0
-        open:
-            description: Only scan for open (or possibly open) ports.
-            type: boolean
-            default: false
-            version_added: 6.5.0
-        dns_resolve:
-            description: Whether to always (C(true)) or never (C(false)) do DNS resolution.
-            type: boolean
-            default: false
-            version_added: 6.1.0
     notes:
         - At least one of ipv4 or ipv6 is required to be True, both can be True, but they cannot both be False.
         - 'TODO: add OS fingerprinting'
@@ -101,14 +62,6 @@ plugin: community.general.nmap
 sudo: true
 strict: false
 address: 192.168.0.0/24
-
-# an nmap scan specifying ports and classifying results to an inventory group
-plugin: community.general.nmap
-address: 192.168.0.0/24
-exclude: 192.168.0.1, web.example.com
-port: 22, 443
-groups:
-  web_servers: "ports | selectattr('port', 'equalto', '443')"
 '''
 
 import os
@@ -199,10 +152,6 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
             if self._options['sudo']:
                 cmd.insert(0, 'sudo')
 
-            if self._options['port']:
-                cmd.append('-p')
-                cmd.append(self._options['port'])
-
             if not self._options['ports']:
                 cmd.append('-sP')
 
@@ -217,18 +166,6 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
                 cmd.append('--exclude')
                 cmd.append(','.join(self._options['exclude']))
 
-            if self._options['dns_resolve']:
-                cmd.append('-n')
-
-            if self._options['udp_scan']:
-                cmd.append('-sU')
-
-            if self._options['icmp_timestamp']:
-                cmd.append('-PP')
-
-            if self._options['open']:
-                cmd.append('--open')
-
             cmd.append(self._options['address'])
             try:
                 # execute

plugins/inventory/online.py

@@ -65,7 +65,7 @@ from sys import version as python_version
 from ansible.errors import AnsibleError
 from ansible.module_utils.urls import open_url
 from ansible.plugins.inventory import BaseInventoryPlugin
-from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils.common.text.converters import to_native, to_text
 from ansible.module_utils.ansible_release import __version__ as ansible_version
 from ansible.module_utils.six.moves.urllib.parse import urljoin
 

plugins/inventory/proxmox.py

@@ -113,9 +113,10 @@ DOCUMENTATION = '''
         description:
           - Whether to set C(ansbile_host) for proxmox nodes.
           - When set to C(true) (default), will use the first available interface. This can be different from what you expect.
-          - The default of this option changed from C(true) to C(false) in community.general 6.0.0.
+          - This currently defaults to C(true), but the default is deprecated since community.general 4.8.0.
+            The default will change to C(false) in community.general 6.0.0. To avoid a deprecation warning, please
+            set this parameter explicitly.
         type: bool
-        default: false
       filters:
         version_added: 4.6.0
         description: A list of Jinja templates that allow filtering hosts.
@@ -222,6 +223,7 @@ from ansible.module_utils.common.text.converters import to_native
 from ansible.module_utils.six import string_types
 from ansible.module_utils.six.moves.urllib.parse import urlencode
 from ansible.utils.display import Display
+from ansible.template import Templar
 
 from ansible_collections.community.general.plugins.module_utils.version import LooseVersion
 
@@ -277,11 +279,6 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
             credentials = urlencode({'username': self.proxmox_user, 'password': self.proxmox_password, })
 
             a = self._get_session()
-
-            if a.verify is False:
-                from requests.packages.urllib3 import disable_warnings
-                disable_warnings()
-
             ret = a.post('%s/api2/json/access/ticket' % self.proxmox_url, data=credentials)
 
             json = ret.json()
@@ -413,7 +410,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
                     stripped_value = value.strip()
                     if stripped_value:
                         parsed_key = key + "_parsed"
-                        properties[parsed_key] = [tag.strip() for tag in stripped_value.replace(',', ';').split(";")]
+                        properties[parsed_key] = [tag.strip() for tag in stripped_value.split(",")]
 
                 # The first field in the agent string tells you whether the agent is enabled
                 # the rest of the comma separated string is extra config for the agent.
@@ -570,6 +567,14 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
         self.inventory.add_group(nodes_group)
 
         want_proxmox_nodes_ansible_host = self.get_option("want_proxmox_nodes_ansible_host")
+        if want_proxmox_nodes_ansible_host is None:
+            display.deprecated(
+                'The want_proxmox_nodes_ansible_host option of the community.general.proxmox inventory plugin'
+                ' currently defaults to `true`, but this default has been deprecated and will change to `false`'
+                ' in community.general 6.0.0. To keep the current behavior and remove this deprecation warning,'
+                ' explicitly set `want_proxmox_nodes_ansible_host` to `true` in your inventory configuration',
+                version='6.0.0', collection_name='community.general')
+            want_proxmox_nodes_ansible_host = True
 
         # gather vm's on nodes
         self._get_auth()
@@ -616,23 +621,40 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
         # read config from file, this sets 'options'
         self._read_config_data(path)
 
-        # read and template auth options
-        for o in ('url', 'user', 'password', 'token_id', 'token_secret'):
-            v = self.get_option(o)
-            if self.templar.is_template(v):
-                v = self.templar.template(v, disable_lookups=False)
-            setattr(self, 'proxmox_%s' % o, v)
+        t = Templar(loader=loader)
 
-        # some more cleanup and validation
-        self.proxmox_url = self.proxmox_url.rstrip('/')
+        # read options
+        proxmox_url = self.get_option('url')
+        if t.is_template(proxmox_url):
+            proxmox_url = t.template(variable=proxmox_url, disable_lookups=False)
+        self.proxmox_url = proxmox_url.rstrip('/')
 
-        if self.proxmox_password is None and (self.proxmox_token_id is None or self.proxmox_token_secret is None):
+        proxmox_user = self.get_option('user')
+        if t.is_template(proxmox_user):
+            proxmox_user = t.template(variable=proxmox_user, disable_lookups=False)
+        self.proxmox_user = proxmox_user
+
+        proxmox_password = self.get_option('password')
+        if t.is_template(proxmox_password):
+            proxmox_password = t.template(variable=proxmox_password, disable_lookups=False)
+        self.proxmox_password = proxmox_password
+
+        proxmox_token_id = self.get_option('token_id')
+        if t.is_template(proxmox_token_id):
+            proxmox_token_id = t.template(variable=proxmox_token_id, disable_lookups=False)
+        self.proxmox_token_id = proxmox_token_id
+
+        proxmox_token_secret = self.get_option('token_secret')
+        if t.is_template(proxmox_token_secret):
+            proxmox_token_secret = t.template(variable=proxmox_token_secret, disable_lookups=False)
+        self.proxmox_token_secret = proxmox_token_secret
+
+        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.')
 
-        # read rest of options
         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/inventory/xen_orchestra.py

@@ -78,7 +78,6 @@ compose:
 
 import json
 import ssl
-from time import sleep
 
 from ansible.errors import AnsibleError
 from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
@@ -139,42 +138,21 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
         self.conn = create_connection(
             '{0}://{1}/api/'.format(proto, xoa_api_host), sslopt=sslopt)
 
-    CALL_TIMEOUT = 100
-    """Number of 1/10ths of a second to wait before method call times out."""
-
-    def call(self, method, params):
-        """Calls a method on the XO server with the provided parameters."""
-        id = self.pointer
-        self.conn.send(json.dumps({
-            'id': id,
-            'jsonrpc': '2.0',
-            'method': method,
-            'params': params
-        }))
-
-        waited = 0
-        while waited < self.CALL_TIMEOUT:
-            response = json.loads(self.conn.recv())
-            if 'id' in response and response['id'] == id:
-                return response
-            else:
-                sleep(0.1)
-                waited += 1
-
-        raise AnsibleError(
-            'Method call {method} timed out after {timeout} seconds.'.format(method=method, timeout=self.CALL_TIMEOUT / 10))
-
     def login(self, user, password):
-        result = self.call('session.signIn', {
-            'username': user, 'password': password
-        })
+        payload = {'id': self.pointer, 'jsonrpc': '2.0', 'method': 'session.signIn', 'params': {
+            'username': user, 'password': password}}
+        self.conn.send(json.dumps(payload))
+        result = json.loads(self.conn.recv())
 
         if 'error' in result:
             raise AnsibleError(
                 'Could not connect: {0}'.format(result['error']))
 
     def get_object(self, name):
-        answer = self.call('xo.getAllObjects', {'filter': {'type': name}})
+        payload = {'id': self.pointer, 'jsonrpc': '2.0',
+                   'method': 'xo.getAllObjects', 'params': {'filter': {'type': name}}}
+        self.conn.send(json.dumps(payload))
+        answer = json.loads(self.conn.recv())
 
         if 'error' in answer:
             raise AnsibleError(

plugins/lookup/bitwarden.py

@@ -12,8 +12,6 @@ DOCUMENTATION = """
     requirements:
       - bw (command line utility)
       - be logged into bitwarden
-      - bitwarden vault unlocked
-      - C(BW_SESSION) environment variable set
     short_description: Retrieve secrets from Bitwarden
     version_added: 5.4.0
     description:
@@ -30,12 +28,8 @@ DOCUMENTATION = """
         default: name
         version_added: 5.7.0
       field:
-        description: Field to fetch. Leave unset to fetch whole response.
+        description: Field to fetch; leave unset to fetch whole response.
         type: str
-      collection_id:
-        description: Collection ID to filter results by collection. Leave unset to skip filtering.
-        type: str
-        version_added: 6.3.0
 """
 
 EXAMPLES = """
@@ -49,20 +43,10 @@ EXAMPLES = """
     msg: >-
       {{ lookup('community.general.bitwarden', 'bafba515-af11-47e6-abe3-af1200cd18b2', search='id', field='password') }}
 
-- name: "Get 'password' from Bitwarden record named 'a_test' from collection"
-  ansible.builtin.debug:
-    msg: >-
-      {{ lookup('community.general.bitwarden', 'a_test', field='password', collection_id='bafba515-af11-47e6-abe3-af1200cd18b2') }}
-
 - name: "Get full Bitwarden record named 'a_test'"
   ansible.builtin.debug:
     msg: >-
       {{ lookup('community.general.bitwarden', 'a_test') }}
-
-- name: "Get custom field 'api_key' from Bitwarden record named 'a_test'"
-  ansible.builtin.debug:
-    msg: >-
-      {{ lookup('community.general.bitwarden', 'a_test', field='api_key') }}
 """
 
 RETURN = """
@@ -94,7 +78,7 @@ class Bitwarden(object):
         return self._cli_path
 
     @property
-    def unlocked(self):
+    def logged_in(self):
         out, err = self._run(['status'], stdin="")
         decoded = AnsibleJSONDecoder().raw_decode(out)[0]
         return decoded['status'] == 'unlocked'
@@ -107,17 +91,10 @@ class Bitwarden(object):
             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, collection_id):
+    def _get_matches(self, search_value, search_field):
         """Return matching records whose search_field is equal to key.
         """
-
-        # Prepare set of params for Bitwarden CLI
-        params = ['list', 'items', '--search', search_value]
-
-        if collection_id:
-            params.extend(['--collectionid', collection_id])
-
-        out, err = self._run(params)
+        out, err = self._run(['list', 'items', '--search', search_value])
 
         # This includes things that matched in different fields.
         initial_matches = AnsibleJSONDecoder().raw_decode(out)[0]
@@ -125,27 +102,17 @@ class Bitwarden(object):
         # 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", collection_id=None):
-        """Return a list of the specified field for records whose search_field match search_value
-        and filtered by collection if collection has been provided.
+    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, search_field, collection_id)
+        matches = self._get_matches(search_value, search_field)
 
-        if field in ['autofillOnPageLoad', 'password', 'passwordRevisionDate', 'totp', 'uris', 'username']:
+        if field:
             return [match['login'][field] for match in matches]
-        elif not field:
-            return matches
-        else:
-            custom_field_matches = []
-            for match in matches:
-                for custom_field in match['fields']:
-                    if custom_field['name'] == field:
-                        custom_field_matches.append(custom_field['value'])
-            if matches and not custom_field_matches:
-                raise AnsibleError("Custom field {field} does not exist in {search_value}".format(field=field, search_value=search_value))
-            return custom_field_matches
+
+        return matches
 
 
 class LookupModule(LookupBase):
@@ -154,11 +121,10 @@ class LookupModule(LookupBase):
         self.set_options(var_options=variables, direct=kwargs)
         field = self.get_option('field')
         search_field = self.get_option('search')
-        collection_id = self.get_option('collection_id')
-        if not _bitwarden.unlocked:
-            raise AnsibleError("Bitwarden Vault locked. Run 'bw unlock'.")
+        if not _bitwarden.logged_in:
+            raise AnsibleError("Not logged into Bitwarden. Run 'bw login'.")
 
-        return [_bitwarden.get_field(field, term, search_field, collection_id) for term in terms]
+        return [_bitwarden.get_field(field, term, search_field) for term in terms]
 
 
 _bitwarden = Bitwarden()

plugins/lookup/cartesian.py

@@ -15,11 +15,9 @@ DOCUMENTATION = '''
         - It is clearer with an example, it turns [1, 2, 3], [a, b] into [1, a], [1, b], [2, a], [2, b], [3, a], [3, b].
          You can see the exact syntax in the examples section.
     options:
-      _terms:
+      _raw:
         description:
           - a set of lists
-        type: list
-        elements: list
         required: true
 '''
 
@@ -66,17 +64,11 @@ class LookupModule(LookupBase):
         """
         results = []
         for x in terms:
-            try:
-                intermediate = listify_lookup_plugin_terms(x, templar=self._templar)
-            except TypeError:
-                # The loader argument is deprecated in ansible-core 2.14+. Fall back to
-                # pre-2.14 behavior for older ansible-core versions.
-                intermediate = listify_lookup_plugin_terms(x, templar=self._templar, loader=self._loader)
+            intermediate = listify_lookup_plugin_terms(x, templar=self._templar, loader=self._loader)
             results.append(intermediate)
         return results
 
     def run(self, terms, variables=None, **kwargs):
-        self.set_options(var_options=variables, direct=kwargs)
 
         terms = self._lookup_variables(terms)
 

plugins/lookup/consul_kv.py

@@ -105,6 +105,7 @@ RETURN = """
     type: dict
 """
 
+import os
 from ansible.module_utils.six.moves.urllib.parse import urlparse
 from ansible.errors import AnsibleError, AnsibleAssertionError
 from ansible.plugins.lookup import LookupBase

plugins/lookup/credstash.py

@@ -22,33 +22,25 @@ DOCUMENTATION = '''
         required: true
       table:
         description: name of the credstash table to query
-        type: str
         default: 'credential-store'
       version:
         description: Credstash version
-        type: str
-        default: ''
       region:
         description: AWS region
-        type: str
       profile_name:
         description: AWS profile to use for authentication
-        type: str
         env:
           - name: AWS_PROFILE
       aws_access_key_id:
         description: AWS access key ID
-        type: str
         env:
           - name: AWS_ACCESS_KEY_ID
       aws_secret_access_key:
         description: AWS access key
-        type: str
         env:
           - name: AWS_SECRET_ACCESS_KEY
       aws_session_token:
         description: AWS session token
-        type: str
         env:
           - name: AWS_SESSION_TOKEN
 '''
@@ -93,6 +85,8 @@ RETURN = """
     type: str
 """
 
+import os
+
 from ansible.errors import AnsibleError
 from ansible.plugins.lookup import LookupBase
 
@@ -106,39 +100,28 @@ except ImportError:
 
 
 class LookupModule(LookupBase):
-    def run(self, terms, variables=None, **kwargs):
+    def run(self, terms, variables, **kwargs):
+
         if not CREDSTASH_INSTALLED:
             raise AnsibleError('The credstash lookup plugin requires credstash to be installed.')
 
-        self.set_options(var_options=variables, direct=kwargs)
-
-        version = self.get_option('version')
-        region = self.get_option('region')
-        table = self.get_option('table')
-        profile_name = self.get_option('profile_name')
-        aws_access_key_id = self.get_option('aws_access_key_id')
-        aws_secret_access_key = self.get_option('aws_secret_access_key')
-        aws_session_token = self.get_option('aws_session_token')
-
-        context = dict(
-            (k, v) for k, v in kwargs.items()
-            if k not in ('version', 'region', 'table', 'profile_name', 'aws_access_key_id', 'aws_secret_access_key', 'aws_session_token')
-        )
-
-        kwargs_pass = {
-            'profile_name': profile_name,
-            'aws_access_key_id': aws_access_key_id,
-            'aws_secret_access_key': aws_secret_access_key,
-            'aws_session_token': aws_session_token,
-        }
-
         ret = []
         for term in terms:
             try:
-                ret.append(credstash.getSecret(term, version, region, table, context=context, **kwargs_pass))
+                version = kwargs.pop('version', '')
+                region = kwargs.pop('region', None)
+                table = kwargs.pop('table', 'credential-store')
+                profile_name = kwargs.pop('profile_name', os.getenv('AWS_PROFILE', None))
+                aws_access_key_id = kwargs.pop('aws_access_key_id', os.getenv('AWS_ACCESS_KEY_ID', None))
+                aws_secret_access_key = kwargs.pop('aws_secret_access_key', os.getenv('AWS_SECRET_ACCESS_KEY', None))
+                aws_session_token = kwargs.pop('aws_session_token', os.getenv('AWS_SESSION_TOKEN', None))
+                kwargs_pass = {'profile_name': profile_name, 'aws_access_key_id': aws_access_key_id,
+                               'aws_secret_access_key': aws_secret_access_key, 'aws_session_token': aws_session_token}
+                val = credstash.getSecret(term, version, region, table, context=kwargs, **kwargs_pass)
             except credstash.ItemNotFound:
                 raise AnsibleError('Key {0} not found'.format(term))
             except Exception as e:
                 raise AnsibleError('Encountered exception while fetching {0}: {1}'.format(term, e))
+            ret.append(val)
 
         return ret

plugins/lookup/cyberarkpassword.py

@@ -80,6 +80,7 @@ from subprocess import Popen
 
 from ansible.errors import AnsibleError
 from ansible.plugins.lookup import LookupBase
+from ansible.parsing.splitter import parse_kv
 from ansible.module_utils.common.text.converters import to_bytes, to_text, to_native
 from ansible.utils.display import Display
 
@@ -173,6 +174,7 @@ class LookupModule(LookupBase):
     """
 
     def run(self, terms, variables=None, **kwargs):
+
         display.vvvv("%s" % terms)
         if isinstance(terms, list):
             return_values = []

plugins/lookup/dependent.py

@@ -16,7 +16,7 @@ description:
      or template expressions which evaluate to lists or dicts, composed of the elements of
      the input evaluated lists and dictionaries."
 options:
-  _terms:
+  _raw:
     description:
       - A list where the elements are one-element dictionaries, mapping a name to a string, list, or dictionary.
         The name is the index that is used in the result object. The value is iterated over as described below.
@@ -191,8 +191,6 @@ class LookupModule(LookupBase):
 
     def run(self, terms, variables=None, **kwargs):
         """Generate list."""
-        self.set_options(var_options=variables, direct=kwargs)
-
         result = []
         if len(terms) > 0:
             templar = Templar(loader=self._templar._loader)

plugins/lookup/dig.py

@@ -21,27 +21,22 @@ DOCUMENTATION = '''
       - In addition to (default) A record, it is also possible to specify a different record type that should be queried.
         This can be done by either passing-in additional parameter of format qtype=TYPE to the dig lookup, or by appending /TYPE to the FQDN being queried.
       - If multiple values are associated with the requested record, the results will be returned as a comma-separated list.
-        In such cases you may want to pass option I(wantlist=true) to the lookup call, or alternatively use C(query) instead of C(lookup),
-        which will result in the record values being returned as a list over which you can iterate later on.
+        In such cases you may want to pass option wantlist=True to the plugin, which will result in the record values being returned as a list
+        over which you can iterate later on.
       - By default, the lookup will rely on system-wide configured DNS servers for performing the query.
         It is also possible to explicitly specify DNS servers to query using the @DNS_SERVER_1,DNS_SERVER_2,...,DNS_SERVER_N notation.
         This needs to be passed-in as an additional parameter to the lookup
     options:
       _terms:
         description: Domain(s) to query.
-        type: list
-        elements: str
       qtype:
         description:
             - Record type to query.
-            - C(DLV) has been removed in community.general 6.0.0.
-            - C(CAA) has been added in community.general 6.3.0.
-        type: str
+            - C(DLV) is deprecated and will be removed in community.general 6.0.0.
         default: 'A'
-        choices: [A, ALL, AAAA, CAA, CNAME, DNAME, DNSKEY, DS, HINFO, LOC, MX, NAPTR, NS, NSEC3PARAM, PTR, RP, RRSIG, SOA, SPF, SRV, SSHFP, TLSA, TXT]
+        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.
-        type: int
         default: 1
       retry_servfail:
         description: Retry a nameserver if it returns SERVFAIL.
@@ -57,19 +52,6 @@ DOCUMENTATION = '''
         default: false
         type: bool
         version_added: 5.4.0
-      real_empty:
-        description:
-          - Return empty result without empty strings, and return empty list instead of C(NXDOMAIN).
-          - The default for this option will likely change to C(true) in the future.
-          - This option will be forced to C(true) if multiple domains to be queried are specified.
-        default: false
-        type: bool
-        version_added: 6.0.0
-      class:
-        description:
-          - "Class."
-        type: str
-        default: 'IN'
     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.
@@ -85,7 +67,7 @@ EXAMPLES = """
 
 - name: "The TXT record for example.org."
   ansible.builtin.debug:
-    msg: "{{ lookup('community.general.dig', 'example.org.', qtype='TXT') }}"
+    msg: "{{ lookup('community.general.dig', 'example.org.', 'qtype=TXT') }}"
 
 - name: "The TXT record for example.org, alternative syntax."
   ansible.builtin.debug:
@@ -94,39 +76,24 @@ EXAMPLES = """
 - name: use in a loop
   ansible.builtin.debug:
     msg: "MX record for gmail.com {{ item }}"
-  with_items: "{{ lookup('community.general.dig', 'gmail.com./MX', wantlist=true) }}"
-
-- name: Lookup multiple names at once
-  ansible.builtin.debug:
-    msg: "A record found {{ item }}"
-  loop: "{{ query('community.general.dig', 'example.org.', 'example.com.', 'gmail.com.') }}"
-
-- name: Lookup multiple names at once (from list variable)
-  ansible.builtin.debug:
-    msg: "A record found {{ item }}"
-  loop: "{{ query('community.general.dig', *hosts) }}"
-  vars:
-    hosts:
-      - example.org.
-      - example.com.
-      - gmail.com.
+  with_items: "{{ lookup('community.general.dig', 'gmail.com./MX', wantlist=True) }}"
 
 - ansible.builtin.debug:
     msg: "Reverse DNS for 192.0.2.5 is {{ lookup('community.general.dig', '192.0.2.5/PTR') }}"
 - ansible.builtin.debug:
     msg: "Reverse DNS for 192.0.2.5 is {{ lookup('community.general.dig', '5.2.0.192.in-addr.arpa./PTR') }}"
 - ansible.builtin.debug:
-    msg: "Reverse DNS for 192.0.2.5 is {{ lookup('community.general.dig', '5.2.0.192.in-addr.arpa.', qtype='PTR') }}"
+    msg: "Reverse DNS for 192.0.2.5 is {{ lookup('community.general.dig', '5.2.0.192.in-addr.arpa.', 'qtype=PTR') }}"
 - ansible.builtin.debug:
     msg: "Querying 198.51.100.23 for IPv4 address for example.com. produces {{ lookup('dig', 'example.com', '@198.51.100.23') }}"
 
 - ansible.builtin.debug:
     msg: "XMPP service for gmail.com. is available at {{ item.target }} on port {{ item.port }}"
-  with_items: "{{ lookup('community.general.dig', '_xmpp-server._tcp.gmail.com./SRV', flat=0, wantlist=true) }}"
+  with_items: "{{ lookup('community.general.dig', '_xmpp-server._tcp.gmail.com./SRV', 'flat=0', wantlist=True) }}"
 
 - name: Retry nameservers that return SERVFAIL
   ansible.builtin.debug:
-    msg: "{{ lookup('community.general.dig', 'example.org./A', retry_servfail=true) }}"
+    msg: "{{ lookup('community.general.dig', 'example.org./A', 'retry_servfail=True') }}"
 """
 
 RETURN = """
@@ -146,18 +113,15 @@ RETURN = """
        AAAA:
            description:
                - address
-       CAA:
-           description:
-               - flags
-               - tag
-               - value
-           version_added: 6.3.0
        CNAME:
            description:
                - target
        DNAME:
            description:
                - target
+       DLV:
+            description:
+                - algorithm, digest_type, key_tag, digest
        DNSKEY:
             description:
                 - flags, algorithm, protocol, key
@@ -221,7 +185,7 @@ try:
     import dns.resolver
     import dns.reversename
     import dns.rdataclass
-    from dns.rdatatype import (A, AAAA, CAA, CNAME, DNAME, DNSKEY, DS, HINFO, LOC,
+    from dns.rdatatype import (A, AAAA, CNAME, DLV, DNAME, DNSKEY, DS, HINFO, LOC,
                                MX, NAPTR, NS, NSEC3PARAM, PTR, RP, SOA, SPF, SRV, SSHFP, TLSA, TXT)
     HAVE_DNS = True
 except ImportError:
@@ -241,9 +205,9 @@ def make_rdata_dict(rdata):
     supported_types = {
         A: ['address'],
         AAAA: ['address'],
-        CAA: ['flags', 'tag', 'value'],
         CNAME: ['target'],
         DNAME: ['target'],
+        DLV: ['algorithm', 'digest_type', 'key_tag', 'digest'],
         DNSKEY: ['flags', 'algorithm', 'protocol', 'key'],
         DS: ['algorithm', 'digest_type', 'key_tag', 'digest'],
         HINFO: ['cpu', 'os'],
@@ -254,7 +218,7 @@ def make_rdata_dict(rdata):
         NSEC3PARAM: ['algorithm', 'flags', 'iterations', 'salt'],
         PTR: ['target'],
         RP: ['mbox', 'txt'],
-        # RRSIG: ['type_covered', 'algorithm', 'labels', 'original_ttl', 'expiration', 'inception', 'key_tag', 'signer', 'signature'],
+        # RRSIG: ['algorithm', 'labels', 'original_ttl', 'expiration', 'inception', 'signature'],
         SOA: ['mname', 'rname', 'serial', 'refresh', 'retry', 'expire', 'minimum'],
         SPF: ['strings'],
         SRV: ['priority', 'weight', 'port', 'target'],
@@ -273,10 +237,10 @@ def make_rdata_dict(rdata):
             if isinstance(val, dns.name.Name):
                 val = dns.name.Name.to_text(val)
 
+            if rdata.rdtype == DLV and f == 'digest':
+                val = dns.rdata._hexify(rdata.digest).replace(' ', '')
             if rdata.rdtype == DS and f == 'digest':
                 val = dns.rdata._hexify(rdata.digest).replace(' ', '')
-            if rdata.rdtype == DNSKEY and f == 'algorithm':
-                val = int(val)
             if rdata.rdtype == DNSKEY and f == 'key':
                 val = dns.rdata._base64ify(rdata.key).replace(' ', '')
             if rdata.rdtype == NSEC3PARAM and f == 'salt':
@@ -314,26 +278,20 @@ class LookupModule(LookupBase):
 
             ... flat=0                                      # returns a dict; default is 1 == string
         '''
+
         if HAVE_DNS is False:
             raise AnsibleError("The dig lookup requires the python 'dnspython' library and it is not installed")
 
-        self.set_options(var_options=variables, direct=kwargs)
-
         # Create Resolver object so that we can set NS if necessary
         myres = dns.resolver.Resolver(configure=True)
         edns_size = 4096
         myres.use_edns(0, ednsflags=dns.flags.DO, payload=edns_size)
 
-        domains = []
-        qtype = self.get_option('qtype')
-        flat = self.get_option('flat')
-        fail_on_error = self.get_option('fail_on_error')
-        real_empty = self.get_option('real_empty')
-        try:
-            rdclass = dns.rdataclass.from_text(self.get_option('class'))
-        except Exception as e:
-            raise AnsibleError("dns lookup illegal CLASS: %s" % to_native(e))
-        myres.retry_servfail = self.get_option('retry_servfail')
+        domain = None
+        qtype = 'A'
+        flat = True
+        fail_on_error = False
+        rdclass = dns.rdataclass.from_text('IN')
 
         for t in terms:
             if t.startswith('@'):       # e.g. "@10.0.1.2,192.0.2.1" is ok.
@@ -356,7 +314,7 @@ class LookupModule(LookupBase):
                 continue
             if '=' in t:
                 try:
-                    opt, arg = t.split('=', 1)
+                    opt, arg = t.split('=')
                 except Exception:
                     pass
 
@@ -373,79 +331,71 @@ class LookupModule(LookupBase):
                     myres.retry_servfail = boolean(arg)
                 elif opt == 'fail_on_error':
                     fail_on_error = boolean(arg)
-                elif opt == 'real_empty':
-                    real_empty = boolean(arg)
 
                 continue
 
             if '/' in t:
                 try:
                     domain, qtype = t.split('/')
-                    domains.append(domain)
                 except Exception:
-                    domains.append(t)
+                    domain = t
             else:
-                domains.append(t)
+                domain = t
 
         # print "--- domain = {0} qtype={1} rdclass={2}".format(domain, qtype, rdclass)
 
-        if qtype.upper() == 'PTR':
-            reversed_domains = []
-            for domain in domains:
-                try:
-                    n = dns.reversename.from_address(domain)
-                    reversed_domains.append(n.to_text())
-                except dns.exception.SyntaxError:
-                    pass
-                except Exception as e:
-                    raise AnsibleError("dns.reversename unhandled exception %s" % to_native(e))
-            domains = reversed_domains
-
-        if len(domains) > 1:
-            real_empty = True
-
         ret = []
 
-        for domain in domains:
+        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:
-                answers = myres.query(domain, qtype, rdclass=rdclass)
-                for rdata in answers:
-                    s = rdata.to_text()
-                    if qtype.upper() == 'TXT':
-                        s = s[1:-1]  # Strip outside quotes on TXT rdata
+                n = dns.reversename.from_address(domain)
+                domain = n.to_text()
+            except dns.exception.SyntaxError:
+                pass
+            except Exception as e:
+                raise AnsibleError("dns.reversename unhandled exception %s" % to_native(e))
 
-                    if flat:
-                        ret.append(s)
-                    else:
-                        try:
-                            rd = make_rdata_dict(rdata)
-                            rd['owner'] = answers.canonical_name.to_text()
-                            rd['type'] = dns.rdatatype.to_text(rdata.rdtype)
-                            rd['ttl'] = answers.rrset.ttl
-                            rd['class'] = dns.rdataclass.to_text(rdata.rdclass)
+        try:
+            answers = myres.query(domain, qtype, rdclass=rdclass)
+            for rdata in answers:
+                s = rdata.to_text()
+                if qtype.upper() == 'TXT':
+                    s = s[1:-1]  # Strip outside quotes on TXT rdata
 
-                            ret.append(rd)
-                        except Exception as err:
-                            if fail_on_error:
-                                raise AnsibleError("Lookup failed: %s" % str(err))
-                            ret.append(str(err))
+                if flat:
+                    ret.append(s)
+                else:
+                    try:
+                        rd = make_rdata_dict(rdata)
+                        rd['owner'] = answers.canonical_name.to_text()
+                        rd['type'] = dns.rdatatype.to_text(rdata.rdtype)
+                        rd['ttl'] = answers.rrset.ttl
+                        rd['class'] = dns.rdataclass.to_text(rdata.rdclass)
 
-            except dns.resolver.NXDOMAIN as err:
-                if fail_on_error:
-                    raise AnsibleError("Lookup failed: %s" % str(err))
-                if not real_empty:
-                    ret.append('NXDOMAIN')
-            except dns.resolver.NoAnswer as err:
-                if fail_on_error:
-                    raise AnsibleError("Lookup failed: %s" % str(err))
-                if not real_empty:
-                    ret.append("")
-            except dns.resolver.Timeout as err:
-                if fail_on_error:
-                    raise AnsibleError("Lookup failed: %s" % str(err))
-                if not real_empty:
-                    ret.append("")
-            except dns.exception.DNSException as err:
-                raise AnsibleError("dns.resolver unhandled exception %s" % to_native(err))
+                        ret.append(rd)
+                    except Exception as err:
+                        if fail_on_error:
+                            raise AnsibleError("Lookup failed: %s" % str(err))
+                        ret.append(str(err))
+
+        except dns.resolver.NXDOMAIN as err:
+            if fail_on_error:
+                raise AnsibleError("Lookup failed: %s" % str(err))
+            ret.append('NXDOMAIN')
+        except dns.resolver.NoAnswer as err:
+            if fail_on_error:
+                raise AnsibleError("Lookup failed: %s" % str(err))
+            ret.append("")
+        except dns.resolver.Timeout as err:
+            if fail_on_error:
+                raise AnsibleError("Lookup failed: %s" % str(err))
+            ret.append('')
+        except dns.exception.DNSException as err:
+            raise AnsibleError("dns.resolver unhandled exception %s" % to_native(err))
 
         return ret

plugins/lookup/dnstxt.py

@@ -20,13 +20,6 @@ DOCUMENTATION = '''
         required: true
         type: list
         elements: string
-      real_empty:
-        description:
-          - Return empty result without empty strings, and return empty list instead of C(NXDOMAIN).
-          - The default for this option will likely change to C(true) in the future.
-        default: false
-        type: bool
-        version_added: 6.0.0
 '''
 
 EXAMPLES = """
@@ -78,13 +71,10 @@ from ansible.plugins.lookup import LookupBase
 class LookupModule(LookupBase):
 
     def run(self, terms, variables=None, **kwargs):
-        self.set_options(var_options=variables, direct=kwargs)
 
         if HAVE_DNS is False:
             raise AnsibleError("Can't LOOKUP(dnstxt): module dns.resolver is not installed")
 
-        real_empty = self.get_option('real_empty')
-
         ret = []
         for term in terms:
             domain = term.split()[0]
@@ -96,16 +86,10 @@ class LookupModule(LookupBase):
                     string.append(s[1:-1])  # Strip outside quotes on TXT rdata
 
             except dns.resolver.NXDOMAIN:
-                if real_empty:
-                    continue
                 string = 'NXDOMAIN'
             except dns.resolver.Timeout:
-                if real_empty:
-                    continue
                 string = ''
             except dns.resolver.NoAnswer:
-                if real_empty:
-                    continue
                 string = ''
             except DNSException as e:
                 raise AnsibleError("dns.resolver unhandled exception %s" % to_native(e))

plugins/lookup/etcd3.py

@@ -136,11 +136,12 @@ RETURN = '''
 
 import re
 
-from ansible.errors import AnsibleLookupError
+from ansible.plugins.lookup import LookupBase
+from ansible.utils.display import Display
 from ansible.module_utils.basic import missing_required_lib
 from ansible.module_utils.common.text.converters import to_native
 from ansible.plugins.lookup import LookupBase
-from ansible.utils.display import Display
+from ansible.errors import AnsibleError, AnsibleLookupError
 
 try:
     import etcd3

plugins/lookup/filetree.py

@@ -201,8 +201,6 @@ def file_props(root, path):
 class LookupModule(LookupBase):
 
     def run(self, terms, variables=None, **kwargs):
-        self.set_options(var_options=variables, direct=kwargs)
-
         basedir = self.get_basedir(variables)
 
         ret = []

plugins/lookup/flattened.py

@@ -11,17 +11,14 @@ DOCUMENTATION = '''
     author: Serge van Ginderachter (!UNKNOWN) <serge@vanginderachter.be>
     short_description: return single list completely flattened
     description:
-      - Given one or more lists, this lookup will flatten any list elements found recursively until only 1 list is left.
+      - given one or more lists, this lookup will flatten any list elements found recursively until only 1 list is left.
     options:
       _terms:
         description: lists to flatten
-        type: list
-        elements: raw
         required: true
     notes:
-      - Unlike the R(items lookup,ansible_collections.ansible.builtin.items_lookup) which only flattens 1 level,
-        this plugin will continue to flatten until it cannot find lists anymore.
-      - Aka highlander plugin, there can only be one (list).
+      - unlike 'items' which only flattens 1 level, this plugin will continue to flatten until it cannot find lists anymore.
+      - aka highlander plugin, there can only be one (list).
 '''
 
 EXAMPLES = """
@@ -67,12 +64,7 @@ class LookupModule(LookupBase):
 
             if isinstance(term, string_types):
                 # convert a variable to a list
-                try:
-                    term2 = listify_lookup_plugin_terms(term, templar=self._templar)
-                except TypeError:
-                    # The loader argument is deprecated in ansible-core 2.14+. Fall back to
-                    # pre-2.14 behavior for older ansible-core versions.
-                    term2 = listify_lookup_plugin_terms(term, templar=self._templar, loader=self._loader)
+                term2 = listify_lookup_plugin_terms(term, templar=self._templar, loader=self._loader)
                 # but avoid converting a plain string to a list of one string
                 if term2 != [term]:
                     term = term2
@@ -86,10 +78,9 @@ class LookupModule(LookupBase):
 
         return ret
 
-    def run(self, terms, variables=None, **kwargs):
+    def run(self, terms, variables, **kwargs):
+
         if not isinstance(terms, list):
             raise AnsibleError("with_flattened expects a list")
 
-        self.set_options(var_options=variables, direct=kwargs)
-
         return self._do_flatten(terms, variables)

plugins/lookup/hiera.py

@@ -14,23 +14,23 @@ DOCUMENTATION = '''
     requirements:
       - hiera (command line utility)
     description:
-        - Retrieves data from an Puppetmaster node using Hiera as ENC.
+        - Retrieves data from an Puppetmaster node using Hiera as ENC
     options:
-      _terms:
+      _hiera_key:
             description:
-                - The list of keys to lookup on the Puppetmaster.
+                - The list of keys to lookup on the Puppetmaster
             type: list
             elements: string
             required: true
-      executable:
+      _bin_file:
             description:
-                - Binary file to execute Hiera.
+                - Binary file to execute Hiera
             default: '/usr/bin/hiera'
             env:
                 - name: ANSIBLE_HIERA_BIN
-      config_file:
+      _hierarchy_file:
             description:
-                - File that describes the hierarchy of Hiera.
+                - File that describes the hierarchy of Hiera
             default: '/etc/hiera.yaml'
             env:
                 - name: ANSIBLE_HIERA_CFG
@@ -61,32 +61,31 @@ RETURN = """
         elements: str
 """
 
+import os
+
 from ansible.plugins.lookup import LookupBase
 from ansible.utils.cmd_functions import run_cmd
 from ansible.module_utils.common.text.converters import to_text
 
+ANSIBLE_HIERA_CFG = os.getenv('ANSIBLE_HIERA_CFG', '/etc/hiera.yaml')
+ANSIBLE_HIERA_BIN = os.getenv('ANSIBLE_HIERA_BIN', '/usr/bin/hiera')
+
 
 class Hiera(object):
-    def __init__(self, hiera_cfg, hiera_bin):
-        self.hiera_cfg = hiera_cfg
-        self.hiera_bin = hiera_bin
-
     def get(self, hiera_key):
-        pargs = [self.hiera_bin]
-        pargs.extend(['-c', self.hiera_cfg])
+        pargs = [ANSIBLE_HIERA_BIN]
+        pargs.extend(['-c', ANSIBLE_HIERA_CFG])
 
         pargs.extend(hiera_key)
 
         rc, output, err = run_cmd("{0} -c {1} {2}".format(
-            self.hiera_bin, self.hiera_cfg, hiera_key[0]))
+            ANSIBLE_HIERA_BIN, ANSIBLE_HIERA_CFG, hiera_key[0]))
 
         return to_text(output.strip())
 
 
 class LookupModule(LookupBase):
-    def run(self, terms, variables=None, **kwargs):
-        self.set_options(var_options=variables, direct=kwargs)
-
-        hiera = Hiera(self.get_option('config_file'), self.get_option('executable'))
+    def run(self, terms, variables=''):
+        hiera = Hiera()
         ret = [hiera.get(terms)]
         return ret

plugins/lookup/keyring.py

@@ -26,9 +26,7 @@ EXAMPLES = """
     - 'servicename username'
 
 - name: access mysql with password from keyring
-  community.mysql.mysql_db:
-    login_password: "{{ lookup('community.general.keyring', 'mysql joe') }}"
-    login_user: joe
+  mysql_db: login_password={{lookup('community.general.keyring','mysql joe')}} login_user=joe
 """
 
 RETURN = """
@@ -55,12 +53,10 @@ display = Display()
 
 class LookupModule(LookupBase):
 
-    def run(self, terms, variables=None, **kwargs):
+    def run(self, terms, **kwargs):
         if not HAS_KEYRING:
             raise AnsibleError(u"Can't LOOKUP(keyring): missing required python library 'keyring'")
 
-        self.set_options(var_options=variables, direct=kwargs)
-
         display.vvvv(u"keyring: %s" % keyring.get_keyring())
         ret = []
         for term in terms:

plugins/lookup/lmdb_kv.py

@@ -13,20 +13,15 @@ DOCUMENTATION = '''
     version_added: '0.2.0'
     short_description: fetch data from LMDB
     description:
-      - This lookup returns a list of results from an LMDB DB corresponding to a list of items given to it.
+      - This lookup returns a list of results from an LMDB DB corresponding to a list of items given to it
     requirements:
       - lmdb (python library https://lmdb.readthedocs.io/en/release/)
     options:
       _terms:
-        description: List of keys to query.
-        type: list
-        elements: str
+        description: list of keys to query
       db:
-        description: Path to LMDB database.
-        type: str
+        description: path to LMDB database
         default: 'ansible.mdb'
-        vars:
-          - name: lmdb_kv_db
 '''
 
 EXAMPLES = """
@@ -48,8 +43,8 @@ EXAMPLES = """
       - item == 'Belgium'
     vars:
       - lmdb_kv_db: jp.mdb
-  with_community.general.lmdb_kv:
-    - be
+    with_community.general.lmdb_kv:
+      - be
 """
 
 RETURN = """
@@ -63,7 +58,6 @@ _raw:
 from ansible.errors import AnsibleError
 from ansible.plugins.lookup import LookupBase
 from ansible.module_utils.common.text.converters import to_native, to_text
-
 HAVE_LMDB = True
 try:
     import lmdb
@@ -73,7 +67,8 @@ except ImportError:
 
 class LookupModule(LookupBase):
 
-    def run(self, terms, variables=None, **kwargs):
+    def run(self, terms, variables, **kwargs):
+
         '''
         terms contain any number of keys to be retrieved.
         If terms is None, all keys from the database are returned
@@ -86,15 +81,17 @@ class LookupModule(LookupBase):
               vars:
                 - lmdb_kv_db: "jp.mdb"
         '''
+
         if HAVE_LMDB is False:
             raise AnsibleError("Can't LOOKUP(lmdb_kv): this module requires lmdb to be installed")
 
-        self.set_options(var_options=variables, direct=kwargs)
-
-        db = self.get_option('db')
+        db = variables.get('lmdb_kv_db', None)
+        if db is None:
+            db = kwargs.get('db', 'ansible.mdb')
+        db = str(db)
 
         try:
-            env = lmdb.open(str(db), readonly=True)
+            env = lmdb.open(db, readonly=True)
         except Exception as e:
             raise AnsibleError("LMDB can't open database %s: %s" % (db, to_native(e)))
 

plugins/lookup/manifold.py

@@ -69,6 +69,7 @@ from ansible.utils.display import Display
 from traceback import format_exception
 import json
 import sys
+import os
 
 display = Display()
 
@@ -206,7 +207,7 @@ class ManifoldApiClient(object):
 
 class LookupModule(LookupBase):
 
-    def run(self, terms, variables=None, **kwargs):
+    def run(self, terms, variables=None, api_token=None, project=None, team=None):
         """
         :param terms: a list of resources lookups to run.
         :param variables: ansible variables active at the time of the lookup
@@ -216,11 +217,10 @@ class LookupModule(LookupBase):
         :return: a dictionary of resources credentials
         """
 
-        self.set_options(var_options=variables, direct=kwargs)
-
-        api_token = self.get_option('api_token')
-        project = self.get_option('project')
-        team = self.get_option('team')
+        if not api_token:
+            api_token = os.getenv('MANIFOLD_API_TOKEN')
+        if not api_token:
+            raise AnsibleError('API token is required. Please set api_token parameter or MANIFOLD_API_TOKEN env var')
 
         try:
             labels = terms

plugins/lookup/merge_variables.py

@@ -1,212 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Thales Netherlands
-# Copyright (c) 2021, Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-DOCUMENTATION = """
-    author:
-      - Roy Lenferink (@rlenferink)
-      - Mark Ettema (@m-a-r-k-e)
-    name: merge_variables
-    short_description: merge variables with a certain suffix
-    description:
-        - This lookup returns the merged result of all variables in scope that match the given prefixes, suffixes, or
-         regular expressions, optionally.
-    version_added: 6.5.0
-    options:
-      _terms:
-        description:
-          - Depending on the value of I(pattern_type), this is a list of prefixes, suffixes, or regular expressions
-            that will be used to match all variables that should be merged.
-        required: true
-        type: list
-        elements: str
-      pattern_type:
-        description:
-          - Change the way of searching for the specified pattern.
-        type: str
-        default: 'regex'
-        choices:
-          - prefix
-          - suffix
-          - regex
-        env:
-          - name: ANSIBLE_MERGE_VARIABLES_PATTERN_TYPE
-        ini:
-          - section: merge_variables_lookup
-            key: pattern_type
-      initial_value:
-        description:
-          - An initial value to start with.
-        type: raw
-      override:
-        description:
-          - Return an error, print a warning or ignore it when a key will be overwritten.
-          - The default behavior C(error) makes the plugin fail when a key would be overwritten.
-          - When C(warn) and C(ignore) are used, note that it is important to know that the variables
-            are sorted by name before being merged. Keys for later variables in this order will overwrite
-            keys of the same name for variables earlier in this order. To avoid potential confusion,
-            better use I(override=error) whenever possible.
-        type: str
-        default: 'error'
-        choices:
-          - error
-          - warn
-          - ignore
-        env:
-          - name: ANSIBLE_MERGE_VARIABLES_OVERRIDE
-        ini:
-          - section: merge_variables_lookup
-            key: override
-"""
-
-EXAMPLES = """
-# Some example variables, they can be defined anywhere as long as they are in scope
-test_init_list:
-  - "list init item 1"
-  - "list init item 2"
-
-testa__test_list:
-  - "test a item 1"
-
-testb__test_list:
-  - "test b item 1"
-
-testa__test_dict:
-  ports:
-    - 1
-
-testb__test_dict:
-  ports:
-    - 3
-
-
-# Merge variables that end with '__test_dict' and store the result in a variable 'example_a'
-example_a: "{{ lookup('community.general.merge_variables', '__test_dict', pattern_type='suffix') }}"
-
-# The variable example_a now contains:
-# ports:
-#   - 1
-#   - 3
-
-
-# Merge variables that match the '^.+__test_list$' regular expression, starting with an initial value and store the
-# result in a variable 'example_b'
-example_b: "{{ lookup('community.general.merge_variables', '^.+__test_list$', initial_value=test_init_list) }}"
-
-# The variable example_b now contains:
-#   - "list init item 1"
-#   - "list init item 2"
-#   - "test a item 1"
-#   - "test b item 1"
-"""
-
-RETURN = """
-  _raw:
-    description: In case the search matches list items, a list will be returned. In case the search matches dicts, a
-     dict will be returned.
-    type: raw
-    elements: raw
-"""
-
-import re
-
-from ansible.errors import AnsibleError
-from ansible.plugins.lookup import LookupBase
-from ansible.utils.display import Display
-
-display = Display()
-
-
-def _verify_and_get_type(variable):
-    if isinstance(variable, list):
-        return "list"
-    elif isinstance(variable, dict):
-        return "dict"
-    else:
-        raise AnsibleError("Not supported type detected, variable must be a list or a dict")
-
-
-class LookupModule(LookupBase):
-
-    def run(self, terms, variables=None, **kwargs):
-        self.set_options(direct=kwargs)
-        initial_value = self.get_option("initial_value", None)
-        self._override = self.get_option('override', 'error')
-        self._pattern_type = self.get_option('pattern_type', 'regex')
-
-        ret = []
-        for term in terms:
-            if not isinstance(term, str):
-                raise AnsibleError("Non-string type '{0}' passed, only 'str' types are allowed!".format(type(term)))
-
-            ret.append(self._merge_vars(term, initial_value, variables))
-
-        return ret
-
-    def _var_matches(self, key, search_pattern):
-        if self._pattern_type == "prefix":
-            return key.startswith(search_pattern)
-        elif self._pattern_type == "suffix":
-            return key.endswith(search_pattern)
-        elif self._pattern_type == "regex":
-            matcher = re.compile(search_pattern)
-            return matcher.search(key)
-
-        return False
-
-    def _merge_vars(self, search_pattern, initial_value, variables):
-        display.vvv("Merge variables with {0}: {1}".format(self._pattern_type, search_pattern))
-        var_merge_names = sorted([key for key in variables.keys() if self._var_matches(key, search_pattern)])
-        display.vvv("The following variables will be merged: {0}".format(var_merge_names))
-
-        prev_var_type = None
-        result = None
-
-        if initial_value is not None:
-            prev_var_type = _verify_and_get_type(initial_value)
-            result = initial_value
-
-        for var_name in var_merge_names:
-            var_value = self._templar.template(variables[var_name])  # Render jinja2 templates
-            var_type = _verify_and_get_type(var_value)
-
-            if prev_var_type is None:
-                prev_var_type = var_type
-            elif prev_var_type != var_type:
-                raise AnsibleError("Unable to merge, not all variables are of the same type")
-
-            if result is None:
-                result = var_value
-                continue
-
-            if var_type == "dict":
-                result = self._merge_dict(var_value, result, [var_name])
-            else:  # var_type == "list"
-                result += var_value
-
-        return result
-
-    def _merge_dict(self, src, dest, path):
-        for key, value in src.items():
-            if isinstance(value, dict):
-                node = dest.setdefault(key, {})
-                self._merge_dict(value, node, path + [key])
-            elif isinstance(value, list) and key in dest:
-                dest[key] += value
-            else:
-                if (key in dest) and dest[key] != value:
-                    msg = "The key '{0}' with value '{1}' will be overwritten with value '{2}' from '{3}.{0}'".format(
-                        key, dest[key], value, ".".join(path))
-
-                    if self._override == "error":
-                        raise AnsibleError(msg)
-                    if self._override == "warn":
-                        display.warning(msg)
-
-                dest[key] = value
-
-        return dest

plugins/lookup/onepassword.py

@@ -32,7 +32,7 @@ DOCUMENTATION = '''
       section:
         description: Item section containing the field to retrieve (case-insensitive). If absent will return first match from any section.
       domain:
-        description: Domain of 1Password.
+        description: Domain of 1Password. Default is U(1password.com).
         version_added: 3.2.0
         default: '1password.com'
         type: str
@@ -55,7 +55,7 @@ DOCUMENTATION = '''
       - This lookup stores potentially sensitive data from 1Password as Ansible facts.
         Facts are subject to caching if enabled, which means this data could be stored in clear text
         on disk or in a database.
-      - Tested with C(op) version 2.7.2
+      - Tested with C(op) version 0.5.3
 '''
 
 EXAMPLES = """
@@ -96,123 +96,106 @@ RETURN = """
     elements: str
 """
 
-import abc
-import os
+import errno
 import json
-import subprocess
+import os
+
+from subprocess import Popen, PIPE
 
 from ansible.plugins.lookup import LookupBase
 from ansible.errors import AnsibleLookupError
-from ansible.module_utils.common.process import get_bin_path
 from ansible.module_utils.common.text.converters import to_bytes, to_text
-from ansible.module_utils.six import with_metaclass
 
 from ansible_collections.community.general.plugins.module_utils.onepassword import OnePasswordConfig
 
 
-class OnePassCLIBase(with_metaclass(abc.ABCMeta, object)):
-    bin = "op"
+class OnePass(object):
+    def __init__(self, path='op'):
+        self.cli_path = path
+        self.logged_in = False
+        self.token = None
+        self.subdomain = None
+        self.domain = None
+        self.username = None
+        self.secret_key = None
+        self.master_password = None
 
-    def __init__(self, subdomain=None, domain="1password.com", username=None, secret_key=None, master_password=None):
-        self.subdomain = subdomain
-        self.domain = domain
-        self.username = username
-        self.master_password = master_password
-        self.secret_key = secret_key
+        self._config = OnePasswordConfig()
 
-        self._path = None
-        self._version = None
+    def get_token(self):
+        # If the config file exists, assume an initial signin has taken place and try basic sign in
+        if os.path.isfile(self._config.config_file_path):
 
-    def _check_required_params(self, required_params):
-        non_empty_attrs = dict((param, getattr(self, param, None)) for param in required_params if getattr(self, param, None))
-        missing = set(required_params).difference(non_empty_attrs)
-        if missing:
-            prefix = "Unable to sign in to 1Password. Missing required parameter"
-            plural = ""
-            suffix = ": {params}.".format(params=", ".join(missing))
-            if len(missing) > 1:
-                plural = "s"
+            if not self.master_password:
+                raise AnsibleLookupError('Unable to sign in to 1Password. master_password is required.')
 
-            msg = "{prefix}{plural}{suffix}".format(prefix=prefix, plural=plural, suffix=suffix)
-            raise AnsibleLookupError(msg)
+            try:
+                args = ['signin', '--output=raw']
 
-    @abc.abstractmethod
-    def _parse_field(self, data_json, field_name, section_title):
-        """Main method for parsing data returned from the op command line tool"""
+                if self.subdomain:
+                    args = ['signin', self.subdomain, '--output=raw']
 
-    def _run(self, args, expected_rc=0, command_input=None, ignore_errors=False, environment_update=None):
-        command = [self.path] + args
-        call_kwargs = {
-            "stdout": subprocess.PIPE,
-            "stderr": subprocess.PIPE,
-            "stdin": subprocess.PIPE,
-        }
+                rc, out, err = self._run(args, command_input=to_bytes(self.master_password))
+                self.token = out.strip()
 
-        if environment_update:
-            env = os.environ.copy()
-            env.update(environment_update)
-            call_kwargs["env"] = env
+            except AnsibleLookupError:
+                self.full_login()
 
-        p = subprocess.Popen(command, **call_kwargs)
+        else:
+            # Attempt a full sign in since there appears to be no existing sign in
+            self.full_login()
+
+    def assert_logged_in(self):
+        try:
+            rc, out, err = self._run(['get', 'account'], ignore_errors=True)
+            if rc == 0:
+                self.logged_in = True
+            if not self.logged_in:
+                self.get_token()
+        except OSError as e:
+            if e.errno == errno.ENOENT:
+                raise AnsibleLookupError("1Password CLI tool '%s' not installed in path on control machine" % self.cli_path)
+            raise e
+
+    def get_raw(self, item_id, vault=None):
+        args = ["get", "item", item_id]
+        if vault is not None:
+            args += ['--vault={0}'.format(vault)]
+        if not self.logged_in:
+            args += [to_bytes('--session=') + self.token]
+        rc, output, dummy = self._run(args)
+        return output
+
+    def get_field(self, item_id, field, section=None, vault=None):
+        output = self.get_raw(item_id, vault)
+        return self._parse_field(output, field, section) if output != '' else ''
+
+    def full_login(self):
+        if None in [self.subdomain, self.username, self.secret_key, self.master_password]:
+            raise AnsibleLookupError('Unable to perform initial sign in to 1Password. '
+                                     'subdomain, username, secret_key, and master_password are required to perform initial sign in.')
+
+        args = [
+            'signin',
+            '{0}.{1}'.format(self.subdomain, self.domain),
+            to_bytes(self.username),
+            to_bytes(self.secret_key),
+            '--output=raw',
+        ]
+
+        rc, out, err = self._run(args, command_input=to_bytes(self.master_password))
+        self.token = out.strip()
+
+    def _run(self, args, expected_rc=0, command_input=None, ignore_errors=False):
+        command = [self.cli_path] + args
+        p = Popen(command, stdout=PIPE, stderr=PIPE, stdin=PIPE)
         out, err = p.communicate(input=command_input)
         rc = p.wait()
-
         if not ignore_errors and rc != expected_rc:
             raise AnsibleLookupError(to_text(err))
-
         return rc, out, err
 
-    @abc.abstractmethod
-    def assert_logged_in(self):
-        """Check whether a login session exists"""
-
-    @abc.abstractmethod
-    def full_signin(self):
-        """Performa full login"""
-
-    @abc.abstractmethod
-    def get_raw(self, item_id, vault=None, token=None):
-        """Gets the specified item from the vault"""
-
-    @abc.abstractmethod
-    def signin(self):
-        """Sign in using the master password"""
-
-    @property
-    def path(self):
-        if self._path is None:
-            self._path = get_bin_path(self.bin)
-
-        return self._path
-
-    @property
-    def version(self):
-        if self._version is None:
-            self._version = self.get_current_version()
-
-        return self._version
-
-    @classmethod
-    def get_current_version(cls):
-        """Standalone method to get the op CLI version. Useful when determining which class to load
-        based on the current version."""
-        try:
-            bin_path = get_bin_path(cls.bin)
-        except ValueError:
-            raise AnsibleLookupError("Unable to locate '%s' command line tool" % cls.bin)
-
-        try:
-            b_out = subprocess.check_output([bin_path, "--version"], stderr=subprocess.PIPE)
-        except subprocess.CalledProcessError as cpe:
-            raise AnsibleLookupError("Unable to get the op version: %s" % cpe)
-
-        return to_text(b_out).strip()
-
-
-class OnePassCLIv1(OnePassCLIBase):
-    supports_version = "1"
-
-    def _parse_field(self, data_json, field_name, section_title):
+    def _parse_field(self, data_json, field_name, section_title=None):
         """
         Retrieves the desired field from the `op` response payload
 
@@ -266,356 +249,36 @@ class OnePassCLIv1(OnePassCLIBase):
             # check the details dictionary for `field_name` and return it immediately if it exists
             # when the entry is a "password" instead of a "login" item, the password field is a key
             # in the `details` dictionary:
-            if field_name in data["details"]:
-                return data["details"][field_name]
+            if field_name in data['details']:
+                return data['details'][field_name]
 
             # when the field is not found above, iterate through the fields list in the object details
-            for field_data in data["details"].get("fields", []):
-                if field_data.get("name", "").lower() == field_name.lower():
-                    return field_data.get("value", "")
-
-        for section_data in data["details"].get("sections", []):
-            if section_title is not None and section_title.lower() != section_data["title"].lower():
+            for field_data in data['details'].get('fields', []):
+                if field_data.get('name', '').lower() == field_name.lower():
+                    return field_data.get('value', '')
+        for section_data in data['details'].get('sections', []):
+            if section_title is not None and section_title.lower() != section_data['title'].lower():
                 continue
-
-            for field_data in section_data.get("fields", []):
-                if field_data.get("t", "").lower() == field_name.lower():
-                    return field_data.get("v", "")
-
-        return ""
-
-    def assert_logged_in(self):
-        args = ["get", "account"]
-        if self.subdomain:
-            account = "{subdomain}.{domain}".format(subdomain=self.subdomain, domain=self.domain)
-            args.extend(["--account", account])
-
-        rc, out, err = self._run(args, ignore_errors=True)
-
-        return not bool(rc)
-
-    def full_signin(self):
-        required_params = [
-            "subdomain",
-            "username",
-            "secret_key",
-            "master_password",
-        ]
-        self._check_required_params(required_params)
-
-        args = [
-            "signin",
-            "{0}.{1}".format(self.subdomain, self.domain),
-            to_bytes(self.username),
-            to_bytes(self.secret_key),
-            "--raw",
-        ]
-
-        return self._run(args, command_input=to_bytes(self.master_password))
-
-    def get_raw(self, item_id, vault=None, token=None):
-        args = ["get", "item", item_id]
-        if vault is not None:
-            args += ["--vault={0}".format(vault)]
-
-        if token is not None:
-            args += [to_bytes("--session=") + token]
-
-        return self._run(args)
-
-    def signin(self):
-        self._check_required_params(['master_password'])
-
-        args = ["signin", "--raw"]
-        if self.subdomain:
-            args.append(self.subdomain)
-
-        return self._run(args, command_input=to_bytes(self.master_password))
-
-
-class OnePassCLIv2(OnePassCLIBase):
-    """
-    CLIv2 Syntax Reference: https://developer.1password.com/docs/cli/upgrade#step-2-update-your-scripts
-    """
-    supports_version = "2"
-
-    def _parse_field(self, data_json, field_name, section_title=None):
-        """
-        Schema reference: https://developer.1password.com/docs/cli/item-template-json
-
-        Example Data:
-
-            # Password item
-            {
-              "id": "ywvdbojsguzgrgnokmcxtydgdv",
-              "title": "Authy Backup",
-              "version": 1,
-              "vault": {
-                "id": "bcqxysvcnejjrwzoqrwzcqjqxc",
-                "name": "Personal"
-              },
-              "category": "PASSWORD",
-              "last_edited_by": "7FUPZ8ZNE02KSHMAIMKHIVUE17",
-              "created_at": "2015-01-18T13:13:38Z",
-              "updated_at": "2016-02-20T16:23:54Z",
-              "additional_information": "Jan 18, 2015, 08:13:38",
-              "fields": [
-                {
-                  "id": "password",
-                  "type": "CONCEALED",
-                  "purpose": "PASSWORD",
-                  "label": "password",
-                  "value": "OctoberPoppyNuttyDraperySabbath",
-                  "reference": "op://Personal/Authy Backup/password",
-                  "password_details": {
-                    "strength": "FANTASTIC"
-                  }
-                },
-                {
-                  "id": "notesPlain",
-                  "type": "STRING",
-                  "purpose": "NOTES",
-                  "label": "notesPlain",
-                  "value": "Backup password to restore Authy",
-                  "reference": "op://Personal/Authy Backup/notesPlain"
-                }
-              ]
-            }
-
-            # Login item
-            {
-              "id": "awk4s2u44fhnrgppszcsvc663i",
-              "title": "Dummy Login",
-              "version": 2,
-              "vault": {
-                "id": "stpebbaccrq72xulgouxsk4p7y",
-                "name": "Personal"
-              },
-              "category": "LOGIN",
-              "last_edited_by": "LSGPJERUYBH7BFPHMZ2KKGL6AU",
-              "created_at": "2018-04-25T21:55:19Z",
-              "updated_at": "2018-04-25T21:56:06Z",
-              "additional_information": "agent.smith",
-              "urls": [
-                {
-                  "primary": true,
-                  "href": "https://acme.com"
-                }
-              ],
-              "sections": [
-                {
-                  "id": "linked items",
-                  "label": "Related Items"
-                }
-              ],
-              "fields": [
-                {
-                  "id": "username",
-                  "type": "STRING",
-                  "purpose": "USERNAME",
-                  "label": "username",
-                  "value": "agent.smith",
-                  "reference": "op://Personal/Dummy Login/username"
-                },
-                {
-                  "id": "password",
-                  "type": "CONCEALED",
-                  "purpose": "PASSWORD",
-                  "label": "password",
-                  "value": "Q7vFwTJcqwxKmTU]Dzx7NW*wrNPXmj",
-                  "entropy": 159.6083697084228,
-                  "reference": "op://Personal/Dummy Login/password",
-                  "password_details": {
-                    "entropy": 159,
-                    "generated": true,
-                    "strength": "FANTASTIC"
-                  }
-                },
-                {
-                  "id": "notesPlain",
-                  "type": "STRING",
-                  "purpose": "NOTES",
-                  "label": "notesPlain",
-                  "reference": "op://Personal/Dummy Login/notesPlain"
-                }
-              ]
-            }
-        """
-        data = json.loads(data_json)
-        for field in data.get("fields", []):
-            if section_title is None:
-                # If the field name exists in the section, return that value
-                if field.get(field_name):
-                    return field.get(field_name)
-
-                # If the field name doesn't exist in the section, match on the value of "label"
-                # then "id" and return "value"
-                if field.get("label") == field_name:
-                    return field["value"]
-
-                if field.get("id") == field_name:
-                    return field["value"]
-
-            # Look at the section data and get an indentifier. The value of 'id' is either a unique ID
-            # or a human-readable string. If a 'label' field exists, prefer that since
-            # it is the value visible in the 1Password UI when both 'id' and 'label' exist.
-            section = field.get("section", {})
-            current_section_title = section.get("label", section.get("id"))
-            if section_title == current_section_title:
-                # In the correct section. Check "label" then "id" for the desired field_name
-                if field.get("label") == field_name:
-                    return field["value"]
-
-                if field.get("id") == field_name:
-                    return field["value"]
-
-        return ""
-
-    def assert_logged_in(self):
-        args = ["account", "list"]
-        if self.subdomain:
-            account = "{subdomain}.{domain}".format(subdomain=self.subdomain, domain=self.domain)
-            args.extend(["--account", account])
-
-        rc, out, err = self._run(args)
-
-        if out:
-            # Running 'op account get' if there are no accounts configured on the system drops into
-            # an interactive prompt. Only run 'op account get' after first listing accounts to see
-            # if there are any previously configured accounts.
-            args = ["account", "get"]
-            if self.subdomain:
-                account = "{subdomain}.{domain}".format(subdomain=self.subdomain, domain=self.domain)
-                args.extend(["--account", account])
-
-            rc, out, err = self._run(args, ignore_errors=True)
-
-            return not bool(rc)
-
-        return False
-
-    def full_signin(self):
-        required_params = [
-            "subdomain",
-            "username",
-            "secret_key",
-            "master_password",
-        ]
-        self._check_required_params(required_params)
-
-        args = [
-            "account", "add", "--raw",
-            "--address", "{0}.{1}".format(self.subdomain, self.domain),
-            "--email", to_bytes(self.username),
-            "--signin",
-        ]
-
-        environment_update = {"OP_SECRET_KEY": self.secret_key}
-        return self._run(args, command_input=to_bytes(self.master_password), environment_update=environment_update)
-
-    def get_raw(self, item_id, vault=None, token=None):
-        args = ["item", "get", item_id, "--format", "json"]
-        if vault is not None:
-            args += ["--vault={0}".format(vault)]
-        if token is not None:
-            args += [to_bytes("--session=") + token]
-
-        return self._run(args)
-
-    def signin(self):
-        self._check_required_params(['master_password'])
-
-        args = ["signin", "--raw"]
-        if self.subdomain:
-            args.extend(["--account", self.subdomain])
-
-        return self._run(args, command_input=to_bytes(self.master_password))
-
-
-class OnePass(object):
-    def __init__(self, subdomain=None, domain="1password.com", username=None, secret_key=None, master_password=None):
-        self.subdomain = subdomain
-        self.domain = domain
-        self.username = username
-        self.secret_key = secret_key
-        self.master_password = master_password
-
-        self.logged_in = False
-        self.token = None
-
-        self._config = OnePasswordConfig()
-        self._cli = self._get_cli_class()
-
-    def _get_cli_class(self):
-        version = OnePassCLIBase.get_current_version()
-        for cls in OnePassCLIBase.__subclasses__():
-            if cls.supports_version == version.split(".")[0]:
-                try:
-                    return cls(self.subdomain, self.domain, self.username, self.secret_key, self.master_password)
-                except TypeError as e:
-                    raise AnsibleLookupError(e)
-
-        raise AnsibleLookupError("op version %s is unsupported" % version)
-
-    def set_token(self):
-        if self._config.config_file_path and os.path.isfile(self._config.config_file_path):
-            # If the config file exists, assume an initial sign in has taken place and try basic sign in
-            try:
-                rc, out, err = self._cli.signin()
-            except AnsibleLookupError as exc:
-                test_strings = (
-                    "missing required parameters",
-                    "unauthorized",
-                )
-                if any(string in exc.message.lower() for string in test_strings):
-                    # A required parameter is missing, or a bad master password was supplied
-                    # so don't bother attempting a full signin
-                    raise
-
-                rc, out, err = self._cli.full_signin()
-
-            self.token = out.strip()
-
-        else:
-            # Attempt a full signin since there appears to be no existing signin
-            rc, out, err = self._cli.full_signin()
-            self.token = out.strip()
-
-    def assert_logged_in(self):
-        logged_in = self._cli.assert_logged_in()
-        if logged_in:
-            self.logged_in = logged_in
-            pass
-        else:
-            self.set_token()
-
-    def get_raw(self, item_id, vault=None):
-        rc, out, err = self._cli.get_raw(item_id, vault, self.token)
-        return out
-
-    def get_field(self, item_id, field, section=None, vault=None):
-        output = self.get_raw(item_id, vault)
-        if output:
-            return self._cli._parse_field(output, field, section)
-
-        return ""
+            for field_data in section_data.get('fields', []):
+                if field_data.get('t', '').lower() == field_name.lower():
+                    return field_data.get('v', '')
+        return ''
 
 
 class LookupModule(LookupBase):
 
     def run(self, terms, variables=None, **kwargs):
-        self.set_options(var_options=variables, direct=kwargs)
+        op = OnePass()
 
-        field = self.get_option("field")
-        section = self.get_option("section")
-        vault = self.get_option("vault")
-        subdomain = self.get_option("subdomain")
-        domain = self.get_option("domain")
-        username = self.get_option("username")
-        secret_key = self.get_option("secret_key")
-        master_password = self.get_option("master_password")
+        field = kwargs.get('field', 'password')
+        section = kwargs.get('section')
+        vault = kwargs.get('vault')
+        op.subdomain = kwargs.get('subdomain')
+        op.domain = kwargs.get('domain', '1password.com')
+        op.username = kwargs.get('username')
+        op.secret_key = kwargs.get('secret_key')
+        op.master_password = kwargs.get('master_password', kwargs.get('vault_password'))
 
-        op = OnePass(subdomain, domain, username, secret_key, master_password)
         op.assert_logged_in()
 
         values = []

plugins/lookup/onepassword_raw.py

@@ -30,11 +30,6 @@ DOCUMENTATION = '''
         description: Item section containing the field to retrieve (case-insensitive). If absent will return first match from any section.
       subdomain:
         description: The 1Password subdomain to authenticate against.
-      domain:
-        description: Domain of 1Password.
-        version_added: 6.0.0
-        default: '1password.com'
-        type: str
       username:
         description: The username used to sign in.
       secret_key:
@@ -52,7 +47,7 @@ DOCUMENTATION = '''
       - This lookup stores potentially sensitive data from 1Password as Ansible facts.
         Facts are subject to caching if enabled, which means this data could be stored in clear text
         on disk or in a database.
-      - Tested with C(op) version 2.7.0
+      - Tested with C(op) version 0.5.3
 '''
 
 EXAMPLES = """
@@ -81,21 +76,18 @@ from ansible.plugins.lookup import LookupBase
 class LookupModule(LookupBase):
 
     def run(self, terms, variables=None, **kwargs):
-        self.set_options(var_options=variables, direct=kwargs)
+        op = OnePass()
 
-        vault = self.get_option("vault")
-        subdomain = self.get_option("subdomain")
-        domain = self.get_option("domain", "1password.com")
-        username = self.get_option("username")
-        secret_key = self.get_option("secret_key")
-        master_password = self.get_option("master_password")
+        vault = kwargs.get('vault')
+        op.subdomain = kwargs.get('subdomain')
+        op.username = kwargs.get('username')
+        op.secret_key = kwargs.get('secret_key')
+        op.master_password = kwargs.get('master_password', kwargs.get('vault_password'))
 
-        op = OnePass(subdomain, domain, username, secret_key, master_password)
         op.assert_logged_in()
 
         values = []
         for term in terms:
             data = json.loads(op.get_raw(term, vault))
             values.append(data)
-
         return values

plugins/lookup/passwordstore.py

@@ -21,15 +21,17 @@ DOCUMENTATION = '''
       _terms:
         description: query key.
         required: true
-      directory:
+      passwordstore:
         description:
-          - The directory of the password store.
-          - If I(backend=pass), the default is C(~/.password-store) is used.
-          - If I(backend=gopass), then the default is the C(path) field in C(~/.config/gopass/config.yml),
-            falling back to C(~/.local/share/gopass/stores/root) if C(path) is not defined in the gopass config.
-        type: path
-        vars:
-          - name: passwordstore
+          - 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.
+      directory:
+        description: The directory of the password store.
         env:
           - name: PASSWORD_STORE_DIR
       create:
@@ -53,11 +55,9 @@ DOCUMENTATION = '''
         default: false
       subkey:
         description: Return a specific subkey of the password. When set to C(password), always returns the first line.
-        type: str
         default: password
       userpass:
         description: Specify a password to save, instead of a generated one.
-        type: str
       length:
         description: The length of the generated password.
         type: integer
@@ -67,7 +67,7 @@ DOCUMENTATION = '''
         type: bool
         default: false
       nosymbols:
-        description: Use alphanumeric characters.
+        description: use alphanumeric characters.
         type: bool
         default: false
       missing:
@@ -129,8 +129,6 @@ DOCUMENTATION = '''
           - pass
           - gopass
         version_added: 5.2.0
-    notes:
-      - The lookup supports passing all options as lookup parameters since community.general 6.0.0.
 '''
 EXAMPLES = """
 ansible.cfg: |
@@ -138,7 +136,7 @@ ansible.cfg: |
   lock=readwrite
   locktimeout=45s
 
-tasks.yml: |
+playbook.yml: |
   ---
 
   # Debug is used for examples, BAD IDEA to show passwords on screen
@@ -148,49 +146,45 @@ tasks.yml: |
 
   - name: Basic lookup. Warns if example/test does not exist and returns empty string
     ansible.builtin.debug:
-      msg: "{{ lookup('community.general.passwordstore', 'example/test', missing='warn')}}"
+      msg: "{{ lookup('community.general.passwordstore', 'example/test missing=warn')}}"
 
   - name: Create pass with random 16 character password. If password exists just give the password
     ansible.builtin.debug:
       var: mypassword
     vars:
-      mypassword: "{{ lookup('community.general.passwordstore', 'example/test', create=true)}}"
+      mypassword: "{{ lookup('community.general.passwordstore', 'example/test create=true')}}"
 
   - name: Create pass with random 16 character password. If password exists just give the password
     ansible.builtin.debug:
       var: mypassword
     vars:
-      mypassword: "{{ lookup('community.general.passwordstore', 'example/test', missing='create')}}"
+      mypassword: "{{ lookup('community.general.passwordstore', 'example/test missing=create')}}"
 
   - name: Prints 'abc' if example/test does not exist, just give the password otherwise
     ansible.builtin.debug:
       var: mypassword
     vars:
-      mypassword: >-
-        {{ lookup('community.general.passwordstore', 'example/test', missing='empty')
-           | default('abc', true) }}
+      mypassword: "{{ lookup('community.general.passwordstore', 'example/test missing=empty') | default('abc', true) }}"
 
   - name: Different size password
     ansible.builtin.debug:
-      msg: "{{ lookup('community.general.passwordstore', 'example/test', create=true, length=42)}}"
+      msg: "{{ lookup('community.general.passwordstore', 'example/test create=true length=42')}}"
 
-  - name: >-
-      Create password and overwrite the password if it exists.
-      As a bonus, this module includes the old password inside the pass file
+  - name: Create password and overwrite the password if it exists. As a bonus, this module includes the old password inside the pass file
     ansible.builtin.debug:
-      msg: "{{ lookup('community.general.passwordstore', 'example/test', create=true, overwrite=true)}}"
+      msg: "{{ lookup('community.general.passwordstore', 'example/test create=true overwrite=true')}}"
 
   - name: Create an alphanumeric password
     ansible.builtin.debug:
-      msg: "{{ lookup('community.general.passwordstore', 'example/test', create=true, nosymbols=true) }}"
+      msg: "{{ lookup('community.general.passwordstore', 'example/test create=true nosymbols=true') }}"
 
   - name: Return the value for user in the KV pair user, username
     ansible.builtin.debug:
-      msg: "{{ lookup('community.general.passwordstore', 'example/test', subkey='user')}}"
+      msg: "{{ lookup('community.general.passwordstore', 'example/test subkey=user')}}"
 
   - name: Return the entire password file content
     ansible.builtin.set_fact:
-      passfilecontent: "{{ lookup('community.general.passwordstore', 'example/test', returnall=true)}}"
+      passfilecontent: "{{ lookup('community.general.passwordstore', 'example/test returnall=true')}}"
 """
 
 RETURN = """
@@ -209,6 +203,7 @@ import time
 import yaml
 
 from ansible.errors import AnsibleError, AnsibleAssertionError
+from ansible.module_utils.common.file import FileLock
 from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
 from ansible.module_utils.parsing.convert_bool import boolean
 from ansible.utils.display import Display
@@ -216,8 +211,6 @@ from ansible.utils.encrypt import random_password
 from ansible.plugins.lookup import LookupBase
 from ansible import constants as C
 
-from ansible_collections.community.general.plugins.module_utils._filelock import FileLock
-
 display = Display()
 
 
@@ -327,7 +320,7 @@ class LookupModule(LookupBase):
                 raise AnsibleError('Passwordstore directory \'{0}\' does not exist'.format(self.paramvals['directory']))
 
             # Set PASSWORD_STORE_UMASK if umask is set
-            if self.paramvals.get('umask') is not None:
+            if 'umask' in self.paramvals:
                 if len(self.paramvals['umask']) != 3:
                     raise AnsibleError('Passwordstore umask must have a length of 3.')
                 elif int(self.paramvals['umask'][0]) > 3:
@@ -442,7 +435,8 @@ class LookupModule(LookupBase):
         unit_to_seconds = {"s": 1, "m": 60, "h": 3600}
         self.lock_timeout = int(timeout[:-1]) * unit_to_seconds[timeout[-1]]
 
-        directory = self.get_option('directory')
+        directory = variables.get('passwordstore', os.environ.get('PASSWORD_STORE_DIR', None))
+
         if directory is None:
             if self.backend == 'gopass':
                 try:
@@ -454,17 +448,16 @@ class LookupModule(LookupBase):
                 directory = os.path.expanduser('~/.password-store')
 
         self.paramvals = {
-            'subkey': self.get_option('subkey'),
+            'subkey': 'password',
             'directory': directory,
-            'create': self.get_option('create'),
-            'returnall': self.get_option('returnall'),
-            'overwrite': self.get_option('overwrite'),
-            'nosymbols': self.get_option('nosymbols'),
-            'userpass': self.get_option('userpass') or '',
-            'length': self.get_option('length'),
-            'backup': self.get_option('backup'),
-            'missing': self.get_option('missing'),
-            'umask': self.get_option('umask'),
+            'create': False,
+            'returnall': False,
+            'overwrite': False,
+            'nosymbols': False,
+            'userpass': '',
+            'length': 16,
+            'backup': False,
+            'missing': 'error',
         }
 
     def run(self, terms, variables, **kwargs):

plugins/lookup/redis.py

@@ -73,6 +73,8 @@ _raw:
   elements: str
 """
 
+import os
+
 HAVE_REDIS = False
 try:
     import redis

plugins/lookup/shelvefile.py

@@ -14,24 +14,23 @@ DOCUMENTATION = '''
       - Read keys from Python shelve file.
     options:
       _terms:
-        description: Sets of key value pairs of parameters.
+        description: sets of key value pairs of parameters
       key:
-        description: Key to query.
+        description: key to query
         required: true
       file:
-        description: Path to shelve file.
+        description: path to shelve file
         required: true
 '''
 
 EXAMPLES = """
-- name: Retrieve a string value corresponding to a key inside a Python shelve file
-  ansible.builtin.debug:
-    msg: "{{ lookup('community.general.shelvefile', 'file=path_to_some_shelve_file.db key=key_to_retrieve') }}"
+- name: retrieve a string value corresponding to a key inside a Python shelve file
+  ansible.builtin.debug: msg="{{ lookup('community.general.shelvefile', 'file=path_to_some_shelve_file.db key=key_to_retrieve') }}
 """
 
 RETURN = """
 _list:
-  description: Value(s) of key(s) in shelve file(s).
+  description: value(s) of key(s) in shelve file(s)
   type: list
   elements: str
 """
@@ -54,6 +53,7 @@ class LookupModule(LookupBase):
         return res
 
     def run(self, terms, variables=None, **kwargs):
+
         if not isinstance(terms, list):
             terms = [terms]
 

plugins/module_utils/_filelock.py

@@ -1,109 +0,0 @@
-# Copyright (c) 2018, Ansible Project
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
-# SPDX-License-Identifier: BSD-2-Clause
-
-# NOTE:
-# This has been vendored from ansible.module_utils.common.file. This code has been removed from there for ansible-core 2.16.
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-import os
-import stat
-import time
-import fcntl
-import sys
-
-from contextlib import contextmanager
-
-
-class LockTimeout(Exception):
-    pass
-
-
-class FileLock:
-    '''
-    Currently FileLock is implemented via fcntl.flock on a lock file, however this
-    behaviour may change in the future. Avoid mixing lock types fcntl.flock,
-    fcntl.lockf and module_utils.common.file.FileLock as it will certainly cause
-    unwanted and/or unexpected behaviour
-    '''
-    def __init__(self):
-        self.lockfd = None
-
-    @contextmanager
-    def lock_file(self, path, tmpdir, lock_timeout=None):
-        '''
-        Context for lock acquisition
-        '''
-        try:
-            self.set_lock(path, tmpdir, lock_timeout)
-            yield
-        finally:
-            self.unlock()
-
-    def set_lock(self, path, tmpdir, lock_timeout=None):
-        '''
-        Create a lock file based on path with flock to prevent other processes
-        using given path.
-        Please note that currently file locking only works when it's executed by
-        the same user, I.E single user scenarios
-
-        :kw path: Path (file) to lock
-        :kw tmpdir: Path where to place the temporary .lock file
-        :kw lock_timeout:
-            Wait n seconds for lock acquisition, fail if timeout is reached.
-            0 = Do not wait, fail if lock cannot be acquired immediately,
-            Default is None, wait indefinitely until lock is released.
-        :returns: True
-        '''
-        lock_path = os.path.join(tmpdir, 'ansible-{0}.lock'.format(os.path.basename(path)))
-        l_wait = 0.1
-        r_exception = IOError
-        if sys.version_info[0] == 3:
-            r_exception = BlockingIOError
-
-        self.lockfd = open(lock_path, 'w')
-
-        if lock_timeout <= 0:
-            fcntl.flock(self.lockfd, fcntl.LOCK_EX | fcntl.LOCK_NB)
-            os.chmod(lock_path, stat.S_IWRITE | stat.S_IREAD)
-            return True
-
-        if lock_timeout:
-            e_secs = 0
-            while e_secs < lock_timeout:
-                try:
-                    fcntl.flock(self.lockfd, fcntl.LOCK_EX | fcntl.LOCK_NB)
-                    os.chmod(lock_path, stat.S_IWRITE | stat.S_IREAD)
-                    return True
-                except r_exception:
-                    time.sleep(l_wait)
-                    e_secs += l_wait
-                    continue
-
-            self.lockfd.close()
-            raise LockTimeout('{0} sec'.format(lock_timeout))
-
-        fcntl.flock(self.lockfd, fcntl.LOCK_EX)
-        os.chmod(lock_path, stat.S_IWRITE | stat.S_IREAD)
-
-        return True
-
-    def unlock(self):
-        '''
-        Make sure lock file is available for everyone and Unlock the file descriptor
-        locked by set_lock
-
-        :returns: True
-        '''
-        if not self.lockfd:
-            return True
-
-        try:
-            fcntl.flock(self.lockfd, fcntl.LOCK_UN)
-            self.lockfd.close()
-        except ValueError:  # file wasn't opened, let context manager fail gracefully
-            pass
-
-        return True

plugins/module_utils/_stormssh.py

@@ -1,258 +0,0 @@
-# -*- coding: utf-8 -*-
-# This code is part of Ansible, but is an independent component.
-# This particular file snippet, and this file snippet only, is based on
-# the config parser from here: https://github.com/emre/storm/blob/master/storm/parsers/ssh_config_parser.py
-# Copyright (C) <2013> <Emre Yilmaz>
-# SPDX-License-Identifier: MIT
-
-from __future__ import (absolute_import, division, print_function)
-import os
-import re
-import traceback
-from operator import itemgetter
-
-__metaclass__ = type
-
-try:
-    from paramiko.config import SSHConfig
-except ImportError:
-    SSHConfig = object
-    HAS_PARAMIKO = False
-    PARAMIKO_IMPORT_ERROR = traceback.format_exc()
-else:
-    HAS_PARAMIKO = True
-    PARAMIKO_IMPORT_ERROR = None
-
-
-class StormConfig(SSHConfig):
-    def parse(self, file_obj):
-        """
-        Read an OpenSSH config from the given file object.
-        @param file_obj: a file-like object to read the config file from
-        @type file_obj: file
-        """
-        order = 1
-        host = {"host": ['*'], "config": {}, }
-        for line in file_obj:
-            line = line.rstrip('\n').lstrip()
-            if line == '':
-                self._config.append({
-                    'type': 'empty_line',
-                    'value': line,
-                    'host': '',
-                    'order': order,
-                })
-                order += 1
-                continue
-
-            if line.startswith('#'):
-                self._config.append({
-                    'type': 'comment',
-                    'value': line,
-                    'host': '',
-                    'order': order,
-                })
-                order += 1
-                continue
-
-            if '=' in line:
-                # Ensure ProxyCommand gets properly split
-                if line.lower().strip().startswith('proxycommand'):
-                    proxy_re = re.compile(r"^(proxycommand)\s*=*\s*(.*)", re.I)
-                    match = proxy_re.match(line)
-                    key, value = match.group(1).lower(), match.group(2)
-                else:
-                    key, value = line.split('=', 1)
-                    key = key.strip().lower()
-            else:
-                # find first whitespace, and split there
-                i = 0
-                while (i < len(line)) and not line[i].isspace():
-                    i += 1
-                if i == len(line):
-                    raise Exception('Unparsable line: %r' % line)
-                key = line[:i].lower()
-                value = line[i:].lstrip()
-            if key == 'host':
-                self._config.append(host)
-                value = value.split()
-                host = {
-                    key: value,
-                    'config': {},
-                    'type': 'entry',
-                    'order': order
-                }
-                order += 1
-            elif key in ['identityfile', 'localforward', 'remoteforward']:
-                if key in host['config']:
-                    host['config'][key].append(value)
-                else:
-                    host['config'][key] = [value]
-            elif key not in host['config']:
-                host['config'].update({key: value})
-        self._config.append(host)
-
-
-class ConfigParser(object):
-    """
-    Config parser for ~/.ssh/config files.
-    """
-
-    def __init__(self, ssh_config_file=None):
-        if not ssh_config_file:
-            ssh_config_file = self.get_default_ssh_config_file()
-
-        self.defaults = {}
-
-        self.ssh_config_file = ssh_config_file
-
-        if not os.path.exists(self.ssh_config_file):
-            if not os.path.exists(os.path.dirname(self.ssh_config_file)):
-                os.makedirs(os.path.dirname(self.ssh_config_file))
-            open(self.ssh_config_file, 'w+').close()
-            os.chmod(self.ssh_config_file, 0o600)
-
-        self.config_data = []
-
-    def get_default_ssh_config_file(self):
-        return os.path.expanduser("~/.ssh/config")
-
-    def load(self):
-        config = StormConfig()
-
-        with open(self.ssh_config_file) as fd:
-            config.parse(fd)
-
-        for entry in config.__dict__.get("_config"):
-            if entry.get("host") == ["*"]:
-                self.defaults.update(entry.get("config"))
-
-            if entry.get("type") in ["comment", "empty_line"]:
-                self.config_data.append(entry)
-                continue
-
-            host_item = {
-                'host': entry["host"][0],
-                'options': entry.get("config"),
-                'type': 'entry',
-                'order': entry.get("order", 0),
-            }
-
-            if len(entry["host"]) > 1:
-                host_item.update({
-                    'host': " ".join(entry["host"]),
-                })
-            # minor bug in paramiko.SSHConfig that duplicates
-            # "Host *" entries.
-            if entry.get("config") and len(entry.get("config")) > 0:
-                self.config_data.append(host_item)
-
-        return self.config_data
-
-    def add_host(self, host, options):
-        self.config_data.append({
-            'host': host,
-            'options': options,
-            'order': self.get_last_index(),
-        })
-
-        return self
-
-    def update_host(self, host, options, use_regex=False):
-        for index, host_entry in enumerate(self.config_data):
-            if host_entry.get("host") == host or \
-                    (use_regex and re.match(host, host_entry.get("host"))):
-
-                if 'deleted_fields' in options:
-                    deleted_fields = options.pop("deleted_fields")
-                    for deleted_field in deleted_fields:
-                        del self.config_data[index]["options"][deleted_field]
-
-                self.config_data[index]["options"].update(options)
-
-        return self
-
-    def search_host(self, search_string):
-        results = []
-        for host_entry in self.config_data:
-            if host_entry.get("type") != 'entry':
-                continue
-            if host_entry.get("host") == "*":
-                continue
-
-            searchable_information = host_entry.get("host")
-            for key, value in host_entry.get("options").items():
-                if isinstance(value, list):
-                    value = " ".join(value)
-                if isinstance(value, int):
-                    value = str(value)
-
-                searchable_information += " " + value
-
-            if search_string in searchable_information:
-                results.append(host_entry)
-
-        return results
-
-    def delete_host(self, host):
-        found = 0
-        for index, host_entry in enumerate(self.config_data):
-            if host_entry.get("host") == host:
-                del self.config_data[index]
-                found += 1
-
-        if found == 0:
-            raise ValueError('No host found')
-        return self
-
-    def delete_all_hosts(self):
-        self.config_data = []
-        self.write_to_ssh_config()
-
-        return self
-
-    def dump(self):
-        if len(self.config_data) < 1:
-            return
-
-        file_content = ""
-        self.config_data = sorted(self.config_data, key=itemgetter("order"))
-
-        for host_item in self.config_data:
-            if host_item.get("type") in ['comment', 'empty_line']:
-                file_content += host_item.get("value") + "\n"
-                continue
-            host_item_content = "Host {0}\n".format(host_item.get("host"))
-            for key, value in host_item.get("options").items():
-                if isinstance(value, list):
-                    sub_content = ""
-                    for value_ in value:
-                        sub_content += "    {0} {1}\n".format(
-                            key, value_
-                        )
-                    host_item_content += sub_content
-                else:
-                    host_item_content += "    {0} {1}\n".format(
-                        key, value
-                    )
-            file_content += host_item_content
-
-        return file_content
-
-    def write_to_ssh_config(self):
-        with open(self.ssh_config_file, 'w+') as f:
-            data = self.dump()
-            if data:
-                f.write(data)
-        return self
-
-    def get_last_index(self):
-        last_index = 0
-        indexes = []
-        for item in self.config_data:
-            if item.get("order"):
-                indexes.append(item.get("order"))
-        if len(indexes) > 0:
-            last_index = max(indexes)
-
-        return last_index

plugins/module_utils/btrfs.py

@@ -1,464 +0,0 @@
-# Copyright (c) 2022, Gregory Furlong <gnfzdz@fzdz.io>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-from ansible.module_utils.common.text.converters import to_bytes
-import re
-import os
-
-
-def normalize_subvolume_path(path):
-    """
-    Normalizes btrfs subvolume paths to ensure exactly one leading slash, no trailing slashes and no consecutive slashes.
-    In addition, if the path is prefixed with a leading <FS_TREE>, this value is removed.
-    """
-    fstree_stripped = re.sub(r'^<FS_TREE>', '', path)
-    result = re.sub(r'/+$', '', re.sub(r'/+', '/', '/' + fstree_stripped))
-    return result if len(result) > 0 else '/'
-
-
-class BtrfsModuleException(Exception):
-    pass
-
-
-class BtrfsCommands(object):
-
-    """
-    Provides access to a subset of the Btrfs command line
-    """
-
-    def __init__(self, module):
-        self.__module = module
-        self.__btrfs = self.__module.get_bin_path("btrfs", required=True)
-
-    def filesystem_show(self):
-        command = "%s filesystem show -d" % (self.__btrfs)
-        result = self.__module.run_command(command, check_rc=True)
-        stdout = [x.strip() for x in result[1].splitlines()]
-        filesystems = []
-        current = None
-        for line in stdout:
-            if line.startswith('Label'):
-                current = self.__parse_filesystem(line)
-                filesystems.append(current)
-            elif line.startswith('devid'):
-                current['devices'].append(self.__parse_filesystem_device(line))
-        return filesystems
-
-    def __parse_filesystem(self, line):
-        label = re.sub(r'\s*uuid:.*$', '', re.sub(r'^Label:\s*', '', line))
-        id = re.sub(r'^.*uuid:\s*', '', line)
-
-        filesystem = {}
-        filesystem['label'] = label.strip("'") if label != 'none' else None
-        filesystem['uuid'] = id
-        filesystem['devices'] = []
-        filesystem['mountpoints'] = []
-        filesystem['subvolumes'] = []
-        filesystem['default_subvolid'] = None
-        return filesystem
-
-    def __parse_filesystem_device(self, line):
-        return re.sub(r'^.*path\s', '', line)
-
-    def subvolumes_list(self, filesystem_path):
-        command = "%s subvolume list -tap %s" % (self.__btrfs, filesystem_path)
-        result = self.__module.run_command(command, check_rc=True)
-        stdout = [x.split('\t') for x in result[1].splitlines()]
-        subvolumes = [{'id': 5, 'parent': None, 'path': '/'}]
-        if len(stdout) > 2:
-            subvolumes.extend([self.__parse_subvolume_list_record(x) for x in stdout[2:]])
-        return subvolumes
-
-    def __parse_subvolume_list_record(self, item):
-        return {
-            'id': int(item[0]),
-            'parent': int(item[2]),
-            'path': normalize_subvolume_path(item[5]),
-        }
-
-    def subvolume_get_default(self, filesystem_path):
-        command = [self.__btrfs, "subvolume", "get-default", to_bytes(filesystem_path)]
-        result = self.__module.run_command(command, check_rc=True)
-        # ID [n] ...
-        return int(result[1].strip().split()[1])
-
-    def subvolume_set_default(self, filesystem_path, subvolume_id):
-        command = [self.__btrfs, "subvolume", "set-default", str(subvolume_id), to_bytes(filesystem_path)]
-        result = self.__module.run_command(command, check_rc=True)
-
-    def subvolume_create(self, subvolume_path):
-        command = [self.__btrfs, "subvolume", "create", to_bytes(subvolume_path)]
-        result = self.__module.run_command(command, check_rc=True)
-
-    def subvolume_snapshot(self, snapshot_source, snapshot_destination):
-        command = [self.__btrfs, "subvolume", "snapshot", to_bytes(snapshot_source), to_bytes(snapshot_destination)]
-        result = self.__module.run_command(command, check_rc=True)
-
-    def subvolume_delete(self, subvolume_path):
-        command = [self.__btrfs, "subvolume", "delete", to_bytes(subvolume_path)]
-        result = self.__module.run_command(command, check_rc=True)
-
-
-class BtrfsInfoProvider(object):
-
-    """
-    Utility providing details of the currently available btrfs filesystems
-    """
-
-    def __init__(self, module):
-        self.__module = module
-        self.__btrfs_api = BtrfsCommands(module)
-        self.__findmnt_path = self.__module.get_bin_path("findmnt", required=True)
-
-    def get_filesystems(self):
-        filesystems = self.__btrfs_api.filesystem_show()
-        mountpoints = self.__find_mountpoints()
-        for filesystem in filesystems:
-            device_mountpoints = self.__filter_mountpoints_for_devices(mountpoints, filesystem['devices'])
-            filesystem['mountpoints'] = device_mountpoints
-
-            if len(device_mountpoints) > 0:
-
-                # any path within the filesystem can be used to query metadata
-                mountpoint = device_mountpoints[0]['mountpoint']
-                filesystem['subvolumes'] = self.get_subvolumes(mountpoint)
-                filesystem['default_subvolid'] = self.get_default_subvolume_id(mountpoint)
-
-        return filesystems
-
-    def get_mountpoints(self, filesystem_devices):
-        mountpoints = self.__find_mountpoints()
-        return self.__filter_mountpoints_for_devices(mountpoints, filesystem_devices)
-
-    def get_subvolumes(self, filesystem_path):
-        return self.__btrfs_api.subvolumes_list(filesystem_path)
-
-    def get_default_subvolume_id(self, filesystem_path):
-        return self.__btrfs_api.subvolume_get_default(filesystem_path)
-
-    def __filter_mountpoints_for_devices(self, mountpoints, devices):
-        return [m for m in mountpoints if (m['device'] in devices)]
-
-    def __find_mountpoints(self):
-        command = "%s -t btrfs -nvP" % self.__findmnt_path
-        result = self.__module.run_command(command)
-        mountpoints = []
-        if result[0] == 0:
-            lines = result[1].splitlines()
-            for line in lines:
-                mountpoint = self.__parse_mountpoint_pairs(line)
-                mountpoints.append(mountpoint)
-        return mountpoints
-
-    def __parse_mountpoint_pairs(self, line):
-        pattern = re.compile(r'^TARGET="(?P<target>.*)"\s+SOURCE="(?P<source>.*)"\s+FSTYPE="(?P<fstype>.*)"\s+OPTIONS="(?P<options>.*)"\s*$')
-        match = pattern.search(line)
-        if match is not None:
-            groups = match.groupdict()
-
-            return {
-                'mountpoint': groups['target'],
-                'device': groups['source'],
-                'subvolid': self.__extract_mount_subvolid(groups['options']),
-            }
-        else:
-            raise BtrfsModuleException("Failed to parse findmnt result for line: '%s'" % line)
-
-    def __extract_mount_subvolid(self, mount_options):
-        for option in mount_options.split(','):
-            if option.startswith('subvolid='):
-                return int(option[len('subvolid='):])
-        raise BtrfsModuleException("Failed to find subvolid for mountpoint in options '%s'" % mount_options)
-
-
-class BtrfsSubvolume(object):
-
-    """
-    Wrapper class providing convenience methods for inspection of a btrfs subvolume
-    """
-
-    def __init__(self, filesystem, subvolume_id):
-        self.__filesystem = filesystem
-        self.__subvolume_id = subvolume_id
-
-    def get_filesystem(self):
-        return self.__filesystem
-
-    def is_mounted(self):
-        mountpoints = self.get_mountpoints()
-        return mountpoints is not None and len(mountpoints) > 0
-
-    def is_filesystem_root(self):
-        return 5 == self.__subvolume_id
-
-    def is_filesystem_default(self):
-        return self.__filesystem.default_subvolid == self.__subvolume_id
-
-    def get_mounted_path(self):
-        mountpoints = self.get_mountpoints()
-        if mountpoints is not None and len(mountpoints) > 0:
-            return mountpoints[0]
-        elif self.parent is not None:
-            parent = self.__filesystem.get_subvolume_by_id(self.parent)
-            parent_path = parent.get_mounted_path()
-            if parent_path is not None:
-                return parent_path + os.path.sep + self.name
-        else:
-            return None
-
-    def get_mountpoints(self):
-        return self.__filesystem.get_mountpoints_by_subvolume_id(self.__subvolume_id)
-
-    def get_child_relative_path(self, absolute_child_path):
-        """
-        Get the relative path from this subvolume to the named child subvolume.
-        The provided parameter is expected to be normalized as by normalize_subvolume_path.
-        """
-        path = self.path
-        if absolute_child_path.startswith(path):
-            relative = absolute_child_path[len(path):]
-            return re.sub(r'^/*', '', relative)
-        else:
-            raise BtrfsModuleException("Path '%s' doesn't start with '%s'" % (absolute_child_path, path))
-
-    def get_parent_subvolume(self):
-        parent_id = self.parent
-        return self.__filesystem.get_subvolume_by_id(parent_id) if parent_id is not None else None
-
-    def get_child_subvolumes(self):
-        return self.__filesystem.get_subvolume_children(self.__subvolume_id)
-
-    @property
-    def __info(self):
-        return self.__filesystem.get_subvolume_info_for_id(self.__subvolume_id)
-
-    @property
-    def id(self):
-        return self.__subvolume_id
-
-    @property
-    def name(self):
-        return self.path.split('/').pop()
-
-    @property
-    def path(self):
-        return self.__info['path']
-
-    @property
-    def parent(self):
-        return self.__info['parent']
-
-
-class BtrfsFilesystem(object):
-
-    """
-    Wrapper class providing convenience methods for inspection of a btrfs filesystem
-    """
-
-    def __init__(self, info, provider, module):
-        self.__provider = provider
-
-        # constant for module execution
-        self.__uuid = info['uuid']
-        self.__label = info['label']
-        self.__devices = info['devices']
-
-        # refreshable
-        self.__default_subvolid = info['default_subvolid'] if 'default_subvolid' in info else None
-        self.__update_mountpoints(info['mountpoints'] if 'mountpoints' in info else [])
-        self.__update_subvolumes(info['subvolumes'] if 'subvolumes' in info else [])
-
-    @property
-    def uuid(self):
-        return self.__uuid
-
-    @property
-    def label(self):
-        return self.__label
-
-    @property
-    def default_subvolid(self):
-        return self.__default_subvolid
-
-    @property
-    def devices(self):
-        return list(self.__devices)
-
-    def refresh(self):
-        self.refresh_mountpoints()
-        self.refresh_subvolumes()
-        self.refresh_default_subvolume()
-
-    def refresh_mountpoints(self):
-        mountpoints = self.__provider.get_mountpoints(list(self.__devices))
-        self.__update_mountpoints(mountpoints)
-
-    def __update_mountpoints(self, mountpoints):
-        self.__mountpoints = dict()
-        for i in mountpoints:
-            subvolid = i['subvolid']
-            mountpoint = i['mountpoint']
-            if subvolid not in self.__mountpoints:
-                self.__mountpoints[subvolid] = []
-            self.__mountpoints[subvolid].append(mountpoint)
-
-    def refresh_subvolumes(self):
-        filesystem_path = self.get_any_mountpoint()
-        if filesystem_path is not None:
-            subvolumes = self.__provider.get_subvolumes(filesystem_path)
-            self.__update_subvolumes(subvolumes)
-
-    def __update_subvolumes(self, subvolumes):
-        # TODO strategy for retaining information on deleted subvolumes?
-        self.__subvolumes = dict()
-        for subvolume in subvolumes:
-            self.__subvolumes[subvolume['id']] = subvolume
-
-    def refresh_default_subvolume(self):
-        filesystem_path = self.get_any_mountpoint()
-        if filesystem_path is not None:
-            self.__default_subvolid = self.__provider.get_default_subvolume_id(filesystem_path)
-
-    def contains_device(self, device):
-        return device in self.__devices
-
-    def contains_subvolume(self, subvolume):
-        return self.get_subvolume_by_name(subvolume) is not None
-
-    def get_subvolume_by_id(self, subvolume_id):
-        return BtrfsSubvolume(self, subvolume_id) if subvolume_id in self.__subvolumes else None
-
-    def get_subvolume_info_for_id(self, subvolume_id):
-        return self.__subvolumes[subvolume_id] if subvolume_id in self.__subvolumes else None
-
-    def get_subvolume_by_name(self, subvolume):
-        for subvolume_info in self.__subvolumes.values():
-            if subvolume_info['path'] == subvolume:
-                return BtrfsSubvolume(self, subvolume_info['id'])
-        return None
-
-    def get_any_mountpoint(self):
-        for subvol_mountpoints in self.__mountpoints.values():
-            if len(subvol_mountpoints) > 0:
-                return subvol_mountpoints[0]
-        # maybe error?
-        return None
-
-    def get_any_mounted_subvolume(self):
-        for subvolid, subvol_mountpoints in self.__mountpoints.items():
-            if len(subvol_mountpoints) > 0:
-                return self.get_subvolume_by_id(subvolid)
-        return None
-
-    def get_mountpoints_by_subvolume_id(self, subvolume_id):
-        return self.__mountpoints[subvolume_id] if subvolume_id in self.__mountpoints else []
-
-    def get_nearest_subvolume(self, subvolume):
-        """Return the identified subvolume if existing, else the closest matching parent"""
-        subvolumes_by_path = self.__get_subvolumes_by_path()
-        while len(subvolume) > 1:
-            if subvolume in subvolumes_by_path:
-                return BtrfsSubvolume(self, subvolumes_by_path[subvolume]['id'])
-            else:
-                subvolume = re.sub(r'/[^/]+$', '', subvolume)
-
-        return BtrfsSubvolume(self, 5)
-
-    def get_mountpath_as_child(self, subvolume_name):
-        """Find a path to the target subvolume through a mounted ancestor"""
-        nearest = self.get_nearest_subvolume(subvolume_name)
-        if nearest.path == subvolume_name:
-            nearest = nearest.get_parent_subvolume()
-        if nearest is None or nearest.get_mounted_path() is None:
-            raise BtrfsModuleException("Failed to find a path '%s' through a mounted parent subvolume" % subvolume_name)
-        else:
-            return nearest.get_mounted_path() + os.path.sep + nearest.get_child_relative_path(subvolume_name)
-
-    def get_subvolume_children(self, subvolume_id):
-        return [BtrfsSubvolume(self, x['id']) for x in self.__subvolumes.values() if x['parent'] == subvolume_id]
-
-    def __get_subvolumes_by_path(self):
-        result = {}
-        for s in self.__subvolumes.values():
-            path = s['path']
-            result[path] = s
-        return result
-
-    def is_mounted(self):
-        return self.__mountpoints is not None and len(self.__mountpoints) > 0
-
-    def get_summary(self):
-        subvolumes = []
-        sources = self.__subvolumes.values() if self.__subvolumes is not None else []
-        for subvolume in sources:
-            id = subvolume['id']
-            subvolumes.append({
-                'id': id,
-                'path': subvolume['path'],
-                'parent': subvolume['parent'],
-                'mountpoints': self.get_mountpoints_by_subvolume_id(id),
-            })
-
-        return {
-            'default_subvolume': self.__default_subvolid,
-            'devices': self.__devices,
-            'label': self.__label,
-            'uuid': self.__uuid,
-            'subvolumes': subvolumes,
-        }
-
-
-class BtrfsFilesystemsProvider(object):
-
-    """
-    Provides methods to query available btrfs filesystems
-    """
-
-    def __init__(self, module):
-        self.__module = module
-        self.__provider = BtrfsInfoProvider(module)
-        self.__filesystems = None
-
-    def get_matching_filesystem(self, criteria):
-        if criteria['device'] is not None:
-            criteria['device'] = os.path.realpath(criteria['device'])
-
-        self.__check_init()
-        matching = [f for f in self.__filesystems.values() if self.__filesystem_matches_criteria(f, criteria)]
-        if len(matching) == 1:
-            return matching[0]
-        else:
-            raise BtrfsModuleException("Found %d filesystems matching criteria uuid=%s label=%s device=%s" % (
-                len(matching),
-                criteria['uuid'],
-                criteria['label'],
-                criteria['device']
-            ))
-
-    def __filesystem_matches_criteria(self, filesystem, criteria):
-        return ((criteria['uuid'] is None or filesystem.uuid == criteria['uuid']) and
-                (criteria['label'] is None or filesystem.label == criteria['label']) and
-                (criteria['device'] is None or filesystem.contains_device(criteria['device'])))
-
-    def get_filesystem_for_device(self, device):
-        real_device = os.path.realpath(device)
-        self.__check_init()
-        for fs in self.__filesystems.values():
-            if fs.contains_device(real_device):
-                return fs
-        return None
-
-    def get_filesystems(self):
-        self.__check_init()
-        return list(self.__filesystems.values())
-
-    def __check_init(self):
-        if self.__filesystems is None:
-            self.__filesystems = dict()
-            for f in self.__provider.get_filesystems():
-                uuid = f['uuid']
-                self.__filesystems[uuid] = BtrfsFilesystem(f, self.__provider, self.__module)

plugins/module_utils/cmd_runner.py

@@ -103,13 +103,8 @@ class _ArgFormat(object):
 
 class _Format(object):
     @staticmethod
-    def as_bool(args_true, args_false=None, ignore_none=None):
-        if args_false is not None:
-            if ignore_none is None:
-                ignore_none = False
-        else:
-            args_false = []
-        return _ArgFormat(lambda value: _ensure_list(args_true) if value else _ensure_list(args_false), ignore_none=ignore_none)
+    def as_bool(args):
+        return _ArgFormat(lambda value: _ensure_list(args) if value else [])
 
     @staticmethod
     def as_bool_not(args):

plugins/module_utils/csv.py

@@ -55,10 +55,8 @@ def initialize_dialect(dialect, **kwargs):
 
 
 def read_csv(data, dialect, fieldnames=None):
-    BOM = to_native(u'\ufeff')
+
     data = to_native(data, errors='surrogate_or_strict')
-    if data.startswith(BOM):
-        data = data[len(BOM):]
 
     if PY3:
         fake_fh = StringIO(data)

plugins/module_utils/deps.py

@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-# (c) 2022, Alexei Znamensky <russoz@gmail.com>
-# Copyright (c) 2022, Ansible Project
-# Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause)
-# SPDX-License-Identifier: BSD-2-Clause
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-
-import traceback
-from contextlib import contextmanager
-
-from ansible.module_utils.common.text.converters import to_native
-from ansible.module_utils.basic import missing_required_lib
-
-
-_deps = dict()
-
-
-class _Dependency(object):
-    _states = ["pending", "failure", "success"]
-
-    def __init__(self, name, reason=None, url=None, msg=None):
-        self.name = name
-        self.reason = reason
-        self.url = url
-        self.msg = msg
-
-        self.state = 0
-        self.trace = None
-        self.exc = None
-
-    def succeed(self):
-        self.state = 2
-
-    def fail(self, exc, trace):
-        self.state = 1
-        self.exc = exc
-        self.trace = trace
-
-    @property
-    def message(self):
-        if self.msg:
-            return to_native(self.msg)
-        else:
-            return missing_required_lib(self.name, reason=self.reason, url=self.url)
-
-    @property
-    def failed(self):
-        return self.state == 1
-
-    def validate(self, module):
-        if self.failed:
-            module.fail_json(msg=self.message, exception=self.trace)
-
-    def __str__(self):
-        return "<dependency: {0} [{1}]>".format(self.name, self._states[self.state])
-
-
-@contextmanager
-def declare(name, *args, **kwargs):
-    dep = _Dependency(name, *args, **kwargs)
-    try:
-        yield dep
-    except Exception as e:
-        dep.fail(e, traceback.format_exc())
-    else:
-        dep.succeed()
-    finally:
-        _deps[name] = dep
-
-
-def _select_names(spec):
-    dep_names = sorted(_deps)
-
-    if spec:
-        if spec.startswith("-"):
-            spec_split = spec[1:].split(":")
-            for d in spec_split:
-                dep_names.remove(d)
-        else:
-            spec_split = spec.split(":")
-            dep_names = []
-            for d in spec_split:
-                _deps[d]  # ensure it exists
-                dep_names.append(d)
-
-    return dep_names
-
-
-def validate(module, spec=None):
-    for dep in _select_names(spec):
-        _deps[dep].validate(module)
-
-
-def failed(spec=None):
-    return any(_deps[d].failed for d in _select_names(spec))

plugins/module_utils/dimensiondata.py

@@ -19,16 +19,15 @@ import os
 import re
 import traceback
 
-# (TODO: remove AnsibleModule from next line!)
-from ansible.module_utils.basic import AnsibleModule, missing_required_lib  # noqa: F401, pylint: disable=unused-import
+from ansible.module_utils.basic import AnsibleModule, missing_required_lib
 from ansible.module_utils.six.moves import configparser
 from os.path import expanduser
 from uuid import UUID
 
 LIBCLOUD_IMP_ERR = None
 try:
-    from libcloud.common.dimensiondata import API_ENDPOINTS, DimensionDataAPIException, DimensionDataStatus  # noqa: F401, pylint: disable=unused-import
-    from libcloud.compute.base import Node, NodeLocation  # noqa: F401, pylint: disable=unused-import
+    from libcloud.common.dimensiondata import API_ENDPOINTS, DimensionDataAPIException, DimensionDataStatus
+    from libcloud.compute.base import Node, NodeLocation
     from libcloud.compute.providers import get_driver
     from libcloud.compute.types import Provider
 

plugins/module_utils/gconftool2.py

@@ -6,14 +6,7 @@
 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
-
-
-_state_map = {
-    "present": "--set",
-    "absent": "--unset",
-    "get": "--get",
-}
+from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt as fmt
 
 
 def gconftool2_runner(module, **kwargs):
@@ -21,12 +14,14 @@ def gconftool2_runner(module, **kwargs):
         module,
         command='gconftool-2',
         arg_formats=dict(
-            state=cmd_runner_fmt.as_map(_state_map),
-            key=cmd_runner_fmt.as_list(),
-            value_type=cmd_runner_fmt.as_opt_val("--type"),
-            value=cmd_runner_fmt.as_list(),
-            direct=cmd_runner_fmt.as_bool("--direct"),
-            config_source=cmd_runner_fmt.as_opt_val("--config-source"),
+            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

@@ -110,14 +110,3 @@ def gitlab_authentication(module):
             GitLab remove Session API now that private tokens are removed from user API endpoints since version 10.2." % to_native(e))
 
     return gitlab_instance
-
-
-def filter_returned_variables(gitlab_variables):
-    # pop properties we don't know
-    existing_variables = [dict(x.attributes) for x in gitlab_variables]
-    KNOWN = ['key', 'value', 'masked', 'protected', 'variable_type', 'environment_scope']
-    for item in existing_variables:
-        for key in list(item.keys()):
-            if key not in KNOWN:
-                item.pop(key)
-    return existing_variables

plugins/module_utils/identity/keycloak/keycloak.py

@@ -42,23 +42,12 @@ URL_CLIENTTEMPLATE = "{url}/admin/realms/{realm}/client-templates/{id}"
 URL_CLIENTTEMPLATES = "{url}/admin/realms/{realm}/client-templates"
 URL_GROUPS = "{url}/admin/realms/{realm}/groups"
 URL_GROUP = "{url}/admin/realms/{realm}/groups/{groupid}"
-URL_GROUP_CHILDREN = "{url}/admin/realms/{realm}/groups/{groupid}/children"
 
 URL_CLIENTSCOPES = "{url}/admin/realms/{realm}/client-scopes"
 URL_CLIENTSCOPE = "{url}/admin/realms/{realm}/client-scopes/{id}"
 URL_CLIENTSCOPE_PROTOCOLMAPPERS = "{url}/admin/realms/{realm}/client-scopes/{id}/protocol-mappers/models"
 URL_CLIENTSCOPE_PROTOCOLMAPPER = "{url}/admin/realms/{realm}/client-scopes/{id}/protocol-mappers/models/{mapper_id}"
 
-URL_DEFAULT_CLIENTSCOPES = "{url}/admin/realms/{realm}/default-default-client-scopes"
-URL_DEFAULT_CLIENTSCOPE = "{url}/admin/realms/{realm}/default-default-client-scopes/{id}"
-URL_OPTIONAL_CLIENTSCOPES = "{url}/admin/realms/{realm}/default-optional-client-scopes"
-URL_OPTIONAL_CLIENTSCOPE = "{url}/admin/realms/{realm}/default-optional-client-scopes/{id}"
-
-URL_CLIENT_DEFAULT_CLIENTSCOPES = "{url}/admin/realms/{realm}/clients/{cid}/default-client-scopes"
-URL_CLIENT_DEFAULT_CLIENTSCOPE = "{url}/admin/realms/{realm}/clients/{cid}/default-client-scopes/{id}"
-URL_CLIENT_OPTIONAL_CLIENTSCOPES = "{url}/admin/realms/{realm}/clients/{cid}/optional-client-scopes"
-URL_CLIENT_OPTIONAL_CLIENTSCOPE = "{url}/admin/realms/{realm}/clients/{cid}/optional-client-scopes/{id}"
-
 URL_CLIENT_GROUP_ROLEMAPPINGS = "{url}/admin/realms/{realm}/groups/{id}/role-mappings/clients/{client}"
 URL_CLIENT_GROUP_ROLEMAPPINGS_AVAILABLE = "{url}/admin/realms/{realm}/groups/{id}/role-mappings/clients/{client}/available"
 URL_CLIENT_GROUP_ROLEMAPPINGS_COMPOSITE = "{url}/admin/realms/{realm}/groups/{id}/role-mappings/clients/{client}/composite"
@@ -69,8 +58,6 @@ URL_CLIENT_USER_ROLEMAPPINGS = "{url}/admin/realms/{realm}/users/{id}/role-mappi
 URL_CLIENT_USER_ROLEMAPPINGS_AVAILABLE = "{url}/admin/realms/{realm}/users/{id}/role-mappings/clients/{client}/available"
 URL_CLIENT_USER_ROLEMAPPINGS_COMPOSITE = "{url}/admin/realms/{realm}/users/{id}/role-mappings/clients/{client}/composite"
 
-URL_CLIENTSECRET = "{url}/admin/realms/{realm}/clients/{id}/client-secret"
-
 URL_AUTHENTICATION_FLOWS = "{url}/admin/realms/{realm}/authentication/flows"
 URL_AUTHENTICATION_FLOW = "{url}/admin/realms/{realm}/authentication/flows/{id}"
 URL_AUTHENTICATION_FLOW_COPY = "{url}/admin/realms/{realm}/authentication/flows/{copyfrom}/copy"
@@ -90,9 +77,6 @@ URL_IDENTITY_PROVIDER_MAPPER = "{url}/admin/realms/{realm}/identity-provider/ins
 URL_COMPONENTS = "{url}/admin/realms/{realm}/components"
 URL_COMPONENT = "{url}/admin/realms/{realm}/components/{id}"
 
-URL_AUTHZ_AUTHORIZATION_SCOPE = "{url}/admin/realms/{realm}/clients/{client_id}/authz/resource-server/scope/{id}"
-URL_AUTHZ_AUTHORIZATION_SCOPES = "{url}/admin/realms/{realm}/clients/{client_id}/authz/resource-server/scope"
-
 
 def keycloak_argument_spec():
     """
@@ -207,30 +191,24 @@ def is_struct_included(struct1, struct2, exclude=None):
             Return True if all element of dict 1 are present in dict 2, return false otherwise.
     """
     if isinstance(struct1, list) and isinstance(struct2, list):
-        if not struct1 and not struct2:
-            return True
         for item1 in struct1:
             if isinstance(item1, (list, dict)):
                 for item2 in struct2:
-                    if is_struct_included(item1, item2, exclude):
-                        break
-                else:
-                    return False
+                    if not is_struct_included(item1, item2, exclude):
+                        return False
             else:
                 if item1 not in struct2:
                     return False
         return True
     elif isinstance(struct1, dict) and isinstance(struct2, dict):
-        if not struct1 and not struct2:
-            return True
         try:
             for key in struct1:
                 if not (exclude and key in exclude):
                     if not is_struct_included(struct1[key], struct2[key], exclude):
                         return False
+            return True
         except KeyError:
             return False
-        return True
     elif isinstance(struct1, bool) and isinstance(struct2, bool):
         return struct1 == struct2
     else:
@@ -628,7 +606,7 @@ class KeycloakAPI(object):
         """
         available_rolemappings_url = URL_CLIENT_GROUP_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, data=json.dumps(role_rep),
+            open_url(available_rolemappings_url, method="DELETE", http_agent=self.http_agent, 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"
@@ -753,15 +731,8 @@ class KeycloakAPI(object):
         users_url = URL_USERS.format(url=self.baseurl, realm=realm)
         users_url += '?username=%s&exact=true' % username
         try:
-            userrep = None
-            users = json.loads(to_native(open_url(users_url, method='GET', headers=self.restheaders, timeout=self.connection_timeout,
-                                                  validate_certs=self.validate_certs).read()))
-            for user in users:
-                if user['username'] == username:
-                    userrep = user
-                    break
-            return userrep
-
+            return json.loads(to_native(open_url(users_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 the user for realm %s and username %s: %s'
                                       % (realm, username, str(e)))
@@ -1189,177 +1160,6 @@ class KeycloakAPI(object):
             self.module.fail_json(msg='Could not update protocolmappers for clientscope %s in realm %s: %s'
                                       % (mapper_rep, realm, str(e)))
 
-    def get_default_clientscopes(self, realm, client_id=None):
-        """Fetch the name and ID of all clientscopes on the Keycloak server.
-
-        To fetch the full data of the client scope, make a subsequent call to
-        get_clientscope_by_clientscopeid, passing in the ID of the client scope you wish to return.
-
-        :param realm: Realm in which the clientscope resides.
-        :param client_id: The client in which the clientscope resides.
-        :return The default clientscopes of this realm or client
-        """
-        url = URL_DEFAULT_CLIENTSCOPES if client_id is None else URL_CLIENT_DEFAULT_CLIENTSCOPES
-        return self._get_clientscopes_of_type(realm, url, 'default', client_id)
-
-    def get_optional_clientscopes(self, realm, client_id=None):
-        """Fetch the name and ID of all clientscopes on the Keycloak server.
-
-        To fetch the full data of the client scope, make a subsequent call to
-        get_clientscope_by_clientscopeid, passing in the ID of the client scope you wish to return.
-
-        :param realm: Realm in which the clientscope resides.
-        :param client_id: The client in which the clientscope resides.
-        :return The optinal clientscopes of this realm or client
-        """
-        url = URL_OPTIONAL_CLIENTSCOPES if client_id is None else URL_CLIENT_OPTIONAL_CLIENTSCOPES
-        return self._get_clientscopes_of_type(realm, url, 'optional', client_id)
-
-    def _get_clientscopes_of_type(self, realm, url_template, scope_type, client_id=None):
-        """Fetch the name and ID of all clientscopes on the Keycloak server.
-
-        To fetch the full data of the client scope, make a subsequent call to
-        get_clientscope_by_clientscopeid, passing in the ID of the client scope you wish to return.
-
-        :param realm: Realm in which the clientscope resides.
-        :param url_template the template for the right type
-        :param scope_type this can be either optinal or default
-        :param client_id: The client in which the clientscope resides.
-        :return The clientscopes of the specified type of this realm
-        """
-        if client_id is None:
-            clientscopes_url = url_template.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, validate_certs=self.validate_certs).read()))
-            except Exception as e:
-                self.module.fail_json(msg="Could not fetch list of %s clientscopes in realm %s: %s" % (scope_type, realm, str(e)))
-        else:
-            cid = self.get_client_id(client_id=client_id, realm=realm)
-            clientscopes_url = url_template.format(url=self.baseurl, realm=realm, cid=cid)
-            try:
-                return json.loads(to_native(open_url(clientscopes_url, method="GET", http_agent=self.http_agent, 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 %s clientscopes in client %s: %s" % (scope_type, client_id, clientscopes_url))
-
-    def _decide_url_type_clientscope(self, client_id=None, scope_type="default"):
-        """Decides which url to use.
-        :param scope_type this can be either optinal or default
-        :param client_id: The client in which the clientscope resides.
-        """
-        if client_id is None:
-            if scope_type == "default":
-                return URL_DEFAULT_CLIENTSCOPE
-            if scope_type == "optional":
-                return URL_OPTIONAL_CLIENTSCOPE
-        else:
-            if scope_type == "default":
-                return URL_CLIENT_DEFAULT_CLIENTSCOPE
-            if scope_type == "optional":
-                return URL_CLIENT_OPTIONAL_CLIENTSCOPE
-
-    def add_default_clientscope(self, id, realm="master", client_id=None):
-        """Add a client scope as default either on realm or client level.
-
-        :param id: Client scope Id.
-        :param realm: Realm in which the clientscope resides.
-        :param client_id: The client in which the clientscope resides.
-        """
-        self._action_type_clientscope(id, client_id, "default", realm, 'add')
-
-    def add_optional_clientscope(self, id, realm="master", client_id=None):
-        """Add a client scope as optional either on realm or client level.
-
-        :param id: Client scope Id.
-        :param realm: Realm in which the clientscope resides.
-        :param client_id: The client in which the clientscope resides.
-        """
-        self._action_type_clientscope(id, client_id, "optional", realm, 'add')
-
-    def delete_default_clientscope(self, id, realm="master", client_id=None):
-        """Remove a client scope as default either on realm or client level.
-
-        :param id: Client scope Id.
-        :param realm: Realm in which the clientscope resides.
-        :param client_id: The client in which the clientscope resides.
-        """
-        self._action_type_clientscope(id, client_id, "default", realm, 'delete')
-
-    def delete_optional_clientscope(self, id, realm="master", client_id=None):
-        """Remove a client scope as optional either on realm or client level.
-
-        :param id: Client scope Id.
-        :param realm: Realm in which the clientscope resides.
-        :param client_id: The client in which the clientscope resides.
-        """
-        self._action_type_clientscope(id, client_id, "optional", realm, 'delete')
-
-    def _action_type_clientscope(self, id=None, client_id=None, scope_type="default", realm="master", action='add'):
-        """ Delete or add a clientscope of type.
-        :param name: The name of the clientscope. A lookup will be performed to retrieve the clientscope ID.
-        :param client_id: The ID of the clientscope (preferred to name).
-        :param scope_type 'default' or 'optional'
-        :param realm: The realm in which this group resides, default "master".
-        """
-        cid = None if client_id is None else self.get_client_id(client_id=client_id, realm=realm)
-        # should have a good cid by here.
-        clientscope_type_url = self._decide_url_type_clientscope(client_id, scope_type).format(realm=realm, id=id, cid=cid, url=self.baseurl)
-        try:
-            method = 'PUT' if action == "add" else 'DELETE'
-            return open_url(clientscope_type_url, method=method, http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
-                            validate_certs=self.validate_certs)
-
-        except Exception as e:
-            place = 'realm' if client_id is None else 'client ' + client_id
-            self.module.fail_json(msg="Unable to %s %s clientscope %s @ %s : %s" % (action, scope_type, id, place, str(e)))
-
-    def create_clientsecret(self, id, realm="master"):
-        """ Generate a new client secret by id
-
-        :param id: id (not clientId) of client to be queried
-        :param realm: client from this realm
-        :return: dict of credential representation
-        """
-        clientsecret_url = URL_CLIENTSECRET.format(url=self.baseurl, realm=realm, id=id)
-
-        try:
-            return json.loads(to_native(open_url(clientsecret_url, method='POST', headers=self.restheaders, timeout=self.connection_timeout,
-                                                 validate_certs=self.validate_certs).read()))
-
-        except HTTPError as e:
-            if e.code == 404:
-                return None
-            else:
-                self.module.fail_json(msg='Could not obtain clientsecret of client %s for realm %s: %s'
-                                          % (id, realm, str(e)))
-        except Exception as e:
-            self.module.fail_json(msg='Could not obtain clientsecret of client %s for realm %s: %s'
-                                      % (id, realm, str(e)))
-
-    def get_clientsecret(self, id, realm="master"):
-        """ Obtain client secret by id
-
-        :param id: id (not clientId) of client to be queried
-        :param realm: client from this realm
-        :return: dict of credential representation
-        """
-        clientsecret_url = URL_CLIENTSECRET.format(url=self.baseurl, realm=realm, id=id)
-
-        try:
-            return json.loads(to_native(open_url(clientsecret_url, method='GET', headers=self.restheaders, timeout=self.connection_timeout,
-                                                 validate_certs=self.validate_certs).read()))
-
-        except HTTPError as e:
-            if e.code == 404:
-                return None
-            else:
-                self.module.fail_json(msg='Could not obtain clientsecret of client %s for realm %s: %s'
-                                          % (id, realm, str(e)))
-        except Exception as e:
-            self.module.fail_json(msg='Could not obtain clientsecret of client %s for realm %s: %s'
-                                      % (id, realm, str(e)))
-
     def get_groups(self, realm="master"):
         """ Fetch the name and ID of all groups on the Keycloak server.
 
@@ -1401,7 +1201,7 @@ class KeycloakAPI(object):
             self.module.fail_json(msg="Could not fetch group %s in realm %s: %s"
                                       % (gid, realm, str(e)))
 
-    def get_group_by_name(self, name, realm="master", parents=None):
+    def get_group_by_name(self, name, realm="master"):
         """ Fetch a keycloak group within a realm based on its name.
 
         The Keycloak API does not allow filtering of the Groups resource by name.
@@ -1411,19 +1211,10 @@ class KeycloakAPI(object):
         If the group does not exist, None is returned.
         :param name: Name of the group to fetch.
         :param realm: Realm in which the group resides; default 'master'
-        :param parents: Optional list of parents when group to look for is a subgroup
         """
         groups_url = URL_GROUPS.format(url=self.baseurl, realm=realm)
         try:
-            if parents:
-                parent = self.get_subgroup_direct_parent(parents, realm)
-
-                if not parent:
-                    return None
-
-                all_groups = parent['subGroups']
-            else:
-                all_groups = self.get_groups(realm=realm)
+            all_groups = self.get_groups(realm=realm)
 
             for group in all_groups:
                 if group['name'] == name:
@@ -1435,102 +1226,6 @@ class KeycloakAPI(object):
             self.module.fail_json(msg="Could not fetch group %s in realm %s: %s"
                                       % (name, realm, str(e)))
 
-    def _get_normed_group_parent(self, parent):
-        """ Converts parent dict information into a more easy to use form.
-
-        :param parent: parent describing dict
-        """
-        if parent['id']:
-            return (parent['id'], True)
-
-        return (parent['name'], False)
-
-    def get_subgroup_by_chain(self, name_chain, realm="master"):
-        """ Access a subgroup API object by walking down a given name/id chain.
-
-        Groups can be given either as by name or by ID, the first element
-        must either be a toplvl group or given as ID, all parents must exist.
-
-        If the group cannot be found, None is returned.
-        :param name_chain: Topdown ordered list of subgroup parent (ids or names) + its own name at the end
-        :param realm: Realm in which the group resides; default 'master'
-        """
-        cp = name_chain[0]
-
-        # for 1st parent in chain we must query the server
-        cp, is_id = self._get_normed_group_parent(cp)
-
-        if is_id:
-            tmp = self.get_group_by_groupid(cp, realm=realm)
-        else:
-            # given as name, assume toplvl group
-            tmp = self.get_group_by_name(cp, realm=realm)
-
-        if not tmp:
-            return None
-
-        for p in name_chain[1:]:
-            for sg in tmp['subGroups']:
-                pv, is_id = self._get_normed_group_parent(p)
-
-                if is_id:
-                    cmpkey = "id"
-                else:
-                    cmpkey = "name"
-
-                if pv == sg[cmpkey]:
-                    tmp = sg
-                    break
-
-            if not tmp:
-                return None
-
-        return tmp
-
-    def get_subgroup_direct_parent(self, parents, realm="master", children_to_resolve=None):
-        """ Get keycloak direct parent group API object for a given chain of parents.
-
-        To succesfully work the API for subgroups we actually dont need
-        to "walk the whole tree" for nested groups but only need to know
-        the ID for the direct predecessor of current subgroup. This
-        method will guarantee us this information getting there with
-        as minimal work as possible.
-
-        Note that given parent list can and might be incomplete at the
-        upper levels as long as it starts with an ID instead of a name
-
-        If the group does not exist, None is returned.
-        :param parents: Topdown ordered list of subgroup parents
-        :param realm: Realm in which the group resides; default 'master'
-        """
-        if children_to_resolve is None:
-            # start recursion by reversing parents (in optimal cases
-            # we dont need to walk the whole tree upwarts)
-            parents = list(reversed(parents))
-            children_to_resolve = []
-
-        if not parents:
-            # walk complete parents list to the top, all names, no id's,
-            # try to resolve it assuming list is complete and 1st
-            # element is a toplvl group
-            return self.get_subgroup_by_chain(list(reversed(children_to_resolve)), realm=realm)
-
-        cp = parents[0]
-        unused, is_id = self._get_normed_group_parent(cp)
-
-        if is_id:
-            # current parent is given as ID, we can stop walking
-            # upwards searching for an entry point
-            return self.get_subgroup_by_chain([cp] + list(reversed(children_to_resolve)), realm=realm)
-        else:
-            # current parent is given as name, it must be resolved
-            # later, try next parent (recurse)
-            children_to_resolve.append(cp)
-            return self.get_subgroup_direct_parent(
-                parents[1:],
-                realm=realm, children_to_resolve=children_to_resolve
-            )
-
     def create_group(self, grouprep, realm="master"):
         """ Create a Keycloak group.
 
@@ -1545,34 +1240,6 @@ class KeycloakAPI(object):
             self.module.fail_json(msg="Could not create group %s in realm %s: %s"
                                       % (grouprep['name'], realm, str(e)))
 
-    def create_subgroup(self, parents, grouprep, realm="master"):
-        """ Create a Keycloak subgroup.
-
-        :param parents: list of one or more parent groups
-        :param grouprep: a GroupRepresentation of the group to be created. Must contain at minimum the field name.
-        :return: HTTPResponse object on success
-        """
-        parent_id = "---UNDETERMINED---"
-        try:
-            parent_id = self.get_subgroup_direct_parent(parents, realm)
-
-            if not parent_id:
-                raise Exception(
-                    "Could not determine subgroup parent ID for given"
-                    " parent chain {0}. Assure that all parents exist"
-                    " already and the list is complete and properly"
-                    " ordered, starts with an ID or starts at the"
-                    " top level".format(parents)
-                )
-
-            parent_id = parent_id["id"]
-            url = URL_GROUP_CHILDREN.format(url=self.baseurl, realm=realm, groupid=parent_id)
-            return open_url(url, method='POST', http_agent=self.http_agent, 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 subgroup %s for parent group %s in realm %s: %s"
-                                      % (grouprep['name'], parent_id, realm, str(e)))
-
     def update_group(self, grouprep, realm="master"):
         """ Update an existing group.
 
@@ -1946,9 +1613,6 @@ class KeycloakAPI(object):
                 data=json.dumps(updatedExec),
                 timeout=self.connection_timeout,
                 validate_certs=self.validate_certs)
-        except HTTPError as e:
-            self.module.fail_json(msg="Unable to update execution '%s': %s: %s %s" %
-                                      (flowAlias, repr(e), ";".join([e.url, e.msg, str(e.code), str(e.hdrs)]), str(updatedExec)))
         except Exception as e:
             self.module.fail_json(msg="Unable to update executions %s: %s" % (updatedExec, str(e)))
 
@@ -1973,7 +1637,7 @@ class KeycloakAPI(object):
         except Exception as e:
             self.module.fail_json(msg="Unable to add authenticationConfig %s: %s" % (executionId, str(e)))
 
-    def create_subflow(self, subflowName, flowAlias, realm='master', flowType='basic-flow'):
+    def create_subflow(self, subflowName, flowAlias, realm='master'):
         """ Create new sublow on the flow
 
         :param subflowName: name of the subflow to create
@@ -1984,7 +1648,7 @@ class KeycloakAPI(object):
             newSubFlow = {}
             newSubFlow["alias"] = subflowName
             newSubFlow["provider"] = "registration-page-form"
-            newSubFlow["type"] = flowType
+            newSubFlow["type"] = "basic-flow"
             open_url(
                 URL_AUTHENTICATION_FLOW_EXECUTIONS_FLOW.format(
                     url=self.baseurl,
@@ -2019,11 +1683,8 @@ class KeycloakAPI(object):
                 data=json.dumps(newExec),
                 timeout=self.connection_timeout,
                 validate_certs=self.validate_certs)
-        except HTTPError as e:
-            self.module.fail_json(msg="Unable to create new execution '%s' %s: %s: %s %s" %
-                                  (flowAlias, execution["providerId"], repr(e), ";".join([e.url, e.msg, str(e.code), str(e.hdrs)]), str(newExec)))
         except Exception as e:
-            self.module.fail_json(msg="Unable to create new execution '%s' %s: %s" % (flowAlias, execution["providerId"], repr(e)))
+            self.module.fail_json(msg="Unable to create new execution %s: %s" % (execution["provider"], str(e)))
 
     def change_execution_priority(self, executionId, diff, realm='master'):
         """ Raise or lower execution priority of diff time
@@ -2347,44 +2008,3 @@ class KeycloakAPI(object):
         except Exception as e:
             self.module.fail_json(msg='Unable to delete component %s in realm %s: %s'
                                       % (cid, realm, str(e)))
-
-    def get_authz_authorization_scope_by_name(self, name, client_id, realm):
-        url = URL_AUTHZ_AUTHORIZATION_SCOPES.format(url=self.baseurl, client_id=client_id, realm=realm)
-        search_url = "%s/search?name=%s" % (url, quote(name))
-
-        try:
-            return json.loads(to_native(open_url(search_url, method='GET', http_agent=self.http_agent, headers=self.restheaders,
-                                                 timeout=self.connection_timeout,
-                                                 validate_certs=self.validate_certs).read()))
-        except Exception:
-            return False
-
-    def create_authz_authorization_scope(self, payload, client_id, realm):
-        """Create an authorization scope for a Keycloak client"""
-        url = URL_AUTHZ_AUTHORIZATION_SCOPES.format(url=self.baseurl, client_id=client_id, realm=realm)
-
-        try:
-            return open_url(url, method='POST', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
-                            data=json.dumps(payload), validate_certs=self.validate_certs)
-        except Exception as e:
-            self.module.fail_json(msg='Could not create authorization scope %s for client %s in realm %s: %s' % (payload['name'], client_id, realm, str(e)))
-
-    def update_authz_authorization_scope(self, payload, id, client_id, realm):
-        """Update an authorization scope for a Keycloak client"""
-        url = URL_AUTHZ_AUTHORIZATION_SCOPE.format(url=self.baseurl, id=id, client_id=client_id, realm=realm)
-
-        try:
-            return open_url(url, method='PUT', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
-                            data=json.dumps(payload), validate_certs=self.validate_certs)
-        except Exception as e:
-            self.module.fail_json(msg='Could not create update scope %s for client %s in realm %s: %s' % (payload['name'], client_id, realm, str(e)))
-
-    def remove_authz_authorization_scope(self, id, client_id, realm):
-        """Remove an authorization scope from a Keycloak client"""
-        url = URL_AUTHZ_AUTHORIZATION_SCOPE.format(url=self.baseurl, id=id, client_id=client_id, realm=realm)
-
-        try:
-            return open_url(url, method='DELETE', http_agent=self.http_agent, headers=self.restheaders, timeout=self.connection_timeout,
-                            validate_certs=self.validate_certs)
-        except Exception as e:
-            self.module.fail_json(msg='Could not delete scope %s for client %s in realm %s: %s' % (id, client_id, realm, str(e)))

plugins/module_utils/identity/keycloak/keycloak_clientsecret.py

@@ -1,77 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (c) 2022, John Cant <a.johncant@gmail.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from __future__ import absolute_import, division, print_function
-
-__metaclass__ = type
-
-from ansible.module_utils.basic import AnsibleModule
-
-from ansible_collections.community.general.plugins.module_utils.identity.keycloak.keycloak import \
-    keycloak_argument_spec
-
-
-def keycloak_clientsecret_module():
-    """
-    Returns an AnsibleModule definition for modules that interact with a client
-    secret.
-
-    :return: argument_spec dict
-    """
-    argument_spec = keycloak_argument_spec()
-
-    meta_args = dict(
-        realm=dict(default='master'),
-        id=dict(type='str'),
-        client_id=dict(type='str', aliases=['clientId']),
-    )
-
-    argument_spec.update(meta_args)
-
-    module = AnsibleModule(
-        argument_spec=argument_spec,
-        supports_check_mode=True,
-        required_one_of=([['id', 'client_id'],
-                         ['token', 'auth_realm', 'auth_username', 'auth_password']]),
-        required_together=([['auth_realm', 'auth_username', 'auth_password']]),
-        mutually_exclusive=[
-            ['token', 'auth_realm'],
-            ['token', 'auth_username'],
-            ['token', 'auth_password']
-        ])
-
-    return module
-
-
-def keycloak_clientsecret_module_resolve_params(module, kc):
-    """
-    Given an AnsibleModule definition for keycloak_clientsecret_*, and a
-    KeycloakAPI client, resolve the params needed to interact with the Keycloak
-    client secret, looking up the client by clientId if necessary via an API
-    call.
-
-    :return: tuple of id, realm
-    """
-
-    realm = module.params.get('realm')
-    id = module.params.get('id')
-    client_id = module.params.get('client_id')
-
-    # only lookup the client_id if id isn't provided.
-    # in the case that both are provided, prefer the ID, since it's one
-    # less lookup.
-    if id is None:
-        # Due to the required_one_of spec, client_id is guaranteed to not be None
-        client = kc.get_client_by_clientid(client_id, realm=realm)
-
-        if client is None:
-            module.fail_json(
-                msg='Client does not exist {client_id}'.format(client_id=client_id)
-            )
-
-        id = client['id']
-
-    return id, realm

plugins/module_utils/ilo_redfish_utils.py

@@ -8,7 +8,6 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 from ansible_collections.community.general.plugins.module_utils.redfish_utils import RedfishUtils
-import time
 
 
 class iLORedfishUtils(RedfishUtils):
@@ -86,16 +85,17 @@ class iLORedfishUtils(RedfishUtils):
 
         datetime_uri = self.manager_uri + "DateTime"
 
-        listofips = mgr_attributes['mgr_attr_value'].split(" ")
-        if len(listofips) > 2:
-            return {'ret': False, 'changed': False, 'msg': "More than 2 NTP Servers mentioned"}
+        response = self.get_request(self.root_uri + datetime_uri)
+        if not response['ret']:
+            return response
 
-        ntp_list = []
-        for ips in listofips:
-            ntp_list.append(ips)
+        data = response['data']
 
-        while len(ntp_list) < 2:
-            ntp_list.append("0.0.0.0")
+        ntp_list = data[setkey]
+        if len(ntp_list) == 2:
+            ntp_list.pop(0)
+
+        ntp_list.append(mgr_attributes['mgr_attr_value'])
 
         payload = {setkey: ntp_list}
 
@@ -137,16 +137,18 @@ class iLORedfishUtils(RedfishUtils):
         nic_info = self.get_manager_ethernet_uri()
         uri = nic_info["nic_addr"]
 
-        listofips = attr['mgr_attr_value'].split(" ")
-        if len(listofips) > 3:
-            return {'ret': False, 'changed': False, 'msg': "More than 3 DNS Servers mentioned"}
+        response = self.get_request(self.root_uri + uri)
+        if not response['ret']:
+            return response
 
-        dns_list = []
-        for ips in listofips:
-            dns_list.append(ips)
+        data = response['data']
 
-        while len(dns_list) < 3:
-            dns_list.append("0.0.0.0")
+        dns_list = data["Oem"]["Hpe"]["IPv4"][key]
+
+        if len(dns_list) == 3:
+            dns_list.pop(0)
+
+        dns_list.append(attr['mgr_attr_value'])
 
         payload = {
             "Oem": {
@@ -229,79 +231,3 @@ class iLORedfishUtils(RedfishUtils):
         if not response['ret']:
             return response
         return {'ret': True, 'changed': True, 'msg': "Modified %s" % mgrattr['mgr_attr_name']}
-
-    def get_server_poststate(self):
-        # Get server details
-        response = self.get_request(self.root_uri + self.systems_uri)
-        if not response["ret"]:
-            return response
-        server_data = response["data"]
-
-        if "Hpe" in server_data["Oem"]:
-            return {
-                "ret": True,
-                "server_poststate": server_data["Oem"]["Hpe"]["PostState"]
-            }
-        else:
-            return {
-                "ret": True,
-                "server_poststate": server_data["Oem"]["Hp"]["PostState"]
-            }
-
-    def wait_for_ilo_reboot_completion(self, polling_interval=60, max_polling_time=1800):
-        # This method checks if OOB controller reboot is completed
-        time.sleep(10)
-
-        # Check server poststate
-        state = self.get_server_poststate()
-        if not state["ret"]:
-            return state
-
-        count = int(max_polling_time / polling_interval)
-        times = 0
-
-        # When server is powered OFF
-        pcount = 0
-        while state["server_poststate"] in ["PowerOff", "Off"] and pcount < 5:
-            time.sleep(10)
-            state = self.get_server_poststate()
-            if not state["ret"]:
-                return state
-
-            if state["server_poststate"] not in ["PowerOff", "Off"]:
-                break
-            pcount = pcount + 1
-        if state["server_poststate"] in ["PowerOff", "Off"]:
-            return {
-                "ret": False,
-                "changed": False,
-                "msg": "Server is powered OFF"
-            }
-
-        # When server is not rebooting
-        if state["server_poststate"] in ["InPostDiscoveryComplete", "FinishedPost"]:
-            return {
-                "ret": True,
-                "changed": False,
-                "msg": "Server is not rebooting"
-            }
-
-        while state["server_poststate"] not in ["InPostDiscoveryComplete", "FinishedPost"] and count > times:
-            state = self.get_server_poststate()
-            if not state["ret"]:
-                return state
-
-            if state["server_poststate"] in ["InPostDiscoveryComplete", "FinishedPost"]:
-                return {
-                    "ret": True,
-                    "changed": True,
-                    "msg": "Server reboot is completed"
-                }
-            time.sleep(polling_interval)
-            times = times + 1
-
-        return {
-            "ret": False,
-            "changed": False,
-            "msg": "Server Reboot has failed, server state: {state} ".format(state=state)
-        }

plugins/module_utils/influxdb.py

@@ -15,7 +15,7 @@ from ansible_collections.community.general.plugins.module_utils.version import L
 
 REQUESTS_IMP_ERR = None
 try:
-    import requests.exceptions  # noqa: F401, pylint: disable=unused-import
+    import requests.exceptions
     HAS_REQUESTS = True
 except ImportError:
     REQUESTS_IMP_ERR = traceback.format_exc()
@@ -25,7 +25,7 @@ INFLUXDB_IMP_ERR = None
 try:
     from influxdb import InfluxDBClient
     from influxdb import __version__ as influxdb_version
-    from influxdb import exceptions  # noqa: F401, pylint: disable=unused-import
+    from influxdb import exceptions
     HAS_INFLUXDB = True
 except ImportError:
     INFLUXDB_IMP_ERR = traceback.format_exc()

plugins/module_utils/jenkins.py

@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2022, Alexei Znamensky <russoz@gmail.com>
-#
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-
-import os
-import time
-
-
-def download_updates_file(updates_expiration):
-    updates_filename = 'jenkins-plugin-cache.json'
-    updates_dir = os.path.expanduser('~/.ansible/tmp')
-    updates_file = os.path.join(updates_dir, updates_filename)
-    download_updates = True
-
-    # Make sure the destination directory exists
-    if not os.path.isdir(updates_dir):
-        os.makedirs(updates_dir, 0o700)
-
-    # Check if we need to download new updates file
-    if os.path.isfile(updates_file):
-        # Get timestamp when the file was changed last time
-        ts_file = os.stat(updates_file).st_mtime
-        ts_now = time.time()
-
-        if ts_now - ts_file < updates_expiration:
-            download_updates = False
-
-    return updates_file, download_updates

plugins/module_utils/ldap.py

@@ -10,14 +10,11 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
-import re
 import traceback
 from ansible.module_utils.common.text.converters import to_native
 
 try:
     import ldap
-    import ldap.dn
-    import ldap.filter
     import ldap.sasl
 
     HAS_LDAP = True
@@ -34,14 +31,12 @@ def gen_specs(**specs):
     specs.update({
         'bind_dn': dict(),
         'bind_pw': dict(default='', no_log=True),
-        'ca_path': dict(type='path'),
         'dn': dict(required=True),
         'referrals_chasing': dict(type='str', default='anonymous', choices=['disabled', 'anonymous']),
         'server_uri': dict(default='ldapi:///'),
         'start_tls': dict(default=False, type='bool'),
         'validate_certs': dict(default=True, type='bool'),
         'sasl_class': dict(choices=['external', 'gssapi'], default='external', type='str'),
-        'xorder_discovery': dict(choices=['enable', 'auto', 'disable'], default='auto', type='str'),
     })
 
     return specs
@@ -53,23 +48,16 @@ class LdapGeneric(object):
         self.module = module
         self.bind_dn = self.module.params['bind_dn']
         self.bind_pw = self.module.params['bind_pw']
-        self.ca_path = self.module.params['ca_path']
+        self.dn = self.module.params['dn']
         self.referrals_chasing = self.module.params['referrals_chasing']
         self.server_uri = self.module.params['server_uri']
         self.start_tls = self.module.params['start_tls']
         self.verify_cert = self.module.params['validate_certs']
         self.sasl_class = self.module.params['sasl_class']
-        self.xorder_discovery = self.module.params['xorder_discovery']
 
         # Establish connection
         self.connection = self._connect_to_ldap()
 
-        if self.xorder_discovery == "enable" or (self.xorder_discovery == "auto" and not self._xorder_dn()):
-            # Try to find the X_ORDERed version of the DN
-            self.dn = self._find_dn()
-        else:
-            self.dn = self.module.params['dn']
-
     def fail(self, msg, exn):
         self.module.fail_json(
             msg=msg,
@@ -77,31 +65,10 @@ class LdapGeneric(object):
             exception=traceback.format_exc()
         )
 
-    def _find_dn(self):
-        dn = self.module.params['dn']
-
-        explode_dn = ldap.dn.explode_dn(dn)
-
-        if len(explode_dn) > 1:
-            try:
-                escaped_value = ldap.filter.escape_filter_chars(explode_dn[0])
-                filterstr = "(%s)" % escaped_value
-                dns = self.connection.search_s(','.join(explode_dn[1:]),
-                                               ldap.SCOPE_ONELEVEL, filterstr)
-                if len(dns) == 1:
-                    dn, dummy = dns[0]
-            except Exception:
-                pass
-
-        return dn
-
     def _connect_to_ldap(self):
         if not self.verify_cert:
             ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_NEVER)
 
-        if self.ca_path:
-            ldap.set_option(ldap.OPT_X_TLS_CACERTFILE, self.ca_path)
-
         connection = ldap.initialize(self.server_uri)
 
         if self.referrals_chasing == 'disabled':
@@ -124,8 +91,3 @@ class LdapGeneric(object):
             self.fail("Cannot bind to the server.", e)
 
         return connection
-
-    def _xorder_dn(self):
-        # match X_ORDERed DNs
-        regex = r"\w+=\{\d+\}.+"
-        return re.match(regex, self.module.params['dn']) is not None

plugins/module_utils/lxd.py

@@ -8,10 +8,8 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 
-import os
 import socket
 import ssl
-import json
 
 from ansible.module_utils.urls import generic_urlparse
 from ansible.module_utils.six.moves.urllib.parse import urlparse
@@ -22,6 +20,8 @@ from ansible.module_utils.common.text.converters import to_text
 HTTPConnection = http_client.HTTPConnection
 HTTPSConnection = http_client.HTTPSConnection
 
+import json
+
 
 class UnixHTTPConnection(HTTPConnection):
     def __init__(self, path):
@@ -60,7 +60,7 @@ class LXDClient(object):
             self.cert_file = cert_file
             self.key_file = key_file
             parts = generic_urlparse(urlparse(self.url))
-            ctx = ssl.create_default_context(ssl.Purpose.SERVER_AUTH)
+            ctx = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
             ctx.load_cert_chain(cert_file, keyfile=key_file)
             self.connection = HTTPSConnection(parts.get('netloc'), context=ctx)
         elif url.startswith('unix:'):
@@ -124,11 +124,3 @@ class LXDClient(object):
         if err is None:
             err = resp_json.get('error', None)
         return err
-
-
-def default_key_file():
-    return os.path.expanduser('~/.config/lxc/client.key')
-
-
-def default_cert_file():
-    return os.path.expanduser('~/.config/lxc/client.crt')

plugins/module_utils/memset.py

@@ -26,7 +26,6 @@ class Response(object):
     def __init__(self):
         self.content = None
         self.status_code = None
-        self.stderr = None
 
     def json(self):
         return json.loads(self.content)
@@ -76,10 +75,6 @@ def memset_api_call(api_key, api_method, payload=None):
             msg = "Memset API returned a {0} response ({1}, {2})." . format(response.status_code, response.json()['error_type'], response.json()['error'])
         else:
             msg = "Memset API returned an error ({0}, {1})." . format(response.json()['error_type'], response.json()['error'])
-    except urllib_error.URLError as e:
-        has_failed = True
-        msg = "An URLError occured ({0})." . format(type(e))
-        response.stderr = "{0}" . format(e)
 
     if msg is None:
         msg = response.json()

plugins/module_utils/mh/deco.py

@@ -37,17 +37,8 @@ def cause_changes(on_success=None, on_failure=None):
 
 
 def module_fails_on_exception(func):
-    conflict_list = ('msg', 'exception', 'output', 'vars', 'changed')
-
     @wraps(func)
     def wrapper(self, *args, **kwargs):
-        def fix_var_conflicts(output):
-            result = dict([
-                (k if k not in conflict_list else "_" + k, v)
-                for k, v in output.items()
-            ])
-            return result
-
         try:
             func(self, *args, **kwargs)
         except SystemExit:
@@ -55,16 +46,12 @@ def module_fails_on_exception(func):
         except ModuleHelperException as e:
             if e.update_output:
                 self.update_output(e.update_output)
-            # patchy solution to resolve conflict with output variables
-            output = fix_var_conflicts(self.output)
             self.module.fail_json(msg=e.msg, exception=traceback.format_exc(),
-                                  output=self.output, vars=self.vars.output(), **output)
+                                  output=self.output, vars=self.vars.output(), **self.output)
         except Exception as e:
-            # patchy solution to resolve conflict with output variables
-            output = fix_var_conflicts(self.output)
             msg = "Module failed with exception: {0}".format(str(e).strip())
             self.module.fail_json(msg=msg, exception=traceback.format_exc(),
-                                  output=self.output, vars=self.vars.output(), **output)
+                                  output=self.output, vars=self.vars.output(), **self.output)
     return wrapper
 
 

plugins/module_utils/mh/module_helper.py

@@ -9,22 +9,24 @@ __metaclass__ = type
 
 from ansible.module_utils.common.dict_transformations import dict_merge
 
-# (TODO: remove AnsibleModule!) pylint: disable-next=unused-import
-from ansible_collections.community.general.plugins.module_utils.mh.base import ModuleHelperBase, AnsibleModule  # noqa: F401
+from ansible_collections.community.general.plugins.module_utils.mh.base import ModuleHelperBase, AnsibleModule
 from ansible_collections.community.general.plugins.module_utils.mh.mixins.cmd import CmdMixin
 from ansible_collections.community.general.plugins.module_utils.mh.mixins.state import StateMixin
 from ansible_collections.community.general.plugins.module_utils.mh.mixins.deps import DependencyMixin
-from ansible_collections.community.general.plugins.module_utils.mh.mixins.vars import VarsMixin
+from ansible_collections.community.general.plugins.module_utils.mh.mixins.vars import VarsMixin, VarDict as _VD
 from ansible_collections.community.general.plugins.module_utils.mh.mixins.deprecate_attrs import DeprecateAttrsMixin
 
 
 class ModuleHelper(DeprecateAttrsMixin, VarsMixin, DependencyMixin, ModuleHelperBase):
+    _output_conflict_list = ('msg', 'exception', 'output', 'vars', 'changed')
     facts_name = None
     output_params = ()
     diff_params = ()
     change_params = ()
     facts_params = ()
 
+    VarDict = _VD  # for backward compatibility, will be deprecated at some point
+
     def __init__(self, module=None):
         super(ModuleHelper, self).__init__(module)
         for name, value in self.module.params.items():
@@ -36,6 +38,16 @@ class ModuleHelper(DeprecateAttrsMixin, VarsMixin, DependencyMixin, ModuleHelper
                 fact=name in self.facts_params,
             )
 
+        self._deprecate_attr(
+            attr="VarDict",
+            msg="ModuleHelper.VarDict attribute is deprecated, use VarDict from "
+                "the ansible_collections.community.general.plugins.module_utils.mh.mixins.vars module instead",
+            version="6.0.0",
+            collection_name="community.general",
+            target=ModuleHelper,
+            module=self.module,
+        )
+
     def update_output(self, **kwargs):
         self.update_vars(meta={"output": True}, **kwargs)
 
@@ -60,6 +72,10 @@ class ModuleHelper(DeprecateAttrsMixin, VarsMixin, DependencyMixin, ModuleHelper
             vars_diff = self.vars.diff() or {}
             result['diff'] = dict_merge(dict(diff), vars_diff)
 
+        for varname in result:
+            if varname in self._output_conflict_list:
+                result["_" + varname] = result[varname]
+                del result[varname]
         return result
 
 

plugins/module_utils/module_helper.py

@@ -8,13 +8,12 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 
-from ansible_collections.community.general.plugins.module_utils.mh.module_helper import (  # noqa: F401, pylint: disable=unused-import
+from ansible_collections.community.general.plugins.module_utils.mh.module_helper import (
     ModuleHelper, StateModuleHelper, CmdModuleHelper, CmdStateModuleHelper, AnsibleModule
 )
-from ansible_collections.community.general.plugins.module_utils.mh.mixins.cmd import CmdMixin, ArgFormat  # noqa: F401, pylint: disable=unused-import
-from ansible_collections.community.general.plugins.module_utils.mh.mixins.state import StateMixin  # noqa: F401, pylint: disable=unused-import
-from ansible_collections.community.general.plugins.module_utils.mh.mixins.deps import DependencyCtxMgr  # noqa: F401, pylint: disable=unused-import
-from ansible_collections.community.general.plugins.module_utils.mh.exceptions import ModuleHelperException  # noqa: F401, pylint: disable=unused-import
-# pylint: disable-next=unused-import
-from ansible_collections.community.general.plugins.module_utils.mh.deco import cause_changes, module_fails_on_exception  # noqa: F401
-from ansible_collections.community.general.plugins.module_utils.mh.mixins.vars import VarMeta, VarDict  # noqa: F401, pylint: disable=unused-import
+from ansible_collections.community.general.plugins.module_utils.mh.mixins.cmd import CmdMixin, ArgFormat
+from ansible_collections.community.general.plugins.module_utils.mh.mixins.state import StateMixin
+from ansible_collections.community.general.plugins.module_utils.mh.mixins.deps import DependencyCtxMgr
+from ansible_collections.community.general.plugins.module_utils.mh.exceptions import ModuleHelperException
+from ansible_collections.community.general.plugins.module_utils.mh.deco import cause_changes, module_fails_on_exception
+from ansible_collections.community.general.plugins.module_utils.mh.mixins.vars import VarMeta, VarDict

plugins/module_utils/ocapi_utils.py

@@ -1,502 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2022 Western Digital Corporation
-# GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-import json
-import os
-import uuid
-
-from ansible.module_utils.urls import open_url
-from ansible.module_utils.common.text.converters import to_native
-from ansible.module_utils.common.text.converters import to_text
-from ansible.module_utils.six.moves.urllib.error import URLError, HTTPError
-from ansible.module_utils.six.moves.urllib.parse import urlparse
-
-
-GET_HEADERS = {'accept': 'application/json'}
-PUT_HEADERS = {'content-type': 'application/json', 'accept': 'application/json'}
-POST_HEADERS = {'content-type': 'application/json', 'accept': 'application/json'}
-DELETE_HEADERS = {'accept': 'application/json'}
-
-HEALTH_OK = 5
-
-
-class OcapiUtils(object):
-
-    def __init__(self, creds, base_uri, proxy_slot_number, timeout, module):
-        self.root_uri = base_uri
-        self.proxy_slot_number = proxy_slot_number
-        self.creds = creds
-        self.timeout = timeout
-        self.module = module
-
-    def _auth_params(self):
-        """
-        Return tuple of required authentication params based on the username and password.
-
-        :return: tuple of username, password
-        """
-        username = self.creds['user']
-        password = self.creds['pswd']
-        force_basic_auth = True
-        return username, password, force_basic_auth
-
-    def get_request(self, uri):
-        req_headers = dict(GET_HEADERS)
-        username, password, basic_auth = self._auth_params()
-        try:
-            resp = open_url(uri, method="GET", headers=req_headers,
-                            url_username=username, url_password=password,
-                            force_basic_auth=basic_auth, validate_certs=False,
-                            follow_redirects='all',
-                            use_proxy=True, timeout=self.timeout)
-            data = json.loads(to_native(resp.read()))
-            headers = dict((k.lower(), v) for (k, v) in resp.info().items())
-        except HTTPError as e:
-            return {'ret': False,
-                    'msg': "HTTP Error %s on GET request to '%s'"
-                           % (e.code, uri),
-                    'status': e.code}
-        except URLError as e:
-            return {'ret': False, 'msg': "URL Error on GET request to '%s': '%s'"
-                                         % (uri, e.reason)}
-        # Almost all errors should be caught above, but just in case
-        except Exception as e:
-            return {'ret': False,
-                    'msg': "Failed GET request to '%s': '%s'" % (uri, to_text(e))}
-        return {'ret': True, 'data': data, 'headers': headers}
-
-    def delete_request(self, uri, etag=None):
-        req_headers = dict(DELETE_HEADERS)
-        if etag is not None:
-            req_headers['If-Match'] = etag
-        username, password, basic_auth = self._auth_params()
-        try:
-            resp = open_url(uri, method="DELETE", headers=req_headers,
-                            url_username=username, url_password=password,
-                            force_basic_auth=basic_auth, validate_certs=False,
-                            follow_redirects='all',
-                            use_proxy=True, timeout=self.timeout)
-            if resp.status != 204:
-                data = json.loads(to_native(resp.read()))
-            else:
-                data = ""
-            headers = dict((k.lower(), v) for (k, v) in resp.info().items())
-        except HTTPError as e:
-            return {'ret': False,
-                    'msg': "HTTP Error %s on DELETE request to '%s'"
-                           % (e.code, uri),
-                    'status': e.code}
-        except URLError as e:
-            return {'ret': False, 'msg': "URL Error on DELETE request to '%s': '%s'"
-                                         % (uri, e.reason)}
-        # Almost all errors should be caught above, but just in case
-        except Exception as e:
-            return {'ret': False,
-                    'msg': "Failed DELETE request to '%s': '%s'" % (uri, to_text(e))}
-        return {'ret': True, 'data': data, 'headers': headers}
-
-    def put_request(self, uri, payload, etag=None):
-        req_headers = dict(PUT_HEADERS)
-        if etag is not None:
-            req_headers['If-Match'] = etag
-        username, password, basic_auth = self._auth_params()
-        try:
-            resp = open_url(uri, data=json.dumps(payload),
-                            headers=req_headers, method="PUT",
-                            url_username=username, url_password=password,
-                            force_basic_auth=basic_auth, validate_certs=False,
-                            follow_redirects='all',
-                            use_proxy=True, timeout=self.timeout)
-            headers = dict((k.lower(), v) for (k, v) in resp.info().items())
-        except HTTPError as e:
-            return {'ret': False,
-                    'msg': "HTTP Error %s on PUT request to '%s'"
-                           % (e.code, uri),
-                    'status': e.code}
-        except URLError as e:
-            return {'ret': False, 'msg': "URL Error on PUT request to '%s': '%s'"
-                                         % (uri, e.reason)}
-        # Almost all errors should be caught above, but just in case
-        except Exception as e:
-            return {'ret': False,
-                    'msg': "Failed PUT request to '%s': '%s'" % (uri, to_text(e))}
-        return {'ret': True, 'headers': headers, 'resp': resp}
-
-    def post_request(self, uri, payload, content_type="application/json", timeout=None):
-        req_headers = dict(POST_HEADERS)
-        if content_type != "application/json":
-            req_headers["content-type"] = content_type
-        username, password, basic_auth = self._auth_params()
-        if content_type == "application/json":
-            request_data = json.dumps(payload)
-        else:
-            request_data = payload
-        try:
-            resp = open_url(uri, data=request_data,
-                            headers=req_headers, method="POST",
-                            url_username=username, url_password=password,
-                            force_basic_auth=basic_auth, validate_certs=False,
-                            follow_redirects='all',
-                            use_proxy=True, timeout=self.timeout if timeout is None else timeout)
-            headers = dict((k.lower(), v) for (k, v) in resp.info().items())
-        except HTTPError as e:
-            return {'ret': False,
-                    'msg': "HTTP Error %s on POST request to '%s'"
-                           % (e.code, uri),
-                    'status': e.code}
-        except URLError as e:
-            return {'ret': False, 'msg': "URL Error on POST request to '%s': '%s'"
-                                         % (uri, e.reason)}
-        # Almost all errors should be caught above, but just in case
-        except Exception as e:
-            return {'ret': False,
-                    'msg': "Failed POST request to '%s': '%s'" % (uri, to_text(e))}
-        return {'ret': True, 'headers': headers, 'resp': resp}
-
-    def get_uri_with_slot_number_query_param(self, uri):
-        """Return the URI with proxy slot number added as a query param, if there is one.
-
-        If a proxy slot number is provided, to access it, we must append it as a query parameter.
-        This method returns the given URI with the slotnumber query param added, if there is one.
-        If there is not a proxy slot number, it just returns the URI as it was passed in.
-        """
-        if self.proxy_slot_number is not None:
-            parsed_url = urlparse(uri)
-            return parsed_url._replace(query="slotnumber=" + str(self.proxy_slot_number)).geturl()
-        else:
-            return uri
-
-    def manage_system_power(self, command):
-        """Process a command to manage the system power.
-
-        :param str command: The Ansible command being processed.
-        """
-        if command == "PowerGracefulRestart":
-            resource_uri = self.root_uri
-            resource_uri = self.get_uri_with_slot_number_query_param(resource_uri)
-
-            # Get the resource so that we have the Etag
-            response = self.get_request(resource_uri)
-            if 'etag' not in response['headers']:
-                return {'ret': False, 'msg': 'Etag not found in response.'}
-            etag = response['headers']['etag']
-            if response['ret'] is False:
-                return response
-
-            # Issue the PUT to do the reboot (unless we are in check mode)
-            if self.module.check_mode:
-                return {
-                    'ret': True,
-                    'changed': True,
-                    'msg': 'Update not performed in check mode.'
-                }
-            payload = {'Reboot': True}
-            response = self.put_request(resource_uri, payload, etag)
-            if response['ret'] is False:
-                return response
-        elif command.startswith("PowerMode"):
-            return self.manage_power_mode(command)
-        else:
-            return {'ret': False, 'msg': 'Invalid command: ' + command}
-
-        return {'ret': True}
-
-    def manage_chassis_indicator_led(self, command):
-        """Process a command to manage the chassis indicator LED.
-
-        :param string command: The Ansible command being processed.
-        """
-        return self.manage_indicator_led(command, self.root_uri)
-
-    def manage_indicator_led(self, command, resource_uri=None):
-        """Process a command to manage an indicator LED.
-
-        :param string command: The Ansible command being processed.
-        :param string resource_uri: URI of the resource whose indicator LED is being managed.
-        """
-        key = "IndicatorLED"
-        if resource_uri is None:
-            resource_uri = self.root_uri
-        resource_uri = self.get_uri_with_slot_number_query_param(resource_uri)
-
-        payloads = {
-            'IndicatorLedOn': {
-                'ID': 2
-            },
-            'IndicatorLedOff': {
-                'ID': 4
-            }
-        }
-
-        response = self.get_request(resource_uri)
-        if 'etag' not in response['headers']:
-            return {'ret': False, 'msg': 'Etag not found in response.'}
-        etag = response['headers']['etag']
-        if response['ret'] is False:
-            return response
-        data = response['data']
-        if key not in data:
-            return {'ret': False, 'msg': "Key %s not found" % key}
-        if 'ID' not in data[key]:
-            return {'ret': False, 'msg': 'IndicatorLED for resource has no ID.'}
-
-        if command in payloads.keys():
-            # See if the LED is already set as requested.
-            current_led_status = data[key]['ID']
-            if current_led_status == payloads[command]['ID']:
-                return {'ret': True, 'changed': False}
-
-            # Set the LED (unless we are in check mode)
-            if self.module.check_mode:
-                return {
-                    'ret': True,
-                    'changed': True,
-                    'msg': 'Update not performed in check mode.'
-                }
-            payload = {'IndicatorLED': payloads[command]}
-            response = self.put_request(resource_uri, payload, etag)
-            if response['ret'] is False:
-                return response
-        else:
-            return {'ret': False, 'msg': 'Invalid command'}
-
-        return {'ret': True}
-
-    def manage_power_mode(self, command):
-        key = "PowerState"
-        resource_uri = self.get_uri_with_slot_number_query_param(self.root_uri)
-
-        payloads = {
-            "PowerModeNormal": 2,
-            "PowerModeLow": 4
-        }
-
-        response = self.get_request(resource_uri)
-        if 'etag' not in response['headers']:
-            return {'ret': False, 'msg': 'Etag not found in response.'}
-        etag = response['headers']['etag']
-        if response['ret'] is False:
-            return response
-        data = response['data']
-        if key not in data:
-            return {'ret': False, 'msg': "Key %s not found" % key}
-        if 'ID' not in data[key]:
-            return {'ret': False, 'msg': 'PowerState for resource has no ID.'}
-
-        if command in payloads.keys():
-            # See if the PowerState is already set as requested.
-            current_power_state = data[key]['ID']
-            if current_power_state == payloads[command]:
-                return {'ret': True, 'changed': False}
-
-            # Set the Power State (unless we are in check mode)
-            if self.module.check_mode:
-                return {
-                    'ret': True,
-                    'changed': True,
-                    'msg': 'Update not performed in check mode.'
-                }
-            payload = {'PowerState': {"ID": payloads[command]}}
-            response = self.put_request(resource_uri, payload, etag)
-            if response['ret'] is False:
-                return response
-        else:
-            return {'ret': False, 'msg': 'Invalid command: ' + command}
-
-        return {'ret': True}
-
-    def prepare_multipart_firmware_upload(self, filename):
-        """Prepare a multipart/form-data body for OCAPI firmware upload.
-
-        :arg filename: The name of the file to upload.
-        :returns: tuple of (content_type, body) where ``content_type`` is
-            the ``multipart/form-data`` ``Content-Type`` header including
-            ``boundary`` and ``body`` is the prepared bytestring body
-
-        Prepares the body to include "FirmwareFile" field with the contents of the file.
-        Because some OCAPI targets do not support Base-64 encoding for multipart/form-data,
-        this method sends the file as binary.
-        """
-        boundary = str(uuid.uuid4())  # Generate a random boundary
-        body = "--" + boundary + '\r\n'
-        body += 'Content-Disposition: form-data; name="FirmwareFile"; filename="%s"\r\n' % to_native(os.path.basename(filename))
-        body += 'Content-Type: application/octet-stream\r\n\r\n'
-        body_bytes = bytearray(body, 'utf-8')
-        with open(filename, 'rb') as f:
-            body_bytes += f.read()
-        body_bytes += bytearray("\r\n--%s--" % boundary, 'utf-8')
-        return ("multipart/form-data; boundary=%s" % boundary,
-                body_bytes)
-
-    def upload_firmware_image(self, update_image_path):
-        """Perform Firmware Upload to the OCAPI storage device.
-
-        :param str update_image_path: The path/filename of the firmware image, on the local filesystem.
-        """
-        if not (os.path.exists(update_image_path) and os.path.isfile(update_image_path)):
-            return {'ret': False, 'msg': 'File does not exist.'}
-        url = self.root_uri + "OperatingSystem"
-        url = self.get_uri_with_slot_number_query_param(url)
-        content_type, b_form_data = self.prepare_multipart_firmware_upload(update_image_path)
-
-        # Post the firmware (unless we are in check mode)
-        if self.module.check_mode:
-            return {
-                'ret': True,
-                'changed': True,
-                'msg': 'Update not performed in check mode.'
-            }
-        result = self.post_request(url, b_form_data, content_type=content_type, timeout=300)
-        if result['ret'] is False:
-            return result
-        return {'ret': True}
-
-    def update_firmware_image(self):
-        """Perform a Firmware Update on the OCAPI storage device."""
-        resource_uri = self.root_uri
-        resource_uri = self.get_uri_with_slot_number_query_param(resource_uri)
-        # We have to do a GET to obtain the Etag.  It's required on the PUT.
-        response = self.get_request(resource_uri)
-        if response['ret'] is False:
-            return response
-        if 'etag' not in response['headers']:
-            return {'ret': False, 'msg': 'Etag not found in response.'}
-        etag = response['headers']['etag']
-
-        # Issue the PUT (unless we are in check mode)
-        if self.module.check_mode:
-            return {
-                'ret': True,
-                'changed': True,
-                'msg': 'Update not performed in check mode.'
-            }
-        payload = {'FirmwareUpdate': True}
-        response = self.put_request(resource_uri, payload, etag)
-        if response['ret'] is False:
-            return response
-
-        return {'ret': True, 'jobUri': response["headers"]["location"]}
-
-    def activate_firmware_image(self):
-        """Perform a Firmware Activate on the OCAPI storage device."""
-        resource_uri = self.root_uri
-        resource_uri = self.get_uri_with_slot_number_query_param(resource_uri)
-        # We have to do a GET to obtain the Etag.  It's required on the PUT.
-        response = self.get_request(resource_uri)
-        if 'etag' not in response['headers']:
-            return {'ret': False, 'msg': 'Etag not found in response.'}
-        etag = response['headers']['etag']
-        if response['ret'] is False:
-            return response
-
-        # Issue the PUT (unless we are in check mode)
-        if self.module.check_mode:
-            return {
-                'ret': True,
-                'changed': True,
-                'msg': 'Update not performed in check mode.'
-            }
-        payload = {'FirmwareActivate': True}
-        response = self.put_request(resource_uri, payload, etag)
-        if response['ret'] is False:
-            return response
-
-        return {'ret': True, 'jobUri': response["headers"]["location"]}
-
-    def get_job_status(self, job_uri):
-        """Get the status of a job.
-
-        :param str job_uri: The URI of the job's status monitor.
-        """
-        job_uri = self.get_uri_with_slot_number_query_param(job_uri)
-        response = self.get_request(job_uri)
-        if response['ret'] is False:
-            if response.get('status') == 404:
-                # Job not found -- assume 0%
-                return {
-                    "ret": True,
-                    "percentComplete": 0,
-                    "operationStatus": "Not Available",
-                    "operationStatusId": 1,
-                    "operationHealth": None,
-                    "operationHealthId": None,
-                    "details": "Job does not exist.",
-                    "jobExists": False
-                }
-            else:
-                return response
-        details = response["data"]["Status"].get("Details")
-        if type(details) is str:
-            details = [details]
-        health_list = response["data"]["Status"]["Health"]
-        return_value = {
-            "ret": True,
-            "percentComplete": response["data"]["PercentComplete"],
-            "operationStatus": response["data"]["Status"]["State"]["Name"],
-            "operationStatusId": response["data"]["Status"]["State"]["ID"],
-            "operationHealth": health_list[0]["Name"] if len(health_list) > 0 else None,
-            "operationHealthId": health_list[0]["ID"] if len(health_list) > 0 else None,
-            "details": details,
-            "jobExists": True
-        }
-        return return_value
-
-    def delete_job(self, job_uri):
-        """Delete the OCAPI job referenced by the specified job_uri."""
-        job_uri = self.get_uri_with_slot_number_query_param(job_uri)
-        # We have to do a GET to obtain the Etag.  It's required on the DELETE.
-        response = self.get_request(job_uri)
-
-        if response['ret'] is True:
-            if 'etag' not in response['headers']:
-                return {'ret': False, 'msg': 'Etag not found in response.'}
-            else:
-                etag = response['headers']['etag']
-
-            if response['data']['PercentComplete'] != 100:
-                return {
-                    'ret': False,
-                    'changed': False,
-                    'msg': 'Cannot delete job because it is in progress.'
-                }
-
-        if response['ret'] is False:
-            if response['status'] == 404:
-                return {
-                    'ret': True,
-                    'changed': False,
-                    'msg': 'Job already deleted.'
-                }
-            return response
-        if self.module.check_mode:
-            return {
-                'ret': True,
-                'changed': True,
-                'msg': 'Update not performed in check mode.'
-            }
-
-        # Do the DELETE (unless we are in check mode)
-        response = self.delete_request(job_uri, etag)
-        if response['ret'] is False:
-            if response['status'] == 404:
-                return {
-                    'ret': True,
-                    'changed': False
-                }
-            elif response['status'] == 409:
-                return {
-                    'ret': False,
-                    'changed': False,
-                    'msg': 'Cannot delete job because it is in progress.'
-                }
-            return response
-        return {
-            'ret': True,
-            'changed': True
-        }

plugins/module_utils/oneview.py

@@ -16,8 +16,7 @@ __metaclass__ = type
 import abc
 import collections
 import json
-# (TODO: remove next line!)
-import os  # noqa: F401, pylint: disable=unused-import
+import os
 import traceback
 
 HPE_ONEVIEW_IMP_ERR = None

plugins/module_utils/opennebula.py

@@ -26,41 +26,6 @@ except ImportError:
     HAS_PYONE = False
 
 
-# A helper function to mitigate https://github.com/OpenNebula/one/issues/6064.
-# It allows for easily handling lists like "NIC" or "DISK" in the JSON-like template representation.
-# There are either lists of dictionaries (length > 1) or just dictionaries.
-def flatten(to_flatten, extract=False):
-    """Flattens nested lists (with optional value extraction)."""
-    def recurse(to_flatten):
-        return sum(map(recurse, to_flatten), []) if isinstance(to_flatten, list) else [to_flatten]
-    value = recurse(to_flatten)
-    if extract and len(value) == 1:
-        return value[0]
-    return value
-
-
-# A helper function to mitigate https://github.com/OpenNebula/one/issues/6064.
-# It renders JSON-like template representation into OpenNebula's template syntax (string).
-def render(to_render):
-    """Converts dictionary to OpenNebula template."""
-    def recurse(to_render):
-        for key, value in sorted(to_render.items()):
-            if value is None:
-                continue
-            if isinstance(value, dict):
-                yield '{0:}=[{1:}]'.format(key, ','.join(recurse(value)))
-                continue
-            if isinstance(value, list):
-                for item in value:
-                    yield '{0:}=[{1:}]'.format(key, ','.join(recurse(item)))
-                continue
-            if isinstance(value, str):
-                yield '{0:}="{1:}"'.format(key, value.replace('\\', '\\\\').replace('"', '\\"'))
-                continue
-            yield '{0:}="{1:}"'.format(key, value)
-    return '\n'.join(recurse(to_render))
-
-
 class OpenNebulaModule:
     """
     Base class for all OpenNebula Ansible Modules.

plugins/module_utils/oracle/oci_utils.py

@@ -10,14 +10,13 @@ import logging
 import logging.config
 import os
 import tempfile
-# (TODO: remove next line!)
-from datetime import datetime  # noqa: F401, pylint: disable=unused-import
+from datetime import datetime
 from operator import eq
 
 import time
 
 try:
-    import yaml  # noqa: F401, pylint: disable=unused-import
+    import yaml
 
     import oci
     from oci.constants import HEADER_NEXT_PAGE

plugins/module_utils/pipx.py

@@ -32,14 +32,12 @@ def pipx_runner(module, command, **kwargs):
             state=fmt.as_map(_state_map),
             name=fmt.as_list(),
             name_source=fmt.as_func(fmt.unpack_args(lambda n, s: [s] if s else [n])),
-            install_apps=fmt.as_bool("--include-apps"),
             install_deps=fmt.as_bool("--include-deps"),
             inject_packages=fmt.as_list(),
             force=fmt.as_bool("--force"),
             include_injected=fmt.as_bool("--include-injected"),
             index_url=fmt.as_opt_val('--index-url'),
             python=fmt.as_opt_val('--python'),
-            system_site_packages=fmt.as_bool("--system-site-packages"),
             _list=fmt.as_fixed(['list', '--include-injected', '--json']),
             editable=fmt.as_bool("--editable"),
             pip_args=fmt.as_opt_val('--pip-args'),

plugins/module_utils/proxmox.py

@@ -7,12 +7,9 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
-# (TODO: remove next line!)
-import atexit  # noqa: F401, pylint: disable=unused-import
-# (TODO: remove next line!)
-import time  # noqa: F401, pylint: disable=unused-import
-# (TODO: remove next line!)
-import re  # noqa: F401, pylint: disable=unused-import
+import atexit
+import time
+import re
 import traceback
 
 PROXMOXER_IMP_ERR = None
@@ -25,8 +22,7 @@ except ImportError:
 
 
 from ansible.module_utils.basic import env_fallback, missing_required_lib
-# (TODO: remove next line!)
-from ansible.module_utils.common.text.converters import to_native  # noqa: F401, pylint: disable=unused-import
+from ansible.module_utils.common.text.converters import to_native
 from ansible_collections.community.general.plugins.module_utils.version import LooseVersion
 
 

plugins/module_utils/puppet.py

@@ -1,111 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2022, Alexei Znamensky <russoz@gmail.com>
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-
-import os
-
-from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt
-
-
-_PUPPET_PATH_PREFIX = ["/opt/puppetlabs/bin"]
-
-
-def get_facter_dir():
-    if os.getuid() == 0:
-        return '/etc/facter/facts.d'
-    else:
-        return os.path.expanduser('~/.facter/facts.d')
-
-
-def _puppet_cmd(module):
-    return module.get_bin_path("puppet", False, _PUPPET_PATH_PREFIX)
-
-
-# If the `timeout` CLI command feature is removed,
-# Then we could add this as a fixed param to `puppet_runner`
-def ensure_agent_enabled(module):
-    runner = CmdRunner(
-        module,
-        command="puppet",
-        path_prefix=_PUPPET_PATH_PREFIX,
-        arg_formats=dict(
-            _agent_disabled=cmd_runner_fmt.as_fixed(['config', 'print', 'agent_disabled_lockfile']),
-        ),
-        check_rc=False,
-    )
-
-    rc, stdout, stderr = runner("_agent_disabled").run()
-    if os.path.exists(stdout.strip()):
-        module.fail_json(
-            msg="Puppet agent is administratively disabled.",
-            disabled=True)
-    elif rc != 0:
-        module.fail_json(
-            msg="Puppet agent state could not be determined.")
-
-
-def puppet_runner(module):
-
-    # Keeping backward compatibility, allow for running with the `timeout` CLI command.
-    # If this can be replaced with ansible `timeout` parameter in playbook,
-    # then this function could be removed.
-    def _prepare_base_cmd():
-        _tout_cmd = module.get_bin_path("timeout", False)
-        if _tout_cmd:
-            cmd = ["timeout", "-s", "9", module.params["timeout"], _puppet_cmd(module)]
-        else:
-            cmd = ["puppet"]
-        return cmd
-
-    def noop_func(v):
-        return ["--noop"] if module.check_mode or v else ["--no-noop"]
-
-    _logdest_map = {
-        "syslog": ["--logdest", "syslog"],
-        "all": ["--logdest", "syslog", "--logdest", "console"],
-    }
-
-    @cmd_runner_fmt.unpack_args
-    def execute_func(execute, manifest):
-        if execute:
-            return ["--execute", execute]
-        else:
-            return [manifest]
-
-    runner = CmdRunner(
-        module,
-        command=_prepare_base_cmd(),
-        path_prefix=_PUPPET_PATH_PREFIX,
-        arg_formats=dict(
-            _agent_fixed=cmd_runner_fmt.as_fixed([
-                "agent", "--onetime", "--no-daemonize", "--no-usecacheonfailure",
-                "--no-splay", "--detailed-exitcodes", "--verbose", "--color", "0",
-            ]),
-            _apply_fixed=cmd_runner_fmt.as_fixed(["apply", "--detailed-exitcodes"]),
-            puppetmaster=cmd_runner_fmt.as_opt_val("--server"),
-            show_diff=cmd_runner_fmt.as_bool("--show-diff"),
-            confdir=cmd_runner_fmt.as_opt_val("--confdir"),
-            environment=cmd_runner_fmt.as_opt_val("--environment"),
-            tags=cmd_runner_fmt.as_func(lambda v: ["--tags", ",".join(v)]),
-            skip_tags=cmd_runner_fmt.as_func(lambda v: ["--skip_tags", ",".join(v)]),
-            certname=cmd_runner_fmt.as_opt_eq_val("--certname"),
-            noop=cmd_runner_fmt.as_func(noop_func),
-            use_srv_records=cmd_runner_fmt.as_map({
-                True: "--usr_srv_records",
-                False: "--no-usr_srv_records",
-            }),
-            logdest=cmd_runner_fmt.as_map(_logdest_map, default=[]),
-            modulepath=cmd_runner_fmt.as_opt_eq_val("--modulepath"),
-            _execute=cmd_runner_fmt.as_func(execute_func),
-            summarize=cmd_runner_fmt.as_bool("--summarize"),
-            debug=cmd_runner_fmt.as_bool("--debug"),
-            verbose=cmd_runner_fmt.as_bool("--verbose"),
-        ),
-        check_rc=False,
-    )
-    return runner

plugins/module_utils/pure.py

@@ -21,15 +21,13 @@ except ImportError:
 
 HAS_PURITY_FB = True
 try:
-    from purity_fb import PurityFb, FileSystem, FileSystemSnapshot, SnapshotSuffix, rest  # noqa: F401, pylint: disable=unused-import
+    from purity_fb import PurityFb, FileSystem, FileSystemSnapshot, SnapshotSuffix, rest
 except ImportError:
     HAS_PURITY_FB = False
 
-# (TODO: remove next line!)
-from functools import wraps  # noqa: F401, pylint: disable=unused-import
+from functools import wraps
 from os import environ
-# (TODO: remove next line!)
-from os import path  # noqa: F401, pylint: disable=unused-import
+from os import path
 import platform
 
 VERSION = 1.2

plugins/module_utils/rax.py

@@ -314,21 +314,3 @@ def setup_rax_module(module, rax_module, region_required=True):
                          (region, ','.join(rax_module.regions)))
 
     return rax_module
-
-
-def rax_scaling_group_personality_file(module, files):
-    if not files:
-        return []
-
-    results = []
-    for rpath, lpath in files.items():
-        lpath = os.path.expanduser(lpath)
-        try:
-            with open(lpath, 'r') as f:
-                results.append({
-                    'path': rpath,
-                    'contents': f.read(),
-                })
-        except Exception as e:
-            module.fail_json(msg='Failed to load %s: %s' % (lpath, str(e)))
-    return results