Release 3.2.0.

* Add domain to onepassword lookup

* Add changelog

* Add default to domain documentation

* Improve format

* Fix sanity issue

* Add option type to documentation

Co-authored-by: Felix Fontein <felix@fontein.de>

* Add domain to init

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit dab5d941e6)

Co-authored-by: Amin Vakil <info@aminvakil.com>

.azure-pipelines/azure-pipelines.yml

@@ -68,19 +68,6 @@ stages:
             - test: 3
             - test: 4
             - test: extra
-  - stage: Sanity_2_12
-    displayName: Sanity 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Test {0}
-          testFormat: 2.12/sanity/{0}
-          targets:
-            - test: 1
-            - test: 2
-            - test: 3
-            - test: 4
   - stage: Sanity_2_11
     displayName: Sanity 2.11
     dependsOn: []
@@ -129,22 +116,6 @@ stages:
         parameters:
           nameFormat: Python {0}
           testFormat: devel/units/{0}/1
-          targets:
-            - test: 2.7
-            - test: 3.5
-            - test: 3.6
-            - test: 3.7
-            - test: 3.8
-            - test: 3.9
-            - test: '3.10'
-  - stage: Units_2_12
-    displayName: Units 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.12/units/{0}/1
           targets:
             - test: 2.6
             - test: 2.7
@@ -152,6 +123,7 @@ stages:
             - test: 3.6
             - test: 3.7
             - test: 3.8
+            - test: 3.9
             - test: '3.10'
   - stage: Units_2_11
     displayName: Units 2.11
@@ -178,8 +150,13 @@ stages:
           nameFormat: Python {0}
           testFormat: 2.10/units/{0}/1
           targets:
+            - test: 2.6
             - test: 2.7
+            - test: 3.5
             - test: 3.6
+            - test: 3.7
+            - test: 3.8
+            - test: 3.9
   - stage: Units_2_9
     displayName: Units 2.9
     dependsOn: []
@@ -209,8 +186,8 @@ stages:
               test: macos/11.1
             - name: RHEL 7.9
               test: rhel/7.9
-            - name: RHEL 8.4
-              test: rhel/8.4
+            - name: RHEL 8.3
+              test: rhel/8.3
             - name: FreeBSD 12.2
               test: freebsd/12.2
             - name: FreeBSD 13.0
@@ -219,23 +196,6 @@ stages:
             - 1
             - 2
             - 3
-  - stage: Remote_2_12
-    displayName: Remote 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.12/{0}
-          targets:
-            - name: macOS 11.1
-              test: macos/11.1
-            - name: RHEL 8.4
-              test: rhel/8.4
-            - name: FreeBSD 13.0
-              test: freebsd/13.0
-          groups:
-            - 1
-            - 2
   - stage: Remote_2_11
     displayName: Remote 2.11
     dependsOn: []
@@ -244,6 +204,8 @@ stages:
         parameters:
           testFormat: 2.11/{0}
           targets:
+            - name: macOS 11.1
+              test: macos/11.1
             - name: RHEL 7.9
               test: rhel/7.9
             - name: RHEL 8.3
@@ -265,6 +227,14 @@ stages:
               test: osx/10.11
             - name: macOS 10.15
               test: macos/10.15
+            - name: macOS 11.1
+              test: macos/11.1
+            - name: RHEL 7.8
+              test: rhel/7.8
+            - name: RHEL 8.2
+              test: rhel/8.2
+            - name: FreeBSD 12.1
+              test: freebsd/12.1
           groups:
             - 1
             - 2
@@ -278,8 +248,6 @@ stages:
           targets:
             - name: RHEL 8.2
               test: rhel/8.2
-            - name: RHEL 7.8
-              test: rhel/7.8
             - name: FreeBSD 12.0
               test: freebsd/12.0
           groups:
@@ -295,8 +263,12 @@ stages:
         parameters:
           testFormat: devel/linux/{0}
           targets:
+            - name: CentOS 6
+              test: centos6
             - name: CentOS 7
               test: centos7
+            - name: CentOS 8
+              test: centos8
             - name: Fedora 33
               test: fedora33
             - name: Fedora 34
@@ -313,28 +285,6 @@ stages:
             - 1
             - 2
             - 3
-  - stage: Docker_2_12
-    displayName: Docker 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.12/linux/{0}
-          targets:
-            - name: CentOS 6
-              test: centos6
-            - name: CentOS 8
-              test: centos8
-            - name: Fedora 34
-              test: fedora34
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 20.04
-              test: ubuntu2004
-          groups:
-            - 1
-            - 2
-            - 3
   - stage: Docker_2_11
     displayName: Docker 2.11
     dependsOn: []
@@ -343,12 +293,14 @@ stages:
         parameters:
           testFormat: 2.11/linux/{0}
           targets:
-            - name: CentOS 7
-              test: centos7
+            - name: CentOS 8
+              test: centos8
             - name: Fedora 33
               test: fedora33
-            - name: openSUSE 15 py2
-              test: opensuse15py2
+            - name: openSUSE 15 py3
+              test: opensuse15
+            - name: Ubuntu 20.04
+              test: ubuntu2004
           groups:
             - 2
             - 3
@@ -360,8 +312,12 @@ stages:
         parameters:
           testFormat: 2.10/linux/{0}
           targets:
+            - name: CentOS 8
+              test: centos8
             - name: Fedora 32
               test: fedora32
+            - name: openSUSE 15 py3
+              test: opensuse15
             - name: Ubuntu 16.04
               test: ubuntu1604
           groups:
@@ -375,6 +331,8 @@ stages:
         parameters:
           testFormat: 2.9/linux/{0}
           targets:
+            - name: CentOS 8
+              test: centos8
             - name: Fedora 31
               test: fedora31
             - name: openSUSE 15 py3
@@ -392,17 +350,6 @@ stages:
         parameters:
           nameFormat: Python {0}
           testFormat: devel/cloud/{0}/1
-          targets:
-            - test: 2.7
-            - test: 3.9
-  - stage: Cloud_2_12
-    displayName: Cloud 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.12/cloud/{0}/1
           targets:
             - test: 3.8
   - stage: Cloud_2_11
@@ -414,6 +361,7 @@ stages:
           nameFormat: Python {0}
           testFormat: 2.11/cloud/{0}/1
           targets:
+            - test: 2.7
             - test: 3.6
   - stage: Cloud_2_10
     displayName: Cloud 2.10
@@ -424,7 +372,7 @@ stages:
           nameFormat: Python {0}
           testFormat: 2.10/cloud/{0}/1
           targets:
-            - test: 3.5
+            - test: 3.6
   - stage: Cloud_2_9
     displayName: Cloud 2.9
     dependsOn: []
@@ -434,7 +382,7 @@ stages:
           nameFormat: Python {0}
           testFormat: 2.9/cloud/{0}/1
           targets:
-            - test: 2.7
+            - test: 3.6
   - stage: Summary
     condition: succeededOrFailed()
     dependsOn:
@@ -442,26 +390,21 @@ stages:
       - Sanity_2_9
       - Sanity_2_10
       - Sanity_2_11
-      - Sanity_2_12
       - Units_devel
       - Units_2_9
       - Units_2_10
       - Units_2_11
-      - Units_2_12
       - Remote_devel
       - Remote_2_9
       - Remote_2_10
       - Remote_2_11
-      - Remote_2_12
       - Docker_devel
       - Docker_2_9
       - Docker_2_10
       - Docker_2_11
-      - Docker_2_12
       - Cloud_devel
       - Cloud_2_9
       - Cloud_2_10
       - Cloud_2_11
-      - Cloud_2_12
     jobs:
       - template: templates/coverage.yml

.github/BOTMETA.yml

@@ -1,9 +1,5 @@
-notifications: true
 automerge: true
 files:
-  plugins/:
-    supershipit: quidame
-  changelogs/: {}
   changelogs/fragments/:
     support: community
   $actions:
@@ -14,69 +10,17 @@ files:
     maintainers: nitzmahone samdoran aminvakil
   $becomes/:
     labels: become
-  $becomes/doas.py:
-    maintainers: $team_ansible_core
-  $becomes/dzdo.py:
-    maintainers: $team_ansible_core
-  $becomes/ksu.py:
-    maintainers: $team_ansible_core
-  $becomes/machinectl.py:
-    maintainers: $team_ansible_core
-  $becomes/pbrun.py:
-    maintainers: $team_ansible_core
-  $becomes/pfexec.py:
-    maintainers: $team_ansible_core
-  $becomes/pmrun.py:
-    maintainers: $team_ansible_core
-  $becomes/sesu.py:
-    maintainers: nekonyuu
-  $becomes/sudosu.py:
-    maintainers: dagwieers
-  $caches/:
-    labels: cache
-  $caches/memcached.py: {}
-  $caches/pickle.py:
-    maintainers: bcoca
-  $caches/redis.py: {}
-  $caches/yaml.py:
-    maintainers: bcoca
   $callbacks/:
     labels: callbacks
-  $callbacks/cgroup_memory_recap.py: {}
-  $callbacks/context_demo.py: {}
-  $callbacks/counter_enabled.py: {}
-  $callbacks/dense.py:
-    maintainers: dagwieers
-  $callbacks/diy.py:
-    maintainers: theque5t
-  $callbacks/elastic.py:
-    maintainers: v1v
-    keywords: apm observability
-  $callbacks/hipchat.py: {}
-  $callbacks/jabber.py: {}
   $callbacks/loganalytics.py:
     maintainers: zhcli
-  $callbacks/logdna.py: {}
-  $callbacks/logentries.py: {}
-  $callbacks/log_plays.py: {}
   $callbacks/logstash.py:
     maintainers: ujenmr
-  $callbacks/mail.py:
-    maintainers: dagwieers
-  $callbacks/nrdp.py:
-    maintainers: rverchere
-  $callbacks/null.py: {}
-  $callbacks/opentelemetry.py:
-    maintainers: v1v
-    keywords: opentelemetry observability
   $callbacks/say.py:
     notify: chris-short
     maintainers: $team_macos
     labels: macos say
     keywords: brew cask darwin homebrew macosx macports osx
-  $callbacks/selective.py: {}
-  $callbacks/slack.py: {}
-  $callbacks/splunk.py: {}
   $callbacks/sumologic.py:
     maintainers: ryancurrah
     labels: sumologic
@@ -85,26 +29,16 @@ files:
   $callbacks/unixy.py:
     maintainers: akatch
     labels: unixy
-  $callbacks/yaml.py: {}
   $connections/:
     labels: connections
-  $connections/chroot.py: {}
-  $connections/funcd.py:
-    maintainers: mscherer
-  $connections/iocage.py: {}
-  $connections/jail.py:
-    maintainers: $team_ansible_core
-  $connections/lxc.py: {}
+  $connections/kubectl.py:
+    maintainers: chouseknecht fabianvf flaper87 maxamillion
+    labels: k8s kubectl
   $connections/lxd.py:
     maintainers: mattclay
     labels: lxd
-  $connections/qubes.py:
-    maintainers: kushaldas
   $connections/saltstack.py:
-    maintainers: mscherer
     labels: saltstack
-  $connections/zone.py:
-    maintainers: $team_ansible_core
   $doc_fragments/:
     labels: docs_fragments
   $doc_fragments/hpe3par.py:
@@ -124,108 +58,65 @@ files:
     maintainers: giner
   $filters/from_csv.py:
     maintainers: Ajpantuso
-  $filters/groupby:
-    maintainers: felixfontein
   $filters/hashids:
     maintainers: Ajpantuso
   $filters/jc.py:
     maintainers: kellyjonbrazil
-  $filters/json_query.py: {}
   $filters/list.py:
     maintainers: vbotka
   $filters/path_join_shim.py:
     maintainers: felixfontein
-  $filters/random_mac.py: {}
   $filters/time.py:
     maintainers: resmo
-  $filters/unicode_normalize.py:
-    maintainers: Ajpantuso
   $filters/version_sort.py:
     maintainers: ericzolf
+  $httpapis/:
+    maintainers: $team_networking
+    labels: networking
+  $httpapis/ftd.py:
+    maintainers: $team_networking annikulin
+    labels: cisco ftd networking
+    keywords: firepower ftd
   $inventories/:
     labels: inventories
-  $inventories/cobbler.py:
-    maintainers: opoplawski
-  $inventories/gitlab_runners.py:
-    maintainers: morph027
   $inventories/linode.py:
     maintainers: $team_linode
     labels: cloud linode
     keywords: linode dynamic inventory script
   $inventories/lxd.py:
     maintainers: conloos
-  $inventories/nmap.py: {}
-  $inventories/online.py:
-    maintainers: sieben
-  $inventories/opennebula.py:
-    maintainers: feldsam
-    labels: cloud opennebula
-    keywords: opennebula dynamic inventory script
   $inventories/proxmox.py:
     maintainers: $team_virt ilijamt
-  $inventories/icinga2.py:
-    maintainers: bongoeadgc6
   $inventories/scaleway.py:
     maintainers: $team_scaleway
     labels: cloud scaleway
-  $inventories/stackpath_compute.py:
-    maintainers: shayrybak
-  $inventories/virtualbox.py: {}
   $lookups/:
     labels: lookups
-  $lookups/cartesian.py: {}
-  $lookups/chef_databag.py: {}
-  $lookups/collection_version.py:
-    maintainers: felixfontein
-  $lookups/consul_kv.py: {}
-  $lookups/credstash.py: {}
-  $lookups/cyberarkpassword.py:
-    notify: cyberark-bizdev
-    labels: cyberarkpassword
-  $lookups/dependent.py:
-    maintainers: felixfontein
-  $lookups/dig.py:
-    maintainers: jpmens
-    labels: dig
-  $lookups/dnstxt.py:
-    maintainers: jpmens
-  $lookups/dsv.py:
-    maintainers: amigus endlesstrax
-  $lookups/etcd3.py:
-    maintainers: eric-belhomme
-  $lookups/etcd.py:
-    maintainers: jpmens
-  $lookups/filetree.py:
-    maintainers: dagwieers
-  $lookups/flattened.py: {}
-  $lookups/hiera.py:
-    maintainers: jparrill
-  $lookups/keyring.py: {}
-  $lookups/lastpass.py: {}
-  $lookups/lmdb_kv.py:
-    maintainers: jpmens
-  $lookups/manifold.py:
-    maintainers: galanoff
-    labels: manifold
   $lookups/onepass:
     maintainers: samdoran
     labels: onepassword
-  $lookups/onepassword.py:
-    maintainers: azenk scottsb
-  $lookups/onepassword_raw.py:
-    maintainers: azenk scottsb
-  $lookups/passwordstore.py: {}
-  $lookups/random_pet.py:
-    maintainers: Akasurde
+  $lookups/conjur_variable.py:
+    notify: cyberark-bizdev
+    maintainers: $team_cyberark_conjur
+    labels: conjur_variable
+  $lookups/cyberarkpassword.py:
+    notify: cyberark-bizdev
+    labels: cyberarkpassword
+  $lookups/dig.py:
+    maintainers: jpmens
+    labels: dig
+  $lookups/tss.py:
+    maintainers: amigus
+  $lookups/dsv.py:
+    maintainers: amigus
+  $lookups/manifold.py:
+    maintainers: galanoff
+    labels: manifold
+  $lookups/nios:
+    maintainers: $team_networking sganesh-infoblox
+    labels: infoblox networking
   $lookups/random_string.py:
     maintainers: Akasurde
-  $lookups/random_words.py:
-    maintainers: konstruktoid
-  $lookups/redis.py:
-    maintainers: $team_ansible_core jpmens
-  $lookups/shelvefile.py: {}
-  $lookups/tss.py:
-    maintainers: amigus endlesstrax
   $module_utils/:
     labels: module_utils
   $module_utils/gitlab.py:
@@ -254,6 +145,9 @@ files:
   $module_utils/module_helper.py:
     maintainers: russoz
     labels: module_helper
+  $module_utils/net_tools/nios/api.py:
+    maintainers: $team_networking sganesh-infoblox
+    labels: infoblox networking
   $module_utils/oracle/oci_utils.py:
     maintainers: $team_oracle
     labels: cloud
@@ -263,13 +157,11 @@ files:
   $module_utils/redfish_utils.py:
     maintainers: $team_redfish
     labels: redfish_utils
-  $module_utils/remote_management/lxca/common.py:
-    maintainers: navalkp prabhosa
+  $module_utils/remote_management/lxca/common.py: navalkp prabhosa
   $module_utils/scaleway.py:
     maintainers: $team_scaleway
     labels: cloud scaleway
-  $module_utils/storage/hpe3par/hpe3par.py:
-    maintainers: farhan7500 gautamphegde
+  $module_utils/storage/hpe3par/hpe3par.py: farhan7500 gautamphegde
   $module_utils/utm_utils.py:
     maintainers: $team_e_spirit
     labels: utm_utils
@@ -300,27 +192,33 @@ files:
     maintainers: zbal
   $modules/cloud/lxc/lxc_container.py:
     maintainers: cloudnull
+  $modules/cloud/lxc/lxc_profile.py:
+    maintainers: conloos
   $modules/cloud/lxd/:
     ignore: hnakamur
-  $modules/cloud/lxd/lxd_profile.py:
-    maintainers: conloos
   $modules/cloud/memset/:
     maintainers: glitchcrab
   $modules/cloud/misc/cloud_init_data_facts.py:
     maintainers: resmo
-  $modules/cloud/misc/proxmox:
+  $modules/cloud/misc/proxmox.py:
+    maintainers: $team_virt UnderGreen
+    labels: proxmox virt
+    ignore: skvidal
+    keywords: kvm libvirt proxmox qemu
+  $modules/cloud/misc/proxmox_kvm.py:
+    maintainers: $team_virt helldorado
+    labels: proxmox_kvm virt
+    ignore: skvidal
+    keywords: kvm libvirt proxmox qemu
+  $modules/cloud/misc/proxmox_snap.py:
     maintainers: $team_virt
     labels: proxmox virt
     keywords: kvm libvirt proxmox qemu
-  $modules/cloud/misc/proxmox.py:
-    maintainers: UnderGreen
-    ignore: skvidal
-  $modules/cloud/misc/proxmox_kvm.py:
-    maintainers: helldorado
-    ignore: skvidal
   $modules/cloud/misc/proxmox_template.py:
-    maintainers: UnderGreen
+    maintainers: $team_virt UnderGreen
+    labels: proxmox_template virt
     ignore: skvidal
+    keywords: kvm libvirt proxmox qemu
   $modules/cloud/misc/rhevm.py:
     maintainers: $team_virt TimothyVandenbrande
     labels: rhevm virt
@@ -362,40 +260,16 @@ files:
     maintainers: omgjlk sivel
   $modules/cloud/rackspace/:
     ignore: ryansb sivel
-  $modules/cloud/rackspace/rax_cbs.py:
-    maintainers: claco
-  $modules/cloud/rackspace/rax_cbs_attachments.py:
-    maintainers: claco
-  $modules/cloud/rackspace/rax_cdb.py:
-    maintainers: jails
-  $modules/cloud/rackspace/rax_cdb_user.py:
-    maintainers: jails
-  $modules/cloud/rackspace/rax_cdb_database.py:
-    maintainers: jails
   $modules/cloud/rackspace/rax_clb.py:
     maintainers: claco
   $modules/cloud/rackspace/rax_clb_nodes.py:
     maintainers: neuroid
   $modules/cloud/rackspace/rax_clb_ssl.py:
     maintainers: smashwilson
-  $modules/cloud/rackspace/rax_files.py:
-    maintainers: angstwad
-  $modules/cloud/rackspace/rax_files_objects.py:
-    maintainers: angstwad
   $modules/cloud/rackspace/rax_identity.py:
     maintainers: claco
   $modules/cloud/rackspace/rax_network.py:
     maintainers: claco omgjlk
-  $modules/cloud/rackspace/rax_mon_alarm.py:
-    maintainers: smashwilson
-  $modules/cloud/rackspace/rax_mon_check.py:
-    maintainers: smashwilson
-  $modules/cloud/rackspace/rax_mon_entity.py:
-    maintainers: smashwilson
-  $modules/cloud/rackspace/rax_mon_notification.py:
-    maintainers: smashwilson
-  $modules/cloud/rackspace/rax_mon_notification_plan.py:
-    maintainers: smashwilson
   $modules/cloud/rackspace/rax_queue.py:
     maintainers: claco
   $modules/cloud/scaleway/:
@@ -407,17 +281,13 @@ files:
   $modules/cloud/scaleway/scaleway_ip_info.py:
     maintainers: Spredzy
   $modules/cloud/scaleway/scaleway_organization_info.py:
-    maintainers: sieben Spredzy
+    maintainers: sieben
   $modules/cloud/scaleway/scaleway_security_group.py:
     maintainers: DenBeke
   $modules/cloud/scaleway/scaleway_security_group_info.py:
-    maintainers: sieben Spredzy
+    maintainers: sieben
   $modules/cloud/scaleway/scaleway_security_group_rule.py:
     maintainers: DenBeke
-  $modules/cloud/scaleway/scaleway_server_info.py:
-    maintainers: Spredzy
-  $modules/cloud/scaleway/scaleway_snapshot_info.py:
-    maintainers: Spredzy
   $modules/cloud/scaleway/scaleway_volume.py:
     labels: scaleway_volume
     ignore: hekonsek
@@ -469,22 +339,11 @@ files:
     maintainers: john-westcott-iv
   $modules/database/misc/redis.py:
     maintainers: slok
-  $modules/database/misc/redis_info.py:
-    maintainers: levonet
-  $modules/database/misc/redis_data_info.py:
-    maintainers: paginabianca
-  $modules/database/misc/redis_data.py:
-    maintainers: paginabianca
-  $modules/database/misc/redis_data_incr.py:
-    maintainers: paginabianca
   $modules/database/misc/riak.py:
     maintainers: drewkerrigan jsmartin
   $modules/database/mssql/mssql_db.py:
     maintainers: vedit Jmainguy kenichi-ogawa-1988
     labels: mssql_db
-  $modules/database/mssql/mssql_script.py:
-    maintainers: kbudde
-    labels: mssql_script
   $modules/database/saphana/hana_query.py:
     maintainers: rainerleber
   $modules/database/vertica/:
@@ -495,14 +354,10 @@ files:
     maintainers: quidame
   $modules/files/ini_file.py:
     maintainers: jpmens noseka1
-  $modules/files/iso_create.py:
-    maintainers: Tomorrow9
   $modules/files/iso_extract.py:
     maintainers: dagwieers jhoekx ribbons
   $modules/files/read_csv.py:
     maintainers: dagwieers
-  $modules/files/sapcar_extract.py:
-    maintainers: RainerLeber
   $modules/files/xattr.py:
     maintainers: bcoca
     labels: xattr
@@ -520,28 +375,15 @@ files:
     maintainers: jparrill
   $modules/identity/keycloak/:
     maintainers: $team_keycloak
-  $modules/identity/keycloak/keycloak_authentication.py:
-    maintainers: elfelip Gaetan2907
-  $modules/identity/keycloak/keycloak_clientscope.py:
-    maintainers: Gaetan2907
-  $modules/identity/keycloak/keycloak_client_rolemapping.py:
-    maintainers: Gaetan2907
   $modules/identity/keycloak/keycloak_group.py:
     maintainers: adamgoossens
-  $modules/identity/keycloak/keycloak_identity_provider.py:
-    maintainers: laurpaum
   $modules/identity/keycloak/keycloak_realm.py:
     maintainers: kris2kris
-  $modules/identity/keycloak/keycloak_role.py:
-    maintainers: laurpaum
-  $modules/identity/keycloak/keycloak_user_federation.py:
-    maintainers: laurpaum
   $modules/identity/onepassword_info.py:
     maintainers: Rylon
   $modules/identity/opendj/opendj_backendprop.py:
     maintainers: dj-wasabi
   $modules/monitoring/airbrake_deployment.py:
-    maintainers: phumpal
     labels: airbrake_deployment
     ignore: bpennypacker
   $modules/monitoring/bigpanda.py:
@@ -552,8 +394,6 @@ files:
     maintainers: n0ts
     labels: datadog_event
     ignore: arturaz
-  $modules/monitoring/datadog/datadog_downtime.py:
-    maintainers: Datadog
   $modules/monitoring/datadog/datadog_monitor.py:
     maintainers: skornehl
   $modules/monitoring/honeybadger_deployment.py:
@@ -617,10 +457,10 @@ files:
     maintainers: drcapulet
   $modules/net_tools/dnsmadeeasy.py:
     maintainers: briceburg
-  $modules/net_tools/gandi_livedns.py:
-    maintainers: gthiemonge
   $modules/net_tools/haproxy.py:
     maintainers: ravibhure Normo
+  $modules/net_tools/:
+    maintainers: nerzhul
   $modules/net_tools/infinity/infinity.py:
     maintainers: MeganLiu
   $modules/net_tools/ip_netns.py:
@@ -644,26 +484,37 @@ files:
     ignore: andyhky
   $modules/net_tools/netcup_dns.py:
     maintainers: nbuchwitz
-  $modules/net_tools/nsupdate.py:
-    maintainers: nerzhul
   $modules/net_tools/omapi_host.py:
-    maintainers: amasolov nerzhul
-  $modules/net_tools/pritunl/:
-    maintainers: Lowess
+    maintainers: amasolov
+  $modules/net_tools/nios/:
+    maintainers: $team_networking
+    labels: infoblox networking
+  $modules/net_tools/nios/nios_fixed_address.py:
+    maintainers: sjaiswal
+  $modules/net_tools/nios/nios_nsgroup.py:
+    maintainers: ebirn sjaiswal
+  $modules/net_tools/nios/nios_ptr_record.py:
+    maintainers: clementtrebuchet
+  $modules/net_tools/nios/nios_srv_record.py:
+    maintainers: brampling
+  $modules/net_tools/nios/nios_txt_record.py:
+    maintainers: coreywan
   $modules/net_tools/nmcli.py:
     maintainers: alcamie101
   $modules/net_tools/snmp_facts.py:
     maintainers: ogenstad ujwalkomarla
+  $modules/notification/osx_say.py:
+    maintainers: ansible mpdehaan
+    labels: _osx_say
+    deprecated: true
   $modules/notification/bearychat.py:
     maintainers: tonyseek
   $modules/notification/campfire.py:
     maintainers: fabulops
   $modules/notification/catapult.py:
     maintainers: Jmainguy
-  $modules/notification/cisco_webex.py:
+  $modules/notification/cisco_spark.py:
     maintainers: drew-russell
-  $modules/notification/discord.py:
-    maintainers: cwollinger
   $modules/notification/flowdock.py:
     maintainers: mcodd
   $modules/notification/grove.py:
@@ -691,13 +542,13 @@ files:
   $modules/notification/pushbullet.py:
     maintainers: willybarro
   $modules/notification/pushover.py:
-    maintainers: weaselkeeper wopfel
+    maintainers: weaselkeeper
   $modules/notification/rocketchat.py:
     maintainers: Deepakkothandan
     labels: rocketchat
     ignore: ramondelafuente
   $modules/notification/say.py:
-    maintainers: $team_ansible_core mpdehaan
+    maintainers: ansible mpdehaan
   $modules/notification/sendgrid.py:
     maintainers: makaimc
   $modules/notification/slack.py:
@@ -705,13 +556,11 @@ files:
   $modules/notification/syslogger.py:
     maintainers: garbled1
   $modules/notification/telegram.py:
-    maintainers: tyouxa loms lomserman
+    maintainers: tyouxa loms
   $modules/notification/twilio.py:
     maintainers: makaimc
   $modules/notification/typetalk.py:
     maintainers: tksmd
-  $modules/packaging/language/ansible_galaxy_install.py:
-    maintainers: russoz
   $modules/packaging/language/bower.py:
     maintainers: mwarkentin
   $modules/packaging/language/bundler.py:
@@ -724,7 +573,7 @@ files:
   $modules/packaging/language/easy_install.py:
     maintainers: mattupstate
   $modules/packaging/language/gem.py:
-    maintainers: $team_ansible_core johanwiren
+    maintainers: ansible johanwiren
     labels: gem
   $modules/packaging/language/maven_artifact.py:
     maintainers: tumbl3w33d turb
@@ -739,22 +588,16 @@ files:
     ignore: jle64
   $modules/packaging/language/pip_package_info.py:
     maintainers: bcoca matburt maxamillion
-  $modules/packaging/language/pipx.py:
-    maintainers: russoz
   $modules/packaging/language/yarn.py:
     maintainers: chrishoffman verkaufer
   $modules/packaging/os/apk.py:
     maintainers: tdtrask
     labels: apk
     ignore: kbrebanov
-  $modules/packaging/os/apt_repo.py:
-    maintainers: obirvalger
   $modules/packaging/os/apt_rpm.py:
     maintainers: evgkrsk
   $modules/packaging/os/copr.py:
     maintainers: schlupov
-  $modules/packaging/os/dnf_versionlock.py:
-    maintainers: moreda
   $modules/packaging/os/flatpak.py:
     maintainers: $team_flatpak
   $modules/packaging/os/flatpak_remote.py:
@@ -851,9 +694,6 @@ files:
   $modules/packaging/os/snap.py:
     maintainers: angristan vcarceler
     labels: snap
-  $modules/packaging/os/snap_alias.py:
-    maintainers: russoz
-    labels: snap
   $modules/packaging/os/sorcery.py:
     maintainers: vaygr
   $modules/packaging/os/svr4pkg.py:
@@ -945,8 +785,6 @@ files:
     maintainers: markuman
   $modules/source_control/gitlab/gitlab_runner.py:
     maintainers: SamyCoenen
-  $modules/source_control/gitlab/gitlab_user.py:
-    maintainers: LennertMertens stgrace
   $modules/source_control/hg.py:
     maintainers: yeukhon
   $modules/storage/emc/emc_vnx_sg_member.py:
@@ -955,6 +793,13 @@ files:
     maintainers: farhan7500 gautamphegde
   $modules/storage/ibm/:
     maintainers: tzure
+  $modules/storage/infinidat/:
+    maintainers: vmalloc GR360RY
+  $modules/storage/netapp/:
+    maintainers: $team_netapp
+  $modules/storage/purestorage/:
+    maintainers: $team_purestorage
+    labels: pure_storage
   $modules/storage/vexata/:
     maintainers: vexata
   $modules/storage/zfs/:
@@ -973,8 +818,6 @@ files:
     maintainers: mulby
     labels: alternatives
     ignore: DavidWittman
-  $modules/system/aix_lvol.py:
-    maintainers: adejoux
   $modules/system/awall.py:
     maintainers: tdtrask
   $modules/system/beadm.py:
@@ -992,7 +835,7 @@ files:
   $modules/system/dpkg_divert.py:
     maintainers: quidame
   $modules/system/facter.py:
-    maintainers: $team_ansible_core gamethis
+    maintainers: ansible gamethis
     labels: facter
   $modules/system/filesystem.py:
     maintainers: pilou- abulimov quidame
@@ -1010,7 +853,7 @@ files:
   $modules/system/java_cert.py:
     maintainers: haad absynth76
   $modules/system/java_keystore.py:
-    maintainers: Mogztter quidame
+    maintainers: Mogztter
   $modules/system/kernel_blacklist.py:
     maintainers: matze
   $modules/system/launchd.py:
@@ -1024,7 +867,7 @@ files:
   $modules/system/lvg.py:
     maintainers: abulimov
   $modules/system/lvol.py:
-    maintainers: abulimov jhoekx zigaSRC unkaputtbar112
+    maintainers: abulimov jhoekx
   $modules/system/make.py:
     maintainers: LinusU
   $modules/system/mksysb.py:
@@ -1037,7 +880,7 @@ files:
   $modules/system/nosh.py:
     maintainers: tacatac
   $modules/system/ohai.py:
-    maintainers: $team_ansible_core mpdehaan
+    maintainers: ansible mpdehaan
     labels: ohai
   $modules/system/open_iscsi.py:
     maintainers: srvg
@@ -1066,8 +909,6 @@ files:
     ignore: ryansb
   $modules/system/runit.py:
     maintainers: jsumners
-  $modules/system/sap_task_list_execute:
-    maintainers: rainerleber
   $modules/system/sefcontext.py:
     maintainers: dagwieers
   $modules/system/selinux_permissive.py:
@@ -1080,8 +921,6 @@ files:
     maintainers: $team_solaris pmarkham
     labels: solaris
     keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
-  $modules/system/ssh_config.py:
-    maintainers: gaqzi Akasurde
   $modules/system/svc.py:
     maintainers: bcoca
   $modules/system/syspatch.py:
@@ -1097,38 +936,31 @@ files:
     maintainers: ahtik ovcharenko pyykkis
     labels: ufw
   $modules/system/vdo.py:
-    maintainers: rhawalsh bgurney-rh
+    maintainers: rhawalsh
   $modules/system/xfconf.py:
     maintainers: russoz jbenden
     labels: xfconf
-  $modules/system/xfconf_info.py:
-    maintainers: russoz
-    labels: xfconf
   $modules/system/xfs_quota.py:
     maintainers: bushvin
   $modules/web_infrastructure/apache2_mod_proxy.py:
     maintainers: oboukili
   $modules/web_infrastructure/apache2_module.py:
-    maintainers: berendt n0trax
-    ignore: robinro
+    maintainers: berendt n0trax robinro
   $modules/web_infrastructure/deploy_helper.py:
     maintainers: ramondelafuente
   $modules/web_infrastructure/django_manage.py:
-    maintainers: russoz
-    ignore: scottanderson42 tastychutney
+    maintainers: scottanderson42 russoz tastychutney
     labels: django_manage
   $modules/web_infrastructure/ejabberd_user.py:
     maintainers: privateip
   $modules/web_infrastructure/gunicorn.py:
     maintainers: agmezr
   $modules/web_infrastructure/htpasswd.py:
-    maintainers: $team_ansible_core
+    maintainers: ansible
     labels: htpasswd
   $modules/web_infrastructure/jboss.py:
     maintainers: $team_jboss jhoekx
     labels: jboss
-  $modules/web_infrastructure/jenkins_build.py:
-    maintainers: brettmilford unnecessary-username
   $modules/web_infrastructure/jenkins_job.py:
     maintainers: sermilrod
   $modules/web_infrastructure/jenkins_job_info.py:
@@ -1138,18 +970,12 @@ files:
   $modules/web_infrastructure/jenkins_script.py:
     maintainers: hogarthj
   $modules/web_infrastructure/jira.py:
-    maintainers: Slezhuk tarka pertoft DWSR
+    maintainers: Slezhuk tarka
     labels: jira
   $modules/web_infrastructure/nginx_status_info.py:
     maintainers: resmo
-  $modules/web_infrastructure/rundeck_acl_policy.py:
+  $modules/web_infrastructure/:
     maintainers: nerzhul
-  $modules/web_infrastructure/rundeck_project.py:
-    maintainers: nerzhul
-  $modules/web_infrastructure/rundeck_job_run.py:
-    maintainers: phsmith
-  $modules/web_infrastructure/rundeck_job_executions_info.py:
-    maintainers: phsmith
   $modules/web_infrastructure/sophos_utm/:
     maintainers: $team_e_spirit
     keywords: sophos utm
@@ -1159,20 +985,10 @@ files:
   $modules/web_infrastructure/sophos_utm/utm_proxy_exception.py:
     maintainers: $team_e_spirit RickS-C137
     keywords: sophos utm
-  $modules/web_infrastructure/sophos_utm/utm_ca_host_key_cert.py:
-    maintainers: stearz
-  $modules/web_infrastructure/sophos_utm/utm_ca_host_key_cert_info.py:
-    maintainers: stearz
-  $modules/web_infrastructure/sophos_utm/utm_network_interface_address.py:
-    maintainers: steamx
-  $modules/web_infrastructure/sophos_utm/utm_network_interface_address_info.py:
-    maintainers: steamx
   $modules/web_infrastructure/supervisorctl.py:
     maintainers: inetfuture mattupstate
   $modules/web_infrastructure/taiga_issue.py:
     maintainers: lekum
-  $tests/a_module.py:
-    maintainers: felixfontein
 #########################
   tests/:
     labels: tests
@@ -1188,19 +1004,17 @@ files:
 macros:
   actions: plugins/action
   becomes: plugins/become
-  caches: plugins/cache
   callbacks: plugins/callback
   cliconfs: plugins/cliconf
   connections: plugins/connection
   doc_fragments: plugins/doc_fragments
   filters: plugins/filter
+  httpapis: plugins/httpapi
   inventories: plugins/inventory
   lookups: plugins/lookup
   module_utils: plugins/module_utils
   modules: plugins/modules
   terminals: plugins/terminal
-  tests: plugins/test
-  team_ansible_core:
   team_aix: MorrisA bcoca d-little flynn1973 gforster kairoaraujo marvin-sinister mator molekuul ramooncamacho wtcross
   team_bsd: JoergFiedler MacLemon bcoca dch jasperla mekanix opoplawski overhacked tuxillo
   team_consul: sgargan
@@ -1216,6 +1030,7 @@ macros:
   team_linode: InTheCloudDan decentral1se displague rmcintosh Charliekenney23 LBGarber
   team_macos: Akasurde kyleabenson martinm82 danieljaouen indrajitr
   team_manageiq: abellotti cben gtanzillo yaacov zgalor dkorn evertmulder
+  team_netapp: amit0701 carchi8py hulquest lmprice lonico ndswartz schmots1
   team_networking: NilashishC Qalthos danielmellado ganeshrn justjais trishnaguha sganesh-infoblox privateip
   team_opennebula: ilicmilan meerkampdvv rsmontero xorel nilsding
   team_oracle: manojmeda mross22 nalsaber

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -62,20 +62,6 @@ body:
   validations:
     required: true
 
-- type: textarea
-  attributes:
-    label: Community.general Version
-    description: >-
-      Paste verbatim output from "ansible-galaxy collection list community.general"
-      between tripple backticks.
-    value: |
-      ```console (paste below)
-      $ ansible-galaxy collection list community.general
-
-      ```
-  validations:
-    required: true
-
 - type: textarea
   attributes:
     label: Configuration

.github/ISSUE_TEMPLATE/documentation_report.yml

@@ -62,20 +62,6 @@ body:
   validations:
     required: false
 
-- type: textarea
-  attributes:
-    label: Community.general Version
-    description: >-
-      Paste verbatim output from "ansible-galaxy collection list community.general"
-      between tripple backticks.
-    value: |
-      ```console (paste below)
-      $ ansible-galaxy collection list community.general
-
-      ```
-  validations:
-    required: true
-
 - type: textarea
   attributes:
     label: Configuration

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -21,7 +21,7 @@ body:
     placeholder: >-
       I am trying to do X with the collection from the main branch on GitHub and
       I think that implementing a feature Y would be very helpful for me and
-      every other user of community.general because of Z.
+      every other user of ansible-core because of Z.
   validations:
     required: true
 

.github/dependabot.yml

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

.gitignore

@@ -1,6 +1,6 @@
 
-# Created by https://www.toptal.com/developers/gitignore/api/git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv
-# Edit at https://www.toptal.com/developers/gitignore?templates=git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv
+# Created by https://www.gitignore.io/api/git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv
+# Edit at https://www.gitignore.io/?templates=git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv
 
 ### dotenv ###
 .env
@@ -88,7 +88,7 @@ flycheck_*.el
 .nfs*
 
 ### PyCharm+all ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff
@@ -98,9 +98,6 @@ flycheck_*.el
 .idea/**/dictionaries
 .idea/**/shelf
 
-# AWS User-specific
-.idea/**/aws.xml
-
 # Generated files
 .idea/**/contentModel.xml
 
@@ -121,9 +118,6 @@ flycheck_*.el
 # When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using
 # auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
 # .idea/modules.xml
 # .idea/*.iml
 # .idea/modules
@@ -204,6 +198,7 @@ parts/
 sdist/
 var/
 wheels/
+pip-wheel-metadata/
 share/python-wheels/
 *.egg-info/
 .installed.cfg
@@ -230,25 +225,13 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *.cover
-*.py,cover
 .hypothesis/
 .pytest_cache/
-cover/
 
 # Translations
 *.mo
 *.pot
 
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
 # Scrapy stuff:
 .scrapy
 
@@ -256,19 +239,9 @@ instance/
 docs/_build/
 
 # PyBuilder
-.pybuilder/
 target/
 
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
 # pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
 .python-version
 
 # pipenv
@@ -278,24 +251,12 @@ ipython_config.py
 #   install all needed dependencies.
 #Pipfile.lock
 
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-__pypackages__/
-
-# Celery stuff
+# celery beat schedule file
 celerybeat-schedule
-celerybeat.pid
 
 # SageMath parsed files
 *.sage.py
 
-# Environments
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
 # Spyder project settings
 .spyderproject
 .spyproject
@@ -303,6 +264,10 @@ venv.bak/
 # Rope project settings
 .ropeproject
 
+# Mr Developer
+.mr.developer.cfg
+.project
+
 # mkdocs documentation
 /site
 
@@ -314,16 +279,9 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
 ### Vim ###
 # Swap
 [._]*.s[a-v][a-z]
-!*.svg  # comment out if you don't need vector files
 [._]*.sw[a-p]
 [._]s[a-rt-v][a-z]
 [._]ss[a-gi-z]
@@ -341,13 +299,11 @@ tags
 [._]*.un~
 
 ### WebStorm ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff
 
-# AWS User-specific
-
 # Generated files
 
 # Sensitive or high-churn files
@@ -358,9 +314,6 @@ tags
 # When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using
 # auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
 # .idea/modules.xml
 # .idea/*.iml
 # .idea/modules
@@ -396,27 +349,15 @@ tags
 # *.ipr
 
 # Sonarlint plugin
-# https://plugins.jetbrains.com/plugin/7973-sonarlint
 .idea/**/sonarlint/
 
 # SonarQube Plugin
-# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
 .idea/**/sonarIssues.xml
 
 # Markdown Navigator plugin
-# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
 .idea/**/markdown-navigator.xml
-.idea/**/markdown-navigator-enh.xml
 .idea/**/markdown-navigator/
 
-# Cache file creation bug
-# See https://youtrack.jetbrains.com/issue/JBR-2257
-.idea/$CACHE_FILE$
-
-# CodeStream plugin
-# https://plugins.jetbrains.com/plugin/12206-codestream
-.idea/codestream.xml
-
 ### Windows ###
 # Windows thumbnail cache files
 Thumbs.db
@@ -443,4 +384,4 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-# End of https://www.toptal.com/developers/gitignore/api/git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv
+# End of https://www.gitignore.io/api/git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv

CONTRIBUTING.md

@@ -23,51 +23,10 @@ Note that reviewing does not only mean code review, but also offering comments o
 Also, consider taking up a valuable, reviewed, but abandoned pull request which you could politely ask the original authors to complete yourself.
 
 * 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.
+* All commits of a pull request branch will be squashed into one commit at last. That does not mean you must have only one commit on your pull request, though!
+* Please try not to force-push if it is not needed, so reviewers and other users looking at your pull request later can see the pull request commit history.
 * 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 respository checkout.
-* 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).
 
-## Test pull requests
-
-If you want to test a PR locally, refer to [our testing guide](https://github.com/ansible/community-docs/blob/main/test_pr_locally_guide.rst) for instructions on how do it quickly.
-
 If you find any inconsistencies or places in this document which can be improved, feel free to raise an issue or pull request to fix it.
-
-## Creating new modules or plugins
-
-Creating new modules and plugins requires a bit more work than other Pull Requests.
-
-1. Please make sure that your new module or plugin is of interest to a larger audience. Very specialized modules or plugins that
-   can only be used by very few people should better be added to more specialized collections.
-
-2. Please do not add more than one plugin/module in one PR, especially if it is the first plugin/module you are contributing.
-   That makes it easier for reviewers, and increases the chance that your PR will get merged. If you plan to contribute a group
-   of plugins/modules (say, more than a module and a corresponding ``_info`` module), please mention that in the first PR. In
-   such cases, you also have to think whether it is better to publish the group of plugins/modules in a new collection.
-
-3. When creating a new module or plugin, please make sure that you follow various guidelines:
-
-   - Follow [development conventions](https://docs.ansible.com/ansible/devel/dev_guide/developing_modules_best_practices.html);
-   - Follow [documentation standards](https://docs.ansible.com/ansible/devel/dev_guide/developing_modules_documenting.html) and
-     the [Ansible style guide](https://docs.ansible.com/ansible/devel/dev_guide/style_guide/index.html#style-guide);
-   - Make sure your modules and plugins are [GPL-3.0-or-later](https://www.gnu.org/licenses/gpl-3.0-standalone.html) licensed
-     (new module_utils can also be [BSD-2-clause](https://opensource.org/licenses/BSD-2-Clause) licensed);
-   - Make sure that new plugins and modules have tests (unit tests, integration tests, or both); it is preferable to have some tests
-     which run in CI.
-
-4. For modules and action plugins, make sure to create your module/plugin in the correct subdirectory, and create a symbolic link
-   from `plugins/modules/` respectively `plugins/action/` to the actual module/plugin code. (Other plugin types should not use
-   subdirectories.)
-
-   - Action plugins need to be accompanied by a module, even if the module file only contains documentation
-     (`DOCUMENTATION`, `EXAMPLES` and `RETURN`). The module must have the same name and directory path in `plugins/modules/`
-     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
-   listed as `maintainers` will be pinged for new issues and PRs that modify the module/plugin or its tests.
-
-   When you add a new plugin/module, we expect that you perform maintainer duty for at least some time after contributing it.

README.md

@@ -1,23 +1,17 @@
 # Community General Collection
 
-[![Build Status](https://dev.azure.com/ansible/community.general/_apis/build/status/CI?branchName=stable-4)](https://dev.azure.com/ansible/community.general/_build?definitionId=31)
+[![Build Status](https://dev.azure.com/ansible/community.general/_apis/build/status/CI?branchName=stable-3)](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.
+This repo contains the `community.general` Ansible Collection. The collection includes many modules and plugins supported by Ansible community which are not part of more specialized community collections.
 
 You can find [documentation for this collection on the Ansible docs site](https://docs.ansible.com/ansible/latest/collections/community/general/).
 
 Please note that this collection does **not** support Windows targets. Only connection plugins included in this collection might support Windows targets, and will explicitly mention that in their documentation if they do so.
 
-## Code of Conduct
-
-We follow [Ansible Code of Conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html) in all our interactions within this project.
-
-If you encounter abusive behavior violating the [Ansible Code of Conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html), please refer to the [policy violations](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html#policy-violations) section of the Code of Conduct for information on how to raise a complaint.
-
 ## Tested with Ansible
 
-Tested with the current Ansible 2.9, ansible-base 2.10, ansible-core 2.11, ansible-core 2.12 releases and the current development version of ansible-core. Ansible versions before 2.9.10 are not supported.
+Tested with the current Ansible 2.9, ansible-base 2.10 and ansible-core 2.11 releases and the current development version of ansible-core. Ansible versions before 2.9.10 are not supported.
 
 ## External requirements
 
@@ -29,9 +23,7 @@ Please check the included content on the [Ansible Galaxy page for this collectio
 
 ## Using this collection
 
-This collection is shipped with the Ansible package. So if you have it installed, no more action is required.
-
-If you have a minimal installation (only Ansible Core installed) or you want to use the latest version of the collection along with the whole Ansible package, you need to install the collection from [Ansible Galaxy](https://galaxy.ansible.com/community/general) manually with the `ansible-galaxy` command-line tool:
+Before using the General community collection, you need to install the collection with the `ansible-galaxy` CLI:
 
     ansible-galaxy collection install community.general
 
@@ -42,79 +34,59 @@ collections:
 - name: community.general
 ```
 
-Note that if you install the collection manually, it will not be upgraded automatically when you upgrade the Ansible package. To upgrade the collection to the latest available version, run the following command:
-
-```bash
-ansible-galaxy collection install community.general --upgrade
-```
-
-You can also install a specific version of the collection, for example, if you need to downgrade when something is broken in the latest version (please report an issue in this repository). Use the following syntax where `X.Y.Z` can be any [available version](https://galaxy.ansible.com/community/general):
-
-```bash
-ansible-galaxy collection install community.general:==X.Y.Z
-```
-
 See [Ansible Using collections](https://docs.ansible.com/ansible/latest/user_guide/collections_using.html) for more details.
 
 ## Contributing to this collection
 
-The content of this collection is made by good people just like you, a community of individuals collaborating on making the world better through developing automation software.
+If you want to develop new content for this collection or improve what is already here, the easiest way to work on the collection is to clone it into one of the configured [`COLLECTIONS_PATH`](https://docs.ansible.com/ansible/latest/reference_appendices/config.html#collections-paths), and work on it there.
 
-We are actively accepting new contributors.
+For example, if you are working in the `~/dev` directory:
 
-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-4/CONTRIBUTING.md)!
-
-The current maintainers are listed in the [commit-rights.md](https://github.com/ansible-collections/community.general/blob/stable-4/commit-rights.md#people) file. If you have questions or need help, feel free to mention them in the proposals.
+```
+cd ~/dev
+git clone git@github.com:ansible-collections/community.general.git collections/ansible_collections/community/general
+export COLLECTIONS_PATH=$(pwd)/collections:$COLLECTIONS_PATH
+```
 
 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-4/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
 
 See [here](https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#testing-collections).
 
-## Collection maintenance
+### Communication
 
-To learn how to maintain / become a maintainer of this collection, refer to:
+We have a dedicated Working Group for Ansible development.
 
-* [Committer guidelines](https://github.com/ansible-collections/community.general/blob/stable-4/commit-rights.md).
-* [Maintainer guidelines](https://github.com/ansible/community-docs/blob/main/maintaining.rst).
-
-It is necessary for maintainers of this collection to be subscribed to:
-
-* The collection itself (the `Watch` button → `All Activity` in the upper right corner of the repository's homepage).
-* The "Changes Impacting Collection Contributors and Maintainers" [issue](https://github.com/ansible-collections/overview/issues/45).
-
-They also should be subscribed to Ansible's [The Bullhorn newsletter](https://docs.ansible.com/ansible/devel/community/communication.html#the-bullhorn).
-
-## Communication
-
-We announce important development changes and releases through Ansible's [The Bullhorn newsletter](https://eepurl.com/gZmiEP). If you are a collection developer, be sure you are subscribed.
-
-Join us in the `#ansible` (general use questions and support), `#ansible-community` (community and collection development questions), and other [IRC channels](https://docs.ansible.com/ansible/devel/community/communication.html#irc-channels) on [Libera.chat](https://libera.chat).
-
-We take part in the global quarterly [Ansible Contributor Summit](https://github.com/ansible/community/wiki/Contributor-Summit) virtually or in-person. Track [The Bullhorn newsletter](https://eepurl.com/gZmiEP) and join us.
+You can find other people interested on the following [Libera.chat](https://libera.chat/) IRC channels -
+- `#ansible` - For general use questions and support.
+- `#ansible-devel` - For discussions on developer topics and code related to features or bugs in ansible-core.
+- `#ansible-community` - For discussions on community topics and community meetings, and for general development questions for community collections.
 
 For more information about communities, meetings and agendas see [Community Wiki](https://github.com/ansible/community/wiki/Community).
 
-For more information about communication, refer to Ansible's the [Communication guide](https://docs.ansible.com/ansible/devel/community/communication.html).
+For more information about [communication](https://docs.ansible.com/ansible/latest/community/communication.html)
 
-## Publishing New Version
+### Publishing New Version
 
-See the [Releasing guidelines](https://github.com/ansible/community-docs/blob/main/releasing_collections.rst) to learn how to release this collection.
+Basic instructions without release branches:
+
+1. Create `changelogs/fragments/<version>.yml` with `release_summary:` section (which must be a string, not a list).
+2. Run `antsibull-changelog release --collection-flatmap yes`
+3. Make sure `CHANGELOG.rst` and `changelogs/changelog.yaml` are added to git, and the deleted fragments have been removed.
+4. Tag the commit with `<version>`. Push changes and tag to the main repository.
 
 ## Release notes
 
-See the [changelog](https://github.com/ansible-collections/community.general/blob/stable-4/CHANGELOG.rst).
+See the [changelog](https://github.com/ansible-collections/community.general/blob/stable-3/CHANGELOG.rst).
 
 ## Roadmap
 
-In general, we plan to release a major version every six months, and minor versions every two months. Major versions can contain breaking changes, while minor versions only contain new features and bugfixes.
+See [this issue](https://github.com/ansible-collections/community.general/issues/582) for information on releasing, versioning and deprecation.
 
-See [this issue](https://github.com/ansible-collections/community.general/issues/582) for information on releasing, versioning, and deprecation.
+In general, we plan to release a major version every six months, and minor versions every two months. Major versions can contain breaking changes, while minor versions only contain new features and bugfixes.
 
 ## More information
 

commit-rights.md

@@ -68,7 +68,7 @@ Individuals who have been asked to become a part of this group have generally be
 | Name                | GitHub ID            | IRC Nick           | Other                |
 | ------------------- | -------------------- | ------------------ | -------------------- |
 | Alexei Znamensky    | russoz               | russoz             |                      |
+| Amin Vakil          | aminvakil            | aminvakil          |                      |
 | Andrew Klychkov     | andersson007         | andersson007_      |                      |
-| Andrew Pantuso      | Ajpantuso            | ajpantuso          |                      |
 | Felix Fontein       | felixfontein         | felixfontein       |                      |
 | John R Barker       | gundalow             | gundalow           |                      |

docs/docsite/extra-docs.yml

@@ -3,4 +3,3 @@ sections:
   - title: Guides
     toctree:
       - filter_guide
-      - test_guide

docs/docsite/rst/filter_guide.rst

@@ -751,34 +751,3 @@ To extract ports from all clusters with name containing 'server1':
         server_name_query: "domain.server[?contains(name,'server1')].port"
 
 .. note:: while using ``starts_with`` and ``contains``, you have to use `` to_json | from_json `` filter for correct parsing of data structure.
-
-Working with Unicode
----------------------
-
-`Unicode <https://unicode.org/main.html>`_ makes it possible to produce two strings which may be visually equivalent, but are comprised of distinctly different characters/character sequences. To address this ``Unicode`` defines `normalization forms <https://unicode.org/reports/tr15/>`_ which avoid these distinctions by choosing a unique character sequence for a given visual representation.
-
-You can use the ``community.general.unicode_normalize`` filter to normalize ``Unicode`` strings within your playbooks.
-
-.. code-block:: yaml+jinja
-
-    - name: Compare Unicode representations
-      debug:
-        msg: "{{ with_combining_character | community.general.unicode_normalize == without_combining_character }}"
-      vars:
-        with_combining_character: "{{ 'Mayagu\u0308ez' }}"
-        without_combining_character: Mayagüez
-
-This produces:
-
-.. code-block:: ansible-output
-
-    TASK [Compare Unicode representations] ********************************************************
-    ok: [localhost] => {
-        "msg": true
-    }
-
-The ``community.general.unicode_normalize`` filter accepts a keyword argument to select the ``Unicode`` form used to normalize the input string.
-
-:form: One of ``'NFC'`` (default), ``'NFD'``, ``'NFKC'``, or ``'NFKD'``. See the `Unicode reference <https://unicode.org/reports/tr15/>`_ for more information.
-
-.. versionadded:: 3.7.0

docs/docsite/rst/test_guide.rst

@@ -1,28 +0,0 @@
-.. _ansible_collections.community.general.docsite.test_guide:
-
-community.general Test (Plugin) Guide
-=====================================
-
-The :ref:`community.general collection <plugins_in_community.general>` offers currently one test plugin.
-
-.. contents:: Topics
-
-Feature Tests
--------------
-
-The ``a_module`` test allows to check whether a given string refers to an existing module or action plugin. This can be useful in roles, which can use this to ensure that required modules are present ahead of time.
-
-.. code-block:: yaml+jinja
-
-    - name: Make sure that community.aws.route53 is available
-      assert:
-        that:
-          - >
-            'community.aws.route53' is community.general.a_module
-
-    - name: Make sure that community.general.does_not_exist is not a module or action plugin
-      assert:
-        that:
-          - "'community.general.does_not_exist' is not community.general.a_module"
-
-.. versionadded:: 4.0.0

galaxy.yml

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

meta/runtime.yml

@@ -12,11 +12,20 @@ plugin_routing:
     hashi_vault:
       redirect: community.hashi_vault.hashi_vault
     nios:
-      redirect: infoblox.nios_modules.nios_lookup
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios lookup plugin has been deprecated.
+          Please use infoblox.nios_modules.nios_lookup instead.
     nios_next_ip:
-      redirect: infoblox.nios_modules.nios_next_ip
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_next_ip lookup plugin has been deprecated.
+          Please use infoblox.nios_modules.nios_next_ip instead.
     nios_next_network:
-      redirect: infoblox.nios_modules.nios_next_network
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_next_network lookup plugin has been
+          deprecated. Please use infoblox.nios_modules.nios_next_network instead.
   modules:
     ali_instance_facts:
       tombstone:
@@ -257,37 +266,85 @@ plugin_routing:
         removal_version: 3.0.0
         warning_text: Use community.general.nginx_status_info instead.
     nios_a_record:
-      redirect: infoblox.nios_modules.nios_a_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_a_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_a_record instead.
     nios_aaaa_record:
-      redirect: infoblox.nios_modules.nios_aaaa_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_aaaa_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_aaaa_record instead.
     nios_cname_record:
-      redirect: infoblox.nios_modules.nios_cname_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_cname_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_cname_record instead.
     nios_dns_view:
-      redirect: infoblox.nios_modules.nios_dns_view
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_dns_view module has been deprecated.
+          Please use infoblox.nios_modules.nios_dns_view instead.
     nios_fixed_address:
-      redirect: infoblox.nios_modules.nios_fixed_address
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_fixed_address module has been deprecated.
+          Please use infoblox.nios_modules.nios_fixed_address instead.
     nios_host_record:
-      redirect: infoblox.nios_modules.nios_host_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_host_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_host_record instead.
     nios_member:
-      redirect: infoblox.nios_modules.nios_member
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_member module has been deprecated.
+          Please use infoblox.nios_modules.nios_member instead.
     nios_mx_record:
-      redirect: infoblox.nios_modules.nios_mx_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_mx_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_mx_record instead.
     nios_naptr_record:
-      redirect: infoblox.nios_modules.nios_naptr_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_naptr_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_naptr_record instead.
     nios_network:
-      redirect: infoblox.nios_modules.nios_network
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_network module has been deprecated.
+          Please use infoblox.nios_modules.nios_network instead.
     nios_network_view:
-      redirect: infoblox.nios_modules.nios_network_view
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_network_view module has been deprecated.
+          Please use infoblox.nios_modules.nios_network_view instead.
     nios_nsgroup:
-      redirect: infoblox.nios_modules.nios_nsgroup
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_nsgroup module has been deprecated.
+          Please use infoblox.nios_modules.nios_nsgroup instead.
     nios_ptr_record:
-      redirect: infoblox.nios_modules.nios_ptr_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_ptr_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_ptr_record instead.
     nios_srv_record:
-      redirect: infoblox.nios_modules.nios_srv_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_srv_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_srv_record instead.
     nios_txt_record:
-      redirect: infoblox.nios_modules.nios_txt_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_txt_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_txt_record instead.
     nios_zone:
-      redirect: infoblox.nios_modules.nios_zone
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_zone module has been deprecated.
+          Please use infoblox.nios_modules.nios_zone instead.
     ome_device_info:
       redirect: dellemc.openmanage.ome_device_info
     one_image_facts:
@@ -571,7 +628,10 @@ plugin_routing:
     kubevirt_vm_options:
       redirect: community.kubevirt.kubevirt_vm_options
     nios:
-      redirect: infoblox.nios_modules.nios
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios document fragment has been deprecated.
+          Please use infoblox.nios_modules.nios instead.
     postgresql:
       redirect: community.postgresql.postgresql
   module_utils:
@@ -590,7 +650,10 @@ plugin_routing:
     kubevirt:
       redirect: community.kubevirt.kubevirt
     net_tools.nios.api:
-      redirect: infoblox.nios_modules.api
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.net_tools.nios.api module_utils has been
+          deprecated. Please use infoblox.nios_modules.api instead.
     postgresql:
       redirect: community.postgresql.postgresql
     remote_management.dellemc.dellemc_idrac:

plugins/action/system/iptables_state.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright: (c) 2020, quidame <quidame@poivron.org>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 

plugins/action/system/shutdown.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright: (c) 2020, Amin Vakil <info@aminvakil.com>
 # Copyright: (c) 2016-2018, Matt Davis <mdavis@ansible.com>
 # Copyright: (c) 2018, Sam Doran <sdoran@redhat.com>
@@ -8,7 +7,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from ansible.errors import AnsibleError, AnsibleConnectionFailure
-from ansible.module_utils.common.text.converters import to_native, to_text
+from ansible.module_utils._text import to_native, to_text
 from ansible.module_utils.common.collections import is_string
 from ansible.plugins.action import ActionBase
 from ansible.utils.display import Display

plugins/become/doas.py

@@ -9,7 +9,7 @@ DOCUMENTATION = '''
     short_description: Do As user
     description:
         - This become plugins allows your remote/login user to execute commands as another user via the doas utility.
-    author: Ansible Core Team
+    author: ansible (@core)
     options:
         become_user:
             description: User you 'become' to execute the task
@@ -81,7 +81,7 @@ DOCUMENTATION = '''
 
 import re
 
-from ansible.module_utils.common.text.converters import to_bytes
+from ansible.module_utils._text import to_bytes
 from ansible.plugins.become import BecomeBase
 
 

plugins/become/dzdo.py

@@ -8,7 +8,7 @@ DOCUMENTATION = '''
     short_description: Centrify's Direct Authorize
     description:
         - This become plugins allows your remote/login user to execute commands as another user via the dzdo utility.
-    author: Ansible Core Team
+    author: ansible (@core)
     options:
         become_user:
             description: User you 'become' to execute the task

plugins/become/ksu.py

@@ -9,7 +9,7 @@ DOCUMENTATION = '''
     short_description: Kerberos substitute user
     description:
         - This become plugins allows your remote/login user to execute commands as another user via the ksu utility.
-    author: Ansible Core Team
+    author: ansible (@core)
     options:
         become_user:
             description: User you 'become' to execute the task
@@ -82,7 +82,7 @@ DOCUMENTATION = '''
 
 import re
 
-from ansible.module_utils.common.text.converters import to_bytes
+from ansible.module_utils._text import to_bytes
 from ansible.plugins.become import BecomeBase
 
 

plugins/become/machinectl.py

@@ -9,7 +9,7 @@ DOCUMENTATION = '''
     short_description: Systemd's machinectl privilege escalation
     description:
         - This become plugins allows your remote/login user to execute commands as another user via the machinectl utility.
-    author: Ansible Core Team
+    author: ansible (@core)
     options:
         become_user:
             description: User you 'become' to execute the task

plugins/become/pbrun.py

@@ -9,7 +9,7 @@ DOCUMENTATION = '''
     short_description: PowerBroker run
     description:
         - This become plugins allows your remote/login user to execute commands as another user via the pbrun utility.
-    author: Ansible Core Team
+    author: ansible (@core)
     options:
         become_user:
             description: User you 'become' to execute the task

plugins/become/pfexec.py

@@ -9,7 +9,7 @@ DOCUMENTATION = '''
     short_description: profile based execution
     description:
         - This become plugins allows your remote/login user to execute commands as another user via the pfexec utility.
-    author: Ansible Core Team
+    author: ansible (@core)
     options:
         become_user:
             description:

plugins/become/pmrun.py

@@ -9,7 +9,7 @@ DOCUMENTATION = '''
     short_description: Privilege Manager run
     description:
         - This become plugins allows your remote/login user to execute commands as another user via the pmrun utility.
-    author: Ansible Core Team
+    author: ansible (@core)
     options:
         become_exe:
             description: Sudo executable

plugins/cache/memcached.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2014, Brian Coca, Josh Drake, et al
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -154,12 +153,12 @@ class CacheModuleKeys(MutableSet):
     def __len__(self):
         return len(self._keyset)
 
-    def add(self, value):
-        self._keyset[value] = time.time()
+    def add(self, key):
+        self._keyset[key] = time.time()
         self._cache.set(self.PREFIX, self._keyset)
 
-    def discard(self, value):
-        del self._keyset[value]
+    def discard(self, key):
+        del self._keyset[key]
         self._cache.set(self.PREFIX, self._keyset)
 
     def remove_by_timerange(self, s_min, s_max):

plugins/cache/pickle.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2017, Brian Coca
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

plugins/cache/redis.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2014, Brian Coca, Josh Drake, et al
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -68,7 +67,7 @@ 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.module_utils._text 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

plugins/cache/yaml.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2017, Brian Coca
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

plugins/callback/context_demo.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (C) 2012, Michael DeHaan, <michael.dehaan@gmail.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

plugins/callback/counter_enabled.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2018, Ivan Aragones Muniesa <ivan.aragones.muniesa@gmail.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 '''

plugins/callback/dense.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2016, Dag Wieers <dag@wieers.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

plugins/callback/diy.py

@@ -792,7 +792,7 @@ 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
-from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils._text import to_text
 
 
 class DummyStdout(object):

plugins/callback/elastic.py

@@ -1,423 +0,0 @@
-# (C) 2021, Victor Martinez <VictorMartinezRubio@gmail.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-DOCUMENTATION = '''
-    author: Victor Martinez (@v1v)  <VictorMartinezRubio@gmail.com>
-    name: elastic
-    type: notification
-    short_description: Create distributed traces for each Ansible task in Elastic APM
-    version_added: 3.8.0
-    description:
-      - This callback creates distributed traces for each Ansible task in Elastic APM.
-      - You can configure the plugin with environment variables.
-      - See U(https://www.elastic.co/guide/en/apm/agent/python/current/configuration.html).
-    options:
-      hide_task_arguments:
-        default: false
-        type: bool
-        description:
-          - Hide the arguments for a task.
-        env:
-          - name: ANSIBLE_OPENTELEMETRY_HIDE_TASK_ARGUMENTS
-      apm_service_name:
-        default: ansible
-        type: str
-        description:
-          - The service name resource attribute.
-        env:
-          - name: ELASTIC_APM_SERVICE_NAME
-      apm_server_url:
-        type: str
-        description:
-          - Use the APM server and its environment variables.
-        env:
-          - name: ELASTIC_APM_SERVER_URL
-      apm_secret_token:
-        type: str
-        description:
-          - Use the APM server token
-        env:
-          - name: ELASTIC_APM_SECRET_TOKEN
-      apm_api_key:
-        type: str
-        description:
-          - Use the APM API key
-        env:
-          - name: ELASTIC_APM_API_KEY
-      apm_verify_server_cert:
-        default: true
-        type: bool
-        description:
-          - Verifies the SSL certificate if an HTTPS connection.
-        env:
-          - name: ELASTIC_APM_VERIFY_SERVER_CERT
-      traceparent:
-        type: str
-        description:
-          - The L(W3C Trace Context header traceparent,https://www.w3.org/TR/trace-context-1/#traceparent-header).
-        env:
-          - name: TRACEPARENT
-    requirements:
-      - elastic-apm (Python library)
-'''
-
-
-EXAMPLES = '''
-examples: |
-  Enable the plugin in ansible.cfg:
-    [defaults]
-    callbacks_enabled = community.general.elastic
-
-  Set the environment variable:
-    export ELASTIC_APM_SERVER_URL=<your APM server URL)>
-    export ELASTIC_APM_SERVICE_NAME=your_service_name
-    export ELASTIC_APM_API_KEY=your_APM_API_KEY
-'''
-
-import getpass
-import socket
-import time
-import uuid
-
-from collections import OrderedDict
-from os.path import basename
-
-from ansible.errors import AnsibleError, AnsibleRuntimeError
-from ansible.module_utils.six import raise_from
-from ansible.plugins.callback import CallbackBase
-
-try:
-    from elasticapm import Client, capture_span, trace_parent_from_string, instrument, label
-except ImportError as imp_exc:
-    ELASTIC_LIBRARY_IMPORT_ERROR = imp_exc
-else:
-    ELASTIC_LIBRARY_IMPORT_ERROR = None
-
-
-class TaskData:
-    """
-    Data about an individual task.
-    """
-
-    def __init__(self, uuid, name, path, play, action, args):
-        self.uuid = uuid
-        self.name = name
-        self.path = path
-        self.play = play
-        self.host_data = OrderedDict()
-        self.start = time.time()
-        self.action = action
-        self.args = args
-
-    def add_host(self, host):
-        if host.uuid in self.host_data:
-            if host.status == 'included':
-                # concatenate task include output from multiple items
-                host.result = '%s\n%s' % (self.host_data[host.uuid].result, host.result)
-            else:
-                return
-
-        self.host_data[host.uuid] = host
-
-
-class HostData:
-    """
-    Data about an individual host.
-    """
-
-    def __init__(self, uuid, name, status, result):
-        self.uuid = uuid
-        self.name = name
-        self.status = status
-        self.result = result
-        self.finish = time.time()
-
-
-class ElasticSource(object):
-    def __init__(self, display):
-        self.ansible_playbook = ""
-        self.ansible_version = None
-        self.session = str(uuid.uuid4())
-        self.host = socket.gethostname()
-        try:
-            self.ip_address = socket.gethostbyname(socket.gethostname())
-        except Exception as e:
-            self.ip_address = None
-        self.user = getpass.getuser()
-
-        self._display = display
-
-    def start_task(self, tasks_data, hide_task_arguments, play_name, task):
-        """ record the start of a task for one or more hosts """
-
-        uuid = task._uuid
-
-        if uuid in tasks_data:
-            return
-
-        name = task.get_name().strip()
-        path = task.get_path()
-        action = task.action
-        args = None
-
-        if not task.no_log and not hide_task_arguments:
-            args = ', '.join(('%s=%s' % a for a in task.args.items()))
-
-        tasks_data[uuid] = TaskData(uuid, name, path, play_name, action, args)
-
-    def finish_task(self, tasks_data, status, result):
-        """ record the results of a task for a single host """
-
-        task_uuid = result._task._uuid
-
-        if hasattr(result, '_host') and result._host is not None:
-            host_uuid = result._host._uuid
-            host_name = result._host.name
-        else:
-            host_uuid = 'include'
-            host_name = 'include'
-
-        task = tasks_data[task_uuid]
-
-        if self.ansible_version is None and result._task_fields['args'].get('_ansible_version'):
-            self.ansible_version = result._task_fields['args'].get('_ansible_version')
-
-        task.add_host(HostData(host_uuid, host_name, status, result))
-
-    def generate_distributed_traces(self, tasks_data, status, end_time, traceparent, apm_service_name,
-                                    apm_server_url, apm_verify_server_cert, apm_secret_token, apm_api_key):
-        """ generate distributed traces from the collected TaskData and HostData """
-
-        tasks = []
-        parent_start_time = None
-        for task_uuid, task in tasks_data.items():
-            if parent_start_time is None:
-                parent_start_time = task.start
-            tasks.append(task)
-
-        apm_cli = self.init_apm_client(apm_server_url, apm_service_name, apm_verify_server_cert, apm_secret_token, apm_api_key)
-        if apm_cli:
-            instrument()  # Only call this once, as early as possible.
-            if traceparent:
-                parent = trace_parent_from_string(traceparent)
-                apm_cli.begin_transaction("Session", trace_parent=parent, start=parent_start_time)
-            else:
-                apm_cli.begin_transaction("Session", start=parent_start_time)
-            # Populate trace metadata attributes
-            if self.ansible_version is not None:
-                label(ansible_version=self.ansible_version)
-            label(ansible_session=self.session, ansible_host_name=self.host, ansible_host_user=self.user)
-            if self.ip_address is not None:
-                label(ansible_host_ip=self.ip_address)
-
-            for task_data in tasks:
-                for host_uuid, host_data in task_data.host_data.items():
-                    self.create_span_data(apm_cli, task_data, host_data)
-
-            apm_cli.end_transaction(name=__name__, result=status, duration=end_time - parent_start_time)
-
-    def create_span_data(self, apm_cli, task_data, host_data):
-        """ create the span with the given TaskData and HostData """
-
-        name = '[%s] %s: %s' % (host_data.name, task_data.play, task_data.name)
-
-        message = "success"
-        status = "success"
-        enriched_error_message = None
-        if host_data.status == 'included':
-            rc = 0
-        else:
-            res = host_data.result._result
-            rc = res.get('rc', 0)
-            if host_data.status == 'failed':
-                message = self.get_error_message(res)
-                enriched_error_message = self.enrich_error_message(res)
-                status = "failure"
-            elif host_data.status == 'skipped':
-                if 'skip_reason' in res:
-                    message = res['skip_reason']
-                else:
-                    message = 'skipped'
-                status = "unknown"
-
-        with capture_span(task_data.name,
-                          start=task_data.start,
-                          span_type="ansible.task.run",
-                          duration=host_data.finish - task_data.start,
-                          labels={"ansible.task.args": task_data.args,
-                                  "ansible.task.message": message,
-                                  "ansible.task.module": task_data.action,
-                                  "ansible.task.name": name,
-                                  "ansible.task.result": rc,
-                                  "ansible.task.host.name": host_data.name,
-                                  "ansible.task.host.status": host_data.status}) as span:
-            span.outcome = status
-            if 'failure' in status:
-                exception = AnsibleRuntimeError(message="{0}: {1} failed with error message {2}".format(task_data.action, name, enriched_error_message))
-                apm_cli.capture_exception(exc_info=(type(exception), exception, exception.__traceback__), handled=True)
-
-    def init_apm_client(self, apm_server_url, apm_service_name, apm_verify_server_cert, apm_secret_token, apm_api_key):
-        if apm_server_url:
-            return Client(service_name=apm_service_name,
-                          server_url=apm_server_url,
-                          verify_server_cert=False,
-                          secret_token=apm_secret_token,
-                          api_key=apm_api_key,
-                          use_elastic_traceparent_header=True,
-                          debug=True)
-
-    @staticmethod
-    def get_error_message(result):
-        if result.get('exception') is not None:
-            return ElasticSource._last_line(result['exception'])
-        return result.get('msg', 'failed')
-
-    @staticmethod
-    def _last_line(text):
-        lines = text.strip().split('\n')
-        return lines[-1]
-
-    @staticmethod
-    def enrich_error_message(result):
-        message = result.get('msg', 'failed')
-        exception = result.get('exception')
-        stderr = result.get('stderr')
-        return ('message: "{0}"\nexception: "{1}"\nstderr: "{2}"').format(message, exception, stderr)
-
-
-class CallbackModule(CallbackBase):
-    """
-    This callback creates distributed traces with Elastic APM.
-    """
-
-    CALLBACK_VERSION = 2.0
-    CALLBACK_TYPE = 'notification'
-    CALLBACK_NAME = 'community.general.elastic'
-    CALLBACK_NEEDS_ENABLED = True
-
-    def __init__(self, display=None):
-        super(CallbackModule, self).__init__(display=display)
-        self.hide_task_arguments = None
-        self.apm_service_name = None
-        self.ansible_playbook = None
-        self.traceparent = False
-        self.play_name = None
-        self.tasks_data = None
-        self.errors = 0
-        self.disabled = False
-
-        if ELASTIC_LIBRARY_IMPORT_ERROR:
-            raise_from(
-                AnsibleError('The `elastic-apm` must be installed to use this plugin'),
-                ELASTIC_LIBRARY_IMPORT_ERROR)
-
-        self.tasks_data = OrderedDict()
-
-        self.elastic = ElasticSource(display=self._display)
-
-    def set_options(self, task_keys=None, var_options=None, direct=None):
-        super(CallbackModule, self).set_options(task_keys=task_keys,
-                                                var_options=var_options,
-                                                direct=direct)
-
-        self.hide_task_arguments = self.get_option('hide_task_arguments')
-
-        self.apm_service_name = self.get_option('apm_service_name')
-        if not self.apm_service_name:
-            self.apm_service_name = 'ansible'
-
-        self.apm_server_url = self.get_option('apm_server_url')
-        self.apm_secret_token = self.get_option('apm_secret_token')
-        self.apm_api_key = self.get_option('apm_api_key')
-        self.apm_verify_server_cert = self.get_option('apm_verify_server_cert')
-        self.traceparent = self.get_option('traceparent')
-
-    def v2_playbook_on_start(self, playbook):
-        self.ansible_playbook = basename(playbook._file_name)
-
-    def v2_playbook_on_play_start(self, play):
-        self.play_name = play.get_name()
-
-    def v2_runner_on_no_hosts(self, task):
-        self.elastic.start_task(
-            self.tasks_data,
-            self.hide_task_arguments,
-            self.play_name,
-            task
-        )
-
-    def v2_playbook_on_task_start(self, task, is_conditional):
-        self.elastic.start_task(
-            self.tasks_data,
-            self.hide_task_arguments,
-            self.play_name,
-            task
-        )
-
-    def v2_playbook_on_cleanup_task_start(self, task):
-        self.elastic.start_task(
-            self.tasks_data,
-            self.hide_task_arguments,
-            self.play_name,
-            task
-        )
-
-    def v2_playbook_on_handler_task_start(self, task):
-        self.elastic.start_task(
-            self.tasks_data,
-            self.hide_task_arguments,
-            self.play_name,
-            task
-        )
-
-    def v2_runner_on_failed(self, result, ignore_errors=False):
-        self.errors += 1
-        self.elastic.finish_task(
-            self.tasks_data,
-            'failed',
-            result
-        )
-
-    def v2_runner_on_ok(self, result):
-        self.elastic.finish_task(
-            self.tasks_data,
-            'ok',
-            result
-        )
-
-    def v2_runner_on_skipped(self, result):
-        self.elastic.finish_task(
-            self.tasks_data,
-            'skipped',
-            result
-        )
-
-    def v2_playbook_on_include(self, included_file):
-        self.elastic.finish_task(
-            self.tasks_data,
-            'included',
-            included_file
-        )
-
-    def v2_playbook_on_stats(self, stats):
-        if self.errors == 0:
-            status = "success"
-        else:
-            status = "failure"
-        self.elastic.generate_distributed_traces(
-            self.tasks_data,
-            status,
-            time.time(),
-            self.traceparent,
-            self.apm_service_name,
-            self.apm_server_url,
-            self.apm_verify_server_cert,
-            self.apm_secret_token,
-            self.apm_api_key
-        )
-
-    def v2_runner_on_async_failed(self, result, **kwargs):
-        self.errors += 1

plugins/callback/hipchat.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (C) 2014, Matt Martz <matt@sivel.net>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

plugins/callback/jabber.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2016 maxn nikolaev.makc@gmail.com
 # Copyright (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

plugins/callback/log_plays.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (C) 2012, Michael DeHaan, <michael.dehaan@gmail.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -32,7 +31,7 @@ import time
 import json
 
 from ansible.utils.path import makedirs_safe
-from ansible.module_utils.common.text.converters import to_bytes
+from ansible.module_utils._text import to_bytes
 from ansible.module_utils.common._collections_compat import MutableMapping
 from ansible.parsing.ajson import AnsibleJSONEncoder
 from ansible.plugins.callback import CallbackBase

plugins/callback/loganalytics.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import (absolute_import, division, print_function)

plugins/callback/logdna.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2018, Samir Musali <samir.musali@logdna.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
@@ -78,7 +77,7 @@ def get_mac():
 
 # Getting hostname of system:
 def get_hostname():
-    return str(socket.gethostname()).split('.local', 1)[0]
+    return str(socket.gethostname()).split('.local')[0]
 
 
 # Getting IP of system:

plugins/callback/logentries.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2015, Logentries.com, Jimmy Tang <jimmy.tang@logentries.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -112,7 +111,7 @@ try:
 except ImportError:
     HAS_FLATDICT = False
 
-from ansible.module_utils.common.text.converters import to_bytes, to_text
+from ansible.module_utils._text import to_bytes, to_text
 from ansible.plugins.callback import CallbackBase
 
 # Todo:

plugins/callback/logstash.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (C) 2020, Yevhen Khmelenko <ujenmr@gmail.com>
 # (C) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -94,7 +93,6 @@ ansible.cfg: |
 
 import os
 import json
-from ansible import context
 import socket
 import uuid
 import logging
@@ -153,11 +151,11 @@ class CallbackModule(CallbackBase):
                 self.base_data['ansible_pre_command_output'] = os.popen(
                     self.ls_pre_command).read()
 
-            if context.CLIARGS is not None:
-                self.base_data['ansible_checkmode'] = context.CLIARGS.get('check')
-                self.base_data['ansible_tags'] = context.CLIARGS.get('tags')
-                self.base_data['ansible_skip_tags'] = context.CLIARGS.get('skip_tags')
-                self.base_data['inventory'] = context.CLIARGS.get('inventory')
+            if self._options is not None:
+                self.base_data['ansible_checkmode'] = self._options.check
+                self.base_data['ansible_tags'] = self._options.tags
+                self.base_data['ansible_skip_tags'] = self._options.skip_tags
+                self.base_data['inventory'] = self._options.inventory
 
     def set_options(self, task_keys=None, var_options=None, direct=None):
         super(CallbackModule, self).set_options(task_keys=task_keys, var_options=var_options, direct=direct)

plugins/callback/mail.py

@@ -62,7 +62,7 @@ import re
 import smtplib
 
 from ansible.module_utils.six import string_types
-from ansible.module_utils.common.text.converters import to_bytes
+from ansible.module_utils._text import to_bytes
 from ansible.parsing.ajson import AnsibleJSONEncoder
 from ansible.plugins.callback import CallbackBase
 

plugins/callback/nrdp.py

@@ -10,23 +10,22 @@ DOCUMENTATION = '''
     name: nrdp
     type: notification
     author: "Remi VERCHERE (@rverchere)"
-    short_description: Post task results to a Nagios server through nrdp
+    short_description: post task result to a nagios server through nrdp
     description:
-        - This callback send playbook result to Nagios.
-        - Nagios shall use NRDP to recive passive events.
-        - The passive check is sent to a dedicated host/service for Ansible.
+        - this callback send playbook result to nagios
+        - nagios shall use NRDP to recive passive events
+        - the passive check is sent to a dedicated host/service for ansible
     options:
         url:
-            description: URL of the nrdp server.
-            required: true
+            description: url of the nrdp server
+            required: True
             env:
                 - name : NRDP_URL
             ini:
                 - section: callback_nrdp
                   key: url
-            type: string
         validate_certs:
-            description: Validate the SSL certificate of the nrdp server. (Used for HTTPS URLs.)
+            description: (bool) validate the SSL certificate of the nrdp server. (For HTTPS url)
             env:
                 - name: NRDP_VALIDATE_CERTS
             ini:
@@ -34,36 +33,32 @@ DOCUMENTATION = '''
                   key: validate_nrdp_certs
                 - section: callback_nrdp
                   key: validate_certs
-            type: boolean
-            default: false
+            default: False
             aliases: [ validate_nrdp_certs ]
         token:
-            description: Token to be allowed to push nrdp events.
-            required: true
+            description: token to be allowed to push nrdp events
+            required: True
             env:
                 - name: NRDP_TOKEN
             ini:
                 - section: callback_nrdp
                   key: token
-            type: string
         hostname:
-            description: Hostname where the passive check is linked to.
-            required: true
+            description: hostname where the passive check is linked to
+            required: True
             env:
                 - name : NRDP_HOSTNAME
             ini:
                 - section: callback_nrdp
                   key: hostname
-            type: string
         servicename:
-            description: Service where the passive check is linked to.
-            required: true
+            description: service where the passive check is linked to
+            required: True
             env:
                 - name : NRDP_SERVICENAME
             ini:
                 - section: callback_nrdp
                   key: servicename
-            type: string
 '''
 
 import os

plugins/callback/null.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 

plugins/callback/opentelemetry.py

@@ -1,507 +0,0 @@
-# (C) 2021, Victor Martinez <VictorMartinezRubio@gmail.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-DOCUMENTATION = '''
-    author: Victor Martinez (@v1v)  <VictorMartinezRubio@gmail.com>
-    name: opentelemetry
-    type: notification
-    short_description: Create distributed traces with OpenTelemetry
-    version_added: 3.7.0
-    description:
-      - This callback creates distributed traces for each Ansible task with OpenTelemetry.
-      - You can configure the OpenTelemetry exporter and SDK with environment variables.
-      - See U(https://opentelemetry-python.readthedocs.io/en/latest/exporter/otlp/otlp.html).
-      - See U(https://opentelemetry-python.readthedocs.io/en/latest/sdk/environment_variables.html#opentelemetry-sdk-environment-variables).
-    options:
-      hide_task_arguments:
-        default: false
-        type: bool
-        description:
-          - Hide the arguments for a task.
-        env:
-          - name: ANSIBLE_OPENTELEMETRY_HIDE_TASK_ARGUMENTS
-      enable_from_environment:
-        type: str
-        description:
-          - Whether to enable this callback only if the given environment variable exists and it is set to C(true).
-          - This is handy when you use Configuration as Code and want to send distributed traces
-            if running in the CI rather when running Ansible locally.
-          - For such, it evaluates the given I(enable_from_environment) value as environment variable
-            and if set to true this plugin will be enabled.
-        env:
-          - name: ANSIBLE_OPENTELEMETRY_ENABLE_FROM_ENVIRONMENT
-        version_added: 3.8.0
-      otel_service_name:
-        default: ansible
-        type: str
-        description:
-          - The service name resource attribute.
-        env:
-          - name: OTEL_SERVICE_NAME
-      traceparent:
-        default: None
-        type: str
-        description:
-          - The L(W3C Trace Context header traceparent,https://www.w3.org/TR/trace-context-1/#traceparent-header).
-        env:
-          - name: TRACEPARENT
-    requirements:
-      - opentelemetry-api (Python library)
-      - opentelemetry-exporter-otlp (Python library)
-      - opentelemetry-sdk (Python library)
-'''
-
-
-EXAMPLES = '''
-examples: |
-  Enable the plugin in ansible.cfg:
-    [defaults]
-    callbacks_enabled = community.general.opentelemetry
-
-  Set the environment variable:
-    export OTEL_EXPORTER_OTLP_ENDPOINT=<your endpoint (OTLP/HTTP)>
-    export OTEL_EXPORTER_OTLP_HEADERS="authorization=Bearer your_otel_token"
-    export OTEL_SERVICE_NAME=your_service_name
-'''
-
-import getpass
-import os
-import socket
-import sys
-import time
-import uuid
-
-from collections import OrderedDict
-from os.path import basename
-
-from ansible.errors import AnsibleError
-from ansible.module_utils.six import raise_from
-from ansible.module_utils.six.moves.urllib.parse import urlparse
-from ansible.plugins.callback import CallbackBase
-
-try:
-    from opentelemetry import trace
-    from opentelemetry.trace import SpanKind
-    from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
-    from opentelemetry.sdk.resources import SERVICE_NAME, Resource
-    from opentelemetry.trace.status import Status, StatusCode
-    from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
-    from opentelemetry.sdk.trace import TracerProvider
-    from opentelemetry.sdk.trace.export import (
-        BatchSpanProcessor
-    )
-    from opentelemetry.util._time import _time_ns
-except ImportError as imp_exc:
-    OTEL_LIBRARY_IMPORT_ERROR = imp_exc
-else:
-    OTEL_LIBRARY_IMPORT_ERROR = None
-
-
-class TaskData:
-    """
-    Data about an individual task.
-    """
-
-    def __init__(self, uuid, name, path, play, action, args):
-        self.uuid = uuid
-        self.name = name
-        self.path = path
-        self.play = play
-        self.host_data = OrderedDict()
-        if sys.version_info >= (3, 7):
-            self.start = time.time_ns()
-        else:
-            self.start = _time_ns()
-        self.action = action
-        self.args = args
-
-    def add_host(self, host):
-        if host.uuid in self.host_data:
-            if host.status == 'included':
-                # concatenate task include output from multiple items
-                host.result = '%s\n%s' % (self.host_data[host.uuid].result, host.result)
-            else:
-                return
-
-        self.host_data[host.uuid] = host
-
-
-class HostData:
-    """
-    Data about an individual host.
-    """
-
-    def __init__(self, uuid, name, status, result):
-        self.uuid = uuid
-        self.name = name
-        self.status = status
-        self.result = result
-        if sys.version_info >= (3, 7):
-            self.finish = time.time_ns()
-        else:
-            self.finish = _time_ns()
-
-
-class OpenTelemetrySource(object):
-    def __init__(self, display):
-        self.ansible_playbook = ""
-        self.ansible_version = None
-        self.session = str(uuid.uuid4())
-        self.host = socket.gethostname()
-        try:
-            self.ip_address = socket.gethostbyname(socket.gethostname())
-        except Exception as e:
-            self.ip_address = None
-        self.user = getpass.getuser()
-
-        self._display = display
-
-    def traceparent_context(self, traceparent):
-        carrier = dict()
-        carrier['traceparent'] = traceparent
-        return TraceContextTextMapPropagator().extract(carrier=carrier)
-
-    def start_task(self, tasks_data, hide_task_arguments, play_name, task):
-        """ record the start of a task for one or more hosts """
-
-        uuid = task._uuid
-
-        if uuid in tasks_data:
-            return
-
-        name = task.get_name().strip()
-        path = task.get_path()
-        action = task.action
-        args = None
-
-        if not task.no_log and not hide_task_arguments:
-            args = task.args
-
-        tasks_data[uuid] = TaskData(uuid, name, path, play_name, action, args)
-
-    def finish_task(self, tasks_data, status, result):
-        """ record the results of a task for a single host """
-
-        task_uuid = result._task._uuid
-
-        if hasattr(result, '_host') and result._host is not None:
-            host_uuid = result._host._uuid
-            host_name = result._host.name
-        else:
-            host_uuid = 'include'
-            host_name = 'include'
-
-        task = tasks_data[task_uuid]
-
-        if self.ansible_version is None and result._task_fields['args'].get('_ansible_version'):
-            self.ansible_version = result._task_fields['args'].get('_ansible_version')
-
-        task.add_host(HostData(host_uuid, host_name, status, result))
-
-    def generate_distributed_traces(self, otel_service_name, ansible_playbook, tasks_data, status, traceparent):
-        """ generate distributed traces from the collected TaskData and HostData """
-
-        tasks = []
-        parent_start_time = None
-        for task_uuid, task in tasks_data.items():
-            if parent_start_time is None:
-                parent_start_time = task.start
-            tasks.append(task)
-
-        trace.set_tracer_provider(
-            TracerProvider(
-                resource=Resource.create({SERVICE_NAME: otel_service_name})
-            )
-        )
-
-        processor = BatchSpanProcessor(OTLPSpanExporter())
-
-        trace.get_tracer_provider().add_span_processor(processor)
-
-        tracer = trace.get_tracer(__name__)
-
-        with tracer.start_as_current_span(ansible_playbook, context=self.traceparent_context(traceparent),
-                                          start_time=parent_start_time, kind=SpanKind.SERVER) as parent:
-            parent.set_status(status)
-            # Populate trace metadata attributes
-            if self.ansible_version is not None:
-                parent.set_attribute("ansible.version", self.ansible_version)
-            parent.set_attribute("ansible.session", self.session)
-            parent.set_attribute("ansible.host.name", self.host)
-            if self.ip_address is not None:
-                parent.set_attribute("ansible.host.ip", self.ip_address)
-            parent.set_attribute("ansible.host.user", self.user)
-            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)
-
-    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)
-
-        message = 'success'
-        res = {}
-        rc = 0
-        status = Status(status_code=StatusCode.OK)
-        if host_data.status != 'included':
-            # Support loops
-            if 'results' in host_data.result._result:
-                if host_data.status == 'failed':
-                    message = self.get_error_message_from_results(host_data.result._result['results'], task_data.action)
-                    enriched_error_message = self.enrich_error_message_from_results(host_data.result._result['results'], task_data.action)
-            else:
-                res = host_data.result._result
-                rc = res.get('rc', 0)
-                message = self.get_error_message(res)
-                enriched_error_message = self.enrich_error_message(res)
-
-            if host_data.status == 'failed':
-                status = Status(status_code=StatusCode.ERROR, description=message)
-                # Record an exception with the task message
-                span.record_exception(BaseException(enriched_error_message))
-            elif host_data.status == 'skipped':
-                message = res['skip_reason'] if 'skip_reason' in res else 'skipped'
-                status = Status(status_code=StatusCode.UNSET)
-
-        span.set_status(status)
-        if isinstance(task_data.args, dict) and "gather_facts" not in task_data.action:
-            names = tuple(self.transform_ansible_unicode_to_str(k) for k in task_data.args.keys())
-            values = tuple(self.transform_ansible_unicode_to_str(k) for k in task_data.args.values())
-            self.set_span_attribute(span, ("ansible.task.args.name"), names)
-            self.set_span_attribute(span, ("ansible.task.args.value"), values)
-        self.set_span_attribute(span, "ansible.task.module", task_data.action)
-        self.set_span_attribute(span, "ansible.task.message", message)
-        self.set_span_attribute(span, "ansible.task.name", name)
-        self.set_span_attribute(span, "ansible.task.result", rc)
-        self.set_span_attribute(span, "ansible.task.host.name", host_data.name)
-        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)
-        span.end(end_time=host_data.finish)
-
-    def set_span_attribute(self, span, attributeName, attributeValue):
-        """ update the span attribute with the given attribute and value if not None """
-
-        if span is None and self._display is not None:
-            self._display.warning('span object is None. Please double check if that is expected.')
-        else:
-            if attributeValue is not None:
-                span.set_attribute(attributeName, attributeValue)
-
-    def add_attributes_for_service_map_if_possible(self, span, task_data):
-        """Update the span attributes with the service that the task interacted with, if possible."""
-
-        redacted_url = self.parse_and_redact_url_if_possible(task_data.args)
-        if redacted_url:
-            self.set_span_attribute(span, "http.url", redacted_url.geturl())
-
-    @staticmethod
-    def parse_and_redact_url_if_possible(args):
-        """Parse and redact the url, if possible."""
-
-        try:
-            parsed_url = urlparse(OpenTelemetrySource.url_from_args(args))
-        except ValueError:
-            return None
-
-        if OpenTelemetrySource.is_valid_url(parsed_url):
-            return OpenTelemetrySource.redact_user_password(parsed_url)
-        return None
-
-    @staticmethod
-    def url_from_args(args):
-        # the order matters
-        url_args = ("url", "api_url", "baseurl", "repo", "server_url", "chart_repo_url")
-        for arg in url_args:
-            if args.get(arg):
-                return args.get(arg)
-        return ""
-
-    @staticmethod
-    def redact_user_password(url):
-        return url._replace(netloc=url.hostname) if url.password else url
-
-    @staticmethod
-    def is_valid_url(url):
-        if all([url.scheme, url.netloc, url.hostname]):
-            return "{{" not in url.hostname
-        return False
-
-    @staticmethod
-    def transform_ansible_unicode_to_str(value):
-        parsed_url = urlparse(str(value))
-        if OpenTelemetrySource.is_valid_url(parsed_url):
-            return OpenTelemetrySource.redact_user_password(parsed_url).geturl()
-        return str(value)
-
-    @staticmethod
-    def get_error_message(result):
-        if result.get('exception') is not None:
-            return OpenTelemetrySource._last_line(result['exception'])
-        return result.get('msg', 'failed')
-
-    @staticmethod
-    def get_error_message_from_results(results, action):
-        for result in results:
-            if result.get('failed', False):
-                return ('{0}({1}) - {2}').format(action, result.get('item', 'none'), OpenTelemetrySource.get_error_message(result))
-
-    @staticmethod
-    def _last_line(text):
-        lines = text.strip().split('\n')
-        return lines[-1]
-
-    @staticmethod
-    def enrich_error_message(result):
-        message = result.get('msg', 'failed')
-        exception = result.get('exception')
-        stderr = result.get('stderr')
-        return ('message: "{0}"\nexception: "{1}"\nstderr: "{2}"').format(message, exception, stderr)
-
-    @staticmethod
-    def enrich_error_message_from_results(results, action):
-        message = ""
-        for result in results:
-            if result.get('failed', False):
-                message = ('{0}({1}) - {2}\n{3}').format(action, result.get('item', 'none'), OpenTelemetrySource.enrich_error_message(result), message)
-        return message
-
-
-class CallbackModule(CallbackBase):
-    """
-    This callback creates distributed traces.
-    """
-
-    CALLBACK_VERSION = 2.0
-    CALLBACK_TYPE = 'notification'
-    CALLBACK_NAME = 'community.general.opentelemetry'
-    CALLBACK_NEEDS_ENABLED = True
-
-    def __init__(self, display=None):
-        super(CallbackModule, self).__init__(display=display)
-        self.hide_task_arguments = None
-        self.otel_service_name = None
-        self.ansible_playbook = None
-        self.play_name = None
-        self.tasks_data = None
-        self.errors = 0
-        self.disabled = False
-        self.traceparent = False
-
-        if OTEL_LIBRARY_IMPORT_ERROR:
-            raise_from(
-                AnsibleError('The `opentelemetry-api`, `opentelemetry-exporter-otlp` or `opentelemetry-sdk` must be installed to use this plugin'),
-                OTEL_LIBRARY_IMPORT_ERROR)
-
-        self.tasks_data = OrderedDict()
-
-        self.opentelemetry = OpenTelemetrySource(display=self._display)
-
-    def set_options(self, task_keys=None, var_options=None, direct=None):
-        super(CallbackModule, self).set_options(task_keys=task_keys,
-                                                var_options=var_options,
-                                                direct=direct)
-
-        environment_variable = self.get_option('enable_from_environment')
-        if environment_variable is not None and os.environ.get(environment_variable, 'false').lower() != 'true':
-            self.disabled = True
-            self._display.warning("The `enable_from_environment` option has been set and {0} is not enabled. "
-                                  "Disabling the `opentelemetry` callback plugin.".format(environment_variable))
-
-        self.hide_task_arguments = self.get_option('hide_task_arguments')
-
-        self.otel_service_name = self.get_option('otel_service_name')
-
-        if not self.otel_service_name:
-            self.otel_service_name = 'ansible'
-
-        # See https://github.com/open-telemetry/opentelemetry-specification/issues/740
-        self.traceparent = self.get_option('traceparent')
-
-    def v2_playbook_on_start(self, playbook):
-        self.ansible_playbook = basename(playbook._file_name)
-
-    def v2_playbook_on_play_start(self, play):
-        self.play_name = play.get_name()
-
-    def v2_runner_on_no_hosts(self, task):
-        self.opentelemetry.start_task(
-            self.tasks_data,
-            self.hide_task_arguments,
-            self.play_name,
-            task
-        )
-
-    def v2_playbook_on_task_start(self, task, is_conditional):
-        self.opentelemetry.start_task(
-            self.tasks_data,
-            self.hide_task_arguments,
-            self.play_name,
-            task
-        )
-
-    def v2_playbook_on_cleanup_task_start(self, task):
-        self.opentelemetry.start_task(
-            self.tasks_data,
-            self.hide_task_arguments,
-            self.play_name,
-            task
-        )
-
-    def v2_playbook_on_handler_task_start(self, task):
-        self.opentelemetry.start_task(
-            self.tasks_data,
-            self.hide_task_arguments,
-            self.play_name,
-            task
-        )
-
-    def v2_runner_on_failed(self, result, ignore_errors=False):
-        self.errors += 1
-        self.opentelemetry.finish_task(
-            self.tasks_data,
-            'failed',
-            result
-        )
-
-    def v2_runner_on_ok(self, result):
-        self.opentelemetry.finish_task(
-            self.tasks_data,
-            'ok',
-            result
-        )
-
-    def v2_runner_on_skipped(self, result):
-        self.opentelemetry.finish_task(
-            self.tasks_data,
-            'skipped',
-            result
-        )
-
-    def v2_playbook_on_include(self, included_file):
-        self.opentelemetry.finish_task(
-            self.tasks_data,
-            'included',
-            included_file
-        )
-
-    def v2_playbook_on_stats(self, stats):
-        if self.errors == 0:
-            status = Status(status_code=StatusCode.OK)
-        else:
-            status = Status(status_code=StatusCode.ERROR)
-        self.opentelemetry.generate_distributed_traces(
-            self.otel_service_name,
-            self.ansible_playbook,
-            self.tasks_data,
-            status,
-            self.traceparent
-        )
-
-    def v2_runner_on_async_failed(self, result, **kwargs):
-        self.errors += 1

plugins/callback/say.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2012, Michael DeHaan, <michael.dehaan@gmail.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

plugins/callback/selective.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) Fastly, inc 2016
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -41,7 +40,7 @@ import difflib
 
 from ansible import constants as C
 from ansible.plugins.callback import CallbackBase
-from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils._text import to_text
 
 try:
     codeCodes = C.COLOR_CODES

plugins/callback/slack.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (C) 2014-2015, Matt Martz <matt@sivel.net>
 # (C) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -59,7 +58,7 @@ import os
 import uuid
 
 from ansible import context
-from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils._text import to_text
 from ansible.module_utils.urls import open_url
 from ansible.plugins.callback import CallbackBase
 

plugins/callback/splunk.py

@@ -68,16 +68,6 @@ DOCUMENTATION = '''
         type: bool
         default: false
         version_added: 2.0.0
-      batch:
-        description:
-          - Correlation ID which can be set across multiple playbook executions.
-        env:
-          - name: SPLUNK_BATCH
-        ini:
-          - section: callback_splunk
-            key: batch
-        type: str
-        version_added: 3.3.0
 '''
 
 EXAMPLES = '''
@@ -117,7 +107,7 @@ class SplunkHTTPCollectorSource(object):
         self.ip_address = socket.gethostbyname(socket.gethostname())
         self.user = getpass.getuser()
 
-    def send_event(self, url, authtoken, validate_certs, include_milliseconds, batch, state, result, runtime):
+    def send_event(self, url, authtoken, validate_certs, include_milliseconds, state, result, runtime):
         if result._task_fields['args'].get('_ansible_check_mode') is True:
             self.ansible_check_mode = True
 
@@ -136,8 +126,6 @@ class SplunkHTTPCollectorSource(object):
         data = {}
         data['uuid'] = result._task._uuid
         data['session'] = self.session
-        if batch is not None:
-            data['batch'] = batch
         data['status'] = state
 
         if include_milliseconds:
@@ -187,7 +175,6 @@ class CallbackModule(CallbackBase):
         self.authtoken = None
         self.validate_certs = None
         self.include_milliseconds = None
-        self.batch = None
         self.splunk = SplunkHTTPCollectorSource()
 
     def _runtime(self, result):
@@ -225,8 +212,6 @@ class CallbackModule(CallbackBase):
 
         self.include_milliseconds = self.get_option('include_milliseconds')
 
-        self.batch = self.get_option('batch')
-
     def v2_playbook_on_start(self, playbook):
         self.splunk.ansible_playbook = basename(playbook._file_name)
 
@@ -242,7 +227,6 @@ class CallbackModule(CallbackBase):
             self.authtoken,
             self.validate_certs,
             self.include_milliseconds,
-            self.batch,
             'OK',
             result,
             self._runtime(result)
@@ -254,7 +238,6 @@ class CallbackModule(CallbackBase):
             self.authtoken,
             self.validate_certs,
             self.include_milliseconds,
-            self.batch,
             'SKIPPED',
             result,
             self._runtime(result)
@@ -266,7 +249,6 @@ class CallbackModule(CallbackBase):
             self.authtoken,
             self.validate_certs,
             self.include_milliseconds,
-            self.batch,
             'FAILED',
             result,
             self._runtime(result)
@@ -278,7 +260,6 @@ class CallbackModule(CallbackBase):
             self.authtoken,
             self.validate_certs,
             self.include_milliseconds,
-            self.batch,
             'FAILED',
             result,
             self._runtime(result)
@@ -290,7 +271,6 @@ class CallbackModule(CallbackBase):
             self.authtoken,
             self.validate_certs,
             self.include_milliseconds,
-            self.batch,
             'UNREACHABLE',
             result,
             self._runtime(result)

plugins/callback/syslog_json.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 

plugins/callback/unixy.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright: (c) 2017, Allyson Bowles <@akatch>
 # Copyright: (c) 2012-2014, Michael DeHaan <michael.dehaan@gmail.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -23,7 +22,7 @@ DOCUMENTATION = '''
 from os.path import basename
 from ansible import constants as C
 from ansible import context
-from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils._text import to_text
 from ansible.utils.color import colorize, hostcolor
 from ansible.plugins.callback.default import CallbackModule as CallbackModule_default
 

plugins/callback/yaml.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
@@ -26,7 +25,7 @@ import re
 import string
 import sys
 
-from ansible.module_utils.common.text.converters import to_bytes, to_text
+from ansible.module_utils._text 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 CallbackBase, strip_internal_keys, module_response_deepcopy
@@ -42,29 +41,28 @@ def should_use_block(value):
     return False
 
 
-class MyDumper(AnsibleDumper):
-    def represent_scalar(self, tag, value, style=None):
-        """Uses block style for multi-line strings"""
-        if style is None:
-            if should_use_block(value):
-                style = '|'
-                # we care more about readable than accuracy, so...
-                # ...no trailing space
-                value = value.rstrip()
-                # ...and non-printable characters
-                value = ''.join(x for x in value if x in string.printable or ord(x) >= 0xA0)
-                # ...tabs prevent blocks from expanding
-                value = value.expandtabs()
-                # ...and odd bits of whitespace
-                value = re.sub(r'[\x0b\x0c\r]', '', value)
-                # ...as does trailing space
-                value = re.sub(r' +\n', '\n', value)
-            else:
-                style = self.default_style
-        node = yaml.representer.ScalarNode(tag, value, style=style)
-        if self.alias_key is not None:
-            self.represented_objects[self.alias_key] = node
-        return node
+def my_represent_scalar(self, tag, value, style=None):
+    """Uses block style for multi-line strings"""
+    if style is None:
+        if should_use_block(value):
+            style = '|'
+            # we care more about readable than accuracy, so...
+            # ...no trailing space
+            value = value.rstrip()
+            # ...and non-printable characters
+            value = ''.join(x for x in value if x in string.printable or ord(x) >= 0xA0)
+            # ...tabs prevent blocks from expanding
+            value = value.expandtabs()
+            # ...and odd bits of whitespace
+            value = re.sub(r'[\x0b\x0c\r]', '', value)
+            # ...as does trailing space
+            value = re.sub(r' +\n', '\n', value)
+        else:
+            style = self.default_style
+    node = yaml.representer.ScalarNode(tag, value, style=style)
+    if self.alias_key is not None:
+        self.represented_objects[self.alias_key] = node
+    return node
 
 
 class CallbackModule(Default):
@@ -80,6 +78,7 @@ class CallbackModule(Default):
 
     def __init__(self):
         super(CallbackModule, self).__init__()
+        yaml.representer.BaseRepresenter.represent_scalar = my_represent_scalar
 
     def _dump_results(self, result, indent=None, sort_keys=True, keep_invocation=False):
         if result.get('_ansible_no_log', False):
@@ -121,7 +120,7 @@ class CallbackModule(Default):
 
         if abridged_result:
             dumped += '\n'
-            dumped += to_text(yaml.dump(abridged_result, allow_unicode=True, width=1000, Dumper=MyDumper, default_flow_style=False))
+            dumped += to_text(yaml.dump(abridged_result, allow_unicode=True, width=1000, Dumper=AnsibleDumper, default_flow_style=False))
 
         # indent by a couple of spaces
         dumped = '\n  '.join(dumped.split('\n')).rstrip()

plugins/connection/chroot.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Based on local.py (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>
 #
 # (c) 2013, Maykel Moya <mmoya@speedyrails.com>
@@ -55,7 +54,7 @@ from ansible.errors import AnsibleError
 from ansible.module_utils.basic import is_executable
 from ansible.module_utils.common.process import get_bin_path
 from ansible.module_utils.six.moves import shlex_quote
-from ansible.module_utils.common.text.converters import to_bytes, to_native
+from ansible.module_utils._text import to_bytes, to_native
 from ansible.plugins.connection import ConnectionBase, BUFSIZE
 from ansible.utils.display import Display
 

plugins/connection/funcd.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Based on local.py (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>
 # Based on chroot.py (c) 2013, Maykel Moya <mmoya@speedyrails.com>
 # Copyright (c) 2013, Michael Scherer <misc@zarb.org>
@@ -9,7 +8,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    author: Michael Scherer (@mscherer) <misc@zarb.org>
+    author: Michael Scherer (@msherer) <misc@zarb.org>
     name: funcd
     short_description: Use funcd to connect to target
     description:

plugins/connection/iocage.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Based on jail.py
 # (c) 2013, Michael Scherer <misc@zarb.org>
 # (c) 2015, Toshio Kuratomi <tkuratomi@ansible.com>
@@ -33,7 +32,7 @@ DOCUMENTATION = '''
 import subprocess
 
 from ansible_collections.community.general.plugins.connection.jail import Connection as Jail
-from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils._text import to_native
 from ansible.errors import AnsibleError
 from ansible.utils.display import Display
 

plugins/connection/jail.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Based on local.py by Michael DeHaan <michael.dehaan@gmail.com>
 # and chroot.py by  Maykel Moya <mmoya@speedyrails.com>
 # Copyright (c) 2013, Michael Scherer <misc@zarb.org>
@@ -39,7 +38,7 @@ import traceback
 
 from ansible.errors import AnsibleError
 from ansible.module_utils.six.moves import shlex_quote
-from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
+from ansible.module_utils._text import to_bytes, to_native, to_text
 from ansible.plugins.connection import ConnectionBase, BUFSIZE
 from ansible.utils.display import Display
 

plugins/connection/lxc.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2015, Joerg Thalheim <joerg@higgsboson.tk>
 # Copyright (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -44,7 +43,7 @@ except ImportError:
     pass
 
 from ansible import errors
-from ansible.module_utils.common.text.converters import to_bytes, to_native
+from ansible.module_utils._text import to_bytes, to_native
 from ansible.plugins.connection import ConnectionBase
 
 

plugins/connection/lxd.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2016 Matt Clay <matt@mystile.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -47,7 +46,7 @@ from distutils.spawn import find_executable
 from subprocess import Popen, PIPE
 
 from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound
-from ansible.module_utils.common.text.converters import to_bytes, to_text
+from ansible.module_utils._text import to_bytes, to_text
 from ansible.plugins.connection import ConnectionBase
 
 

plugins/connection/qubes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Based on the buildah connection plugin
 # Copyright (c) 2017 Ansible Project
 #               2018 Kushal Das
@@ -40,7 +39,7 @@ DOCUMENTATION = '''
 
 import subprocess
 
-from ansible.module_utils.common.text.converters import to_bytes
+from ansible.module_utils._text import to_bytes
 from ansible.plugins.connection import ConnectionBase, ensure_connect
 from ansible.errors import AnsibleConnectionFailure
 from ansible.utils.display import Display

plugins/connection/saltstack.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Based on local.py (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>
 # Based on chroot.py (c) 2013, Maykel Moya <mmoya@speedyrails.com>
 # Based on func.py
@@ -51,7 +50,7 @@ class Connection(ConnectionBase):
         self._connected = True
         return self
 
-    def exec_command(self, cmd, in_data=None, sudoable=False):
+    def exec_command(self, cmd, sudoable=False, in_data=None):
         """ run a command on the remote minion """
         super(Connection, self).exec_command(cmd, in_data=in_data, sudoable=sudoable)
 

plugins/connection/zone.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Based on local.py (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>
 # and chroot.py     (c) 2013, Maykel Moya <mmoya@speedyrails.com>
 # and jail.py       (c) 2013, Michael Scherer <misc@zarb.org>
@@ -34,7 +33,7 @@ import traceback
 
 from ansible.errors import AnsibleError
 from ansible.module_utils.six.moves import shlex_quote
-from ansible.module_utils.common.text.converters import to_bytes
+from ansible.module_utils._text import to_bytes
 from ansible.plugins.connection import ConnectionBase, BUFSIZE
 from ansible.utils.display import Display
 

plugins/doc_fragments/_netapp.py

@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+
+# Copyright: (c) 2018, Sumit Kumar <sumit4@netapp.com>, chris Archibald <carchi@netapp.com>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+
+class ModuleDocFragment(object):
+
+    DOCUMENTATION = r'''
+options:
+  - See respective platform section for more details
+requirements:
+  - See respective platform section for more details
+notes:
+  - Ansible modules are available for the following NetApp Storage Platforms: E-Series, ONTAP, SolidFire
+'''
+
+    # Documentation fragment for ONTAP (na_cdot)
+    ONTAP = r'''
+options:
+  hostname:
+      required: true
+      description:
+      - The hostname or IP address of the ONTAP instance.
+  username:
+      required: true
+      description:
+      - This can be a Cluster-scoped or SVM-scoped account, depending on whether a Cluster-level or SVM-level API is required.
+        For more information, please read the documentation U(https://mysupport.netapp.com/NOW/download/software/nmsdk/9.4/).
+      aliases: ['user']
+  password:
+      required: true
+      description:
+      - Password for the specified user.
+      aliases: ['pass']
+requirements:
+  - A physical or virtual clustered Data ONTAP system. The modules were developed with Clustered Data ONTAP 8.3
+  - Ansible 2.2
+  - netapp-lib (2015.9.25). Install using 'pip install netapp-lib'
+
+notes:
+  - The modules prefixed with na\\_cdot are built to support the ONTAP storage platform.
+
+'''
+
+    # Documentation fragment for SolidFire
+    SOLIDFIRE = r'''
+options:
+  hostname:
+      required: true
+      description:
+      - The hostname or IP address of the SolidFire cluster.
+  username:
+      required: true
+      description:
+      - Please ensure that the user has the adequate permissions. For more information, please read the official documentation
+        U(https://mysupport.netapp.com/documentation/docweb/index.html?productID=62636&language=en-US).
+      aliases: ['user']
+  password:
+      required: true
+      description:
+      - Password for the specified user.
+      aliases: ['pass']
+
+requirements:
+  - The modules were developed with SolidFire 10.1
+  - solidfire-sdk-python (1.1.0.92) or greater. Install using 'pip install solidfire-sdk-python'
+
+notes:
+  - The modules prefixed with na\\_elementsw are built to support the SolidFire storage platform.
+
+'''
+
+    # Documentation fragment for ONTAP (na_ontap)
+    NA_ONTAP = r'''
+options:
+  hostname:
+      description:
+      - The hostname or IP address of the ONTAP instance.
+      type: str
+      required: true
+  username:
+      description:
+      - This can be a Cluster-scoped or SVM-scoped account, depending on whether a Cluster-level or SVM-level API is required.
+        For more information, please read the documentation U(https://mysupport.netapp.com/NOW/download/software/nmsdk/9.4/).
+      type: str
+      required: true
+      aliases: [ user ]
+  password:
+      description:
+      - Password for the specified user.
+      type: str
+      required: true
+      aliases: [ pass ]
+  https:
+      description:
+      - Enable and disable https
+      type: bool
+      default: no
+  validate_certs:
+      description:
+      - If set to C(no), the SSL certificates will not be validated.
+      - This should only set to C(False) used on personally controlled sites using self-signed certificates.
+      type: bool
+      default: yes
+  http_port:
+      description:
+      - Override the default port (80 or 443) with this port
+      type: int
+  ontapi:
+      description:
+      - The ontap api version to use
+      type: int
+  use_rest:
+      description:
+      - REST API if supported by the target system for all the resources and attributes the module requires. Otherwise will revert to ZAPI.
+      - Always -- will always use the REST API
+      - Never -- will always use the ZAPI
+      - Auto -- will try to use the REST Api
+      default: Auto
+      choices: ['Never', 'Always', 'Auto']
+      type: str
+
+
+requirements:
+  - A physical or virtual clustered Data ONTAP system. The modules support Data ONTAP 9.1 and onward
+  - Ansible 2.6
+  - Python2 netapp-lib (2017.10.30) or later. Install using 'pip install netapp-lib'
+  - Python3 netapp-lib (2018.11.13) or later. Install using 'pip install netapp-lib'
+  - To enable http on the cluster you must run the following commands 'set -privilege advanced;' 'system services web modify -http-enabled true;'
+
+notes:
+  - The modules prefixed with na\\_ontap are built to support the ONTAP storage platform.
+
+'''

plugins/doc_fragments/bitbucket.py

@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2019, Evgeniy Krysanov <evgeniy.krysanov@gmail.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-
-class ModuleDocFragment(object):
-
-    # Standard documentation fragment
-    DOCUMENTATION = r'''
-options:
-  client_id:
-    description:
-      - The OAuth consumer key.
-      - If not set the environment variable C(BITBUCKET_CLIENT_ID) will be used.
-    type: str
-  client_secret:
-    description:
-      - The OAuth consumer secret.
-      - If not set the environment variable C(BITBUCKET_CLIENT_SECRET) will be used.
-    type: str
-  user:
-    description:
-      - The username.
-      - If not set the environment variable C(BITBUCKET_USERNAME) will be used.
-    type: str
-    version_added: 4.0.0
-  password:
-    description:
-      - The App password.
-      - If not set the environment variable C(BITBUCKET_PASSWORD) will be used.
-    type: str
-    version_added: 4.0.0
-notes:
-  - Bitbucket OAuth consumer key and secret can be obtained from Bitbucket profile -> Settings -> Access Management -> OAuth.
-  - Bitbucket App password can be created from Bitbucket profile -> Personal Settings -> App passwords.
-  - If both OAuth and Basic Auth credentials are passed, OAuth credentials take precedence.
-'''

plugins/doc_fragments/hpe3par.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright: (c) 2018, Hewlett Packard Enterprise Development LP
 # GNU General Public License v3.0+
 # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

plugins/doc_fragments/hwc.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright: (c) 2018, Huawei Inc.
 # GNU General Public License v3.0+
 # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

plugins/doc_fragments/nios.py

@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+
+# Copyright: (c) 2015, Peter Sprygada <psprygada@ansible.com>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+
+class ModuleDocFragment(object):
+
+    # Standard files documentation fragment
+    DOCUMENTATION = r'''
+options:
+  provider:
+    description:
+      - A dict object containing connection details.
+    type: dict
+    suboptions:
+      host:
+        description:
+          - Specifies the DNS host name or address for connecting to the remote
+            instance of NIOS WAPI over REST
+          - Value can also be specified using C(INFOBLOX_HOST) environment
+            variable.
+        type: str
+      username:
+        description:
+          - Configures the username to use to authenticate the connection to
+            the remote instance of NIOS.
+          - Value can also be specified using C(INFOBLOX_USERNAME) environment
+            variable.
+        type: str
+      password:
+        description:
+          - Specifies the password to use to authenticate the connection to
+            the remote instance of NIOS.
+          - Value can also be specified using C(INFOBLOX_PASSWORD) environment
+            variable.
+        type: str
+      validate_certs:
+        description:
+          - Boolean value to enable or disable verifying SSL certificates
+          - Value can also be specified using C(INFOBLOX_SSL_VERIFY) environment
+            variable.
+        type: bool
+        default: no
+        aliases: [ ssl_verify ]
+      http_request_timeout:
+        description:
+          - The amount of time before to wait before receiving a response
+          - Value can also be specified using C(INFOBLOX_HTTP_REQUEST_TIMEOUT) environment
+            variable.
+        type: int
+        default: 10
+      max_retries:
+        description:
+          - Configures the number of attempted retries before the connection
+            is declared usable
+          - Value can also be specified using C(INFOBLOX_MAX_RETRIES) environment
+            variable.
+        type: int
+        default: 3
+      wapi_version:
+        description:
+          - Specifies the version of WAPI to use
+          - Value can also be specified using C(INFOBLOX_WAP_VERSION) environment
+            variable.
+          - Until ansible 2.8 the default WAPI was 1.4
+        type: str
+        default: '2.1'
+      max_results:
+        description:
+          - Specifies the maximum number of objects to be returned,
+            if set to a negative number the appliance will return an error when the
+            number of returned objects would exceed the setting.
+          - Value can also be specified using C(INFOBLOX_MAX_RESULTS) environment
+            variable.
+        type: int
+        default: 1000
+      http_pool_connections:
+        description:
+          - Number of pools to be used by the C(infoblox_client.Connector) object.
+          - This is passed as-is to the underlying C(requests.adapters.HTTPAdapter) class.
+        type: int
+        default: 10
+      http_pool_maxsize:
+        description:
+          - Maximum number of connections per pool to be used by the C(infoblox_client.Connector) object.
+          - This is passed as-is to the underlying C(requests.adapters.HTTPAdapter) class.
+        type: int
+        default: 10
+      silent_ssl_warnings:
+        description:
+          - Disable C(urllib3) SSL warnings in the C(infoblox_client.Connector) object.
+          - This is passed as-is to the underlying C(requests.adapters.HTTPAdapter) class.
+        type: bool
+        default: true
+notes:
+  - "This module must be run locally, which can be achieved by specifying C(connection: local)."
+  - Please read the :ref:`nios_guide` for more detailed information on how to use Infoblox with Ansible.
+
+'''

plugins/doc_fragments/oracle.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2018, Oracle and/or its affiliates.
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 

plugins/doc_fragments/oracle_creatable_resource.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2018, Oracle and/or its affiliates.
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 

plugins/doc_fragments/oracle_display_name_option.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2018, Oracle and/or its affiliates.
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 

plugins/doc_fragments/oracle_name_option.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2018, Oracle and/or its affiliates.
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 

plugins/doc_fragments/oracle_tags.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2018, Oracle and/or its affiliates.
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 

plugins/doc_fragments/oracle_wait_options.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2018, Oracle and/or its affiliates.
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 

plugins/doc_fragments/redis.py

@@ -1,57 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2021, Andreas Botzner <andreas at botzner dot com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-
-class ModuleDocFragment(object):
-    # Common parameters for Redis modules
-    DOCUMENTATION = r'''
-options:
-  login_host:
-    description:
-      - Specify the target host running the database.
-    default: localhost
-    type: str
-  login_port:
-    description:
-      - Specify the port to connect to.
-    default: 6379
-    type: int
-  login_user:
-    description:
-      - Specify the user to authenticate with.
-      - Requires L(redis,https://pypi.org/project/redis) >= 3.4.0.
-    type: str
-  login_password:
-    description:
-      - Specify the password to authenticate with.
-      - Usually not used when target is localhost.
-    type: str
-  tls:
-    description:
-      - Specify whether or not to use TLS for the connection.
-    type: bool
-    default: true
-  validate_certs:
-    description:
-      - Specify whether or not to validate TLS certificates.
-      - This should only be turned off for personally controlled sites or with
-        C(localhost) as target.
-    type: bool
-    default: true
-  ca_certs:
-    description:
-      - Path to root certificates file. If not set and I(tls) is
-        set to C(true), certifi ca-certificates will be used.
-    type: str
-requirements: [ "redis", "certifi" ]
-
-notes:
-  - Requires the C(redis) Python package on the remote host. You can
-    install it with pip (C(pip install redis)) or with a package manager.
-    Information on the library can be found at U(https://github.com/andymccurdy/redis-py).
-'''

plugins/doc_fragments/rundeck.py

@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2021, Phillipe Smith <phsmithcc@gmail.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-
-class ModuleDocFragment(object):
-
-    # Standard files documentation fragment
-    DOCUMENTATION = r'''
-options:
-  url:
-    type: str
-    description:
-      - Rundeck instance URL.
-    required: true
-  api_version:
-    type: int
-    description:
-      - Rundeck API version to be used.
-      - API version must be at least 14.
-    default: 39
-  api_token:
-    type: str
-    description:
-      - Rundeck User API Token.
-    required: true
-'''

plugins/doc_fragments/vexata.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright: (c) 2019, Sandeep Kasargod <sandeep@vexata.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

plugins/filter/dict_kv.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2020 Stanislav German-Evtushenko (@giner) <ginermail@gmail.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 

plugins/filter/from_csv.py

@@ -8,7 +8,7 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 from ansible.errors import AnsibleFilterError
-from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils._text import to_native
 
 from ansible_collections.community.general.plugins.module_utils.csv import (initialize_dialect, read_csv, CSVError,
                                                                             DialectNotAvailableError,

plugins/filter/jc.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2015, Filipe Niero Felisbino <filipenf@gmail.com>
 #
 # This file is part of Ansible

plugins/filter/json_query.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2015, Filipe Niero Felisbino <filipenf@gmail.com>
 #
 # This file is part of Ansible

plugins/filter/random_mac.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2020 Ansible Project
 #
 # This file is part of Ansible

plugins/filter/unicode_normalize.py

@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2021, Andrew Pantuso (@ajpantuso) <ajpantuso@gmail.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-from unicodedata import normalize
-
-from ansible.errors import AnsibleFilterError, AnsibleFilterTypeError
-from ansible.module_utils.six import text_type
-
-
-def unicode_normalize(data, form='NFC'):
-    """Applies normalization to 'unicode' strings.
-
-    Args:
-        data: A unicode string piped into the Jinja filter
-        form: One of ('NFC', 'NFD', 'NFKC', 'NFKD').
-              See https://docs.python.org/3/library/unicodedata.html#unicodedata.normalize for more information.
-
-    Returns:
-        A normalized unicode string of the specified 'form'.
-    """
-
-    if not isinstance(data, text_type):
-        raise AnsibleFilterTypeError("%s is not a valid input type" % type(data))
-
-    if form not in ('NFC', 'NFD', 'NFKC', 'NFKD'):
-        raise AnsibleFilterError("%s is not a valid form" % form)
-
-    return normalize(form, data)
-
-
-class FilterModule(object):
-    def filters(self):
-        return {
-            'unicode_normalize': unicode_normalize,
-        }

plugins/filter/version_sort.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2021 Eric Lavarde <elavarde@redhat.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 

plugins/inventory/cobbler.py

@@ -72,7 +72,7 @@ from distutils.version import LooseVersion
 import socket
 
 from ansible.errors import AnsibleError
-from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
+from ansible.module_utils._text import to_bytes, to_native, to_text
 from ansible.module_utils.common._collections_compat import MutableMapping
 from ansible.module_utils.six import iteritems
 from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, to_safe_group_name

plugins/inventory/gitlab_runners.py

@@ -82,7 +82,7 @@ keyed_groups:
 '''
 
 from ansible.errors import AnsibleError, AnsibleParserError
-from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils._text import to_native
 from ansible.plugins.inventory import BaseInventoryPlugin, Constructable
 
 try:

plugins/inventory/icinga2.py

@@ -1,222 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021, Cliff Hults <cliff.hlts@gmail.com>
-# Copyright (c) 2021 Ansible Project
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-from __future__ import (absolute_import, division, print_function)
-
-__metaclass__ = type
-
-DOCUMENTATION = '''
-    name: icinga2
-    short_description: Icinga2 inventory source
-    version_added: 3.7.0
-    author:
-        - Cliff Hults (@BongoEADGC6) <cliff.hults@gmail.com>
-    description:
-        - Get inventory hosts from the Icinga2 API.
-        - "Uses a configuration file as an inventory source, it must end in
-          C(.icinga2.yml) or C(.icinga2.yaml)."
-    options:
-      plugin:
-        description: Name of the plugin.
-        required: true
-        type: string
-        choices: ['community.general.icinga2']
-      url:
-        description: Root URL of Icinga2 API.
-        type: string
-        required: true
-      user:
-        description: Username to query the API.
-        type: string
-        required: true
-      password:
-        description: Password to query the API.
-        type: string
-        required: true
-      host_filter:
-        description: An Icinga2 API valid host filter.
-        type: string
-        required: false
-      validate_certs:
-        description: Enables or disables SSL certificate verification.
-        type: boolean
-        default: true
-'''
-
-EXAMPLES = r'''
-# my.icinga2.yml
-plugin: community.general.icinga2
-url: http://localhost:5665
-user: ansible
-password: secure
-host_filter: \"linux-servers\" in host.groups
-validate_certs: false
-'''
-
-import json
-
-from ansible.errors import AnsibleParserError
-from ansible.plugins.inventory import BaseInventoryPlugin, Constructable
-from ansible.module_utils.urls import open_url
-
-
-class InventoryModule(BaseInventoryPlugin, Constructable):
-    ''' Host inventory parser for ansible using Icinga2 as source. '''
-
-    NAME = 'community.general.icinga2'
-
-    def __init__(self):
-
-        super(InventoryModule, self).__init__()
-
-        # from config
-        self.icinga2_url = None
-        self.icinga2_user = None
-        self.icinga2_password = None
-        self.ssl_verify = None
-        self.host_filter = None
-
-        self.cache_key = None
-        self.use_cache = None
-
-    def verify_file(self, path):
-        valid = False
-        if super(InventoryModule, self).verify_file(path):
-            if path.endswith(('icinga2.yaml', 'icinga2.yml')):
-                valid = True
-            else:
-                self.display.vvv('Skipping due to inventory source not ending in "icinga2.yaml" nor "icinga2.yml"')
-        return valid
-
-    def _api_connect(self):
-        self.headers = {
-            'User-Agent': "ansible-icinga2-inv",
-            'Accept': "application/json",
-        }
-        api_status_url = self.icinga2_url + "/status"
-        request_args = {
-            'headers': self.headers,
-            'url_username': self.icinga2_user,
-            'url_password': self.icinga2_password,
-            'validate_certs': self.ssl_verify
-        }
-        open_url(api_status_url, **request_args)
-
-    def _post_request(self, request_url, data=None):
-        self.display.vvv("Requested URL: %s" % request_url)
-        request_args = {
-            'headers': self.headers,
-            'url_username': self.icinga2_user,
-            'url_password': self.icinga2_password,
-            'validate_certs': self.ssl_verify
-        }
-        if data is not None:
-            request_args['data'] = json.dumps(data)
-        self.display.vvv("Request Args: %s" % request_args)
-        response = open_url(request_url, **request_args)
-        response_body = response.read()
-        json_data = json.loads(response_body.decode('utf-8'))
-        if 200 <= response.status <= 299:
-            return json_data
-        if response.status == 404 and json_data['status'] == "No objects found.":
-            raise AnsibleParserError(
-                "API returned no data -- Response: %s - %s"
-                % (response.status, json_data['status']))
-        if response.status == 401:
-            raise AnsibleParserError(
-                "API was unable to complete query -- Response: %s - %s"
-                % (response.status, json_data['status']))
-        if response.status == 500:
-            raise AnsibleParserError(
-                "API Response - %s - %s"
-                % (json_data['status'], json_data['errors']))
-        raise AnsibleParserError(
-            "Unexpected data returned - %s - %s"
-            % (json_data['status'], json_data['errors']))
-
-    def _query_hosts(self, hosts=None, attrs=None, joins=None, host_filter=None):
-        query_hosts_url = "{0}/objects/hosts".format(self.icinga2_url)
-        self.headers['X-HTTP-Method-Override'] = 'GET'
-        data_dict = dict()
-        if hosts:
-            data_dict['hosts'] = hosts
-        if attrs is not None:
-            data_dict['attrs'] = attrs
-        if joins is not None:
-            data_dict['joins'] = joins
-        if host_filter is not None:
-            data_dict['filter'] = host_filter.replace("\\\"", "\"")
-            self.display.vvv(host_filter)
-        host_dict = self._post_request(query_hosts_url, data_dict)
-        return host_dict['results']
-
-    def get_inventory_from_icinga(self):
-        """Query for all hosts """
-        self.display.vvv("Querying Icinga2 for inventory")
-        query_args = {
-            "attrs": ["address", "state_type", "state", "groups"],
-        }
-        if self.host_filter is not None:
-            query_args['host_filter'] = self.host_filter
-        # Icinga2 API Call
-        results_json = self._query_hosts(**query_args)
-        # Manipulate returned API data to Ansible inventory spec
-        ansible_inv = self._convert_inv(results_json)
-        return ansible_inv
-
-    def _populate(self):
-        groups = self._to_json(self.get_inventory_from_icinga())
-        return groups
-
-    def _to_json(self, in_dict):
-        """Convert dictionary to JSON"""
-        return json.dumps(in_dict, sort_keys=True, indent=2)
-
-    def _convert_inv(self, json_data):
-        """Convert Icinga2 API data to JSON format for Ansible"""
-        groups_dict = {"_meta": {"hostvars": {}}}
-        for entry in json_data:
-            host_name = entry['name']
-            host_attrs = entry['attrs']
-            if host_attrs['state'] == 0:
-                host_attrs['state'] = 'on'
-            else:
-                host_attrs['state'] = 'off'
-            host_groups = host_attrs['groups']
-            host_addr = host_attrs['address']
-            self.inventory.add_host(host_addr)
-            for group in host_groups:
-                if group not in self.inventory.groups.keys():
-                    self.inventory.add_group(group)
-                self.inventory.add_child(group, host_addr)
-            self.inventory.set_variable(host_addr, 'address', host_addr)
-            self.inventory.set_variable(host_addr, 'hostname', host_name)
-            self.inventory.set_variable(host_addr, 'state',
-                                        host_attrs['state'])
-            self.inventory.set_variable(host_addr, 'state_type',
-                                        host_attrs['state_type'])
-        return groups_dict
-
-    def parse(self, inventory, loader, path, cache=True):
-
-        super(InventoryModule, self).parse(inventory, loader, path)
-
-        # read config from file, this sets 'options'
-        self._read_config_data(path)
-
-        # Store the options from the YAML file
-        self.icinga2_url = self.get_option('url').rstrip('/') + '/v1'
-        self.icinga2_user = self.get_option('user')
-        self.icinga2_password = self.get_option('password')
-        self.ssl_verify = self.get_option('validate_certs')
-        self.host_filter = self.get_option('host_filter')
-        # Not currently enabled
-        # self.cache_key = self.get_cache_key(path)
-        # self.use_cache = cache and self.get_option('cache')
-
-        # Test connection to API
-        self._api_connect()
-
-        # Call our internal helper to populate the dynamic inventory
-        self._populate()

plugins/inventory/linode.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
@@ -23,17 +22,9 @@ DOCUMENTATION = r'''
         - constructed
     options:
         plugin:
-            description: Marks this as an instance of the 'linode' plugin.
+            description: marks this as an instance of the 'linode' plugin
             required: true
             choices: ['linode', 'community.general.linode']
-        ip_style:
-            description: Populate hostvars with all information available from the Linode APIv4.
-            type: string
-            default: plain
-            choices:
-                - plain
-                - api
-            version_added: 3.6.0
         access_token:
             description: The Linode account personal access token.
             required: true
@@ -86,18 +77,7 @@ groups:
   webservers: "'web' in (tags|list)"
   mailservers: "'mail' in (tags|list)"
 compose:
-  # By default, Ansible tries to connect to the label of the instance.
-  # Since that might not be a valid name to connect to, you can
-  # replace it with the first IPv4 address of the linode as follows:
-  ansible_ssh_host: ipv4[0]
   ansible_port: 2222
-
-# Example where control traffic limited to internal network
-plugin: community.general.linode
-access_token: foobar
-ip_style: api
-compose:
-  ansible_host: "ipv4 | community.general.json_query('[?public==`false`].address') | first"
 '''
 
 import os
@@ -185,44 +165,14 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
 
     def _add_hostvars_for_instances(self):
         """Add hostvars for instances in the dynamic inventory."""
-        ip_style = self.get_option('ip_style')
         for instance in self.instances:
             hostvars = instance._raw_json
             for hostvar_key in hostvars:
-                if ip_style == 'api' and hostvar_key in ['ipv4', 'ipv6']:
-                    continue
                 self.inventory.set_variable(
                     instance.label,
                     hostvar_key,
                     hostvars[hostvar_key]
                 )
-            if ip_style == 'api':
-                ips = instance.ips.ipv4.public + instance.ips.ipv4.private
-                ips += [instance.ips.ipv6.slaac, instance.ips.ipv6.link_local]
-                ips += instance.ips.ipv6.pools
-
-                for ip_type in set(ip.type for ip in ips):
-                    self.inventory.set_variable(
-                        instance.label,
-                        ip_type,
-                        self._ip_data([ip for ip in ips if ip.type == ip_type])
-                    )
-
-    def _ip_data(self, ip_list):
-        data = []
-        for ip in list(ip_list):
-            data.append(
-                {
-                    'address': ip.address,
-                    'subnet_mask': ip.subnet_mask,
-                    'gateway': ip.gateway,
-                    'public': ip.public,
-                    'prefix': ip.prefix,
-                    'rdns': ip.rdns,
-                    'type': ip.type
-                }
-            )
-        return data
 
     def _validate_option(self, name, desired_type, option_value):
         """Validate user specified configuration data against types."""

plugins/inventory/lxd.py

@@ -13,8 +13,6 @@ DOCUMENTATION = r'''
         - Uses a YAML configuration file that ends with 'lxd.(yml|yaml)'.
     version_added: "3.0.0"
     author: "Frank Dornheim (@conloos)"
-    requirements:
-        - ipaddress
     options:
         plugin:
             description: Token that ensures this is a source file for the 'lxd' plugin.
@@ -124,19 +122,12 @@ 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._text 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_collections.community.general.plugins.module_utils.compat import ipaddress
 from ansible_collections.community.general.plugins.module_utils.lxd import LXDClient, LXDClientException
 
-try:
-    import ipaddress
-except ImportError as exc:
-    IPADDRESS_IMPORT_ERROR = exc
-else:
-    IPADDRESS_IMPORT_ERROR = None
-
 
 class InventoryModule(BaseInventoryPlugin):
     DEBUG = 4
@@ -933,10 +924,6 @@ class InventoryModule(BaseInventoryPlugin):
             AnsibleParserError
         Returns:
             None"""
-        if IPADDRESS_IMPORT_ERROR:
-            raise_from(
-                AnsibleError('another_library must be installed to use this plugin'),
-                IPADDRESS_IMPORT_ERROR)
 
         super(InventoryModule, self).parse(inventory, loader, path, cache=False)
         # Read the inventory YAML file

plugins/inventory/nmap.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
@@ -57,7 +56,7 @@ from subprocess import Popen, PIPE
 
 from ansible import constants as C
 from ansible.errors import AnsibleParserError
-from ansible.module_utils.common.text.converters import to_native, to_text
+from ansible.module_utils._text import to_native, to_text
 from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
 from ansible.module_utils.common.process import get_bin_path
 

plugins/inventory/online.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2018 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
@@ -62,7 +61,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_native, to_text
+from ansible.module_utils._text 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
 
@@ -235,7 +234,7 @@ class InventoryModule(BaseInventoryPlugin):
 
         self.headers = {
             'Authorization': "Bearer %s" % token,
-            'User-Agent': "ansible %s Python %s" % (ansible_version, python_version.split(' ', 1)[0]),
+            'User-Agent': "ansible %s Python %s" % (ansible_version, python_version.split(' ')[0]),
             'Content-type': 'application/json'
         }
 

plugins/inventory/opennebula.py

@@ -1,239 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, FELDSAM s.r.o. - FeldHost™ <support@feldhost.cz>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import (absolute_import, division, print_function)
-
-__metaclass__ = type
-
-DOCUMENTATION = r'''
-    name: opennebula
-    author:
-        - Kristian Feldsam (@feldsam)
-    short_description: OpenNebula inventory source
-    version_added: "3.8.0"
-    extends_documentation_fragment:
-        - constructed
-    description:
-        - Get inventory hosts from OpenNebula cloud.
-        - Uses an YAML configuration file ending with either I(opennebula.yml) or I(opennebula.yaml)
-          to set parameter values.
-        - Uses I(api_authfile), C(~/.one/one_auth), or C(ONE_AUTH) pointing to a OpenNebula credentials file.
-    options:
-        plugin:
-            description: Token that ensures this is a source file for the 'opennebula' plugin.
-            type: string
-            required: true
-            choices: [ community.general.opennebula ]
-        api_url:
-            description:
-              - URL of the OpenNebula RPC server.
-              - It is recommended to use HTTPS so that the username/password are not
-                transferred over the network unencrypted.
-              - If not set then the value of the C(ONE_URL) environment variable is used.
-            env:
-              - name: ONE_URL
-            required: True
-            type: string
-        api_username:
-            description:
-              - Name of the user to login into the OpenNebula RPC server. If not set
-                then the value of the C(ONE_USERNAME) environment variable is used.
-            env:
-              - name: ONE_USERNAME
-            type: string
-        api_password:
-            description:
-              - Password or a token of the user to login into OpenNebula RPC server.
-              - If not set, the value of the C(ONE_PASSWORD) environment variable is used.
-            env:
-              - name: ONE_PASSWORD
-            required: False
-            type: string
-        api_authfile:
-            description:
-              - If both I(api_username) or I(api_password) are not set, then it will try
-                authenticate with ONE auth file. Default path is C(~/.one/one_auth).
-              - Set environment variable C(ONE_AUTH) to override this path.
-            env:
-              - name: ONE_AUTH
-            required: False
-            type: string
-        hostname:
-            description: Field to match the hostname. Note C(v4_first_ip) corresponds to the first IPv4 found on VM.
-            type: string
-            default: v4_first_ip
-            choices:
-                - v4_first_ip
-                - v6_first_ip
-                - name
-        filter_by_label:
-            description: Only return servers filtered by this label.
-            type: string
-        group_by_labels:
-            description: Create host groups by vm labels
-            type: bool
-            default: True
-'''
-
-EXAMPLES = r'''
-# inventory_opennebula.yml file in YAML format
-# Example command line: ansible-inventory --list -i inventory_opennebula.yml
-
-# Pass a label filter to the API
-plugin: community.general.opennebula
-api_url: https://opennebula:2633/RPC2
-filter_by_label: Cache
-'''
-
-try:
-    import pyone
-
-    HAS_PYONE = True
-except ImportError:
-    HAS_PYONE = False
-
-from ansible.errors import AnsibleError
-from ansible.plugins.inventory import BaseInventoryPlugin, Constructable
-from ansible.module_utils._text import to_native
-
-from collections import namedtuple
-import os
-
-
-class InventoryModule(BaseInventoryPlugin, Constructable):
-    NAME = 'community.general.opennebula'
-
-    def verify_file(self, path):
-        valid = False
-        if super(InventoryModule, self).verify_file(path):
-            if path.endswith(('opennebula.yaml', 'opennebula.yml')):
-                valid = True
-        return valid
-
-    def _get_connection_info(self):
-        url = self.get_option('api_url')
-        username = self.get_option('api_username')
-        password = self.get_option('api_password')
-        authfile = self.get_option('api_authfile')
-
-        if not username and not password:
-            if authfile is None:
-                authfile = os.path.join(os.environ.get("HOME"), ".one", "one_auth")
-            try:
-                with open(authfile, "r") as fp:
-                    authstring = fp.read().rstrip()
-                username, password = authstring.split(":")
-            except (OSError, IOError):
-                raise AnsibleError("Could not find or read ONE_AUTH file at '{e}'".format(e=authfile))
-            except Exception:
-                raise AnsibleError("Error occurs when reading ONE_AUTH file at '{e}'".format(e=authfile))
-
-        auth_params = namedtuple('auth', ('url', 'username', 'password'))
-
-        return auth_params(url=url, username=username, password=password)
-
-    def _get_vm_ipv4(self, vm):
-        nic = vm.TEMPLATE.get('NIC')
-
-        if isinstance(nic, dict):
-            nic = [nic]
-
-        for net in nic:
-            return net['IP']
-
-        return False
-
-    def _get_vm_ipv6(self, vm):
-        nic = vm.TEMPLATE.get('NIC')
-
-        if isinstance(nic, dict):
-            nic = [nic]
-
-        for net in nic:
-            if net.get('IP6_GLOBAL'):
-                return net['IP6_GLOBAL']
-
-        return False
-
-    def _get_vm_pool(self):
-        auth = self._get_connection_info()
-
-        if not (auth.username and auth.password):
-            raise AnsibleError('API Credentials missing. Check OpenNebula inventory file.')
-        else:
-            one_client = pyone.OneServer(auth.url, session=auth.username + ':' + auth.password)
-
-        # get hosts (VMs)
-        try:
-            vm_pool = one_client.vmpool.infoextended(-2, -1, -1, 3)
-        except Exception as e:
-            raise AnsibleError("Something happened during XML-RPC call: {e}".format(e=to_native(e)))
-
-        return vm_pool
-
-    def _retrieve_servers(self, label_filter=None):
-        vm_pool = self._get_vm_pool()
-
-        result = []
-
-        # iterate over hosts
-        for vm in vm_pool.VM:
-            server = vm.USER_TEMPLATE
-
-            labels = []
-            if vm.USER_TEMPLATE.get('LABELS'):
-                labels = [s for s in vm.USER_TEMPLATE.get('LABELS') if s == ',' or s == '-' or s.isalnum() or s.isspace()]
-                labels = ''.join(labels)
-                labels = labels.replace(' ', '_')
-                labels = labels.replace('-', '_')
-                labels = labels.split(',')
-
-            # filter by label
-            if label_filter is not None:
-                if label_filter not in labels:
-                    continue
-
-            server['name'] = vm.NAME
-            server['LABELS'] = labels
-            server['v4_first_ip'] = self._get_vm_ipv4(vm)
-            server['v6_first_ip'] = self._get_vm_ipv6(vm)
-
-            result.append(server)
-
-        return result
-
-    def _populate(self):
-        hostname_preference = self.get_option('hostname')
-        group_by_labels = self.get_option('group_by_labels')
-
-        # Add a top group 'one'
-        self.inventory.add_group(group='all')
-
-        filter_by_label = self.get_option('filter_by_label')
-        for server in self._retrieve_servers(filter_by_label):
-            # check for labels
-            if group_by_labels and server['LABELS']:
-                for label in server['LABELS']:
-                    self.inventory.add_group(group=label)
-                    self.inventory.add_host(host=server['name'], group=label)
-
-            self.inventory.add_host(host=server['name'], group='all')
-
-            for attribute, value in server.items():
-                self.inventory.set_variable(server['name'], attribute, value)
-
-            if hostname_preference != 'name':
-                self.inventory.set_variable(server['name'], 'ansible_host', server[hostname_preference])
-
-            if server.get('SSH_PORT'):
-                self.inventory.set_variable(server['name'], 'ansible_port', server['SSH_PORT'])
-
-    def parse(self, inventory, loader, path, cache=True):
-        if not HAS_PYONE:
-            raise AnsibleError('OpenNebula Inventory plugin requires pyone to work!')
-
-        super(InventoryModule, self).parse(inventory, loader, path)
-        self._read_config_data(path=path)
-
-        self._populate()

plugins/inventory/proxmox.py

@@ -88,24 +88,13 @@ DOCUMENTATION = '''
 '''
 
 EXAMPLES = '''
-# Minimal example which will not gather additional facts for QEMU/LXC guests
-# By not specifying a URL the plugin will attempt to connect to the controller host on port 8006
 # my.proxmox.yml
 plugin: community.general.proxmox
+url: http://localhost:8006
 user: ansible@pve
 password: secure
-
-# More complete example demonstrating the use of 'want_facts' and the constructed options
-# Note that using facts returned by 'want_facts' in constructed options requires 'want_facts=true'
-# my.proxmox.yml
-plugin: community.general.proxmox
-url: http://pve.domain.com:8006
-user: ansible@pve
-password: secure
-validate_certs: false
-want_facts: true
+validate_certs: no
 keyed_groups:
-    # proxmox_tags_parsed is an example of a fact only returned when 'want_facts=true'
   - key: proxmox_tags_parsed
     separator: ""
     prefix: group
@@ -336,15 +325,6 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
         status_key = self.to_safe('%s%s' % (self.get_option('facts_prefix'), status_key.lower()))
         self.inventory.set_variable(name, status_key, status)
 
-    def _get_vm_snapshots(self, node, vmid, vmtype, name):
-        ret = self._get_json("%s/api2/json/nodes/%s/%s/%s/snapshot" % (self.proxmox_url, node, vmtype, vmid))
-
-        snapshots_key = 'snapshots'
-        snapshots_key = self.to_safe('%s%s' % (self.get_option('facts_prefix'), snapshots_key.lower()))
-
-        snapshots = [snapshot['name'] for snapshot in ret if snapshot['name'] != 'current']
-        self.inventory.set_variable(name, snapshots_key, snapshots)
-
     def to_safe(self, word):
         '''Converts 'bad' characters in a string to underscores so they can be used as Ansible groups
         #> ProxmoxInventory.to_safe("foo-bar baz")
@@ -389,9 +369,6 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
                 if node['type'] == 'node':
                     self.inventory.add_child(nodes_group, node['node'])
 
-                if node['status'] == 'offline':
-                    continue
-
                 # get node IP address
                 if self.get_option("want_proxmox_nodes_ansible_host"):
                     ip = self._get_node_ip(node['node'])
@@ -413,10 +390,9 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
                         elif lxc['status'] == 'running':
                             self.inventory.add_child(running_group, lxc['name'])
 
-                    # get LXC config and snapshots for facts
+                    # get LXC config for facts
                     if self.get_option('want_facts'):
                         self._get_vm_config(node['node'], lxc['vmid'], 'lxc', lxc['name'])
-                        self._get_vm_snapshots(node['node'], lxc['vmid'], 'lxc', lxc['name'])
 
                     self._apply_constructable(lxc["name"], self.inventory.get_host(lxc['name']).get_vars())
 
@@ -424,7 +400,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
                 node_qemu_group = self.to_safe('%s%s' % (self.get_option('group_prefix'), ('%s_qemu' % node['node']).lower()))
                 self.inventory.add_group(node_qemu_group)
                 for qemu in self._get_qemu_per_node(node['node']):
-                    if qemu.get('template'):
+                    if qemu['template']:
                         continue
 
                     self.inventory.add_host(qemu['name'])
@@ -438,10 +414,9 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
                     elif qemu['status'] == 'running':
                         self.inventory.add_child(running_group, qemu['name'])
 
-                    # get QEMU config and snapshots for facts
+                    # get QEMU config for facts
                     if self.get_option('want_facts'):
                         self._get_vm_config(node['node'], qemu['vmid'], 'qemu', qemu['name'])
-                        self._get_vm_snapshots(node['node'], qemu['vmid'], 'qemu', qemu['name'])
 
                     self._apply_constructable(qemu["name"], self.inventory.get_host(qemu['name']).get_vars())
 

plugins/inventory/scaleway.py

@@ -1,27 +1,24 @@
-# -*- coding: utf-8 -*-
-# Copyright: (c) 2017 Ansible Project
+# Copyright (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import (absolute_import, division, print_function)
 
 __metaclass__ = type
 
-DOCUMENTATION = r'''
+DOCUMENTATION = '''
     name: scaleway
     author:
       - Remy Leone (@sieben)
     short_description: Scaleway inventory source
     description:
-        - Get inventory hosts from Scaleway.
-    requirements:
-        - PyYAML
+        - Get inventory hosts from Scaleway
     options:
         plugin:
-            description: Token that ensures this is a source file for the 'scaleway' plugin.
+            description: token that ensures this is a source file for the 'scaleway' plugin.
             required: True
             choices: ['scaleway', 'community.general.scaleway']
         regions:
-            description: Filter results on a specific Scaleway region.
+            description: Filter results on a specific Scaleway region
             type: list
             default:
                 - ams1
@@ -29,14 +26,11 @@ DOCUMENTATION = r'''
                 - par2
                 - waw1
         tags:
-            description: Filter results on a specific tag.
+            description: Filter results on a specific tag
             type: list
         oauth_token:
-            description:
-            - Scaleway OAuth token.
-            - If not explicitly defined or in environment variables, it will try to lookup in the scaleway-cli configuration file
-              (C($SCW_CONFIG_PATH), C($XDG_CONFIG_HOME/scw/config.yaml), or C(~/.config/scw/config.yaml)).
-            - More details on L(how to generate token, https://www.scaleway.com/en/docs/generate-api-keys/).
+            required: True
+            description: Scaleway OAuth token.
             env:
                 # in order of precedence
                 - name: SCW_TOKEN
@@ -54,14 +48,14 @@ DOCUMENTATION = r'''
                 - hostname
                 - id
         variables:
-            description: 'Set individual variables: keys are variable names and
+            description: 'set individual variables: keys are variable names and
                           values are templates. Any value returned by the
                           L(Scaleway API, https://developer.scaleway.com/#servers-server-get)
                           can be used.'
             type: dict
 '''
 
-EXAMPLES = r'''
+EXAMPLES = '''
 # scaleway_inventory.yml file in YAML format
 # Example command line: ansible-inventory --list -i scaleway_inventory.yml
 
@@ -87,33 +81,15 @@ regions:
   - par1
 variables:
   ansible_host: public_ip.address
-
-# Using static strings as variables
-plugin: community.general.scaleway
-hostnames:
-  - hostname
-variables:
-  ansible_host: public_ip.address
-  ansible_connection: "'ssh'"
-  ansible_user: "'admin'"
 '''
 
-import os
 import json
 
-try:
-    import yaml
-except ImportError as exc:
-    YAML_IMPORT_ERROR = exc
-else:
-    YAML_IMPORT_ERROR = None
-
 from ansible.errors import AnsibleError
 from ansible.plugins.inventory import BaseInventoryPlugin, Constructable
 from ansible_collections.community.general.plugins.module_utils.scaleway import SCALEWAY_LOCATION, parse_pagination_link
 from ansible.module_utils.urls import open_url
-from ansible.module_utils.common.text.converters import to_native, to_text
-from ansible.module_utils.six import raise_from
+from ansible.module_utils._text import to_native
 
 import ansible.module_utils.six.moves.urllib.parse as urllib_parse
 
@@ -129,7 +105,7 @@ def _fetch_information(token, url):
         except Exception as e:
             raise AnsibleError("Error while fetching %s: %s" % (url, to_native(e)))
         try:
-            raw_json = json.loads(to_text(response.read()))
+            raw_json = json.loads(response.read())
         except ValueError:
             raise AnsibleError("Incorrect JSON payload")
 
@@ -254,7 +230,8 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
 
         if not matching_tags:
             return set()
-        return matching_tags.union((server_zone,))
+        else:
+            return matching_tags.union((server_zone,))
 
     def _filter_host(self, host_infos, hostname_preferences):
 
@@ -290,38 +267,13 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
                 # Composed variables
                 self._set_composite_vars(self.get_option('variables'), host_infos, hostname, strict=False)
 
-    def get_oauth_token(self):
-        oauth_token = self.get_option('oauth_token')
-
-        if 'SCW_CONFIG_PATH' in os.environ:
-            scw_config_path = os.getenv('SCW_CONFIG_PATH')
-        elif 'XDG_CONFIG_HOME' in os.environ:
-            scw_config_path = os.path.join(os.getenv('XDG_CONFIG_HOME'), 'scw', 'config.yaml')
-        else:
-            scw_config_path = os.path.join(os.path.expanduser('~'), '.config', 'scw', 'config.yaml')
-
-        if not oauth_token and os.path.exists(scw_config_path):
-            with open(scw_config_path) as fh:
-                scw_config = yaml.safe_load(fh)
-                active_profile = scw_config.get('active_profile', 'default')
-                if active_profile == 'default':
-                    oauth_token = scw_config.get('secret_key')
-                else:
-                    oauth_token = scw_config['profiles'][active_profile].get('secret_key')
-
-        return oauth_token
-
     def parse(self, inventory, loader, path, cache=True):
-        if YAML_IMPORT_ERROR:
-            raise_from(AnsibleError('PyYAML is probably missing'), YAML_IMPORT_ERROR)
         super(InventoryModule, self).parse(inventory, loader, path)
         self._read_config_data(path=path)
 
         config_zones = self.get_option("regions")
         tags = self.get_option("tags")
-        token = self.get_oauth_token()
-        if not token:
-            raise AnsibleError("'oauth_token' value is null, you must configure it either in inventory, envvars or scaleway-cli config.")
+        token = self.get_option("oauth_token")
         hostname_preference = self.get_option("hostnames")
 
         for zone in self._get_zones(config_zones):

plugins/inventory/stackpath_compute.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2020 Shay Rybak <shay.rybak@stackpath.com>
 # Copyright (c) 2020 Ansible Project
 # GNU General Public License v3.0+

plugins/inventory/virtualbox.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
@@ -57,7 +56,7 @@ import os
 from subprocess import Popen, PIPE
 
 from ansible.errors import AnsibleParserError
-from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
+from ansible.module_utils._text import to_bytes, to_native, to_text
 from ansible.module_utils.common._collections_compat import MutableMapping
 from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
 from ansible.module_utils.common.process import get_bin_path

plugins/lookup/cartesian.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2013, Bradley Young <young.bradley@gmail.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

plugins/lookup/chef_databag.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2016, Josh Bradley <jbradley(at)digitalocean.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

plugins/lookup/collection_version.py

@@ -1,138 +0,0 @@
-# (c) 2021, Felix Fontein <felix@fontein.de>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-DOCUMENTATION = """
-name: collection_version
-author: Felix Fontein (@felixfontein)
-version_added: "4.0.0"
-short_description: Retrieves the version of an installed collection
-description:
-  - This lookup allows to query the version of an installed collection, and to determine whether a
-    collection is installed at all.
-  - By default it returns C(none) for non-existing collections and C(*) for collections without a
-    version number. The latter should only happen in development environments, or when installing
-    a collection from git which has no version in its C(galaxy.yml). This behavior can be adjusted
-    by providing other values with I(result_not_found) and I(result_no_version).
-options:
-  _terms:
-    description:
-      - The collections to look for.
-      - For example C(community.general).
-    type: list
-    elements: str
-    required: true
-  result_not_found:
-    description:
-      - The value to return when the collection could not be found.
-      - By default, C(none) is returned.
-    type: string
-    default: ~
-  result_no_version:
-    description:
-      - The value to return when the collection has no version number.
-      - This can happen for collections installed from git which do not have a version number
-        in C(galaxy.yml).
-      - By default, C(*) is returned.
-    type: string
-    default: '*'
-"""
-
-EXAMPLES = """
-- name: Check version of community.general
-  ansible.builtin.debug:
-    msg: "community.general version {{ lookup('community.general.collection_version', 'community.general') }}"
-"""
-
-RETURN = """
-  _raw:
-    description:
-      - The version number of the collections listed as input.
-      - If a collection can not be found, it will return the value provided in I(result_not_found).
-        By default, this is C(none).
-      - If a collection can be found, but the version not identified, it will return the value provided in
-        I(result_no_version). By default, this is C(*). This can happen for collections installed
-        from git which do not have a version number in C(galaxy.yml).
-    type: list
-    elements: str
-"""
-
-import json
-import os
-import re
-
-import yaml
-
-from ansible.errors import AnsibleLookupError
-from ansible.module_utils.compat.importlib import import_module
-from ansible.plugins.lookup import LookupBase
-
-
-FQCN_RE = re.compile(r'^[A-Za-z0-9_]+\.[A-Za-z0-9_]+$')
-
-
-def load_collection_meta_manifest(manifest_path):
-    with open(manifest_path, 'rb') as f:
-        meta = json.load(f)
-    return {
-        'version': meta['collection_info']['version'],
-    }
-
-
-def load_collection_meta_galaxy(galaxy_path, no_version='*'):
-    with open(galaxy_path, 'rb') as f:
-        meta = yaml.safe_load(f)
-    return {
-        'version': meta.get('version') or no_version,
-    }
-
-
-def load_collection_meta(collection_pkg, no_version='*'):
-    path = os.path.dirname(collection_pkg.__file__)
-
-    # Try to load MANIFEST.json
-    manifest_path = os.path.join(path, 'MANIFEST.json')
-    if os.path.exists(manifest_path):
-        return load_collection_meta_manifest(manifest_path)
-
-    # Try to load galaxy.y(a)ml
-    galaxy_path = os.path.join(path, 'galaxy.yml')
-    galaxy_alt_path = os.path.join(path, 'galaxy.yaml')
-    # galaxy.yaml was only supported in ansible-base 2.10 and ansible-core 2.11. Support was removed
-    # in https://github.com/ansible/ansible/commit/595413d11346b6f26bb3d9df2d8e05f2747508a3 for
-    # ansible-core 2.12.
-    for path in (galaxy_path, galaxy_alt_path):
-        if os.path.exists(path):
-            return load_collection_meta_galaxy(path, no_version=no_version)
-
-    return {}
-
-
-class LookupModule(LookupBase):
-    def run(self, terms, variables=None, **kwargs):
-        result = []
-        self.set_options(var_options=variables, direct=kwargs)
-        not_found = self.get_option('result_not_found')
-        no_version = self.get_option('result_no_version')
-
-        for term in terms:
-            if not FQCN_RE.match(term):
-                raise AnsibleLookupError('"{term}" is not a FQCN'.format(term=term))
-
-            try:
-                collection_pkg = import_module('ansible_collections.{fqcn}'.format(fqcn=term))
-            except ImportError:
-                # Collection not found
-                result.append(not_found)
-                continue
-
-            try:
-                data = load_collection_meta(collection_pkg, no_version=no_version)
-            except Exception as exc:
-                raise AnsibleLookupError('Error while loading metadata for {fqcn}: {error}'.format(fqcn=term, error=exc))
-
-            result.append(data.get('version', no_version))
-
-        return result

plugins/lookup/consul_kv.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2015, Steve Gargan <steve.gargan@gmail.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -107,7 +106,7 @@ import os
 from ansible.module_utils.six.moves.urllib.parse import urlparse
 from ansible.errors import AnsibleError, AnsibleAssertionError
 from ansible.plugins.lookup import LookupBase
-from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils._text import to_text
 
 try:
     import consul

plugins/lookup/credstash.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2015, Ensighten <infra@ensighten.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)