Release 5.5.0.

* feat: Add crc32 filter

Compute CRC32 checksum of a string and return its hex representation. Can be
use to create short checksums.

Signed-off-by: Julien Riou <julien@riou.xyz>

* Update license lines

* Improve string check of a crc32 value

Signed-off-by: Julien Riou <julien@riou.xyz>

Signed-off-by: Julien Riou <julien@riou.xyz>
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 8e9ec610c3)

Co-authored-by: Julien Riou <julien@riou.xyz>

.azure-pipelines/azure-pipelines.yml

@@ -29,14 +29,14 @@ schedules:
     always: true
     branches:
       include:
-        - stable-6
         - stable-5
+        - stable-4
   - cron: 0 11 * * 0
     displayName: Weekly (old stable branches)
     always: true
     branches:
       include:
-        - stable-4
+        - stable-3
 
 variables:
   - name: checkoutPath
@@ -73,19 +73,6 @@ stages:
             - test: 3
             - test: 4
             - test: extra
-  - stage: Sanity_2_14
-    displayName: Sanity 2.14
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Test {0}
-          testFormat: 2.14/sanity/{0}
-          targets:
-            - test: 1
-            - test: 2
-            - test: 3
-            - test: 4
   - stage: Sanity_2_13
     displayName: Sanity 2.13
     dependsOn: []
@@ -112,6 +99,19 @@ stages:
             - 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
@@ -129,18 +129,6 @@ stages:
             - test: 3.8
             - test: 3.9
             - test: '3.10'
-            - test: '3.11'
-  - stage: Units_2_14
-    displayName: Units 2.14
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.14/units/{0}/1
-          targets:
-            - test: 2.7
-            - test: 3.9
   - stage: Units_2_13
     displayName: Units 2.13
     dependsOn: []
@@ -151,7 +139,9 @@ stages:
           testFormat: 2.13/units/{0}/1
           targets:
             - test: 2.7
+            - test: 3.6
             - test: 3.8
+            - test: 3.9
   - stage: Units_2_12
     displayName: Units 2.12
     dependsOn: []
@@ -162,27 +152,24 @@ stages:
           testFormat: 2.12/units/{0}/1
           targets:
             - test: 2.6
+            - test: 3.5
             - test: 3.8
-
-## Remote
-  - stage: Remote_devel_extra_vms
-    displayName: Remote devel extra VMs
+  - stage: Units_2_11
+    displayName: Units 2.11
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: devel/{0}
+          nameFormat: Python {0}
+          testFormat: 2.11/units/{0}/1
           targets:
-            - name: Alpine 3.17
-              test: alpine/3.17
-            # - name: Fedora 37
-            #   test: fedora/37
-            # - name: Ubuntu 20.04
-            #   test: ubuntu/20.04
-            - name: Ubuntu 22.04
-              test: ubuntu/22.04
-          groups:
-            - vm
+            - test: 2.6
+            - test: 2.7
+            - test: 3.5
+            - test: 3.6
+            - test: 3.9
+
+## Remote
   - stage: Remote_devel
     displayName: Remote devel
     dependsOn: []
@@ -195,28 +182,12 @@ stages:
               test: macos/12.0
             - name: RHEL 7.9
               test: rhel/7.9
-            - name: RHEL 9.1
-              test: rhel/9.1
-            - name: FreeBSD 13.1
-              test: freebsd/13.1
-            - name: FreeBSD 12.4
-              test: freebsd/12.4
-          groups:
-            - 1
-            - 2
-            - 3
-  - stage: Remote_2_14
-    displayName: Remote 2.14
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.14/{0}
-          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
@@ -255,6 +226,24 @@ stages:
             - 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
+            #- name: FreeBSD 12.2
+            #  test: freebsd/12.2
+          groups:
+            - 1
+            - 2
+            - 3
 
 ### Docker
   - stage: Docker_devel
@@ -267,8 +256,8 @@ stages:
           targets:
             - name: CentOS 7
               test: centos7
-            - name: Fedora 37
-              test: fedora37
+            - name: Fedora 36
+              test: fedora36
             - name: openSUSE 15
               test: opensuse15
             - name: Ubuntu 20.04
@@ -281,20 +270,6 @@ stages:
             - 1
             - 2
             - 3
-  - stage: Docker_2_14
-    displayName: Docker 2.14
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.14/linux/{0}
-          targets:
-            - name: Fedora 36
-              test: fedora36
-          groups:
-            - 1
-            - 2
-            - 3
   - stage: Docker_2_13
     displayName: Docker 2.13
     dependsOn: []
@@ -331,6 +306,24 @@ stages:
             - 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
@@ -346,80 +339,79 @@ stages:
             - name: ArchLinux
               test: archlinux/3.10
             - name: CentOS Stream 8
-              test: centos-stream8/3.9
+              test: centos-stream8/3.8
           groups:
             - 1
             - 2
             - 3
 
-### Generic
-  - stage: Generic_devel
-    displayName: Generic devel
+### Cloud
+  - stage: Cloud_devel
+    displayName: Cloud devel
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: devel/generic/{0}/1
+          testFormat: devel/cloud/{0}/1
           targets:
             - test: 2.7
-            - test: '3.11'
-  - stage: Generic_2_14
-    displayName: Generic 2.14
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.14/generic/{0}/1
-          targets:
             - test: '3.10'
-  - stage: Generic_2_13
-    displayName: Generic 2.13
+  - stage: Cloud_2_13
+    displayName: Cloud 2.13
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: 2.13/generic/{0}/1
+          testFormat: 2.13/cloud/{0}/1
           targets:
             - test: 3.9
-  - stage: Generic_2_12
-    displayName: Generic 2.12
+  - stage: Cloud_2_12
+    displayName: Cloud 2.12
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: 2.12/generic/{0}/1
+          testFormat: 2.12/cloud/{0}/1
           targets:
             - test: 3.8
+  - stage: Cloud_2_11
+    displayName: Cloud 2.11
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Python {0}
+          testFormat: 2.11/cloud/{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
       - Units_devel
+      - Units_2_11
       - Units_2_12
       - Units_2_13
-      - Units_2_14
-      - Remote_devel_extra_vms
       - Remote_devel
+      - Remote_2_11
       - Remote_2_12
       - Remote_2_13
-      - Remote_2_14
       - Docker_devel
+      - Docker_2_11
       - Docker_2_12
       - Docker_2_13
-      - Docker_2_14
       - Docker_community_devel
-# Right now all generic tests are disabled. Uncomment when at least one of them is re-enabled.
-#      - Generic_devel
-#      - Generic_2_12
-#      - Generic_2_13
-#      - Generic_2_14
+      - Cloud_devel
+      - Cloud_2_11
+      - Cloud_2_12
+      - Cloud_2_13
     jobs:
       - template: templates/coverage.yml

.github/workflows/ansible-test.yml

@@ -1,193 +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'
-    # 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: felixfontein/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'
-
-    steps:
-      - name: >-
-          Perform unit testing against
-          Ansible version ${{ matrix.ansible }}
-        uses: felixfontein/ansible-test-gh-action@main
-        with:
-          ansible-core-github-repository-slug: felixfontein/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/2/
-
-    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: felixfontein/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: |

.gitignore

@@ -509,6 +509,3 @@ $RECYCLE.BIN/
 *.lnk
 
 # End of https://www.toptal.com/developers/gitignore/api/vim,git,macos,linux,pydev,emacs,dotenv,python,windows,webstorm,pycharm+all,jupyternotebooks
-
-# Integration tests cloud configs
-tests/integration/cloud-config-*.ini

CONTRIBUTING.md

@@ -31,7 +31,7 @@ Also, consider taking up a valuable, reviewed, but abandoned pull request which
 * Try committing your changes with an informative but short commit message.
 * Do not squash your commits and force-push to your branch if not needed. Reviews of your pull request are much easier with individual commits to comprehend the pull request history. All commits of your pull request branch will be squashed into one commit by GitHub upon merge.
 * Do not add merge commits to your PR. The bot will complain and you will have to rebase ([instructions for rebasing](https://docs.ansible.com/ansible/latest/dev_guide/developing_rebasing.html)) to remove them before your PR can be merged. To avoid that git automatically does merges during pulls, you can configure it to do rebases instead by running `git config pull.rebase true` inside the repository checkout.
-* Make sure your PR includes a [changelog fragment](https://docs.ansible.com/ansible/devel/community/development_process.html#creating-changelog-fragments). (You must not include a fragment for new modules or new plugins, except for test and filter plugins. Also you shouldn't include one for docs-only changes. If you're not sure, simply don't include one, we'll tell you whether one is needed or not :) )
+* Make sure your PR includes a [changelog fragment](https://docs.ansible.com/ansible/devel/community/development_process.html#changelogs-how-to). (You must not include a fragment for new modules or new plugins, except for test and filter plugins. Also you shouldn't include one for docs-only changes. If you're not sure, simply don't include one, we'll tell you whether one is needed or not :) )
 * Avoid reformatting unrelated parts of the codebase in your PR. These types of changes will likely be requested for reversion, create additional work for reviewers, and may cause approval to be delayed.
 
 You can also read [our Quick-start development guide](https://github.com/ansible/community-docs/blob/main/create_pr_quick_start_guide.rst).
@@ -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.
@@ -24,7 +23,7 @@ If you encounter abusive behavior violating the [Ansible Code of Conduct](https:
 
 ## Tested with Ansible
 
-Tested with the current ansible-core 2.11, ansible-core 2.12, ansible-core 2.13, ansible-core 2.14 releases and the current development version of ansible-core. Ansible-core versions before 2.11.0 are not supported. This includes all ansible-base 2.10 and Ansible 2.9 releases.
+Tested with the current ansible-core 2.11, ansible-core 2.12, ansible-core 2.13 releases and the current development version of ansible-core. Ansible-core versions before 2.11.0 are not supported. This includes all ansible-base 2.10 and Ansible 2.9 releases.
 
 Parts of this collection will not work with ansible-core 2.11 on Python 3.12+.
 
@@ -73,13 +72,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 +88,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 +116,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 +135,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.4.0
+version: 5.5.0
 readme: README.md
 authors:
   - Ansible (https://github.com/ansible)

plugins/become/doas.py

@@ -55,7 +55,7 @@ DOCUMENTATION = '''
               - name: ANSIBLE_DOAS_FLAGS
         become_pass:
             description: password for doas prompt
-            required: false
+            required: False
             vars:
               - name: ansible_become_password
               - name: ansible_become_pass

plugins/become/dzdo.py

@@ -55,7 +55,7 @@ DOCUMENTATION = '''
               - name: ANSIBLE_DZDO_FLAGS
         become_pass:
             description: Options to pass to dzdo
-            required: false
+            required: False
             vars:
               - name: ansible_become_password
               - name: ansible_become_pass

plugins/become/ksu.py

@@ -25,7 +25,7 @@ DOCUMENTATION = '''
             env:
               - name: ANSIBLE_BECOME_USER
               - name: ANSIBLE_KSU_USER
-            required: true
+            required: True
         become_exe:
             description: Su executable
             default: ksu
@@ -56,7 +56,7 @@ DOCUMENTATION = '''
               - name: ANSIBLE_KSU_FLAGS
         become_pass:
             description: ksu password
-            required: false
+            required: False
             vars:
               - name: ansible_ksu_pass
               - name: ansible_become_pass

plugins/become/machinectl.py

@@ -56,7 +56,7 @@ DOCUMENTATION = '''
               - name: ANSIBLE_MACHINECTL_FLAGS
         become_pass:
             description: Password for machinectl
-            required: false
+            required: False
             vars:
               - name: ansible_become_password
               - name: ansible_become_pass
@@ -117,7 +117,7 @@ class BecomeModule(BecomeBase):
 
         flags = self.get_option('become_flags')
         user = self.get_option('become_user')
-        return '%s -q shell %s %s@ %s' % (become, flags, user, self._build_success_command(cmd, shell))
+        return '%s -q shell %s %s@ %s' % (become, flags, user, cmd)
 
     def check_success(self, b_output):
         b_output = self.remove_ansi_codes(b_output)

plugins/become/pbrun.py

@@ -56,7 +56,7 @@ DOCUMENTATION = '''
               - name: ANSIBLE_PBRUN_FLAGS
         become_pass:
             description: Password for pbrun
-            required: false
+            required: False
             vars:
               - name: ansible_become_password
               - name: ansible_become_pass
@@ -69,7 +69,7 @@ DOCUMENTATION = '''
                 key: password
         wrap_exe:
             description: Toggle to wrap the command pbrun calls in 'shell -c' or not
-            default: false
+            default: False
             type: bool
             ini:
               - section: pbrun_become_plugin

plugins/become/pfexec.py

@@ -59,7 +59,7 @@ DOCUMENTATION = '''
               - name: ANSIBLE_PFEXEC_FLAGS
         become_pass:
             description: pfexec password
-            required: false
+            required: False
             vars:
               - name: ansible_become_password
               - name: ansible_become_pass
@@ -72,7 +72,7 @@ DOCUMENTATION = '''
                 key: password
         wrap_exe:
             description: Toggle to wrap the command pfexec calls in 'shell -c' or not
-            default: false
+            default: False
             type: bool
             ini:
               - section: pfexec_become_plugin
@@ -102,4 +102,4 @@ class BecomeModule(BecomeBase):
 
         flags = self.get_option('become_flags')
         noexe = not self.get_option('wrap_exe')
-        return '%s %s %s' % (exe, flags, self._build_success_command(cmd, shell, noexe=noexe))
+        return '%s %s "%s"' % (exe, flags, self._build_success_command(cmd, shell, noexe=noexe))

plugins/become/pmrun.py

@@ -42,7 +42,7 @@ DOCUMENTATION = '''
               - name: ANSIBLE_PMRUN_FLAGS
         become_pass:
             description: pmrun password
-            required: false
+            required: False
             vars:
               - name: ansible_become_password
               - name: ansible_become_pass

plugins/become/sesu.py

@@ -56,7 +56,7 @@ DOCUMENTATION = '''
               - name: ANSIBLE_SESU_FLAGS
         become_pass:
             description: Password to pass to sesu
-            required: false
+            required: False
             vars:
               - name: ansible_become_password
               - name: ansible_become_pass

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/pickle.py

@@ -16,7 +16,7 @@ DOCUMENTATION = '''
     author: Brian Coca (@bcoca)
     options:
       _uri:
-        required: true
+        required: True
         description:
           - Path in which the cache plugin will save the files
         env:

plugins/cache/redis.py

@@ -21,7 +21,7 @@ DOCUMENTATION = '''
           - The format is C(host:port:db:password), for example C(localhost:6379:0:changeme).
           - To use encryption in transit, prefix the connection with C(tls://), as in C(tls://localhost:6379:0:changeme).
           - To use redis sentinel, use separator C(;), for example C(localhost:26379;localhost:26379;0:changeme). Requires redis>=2.9.0.
-        required: true
+        required: True
         env:
           - name: ANSIBLE_CACHE_PLUGIN_CONNECTION
         ini:
@@ -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/cache/yaml.py

@@ -16,7 +16,7 @@ DOCUMENTATION = '''
     author: Brian Coca (@bcoca)
     options:
       _uri:
-        required: true
+        required: True
         description:
           - Path in which the cache plugin will save the files
         env:

plugins/callback/cgroup_memory_recap.py

@@ -16,23 +16,23 @@ 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).
+        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)
         env:
           - name: CGROUP_MAX_MEM_FILE
         ini:
           - section: callback_cgroupmemrecap
             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).
+        required: True
+        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

@@ -627,7 +627,7 @@ playbook.yml: >
   ---
   - name: "Default plugin output: play example"
     hosts: localhost
-    gather_facts: false
+    gather_facts: no
     tasks:
       - name:  Default plugin output
         ansible.builtin.debug:
@@ -635,7 +635,7 @@ playbook.yml: >
 
   - name: Override from play vars
     hosts: localhost
-    gather_facts: false
+    gather_facts: no
     vars:
       ansible_connection: local
       green: "\e[0m\e[38;5;82m"
@@ -713,7 +713,7 @@ playbook.yml: >
       - name: Using alias vars (see ansible.cfg)
         ansible.builtin.debug:
           msg:
-        when: false
+        when: False
         vars:
           ansible_callback_diy_playbook_on_task_start_msg: ""
           on_skipped_msg: "DIY output(via task vars): skipped example:\n\e[0m\e[38;5;4m\u25b6\u25b6 {{ ansible_callback_diy.result.task.name }}\n"
@@ -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/hipchat.py

@@ -21,7 +21,7 @@ DOCUMENTATION = '''
     options:
       token:
         description: HipChat API token for v1 or v2 API.
-        required: true
+        required: True
         env:
           - name: HIPCHAT_TOKEN
         ini:
@@ -29,7 +29,7 @@ DOCUMENTATION = '''
             key: token
       api_version:
         description: HipChat API version, v1 or v2.
-        required: false
+        required: False
         default: v1
         env:
           - name: HIPCHAT_API_VERSION
@@ -55,7 +55,7 @@ DOCUMENTATION = '''
       notify:
         description: Add notify flag to important messages
         type: bool
-        default: true
+        default: True
         env:
           - name: HIPCHAT_NOTIFY
         ini:

plugins/callback/jabber.py

@@ -13,29 +13,29 @@ 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
-        required: true
+        required: True
         env:
           - name: JABBER_SERV
       user:
         description: Jabber user to authenticate as
-        required: true
+        required: True
         env:
           - name: JABBER_USER
       password:
         description: Password for the user to the jabber server
-        required: true
+        required: True
         env:
           - name: JABBER_PASS
       to:
         description: chat identifier that will receive the message
-        required: true
+        required: True
         env:
           - name: JABBER_TO
 '''

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.
+        required: True
+        description: LogDNA Ingestion Key
         type: string
         env:
           - name: LOGDNA_INGESTION_KEY
@@ -27,18 +27,18 @@ DOCUMENTATION = '''
           - section: callback_logdna
             key: conf_key
       plugin_ignore_errors:
-        required: false
-        description: Whether to ignore errors on failing or not.
+        required: False
+        description: Whether to ignore errors on failing or not
         type: boolean
         env:
           - name: ANSIBLE_IGNORE_ERRORS
         ini:
           - section: callback_logdna
             key: plugin_ignore_errors
-        default: false
+        default: False
       conf_hostname:
-        required: false
-        description: Alternative Host Name; the current host name by default.
+        required: False
+        description: Alternative Host Name; the current host name by default
         type: string
         env:
           - name: LOGDNA_HOSTNAME
@@ -46,8 +46,8 @@ DOCUMENTATION = '''
           - section: callback_logdna
             key: conf_hostname
       conf_tags:
-        required: false
-        description: Tags.
+        required: False
+        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,27 +45,27 @@ 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
+        required: True
         ini:
           - section: callback_logentries
             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
+        default: False
         type: boolean
         ini:
           - 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
+        default: False
         env:
           - name: LOGENTRIES_FLATTEN
         ini:

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/opentelemetry.py

@@ -62,17 +62,6 @@ DOCUMENTATION = '''
           - The L(W3C Trace Context header traceparent,https://www.w3.org/TR/trace-context-1/#traceparent-header).
         env:
           - name: TRACEPARENT
-      disable_logs:
-        default: false
-        type: bool
-        description:
-          - Disable sending logs.
-        env:
-          - name: ANSIBLE_OPENTELEMETRY_DISABLE_LOGS
-        ini:
-          - section: callback_opentelemetry
-            key: disable_logs
-        version_added: 5.8.0
     requirements:
       - opentelemetry-api (Python library)
       - opentelemetry-exporter-otlp (Python library)
@@ -121,32 +110,13 @@ try:
     from opentelemetry.sdk.trace.export import (
         BatchSpanProcessor
     )
-
-    # Support for opentelemetry-api <= 1.12
-    try:
-        from opentelemetry.util._time import _time_ns
-    except ImportError as imp_exc:
-        OTEL_LIBRARY_TIME_NS_ERROR = imp_exc
-    else:
-        OTEL_LIBRARY_TIME_NS_ERROR = None
-
+    from opentelemetry.util._time import _time_ns
 except ImportError as imp_exc:
     OTEL_LIBRARY_IMPORT_ERROR = imp_exc
-    OTEL_LIBRARY_TIME_NS_ERROR = imp_exc
 else:
     OTEL_LIBRARY_IMPORT_ERROR = None
 
 
-if sys.version_info >= (3, 7):
-    time_ns = time.time_ns
-elif not OTEL_LIBRARY_TIME_NS_ERROR:
-    time_ns = _time_ns
-else:
-    def time_ns():
-        # Support versions older than 3.7 with opentelemetry-api > 1.12
-        return int(time.time() * 1e9)
-
-
 class TaskData:
     """
     Data about an individual task.
@@ -158,10 +128,12 @@ class TaskData:
         self.path = path
         self.play = play
         self.host_data = OrderedDict()
-        self.start = time_ns()
+        if sys.version_info >= (3, 7):
+            self.start = time.time_ns()
+        else:
+            self.start = _time_ns()
         self.action = action
         self.args = args
-        self.dump = None
 
     def add_host(self, host):
         if host.uuid in self.host_data:
@@ -184,7 +156,10 @@ class HostData:
         self.name = name
         self.status = status
         self.result = result
-        self.finish = time_ns()
+        if sys.version_info >= (3, 7):
+            self.finish = time.time_ns()
+        else:
+            self.finish = _time_ns()
 
 
 class OpenTelemetrySource(object):
@@ -224,7 +199,7 @@ class OpenTelemetrySource(object):
 
         tasks_data[uuid] = TaskData(uuid, name, path, play_name, action, args)
 
-    def finish_task(self, tasks_data, status, result, dump):
+    def finish_task(self, tasks_data, status, result):
         """ record the results of a task for a single host """
 
         task_uuid = result._task._uuid
@@ -241,10 +216,9 @@ class OpenTelemetrySource(object):
         if self.ansible_version is None and hasattr(result, '_task_fields') and result._task_fields['args'].get('_ansible_version'):
             self.ansible_version = result._task_fields['args'].get('_ansible_version')
 
-        task.dump = dump
         task.add_host(HostData(host_uuid, host_name, status, result))
 
-    def generate_distributed_traces(self, otel_service_name, ansible_playbook, tasks_data, status, traceparent, disable_logs):
+    def generate_distributed_traces(self, otel_service_name, ansible_playbook, tasks_data, status, traceparent):
         """ generate distributed traces from the collected TaskData and HostData """
 
         tasks = []
@@ -280,9 +254,9 @@ class OpenTelemetrySource(object):
             for task in tasks:
                 for host_uuid, host_data in task.host_data.items():
                     with tracer.start_as_current_span(task.name, start_time=task.start, end_on_exit=False) as span:
-                        self.update_span_data(task, host_data, span, disable_logs)
+                        self.update_span_data(task, host_data, span)
 
-    def update_span_data(self, task_data, host_data, span, disable_logs):
+    def update_span_data(self, task_data, host_data, span):
         """ update the span with the given TaskData and HostData """
 
         name = '[%s] %s: %s' % (host_data.name, task_data.play, task_data.name)
@@ -328,9 +302,6 @@ class OpenTelemetrySource(object):
         self.set_span_attribute(span, "ansible.task.host.status", host_data.status)
         # This will allow to enrich the service map
         self.add_attributes_for_service_map_if_possible(span, task_data)
-        # Send logs
-        if not disable_logs:
-            span.add_event(task_data.dump)
         span.end(end_time=host_data.finish)
 
     def set_span_attribute(self, span, attributeName, attributeValue):
@@ -434,7 +405,6 @@ class CallbackModule(CallbackBase):
     def __init__(self, display=None):
         super(CallbackModule, self).__init__(display=display)
         self.hide_task_arguments = None
-        self.disable_logs = None
         self.otel_service_name = None
         self.ansible_playbook = None
         self.play_name = None
@@ -465,8 +435,6 @@ class CallbackModule(CallbackBase):
 
         self.hide_task_arguments = self.get_option('hide_task_arguments')
 
-        self.disable_logs = self.get_option('disable_logs')
-
         self.otel_service_name = self.get_option('otel_service_name')
 
         if not self.otel_service_name:
@@ -523,32 +491,28 @@ class CallbackModule(CallbackBase):
         self.opentelemetry.finish_task(
             self.tasks_data,
             status,
-            result,
-            self._dump_results(result._result)
+            result
         )
 
     def v2_runner_on_ok(self, result):
         self.opentelemetry.finish_task(
             self.tasks_data,
             'ok',
-            result,
-            self._dump_results(result._result)
+            result
         )
 
     def v2_runner_on_skipped(self, result):
         self.opentelemetry.finish_task(
             self.tasks_data,
             'skipped',
-            result,
-            self._dump_results(result._result)
+            result
         )
 
     def v2_playbook_on_include(self, included_file):
         self.opentelemetry.finish_task(
             self.tasks_data,
             'included',
-            included_file,
-            ""
+            included_file
         )
 
     def v2_playbook_on_stats(self, stats):
@@ -561,8 +525,7 @@ class CallbackModule(CallbackBase):
             self.ansible_playbook,
             self.tasks_data,
             status,
-            self.traceparent,
-            self.disable_logs
+            self.traceparent
         )
 
     def v2_runner_on_async_failed(self, result, **kwargs):

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

@@ -21,8 +21,8 @@ DOCUMENTATION = '''
       - If you increase verbosity all tasks are printed.
     options:
       nocolor:
-        default: false
-        description: This setting allows suppressing colorizing output.
+        default: False
+        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.
+        required: True
+        description: Slack Webhook URL
         env:
           - name: SLACK_WEBHOOK_URL
         ini:
@@ -45,13 +45,13 @@ 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:
           - section: callback_slack
             key: validate_certs
-        default: true
+        default: True
         type: bool
 '''
 

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

@@ -63,7 +63,7 @@ class CallbackModule(CallbackModule_default):
 
     def _preprocess_result(self, result):
         self.delegated_vars = result._result.get('_ansible_delegated_vars', None)
-        self._handle_exception(result._result, use_stderr=self.get_option('display_failed_stderr'))
+        self._handle_exception(result._result, use_stderr=self.display_failed_stderr)
         self._handle_warnings(result._result)
 
     def _process_result_output(self, result, msg):
@@ -109,7 +109,7 @@ class CallbackModule(CallbackModule_default):
         self._display.display(msg)
 
     def v2_runner_on_skipped(self, result, ignore_errors=False):
-        if self.get_option('display_skipped_hosts'):
+        if self.display_skipped_hosts:
             self._preprocess_result(result)
             display_color = C.COLOR_SKIP
             msg = "skipped"
@@ -128,7 +128,7 @@ class CallbackModule(CallbackModule_default):
             msg += " | item: %s" % (item_value,)
 
         task_result = self._process_result_output(result, msg)
-        self._display.display("  " + task_result, display_color, stderr=self.get_option('display_failed_stderr'))
+        self._display.display("  " + task_result, display_color, stderr=self.display_failed_stderr)
 
     def v2_runner_on_ok(self, result, msg="ok", display_color=C.COLOR_OK):
         self._preprocess_result(result)
@@ -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.display_ok_hosts:
             task_result = self._process_result_output(result, msg)
             self._display.display("  " + task_result, display_color)
 
@@ -162,7 +162,7 @@ class CallbackModule(CallbackModule_default):
         display_color = C.COLOR_UNREACHABLE
         task_result = self._process_result_output(result, msg)
 
-        self._display.display("  " + task_result, display_color, stderr=self.get_option('display_failed_stderr'))
+        self._display.display("  " + task_result, display_color, stderr=self.display_failed_stderr)
 
     def v2_on_file_diff(self, result):
         if result._task.loop and 'results' in result._result:
@@ -205,7 +205,7 @@ class CallbackModule(CallbackModule_default):
                 colorize(u'ignored', t['ignored'], None)),
                 log_only=True
             )
-        if stats.custom and self.get_option('show_custom_stats'):
+        if stats.custom and self.show_custom_stats:
             self._display.banner("CUSTOM STATS: ")
             # per host
             # TODO: come up with 'pretty format'

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/chroot.py

@@ -22,7 +22,6 @@ DOCUMENTATION = '''
             - The path of the chroot you want to access.
         default: inventory_hostname
         vars:
-            - name: inventory_hostname
             - name: ansible_host
       executable:
         description:

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/auth_basic.py

@@ -28,5 +28,5 @@ options:
     description:
       - Whether or not to validate SSL certs when supplying a https endpoint.
     type: bool
-    default: true
+    default: yes
 '''

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/dimensiondata.py

@@ -47,5 +47,5 @@ options:
       - If C(false), SSL certificates will not be validated.
       - This should only be used on private instances of the CloudControl API that use self-signed certificates.
     type: bool
-    default: true
+    default: yes
 '''

plugins/doc_fragments/dimensiondata_wait.py

@@ -21,7 +21,7 @@ options:
     description:
       - Should we wait for the task to complete before moving onto the next.
     type: bool
-    default: false
+    default: no
   wait_time:
     description:
       - The maximum amount of time (in seconds) to wait for the task to complete.

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/ibm_storage.py

@@ -18,17 +18,17 @@ options:
         description:
             - Management user on the spectrum accelerate storage system.
         type: str
-        required: true
+        required: True
     password:
         description:
             - Password for username on the spectrum accelerate storage system.
         type: str
-        required: true
+        required: True
     endpoints:
         description:
             - The hostname or management IP of Spectrum Accelerate storage system.
         type: str
-        required: true
+        required: True
 notes:
   - This module requires pyxcli python library.
     Use 'pip install pyxcli' in order to get pyxcli.

plugins/doc_fragments/influxdb.py

@@ -43,14 +43,13 @@ options:
     - The path on which InfluxDB server is accessible
     - Only available when using python-influxdb >= 5.1.0
     type: str
-    default: ''
     version_added: '0.2.0'
   validate_certs:
     description:
-    - If set to C(false), the SSL certificates will not be validated.
-    - This should only set to C(false) used on personally controlled sites using self-signed certificates.
+    - If set to C(no), the SSL certificates will not be validated.
+    - This should only set to C(no) used on personally controlled sites using self-signed certificates.
     type: bool
-    default: true
+    default: yes
   ssl:
     description:
     - Use https instead of http to connect to InfluxDB server.
@@ -81,5 +80,4 @@ options:
     description:
     - HTTP(S) proxy to use for Requests to connect to InfluxDB server.
     type: dict
-    default: {}
 '''

plugins/doc_fragments/ipa.py

@@ -61,10 +61,10 @@ options:
   validate_certs:
     description:
     - This only applies if C(ipa_prot) is I(https).
-    - If set to C(false), the SSL certificates will not be validated.
-    - This should only set to C(false) used on personally controlled sites using self-signed certificates.
+    - If set to C(no), the SSL certificates will not be validated.
+    - This should only set to C(no) used on personally controlled sites using self-signed certificates.
     type: bool
-    default: true
+    default: yes
   ipa_timeout:
     description:
     - Specifies idle timeout (in seconds) for the connection.

plugins/doc_fragments/keycloak.py

@@ -61,7 +61,7 @@ options:
         description:
             - Verify TLS certificates (do not disable this in production).
         type: bool
-        default: true
+        default: yes
 
     connection_timeout:
         description:

plugins/doc_fragments/ldap.py

@@ -23,7 +23,6 @@ options:
     description:
       - The password to use with I(bind_dn).
     type: str
-    default: ''
   dn:
     required: true
     description:
@@ -50,30 +49,19 @@ options:
     description:
       - If true, we'll use the START_TLS LDAP extension.
     type: bool
-    default: false
+    default: no
   validate_certs:
     description:
-      - If set to C(false), SSL certificates will not be validated.
+      - If set to C(no), SSL certificates will not be validated.
       - This should only be used on sites using self-signed certificates.
     type: bool
-    default: true
+    default: yes
   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/doc_fragments/manageiq.py

@@ -40,7 +40,7 @@ options:
         description:
           - Whether SSL certificates should be verified for HTTPS requests. defaults to True.
         type: bool
-        default: true
+        default: yes
         aliases: [ verify_ssl ]
       ca_cert:
         description:

plugins/doc_fragments/oneview.py

@@ -63,7 +63,7 @@ options:
             - When the ETag Validation is enabled, the request will be conditionally processed only if the current ETag
                 for the resource matches the ETag provided in the data.
         type: bool
-        default: true
+        default: yes
 '''
 
     FACTSPARAMS = r'''

plugins/doc_fragments/online.py

@@ -34,7 +34,7 @@ options:
     description:
       - Validate SSL certs of the Online API.
     type: bool
-    default: true
+    default: yes
 notes:
   - Also see the API documentation on U(https://console.online.net/en/api/)
   - If C(api_token) is not set within the module, the following

plugins/doc_fragments/opennebula.py

@@ -36,7 +36,7 @@ options:
             - Whether to validate the SSL certificates or not.
             - This parameter is ignored if PYTHONHTTPSVERIFY environment variable is used.
         type: bool
-        default: true
+        default: yes
     wait_timeout:
         description:
             - Time to wait for the desired state to be reached before timeout, in seconds.

plugins/doc_fragments/openswitch.py

@@ -71,11 +71,11 @@ options:
     default: ssh
   use_ssl:
     description:
-      - Configures the I(transport) to use SSL if set to C(true) only when the
+      - Configures the I(transport) to use SSL if set to C(yes) only when the
         I(transport) argument is configured as rest.  If the transport
         argument is not I(rest), this value is ignored.
     type: bool
-    default: true
+    default: yes
   provider:
     description:
       - Convenience method that allows all I(openswitch) arguments to be passed as

plugins/doc_fragments/oracle_creatable_resource.py

@@ -15,7 +15,7 @@ class ModuleDocFragment(object):
                          idempotent operation, and doesn't create the resource if it already exists. Setting this option
                          to true, forcefully creates a copy of the resource, even if it already exists.This option is
                          mutually exclusive with I(key_by).
-            default: false
+            default: False
             type: bool
         key_by:
             description: The list of comma-separated attributes of this resource which should be used to uniquely

plugins/doc_fragments/oracle_wait_options.py

@@ -12,15 +12,15 @@ class ModuleDocFragment(object):
     options:
         wait:
             description: Whether to wait for create or delete operation to complete.
-            default: true
+            default: yes
             type: bool
         wait_timeout:
-            description: Time, in seconds, to wait when I(wait=true).
+            description: Time, in seconds, to wait when I(wait=yes).
             default: 1200
             type: int
         wait_until:
-            description: The lifecycle state to wait for the resource to transition into when I(wait=true). By default,
-                         when I(wait=true), we wait for the resource to get into ACTIVE/ATTACHED/AVAILABLE/PROVISIONED/
+            description: The lifecycle state to wait for the resource to transition into when I(wait=yes). By default,
+                         when I(wait=yes), we wait for the resource to get into ACTIVE/ATTACHED/AVAILABLE/PROVISIONED/
                          RUNNING applicable lifecycle state during create operation & to get into DELETED/DETACHED/
                          TERMINATED lifecycle state during delete operation.
             type: str

plugins/doc_fragments/proxmox.py

@@ -38,10 +38,10 @@ options:
     version_added: 1.3.0
   validate_certs:
     description:
-      - If C(false), SSL certificates will not be validated.
+      - If C(no), SSL certificates will not be validated.
       - This should only be used on personally controlled sites using self-signed certificates.
     type: bool
-    default: false
+    default: no
 requirements: [ "proxmoxer", "requests" ]
 '''
 

plugins/doc_fragments/scaleway.py

@@ -40,7 +40,7 @@ options:
     description:
       - Validate SSL certs of the Scaleway API.
     type: bool
-    default: true
+    default: yes
 notes:
   - Also see the API documentation on U(https://developer.scaleway.com/)
   - If C(api_token) is not set within the module, the following

plugins/doc_fragments/scaleway_waitable_resource.py

@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2022, Guillaume MARTINEZ <lunik@tiwabbit.fr>
-# 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
-
-
-class ModuleDocFragment(object):
-
-    # Standard documentation fragment
-    DOCUMENTATION = r'''
-options:
-  wait:
-    description:
-    - Wait for the resource to reach its desired state before returning.
-    type: bool
-    default: true
-  wait_timeout:
-    type: int
-    description:
-    - Time to wait for the resource to reach the expected state.
-    required: false
-    default: 300
-  wait_sleep_time:
-    type: int
-    description:
-    - Time to wait before every attempt to check the state of the resource.
-    required: false
-    default: 3
-'''

plugins/doc_fragments/utm.py

@@ -17,7 +17,6 @@ options:
           - Is needed for some modules
         type: dict
         required: false
-        default: {}
     utm_host:
         description:
           - The REST Endpoint of the Sophos UTM.
@@ -44,7 +43,7 @@ options:
         description:
           - Whether the REST interface's ssl certificate should be verified or not.
         type: bool
-        default: true
+        default: yes
     state:
         description:
           - The desired state of the object.

plugins/doc_fragments/vexata.py

@@ -40,10 +40,10 @@ options:
   validate_certs:
     description:
       - Allows connection when SSL certificates are not valid. Set to C(false) when certificates are not trusted.
-      - If set to C(true), please make sure Python >= 2.7.9 is installed on the given machine.
+      - If set to C(yes), please make sure Python >= 2.7.9 is installed on the given machine.
     required: false
     type: bool
-    default: false
+    default: 'no'
 
 requirements:
   - Vexata VX100 storage array with VXOS >= v3.5.0 on storage array

plugins/doc_fragments/xenserver.py

@@ -37,5 +37,5 @@ options:
     - Allows connection when SSL certificates are not valid. Set to C(false) when certificates are not trusted.
     - If the value is not specified in the task, the value of environment variable C(XENSERVER_VALIDATE_CERTS) will be used instead.
     type: bool
-    default: true
+    default: yes
 '''

plugins/filter/jc.py

@@ -26,7 +26,6 @@ DOCUMENTATION = '''
       description:
         - The correct parser for the input data.
         - For example C(ifconfig).
-        - "Note: use underscores instead of dashes (if any) in the parser module name."
         - See U(https://github.com/kellyjonbrazil/jc#parsers) for the latest list of parsers.
       type: string
       required: true
@@ -39,16 +38,10 @@ DOCUMENTATION = '''
       type: boolean
       default: false
   requirements:
-    - jc installed as a Python library (U(https://pypi.org/project/jc/))
+    - jc (https://github.com/kellyjonbrazil/jc)
 '''
 
 EXAMPLES = '''
-- name: Install the prereqs of the jc filter (jc Python package) on the Ansible controller
-  delegate_to: localhost
-  ansible.builtin.pip:
-    name: jc
-    state: present
-
 - name: Run command
   ansible.builtin.command: uname -a
   register: result
@@ -80,13 +73,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:
@@ -101,19 +94,15 @@ def jc_filter(data, parser, quiet=True, raw=False):
         dictionary or list of dictionaries
 
     Example:
+
         - name: run date command
           hosts: ubuntu
           tasks:
-          - name: install the prereqs of the jc filter (jc Python package) on the Ansible controller
-            delegate_to: localhost
-            ansible.builtin.pip:
-              name: jc
-              state: present
-          - ansible.builtin.shell: date
+          - shell: date
             register: result
-          - ansible.builtin.set_fact:
+          - set_fact:
               myvar: "{{ result.stdout | community.general.jc('date') }}"
-          - ansible.builtin.debug:
+          - debug:
               msg: "{{ myvar }}"
 
         produces:
@@ -135,17 +124,11 @@ def jc_filter(data, parser, quiet=True, raw=False):
     """
 
     if not HAS_LIB:
-        raise AnsibleError('You need to install "jc" as a Python library on the Ansible controller prior to running jc filter')
+        raise AnsibleError('You need to install "jc" 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 +139,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/cobbler.py

@@ -19,7 +19,7 @@ DOCUMENTATION = '''
     options:
       plugin:
         description: The name of this plugin, it should always be set to C(community.general.cobbler) for this plugin to recognize it as it's own.
-        required: true
+        required: yes
         choices: [ 'cobbler', 'community.general.cobbler' ]
       url:
         description: URL to cobbler.
@@ -28,18 +28,18 @@ DOCUMENTATION = '''
             - name: COBBLER_SERVER
       user:
         description: Cobbler authentication user.
-        required: false
+        required: no
         env:
             - name: COBBLER_USER
       password:
         description: Cobbler authentication password
-        required: false
+        required: no
         env:
             - name: COBBLER_PASSWORD
       cache_fallback:
         description: Fallback to cached results if connection to cobbler fails
         type: boolean
-        default: false
+        default: no
       exclude_profiles:
         description:
           - Profiles to exclude from inventory.
@@ -70,7 +70,7 @@ DOCUMENTATION = '''
       want_facts:
         description: Toggle, if C(true) the plugin will retrieve host facts from the server
         type: boolean
-        default: true
+        default: yes
 '''
 
 EXAMPLES = '''

plugins/inventory/gitlab_runners.py

@@ -55,7 +55,7 @@ DOCUMENTATION = '''
         verbose_output:
             description: Toggle to (not) include all available nodes metadata
             type: bool
-            default: true
+            default: yes
 '''
 
 EXAMPLES = '''
@@ -66,7 +66,7 @@ host: https://gitlab.com
 # Example using constructed features to create groups and set ansible_host
 plugin: community.general.gitlab_runners
 host: https://gitlab.com
-strict: false
+strict: False
 keyed_groups:
   # add e.g. amd64 hosts to an arch_amd64 group
   - prefix: arch

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

@@ -20,7 +20,7 @@ DOCUMENTATION = '''
     options:
         plugin:
             description: token that ensures this is a source file for the 'nmap' plugin.
-            required: true
+            required: True
             choices: ['nmap', 'community.general.nmap']
         sudo:
             description: Set to C(true) to execute a C(sudo nmap) plugin scan.
@@ -29,7 +29,7 @@ DOCUMENTATION = '''
             type: boolean
         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
+            required: True
         exclude:
             description: list of addresses to exclude
             type: list
@@ -37,34 +37,15 @@ DOCUMENTATION = '''
         ports:
             description: Enable/disable scanning for open ports
             type: boolean
-            default: true
+            default: True
         ipv4:
             description: use IPv4 type addresses
             type: boolean
-            default: true
+            default: True
         ipv6:
             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
-        dns_resolve:
-            description: Whether to always (C(true)) or never (C(false)) do DNS resolution.
-            type: boolean
-            default: false
-            version_added: 6.1.0
+            default: True
     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'
@@ -72,14 +53,14 @@ DOCUMENTATION = '''
 EXAMPLES = '''
 # inventory.config file in YAML format
 plugin: community.general.nmap
-strict: false
+strict: False
 address: 192.168.0.0/24
 
 
 # a sudo nmap scan to fully use nmap scan power.
 plugin: community.general.nmap
 sudo: true
-strict: false
+strict: False
 address: 192.168.0.0/24
 '''
 
@@ -185,15 +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')
-
             cmd.append(self._options['address'])
             try:
                 # execute

plugins/inventory/online.py

@@ -16,10 +16,10 @@ DOCUMENTATION = r'''
     options:
         plugin:
             description: token that ensures this is a source file for the 'online' plugin.
-            required: true
+            required: True
             choices: ['online', 'community.general.online']
         oauth_token:
-            required: true
+            required: True
             description: Online OAuth token.
             env:
                 # in order of precedence
@@ -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/opennebula.py

@@ -34,7 +34,7 @@ DOCUMENTATION = r'''
               - If not set then the value of the C(ONE_URL) environment variable is used.
             env:
               - name: ONE_URL
-            required: true
+            required: True
             type: string
         api_username:
             description:
@@ -49,7 +49,7 @@ DOCUMENTATION = r'''
               - If not set, the value of the C(ONE_PASSWORD) environment variable is used.
             env:
               - name: ONE_PASSWORD
-            required: false
+            required: False
             type: string
         api_authfile:
             description:
@@ -58,7 +58,7 @@ DOCUMENTATION = r'''
               - Set environment variable C(ONE_AUTH) to override this path.
             env:
               - name: ONE_AUTH
-            required: false
+            required: False
             type: string
         hostname:
             description: Field to match the hostname. Note C(v4_first_ip) corresponds to the first IPv4 found on VM.
@@ -74,7 +74,7 @@ DOCUMENTATION = r'''
         group_by_labels:
             description: Create host groups by vm labels
             type: bool
-            default: true
+            default: True
 '''
 
 EXAMPLES = r'''

plugins/inventory/proxmox.py

@@ -26,7 +26,7 @@ DOCUMENTATION = '''
     options:
       plugin:
         description: The name of this plugin, it should always be set to C(community.general.proxmox) for this plugin to recognize it as it's own.
-        required: true
+        required: yes
         choices: ['community.general.proxmox']
         type: str
       url:
@@ -44,7 +44,7 @@ DOCUMENTATION = '''
           - Proxmox authentication user.
           - If the value is not specified in the inventory configuration, the value of environment variable C(PROXMOX_USER) will be used instead.
           - Since community.general 4.7.0 you can also use templating to specify the value of the I(user).
-        required: true
+        required: yes
         type: str
         env:
           - name: PROXMOX_USER
@@ -83,7 +83,7 @@ DOCUMENTATION = '''
       validate_certs:
         description: Verify SSL certificate if using HTTPS.
         type: boolean
-        default: true
+        default: yes
       group_prefix:
         description: Prefix to apply to Proxmox groups.
         default: proxmox_
@@ -98,14 +98,14 @@ DOCUMENTATION = '''
           - When I(want_facts) is set to C(true) more details about QEMU VM status are possible, besides the running and stopped states.
             Currently if the VM is running and it is suspended, the status will be running and the machine will be in C(running) group,
             but its actual state will be paused. See I(qemu_extended_statuses) for how to retrieve the real status.
-        default: false
+        default: no
         type: bool
       qemu_extended_statuses:
         description:
           - Requires I(want_facts) to be set to C(true) to function. This will allow you to differentiate betweend C(paused) and C(prelaunch)
             statuses of the QEMU VMs.
           - This introduces multiple groups [prefixed with I(group_prefix)] C(prelaunch) and C(paused).
-        default: false
+        default: no
         type: bool
         version_added: 5.1.0
       want_proxmox_nodes_ansible_host:
@@ -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/scaleway.py

@@ -19,7 +19,7 @@ DOCUMENTATION = r'''
     options:
         plugin:
             description: Token that ensures this is a source file for the 'scaleway' plugin.
-            required: true
+            required: True
             choices: ['scaleway', 'community.general.scaleway']
         regions:
             description: Filter results on a specific Scaleway region.

plugins/inventory/virtualbox.py

@@ -20,12 +20,12 @@ DOCUMENTATION = '''
     options:
         plugin:
             description: token that ensures this is a source file for the 'virtualbox' plugin
-            required: true
+            required: True
             choices: ['virtualbox', 'community.general.virtualbox']
         running_only:
             description: toggles showing all vms vs only those currently running
             type: boolean
-            default: false
+            default: False
         settings_password_file:
             description: provide a file containing the settings password (equivalent to --settingspwfile)
         network_info_path:
@@ -186,13 +186,10 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
             else:
                 # found vars, accumulate in hostvars for clean inventory set
                 pref_k = 'vbox_' + k.strip().replace(' ', '_')
-                leading_spaces = len(k) - len(k.lstrip(' '))
-                if 0 < leading_spaces <= 2:
-                    if prevkey not in hostvars[current_host] or not isinstance(hostvars[current_host][prevkey], dict):
+                if k.startswith(' '):
+                    if prevkey not in hostvars[current_host]:
                         hostvars[current_host][prevkey] = {}
                     hostvars[current_host][prevkey][pref_k] = v
-                elif leading_spaces > 2:
-                    continue
                 else:
                     if v != '':
                         hostvars[current_host][pref_k] = v

plugins/inventory/xen_orchestra.py

@@ -24,7 +24,7 @@ DOCUMENTATION = '''
     options:
         plugin:
             description: The name of this plugin, it should always be set to C(community.general.xen_orchestra) for this plugin to recognize it as its own.
-            required: true
+            required: yes
             choices: ['community.general.xen_orchestra']
             type: str
         api_host:
@@ -38,7 +38,7 @@ DOCUMENTATION = '''
             description:
                 - Xen Orchestra user.
                 - If the value is not specified in the inventory configuration, the value of environment variable C(ANSIBLE_XO_USER) will be used instead.
-            required: true
+            required: yes
             type: str
             env:
                 - name: ANSIBLE_XO_USER
@@ -46,7 +46,7 @@ DOCUMENTATION = '''
             description:
                 - Xen Orchestra password.
                 - If the value is not specified in the inventory configuration, the value of environment variable C(ANSIBLE_XO_PASSWORD) will be used instead.
-            required: true
+            required: yes
             type: str
             env:
                 - name: ANSIBLE_XO_PASSWORD

plugins/lookup/bitwarden.py

@@ -22,18 +22,9 @@ DOCUMENTATION = """
         required: true
         type: list
         elements: str
-      search:
-        description: Field to retrieve, for example C(name) or C(id).
-        type: str
-        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 = """
@@ -42,25 +33,10 @@ EXAMPLES = """
     msg: >-
       {{ lookup('community.general.bitwarden', 'a_test', field='password') }}
 
-- name: "Get 'password' from Bitwarden record with id 'bafba515-af11-47e6-abe3-af1200cd18b2'"
-  ansible.builtin.debug:
-    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 = """
@@ -92,7 +68,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'
@@ -105,17 +81,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="name"):
         """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]
@@ -123,27 +92,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)
 
-        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):
@@ -151,12 +110,10 @@ class LookupModule(LookupBase):
     def run(self, terms, variables=None, **kwargs):
         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) for term in terms]
 
 
 _bitwarden = Bitwarden()

plugins/lookup/cartesian.py

@@ -15,12 +15,10 @@ 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
+        required: True
 '''
 
 EXAMPLES = """
@@ -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/chef_databag.py

@@ -22,11 +22,11 @@ DOCUMENTATION = '''
         name:
           description:
             - Name of the databag
-          required: true
+          required: True
         item:
           description:
             - Item to fetch
-          required: true
+          required: True
 '''
 
 EXAMPLES = """

plugins/lookup/consul_kv.py

@@ -25,7 +25,7 @@ DOCUMENTATION = '''
       recurse:
         type: boolean
         description: If true, will retrieve all the values that have the given key as prefix.
-        default: false
+        default: False
       index:
         description:
           - If the key has a value with the specified index then this is returned allowing access to historical values.
@@ -56,7 +56,7 @@ DOCUMENTATION = '''
           - Whether to use http or https.
           - If you use C(ANSIBLE_CONSUL_URL) this value will be used from there.
       validate_certs:
-        default: true
+        default: True
         description: Whether to verify the ssl connection or not.
         env:
           - name: ANSIBLE_CONSUL_VALIDATE_CERTS
@@ -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

@@ -22,10 +22,10 @@ DOCUMENTATION = '''
         default: '/opt/CARKaim/sdk/clipasswordsdk'
       appid:
         description: Defines the unique ID of the application that is issuing the password request.
-        required: true
+        required: True
       query:
         description: Describes the filter criteria for the password retrieval.
-        required: true
+        required: True
       output:
         description:
           - Specifies the desired output fields separated by commas.
@@ -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.
@@ -125,16 +125,8 @@ from ansible.errors import AnsibleLookupError
 from ansible.module_utils.common._collections_compat import Mapping, Sequence
 from ansible.module_utils.six import string_types
 from ansible.plugins.lookup import LookupBase
-from ansible.release import __version__ as ansible_version
 from ansible.template import Templar
 
-from ansible_collections.community.general.plugins.module_utils.version import LooseVersion
-
-
-# Whether Templar has a cache, which can be controlled by Templar.template()'s cache option.
-# The cache was removed for ansible-core 2.14 (https://github.com/ansible/ansible/pull/78419)
-_TEMPLAR_HAS_TEMPLATE_CACHE = LooseVersion(ansible_version) < LooseVersion('2.14.0')
-
 
 class LookupModule(LookupBase):
     def __evaluate(self, expression, templar, variables):
@@ -144,10 +136,7 @@ class LookupModule(LookupBase):
         ``variables`` are the variables to use.
         """
         templar.available_variables = variables or {}
-        expression = "{0}{1}{2}".format("{{", expression, "}}")
-        if _TEMPLAR_HAS_TEMPLATE_CACHE:
-            return templar.template(expression, cache=False)
-        return templar.template(expression)
+        return templar.template("{0}{1}{2}".format("{{", expression, "}}"), cache=False)
 
     def __process(self, result, terms, index, current, templar, variables):
         """Fills ``result`` list with evaluated items.
@@ -191,8 +180,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,18 +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.
-        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.
@@ -84,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:
@@ -93,24 +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) }}"
+  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 = """
@@ -130,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
@@ -205,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:
@@ -225,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'],
@@ -238,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'],
@@ -257,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':
@@ -298,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)
 
         domain = None
-        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')
+        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.
@@ -340,7 +314,7 @@ class LookupModule(LookupBase):
                 continue
             if '=' in t:
                 try:
-                    opt, arg = t.split('=', 1)
+                    opt, arg = t.split('=')
                 except Exception:
                     pass
 
@@ -357,8 +331,6 @@ 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
 
@@ -374,6 +346,11 @@ class LookupModule(LookupBase):
 
         ret = []
 
+        if qtype.upper() == 'DLV':
+            display.deprecated('The DLV record type has been decommissioned in 2017 and support for'
+                               ' it will be removed from community.general 6.0.0',
+                               version='6.0.0', collection_name='community.general')
+
         if qtype.upper() == 'PTR':
             try:
                 n = dns.reversename.from_address(domain)
@@ -409,18 +386,15 @@ class LookupModule(LookupBase):
         except dns.resolver.NXDOMAIN as err:
             if fail_on_error:
                 raise AnsibleError("Lookup failed: %s" % str(err))
-            if not real_empty:
-                ret.append('NXDOMAIN')
+            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("")
+            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("")
+            ret.append('')
         except dns.exception.DNSException as err:
             raise AnsibleError("dns.resolver unhandled exception %s" % to_native(err))
 

plugins/lookup/dnstxt.py

@@ -17,16 +17,9 @@ DOCUMENTATION = '''
     options:
       _terms:
         description: domain or list of domains to query TXT records from
-        required: true
+        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/etcd.py

@@ -21,7 +21,7 @@ DOCUMENTATION = '''
                 - the list of keys to lookup on the etcd server
             type: list
             elements: string
-            required: true
+            required: True
         url:
             description:
                 - Environment variable with the url for the etcd server
@@ -37,7 +37,7 @@ DOCUMENTATION = '''
         validate_certs:
             description:
                 - toggle checking that the ssl certificates are valid, you normally only want to turn this off with self-signed certs.
-            default: true
+            default: True
             type: boolean
 '''
 

plugins/lookup/etcd3.py

@@ -24,12 +24,12 @@ DOCUMENTATION = '''
             - The list of keys (or key prefixes) to look up on the etcd3 server.
             type: list
             elements: str
-            required: true
+            required: True
         prefix:
             description:
             - Look for key or prefix key.
             type: bool
-            default: false
+            default: False
         endpoints:
             description:
             - Counterpart of C(ETCDCTL_ENDPOINTS) environment variable.
@@ -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

@@ -18,7 +18,7 @@ description:
 options:
   _terms:
     description: path(s) of files to read
-    required: true
+    required: True
 '''
 
 EXAMPLES = r"""
@@ -46,7 +46,7 @@ EXAMPLES = r"""
     dest: /web/{{ item.path }}
     state: link
     follow: false  # avoid corrupting target files if the link already exists
-    force: true
+    force: yes
     mode: '{{ item.mode }}'
   with_community.general.filetree: web/
   when: item.state == 'link'
@@ -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
+        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)