Release 3.5.0.

Support older version of psutil (RHEL7 and RHEL6) (#2808 ) (#3189 )
* Support older version of psutil (RHEL7 and RHEL6) The psutil python module is a true mess, they changed the API twice. The function arguments, as well as the objects that are returned. The documentation does not make it clear which version supports what so the safest implementation is this waterfall approach. A better approach would be to inspect the returned information, rather than trust a version, but that would not be any more efficient. In the end it is better to have something that at least works out-of-the-box on all platforms than something that requires custom updates to system packages before it works as expected. Especially for something as basic as `pids`. * A little bit more concise * Apply suggestions from code review * Add changelog fragment. Co-authored-by: Felix Fontein <felix@fontein.de> (cherry picked from commit b5d6457611) Co-authored-by: Dag Wieers <dag@wieers.com>
2026-04-28 17:36:49 +00:00 · 2021-08-10 17:03:35 +02:00 · 2021-08-10 08:08:50 +02:00 · 2021-08-10 07:52:36 +02:00 · 2021-08-09 23:12:35 +02:00 · 2021-08-09 23:10:03 +02:00
456 changed files with 9629 additions and 1448 deletions
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -186,8 +186,8 @@ stages:
              test: macos/11.1
            - name: RHEL 7.9
              test: rhel/7.9
-            - name: RHEL 8.3
-              test: rhel/8.3
+            - name: RHEL 8.4
+              test: rhel/8.4
            - name: FreeBSD 12.2
              test: freebsd/12.2
            - name: FreeBSD 13.0
--- a/.github/BOTMETA.yml
+++ b/.github/BOTMETA.yml
@@ -2,6 +2,7 @@ automerge: true
 files:
  plugins/:
    supershipit: quidame Ajpantuso
+  changelogs/: {}
  changelogs/fragments/:
    support: community
  $actions:
@@ -12,17 +13,63 @@ 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/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/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
@@ -31,16 +78,26 @@ files:
  $callbacks/unixy.py:
    maintainers: akatch
    labels: unixy
+  $callbacks/yaml.py: {}
  $connections/:
    labels: connections
-  $connections/kubectl.py:
-    maintainers: chouseknecht fabianvf flaper87 maxamillion
-    labels: k8s kubectl
+  $connections/chroot.py: {}
+  $connections/funcd.py:
+    maintainers: mscherer
+  $connections/iocage.py: {}
+  $connections/jail.py:
+    maintainers: $team_ansible_core
+  $connections/lxc.py: {}
  $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:
@@ -60,65 +117,99 @@ 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/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/proxmox.py:
    maintainers: $team_virt ilijamt
  $inventories/scaleway.py:
    maintainers: $team_scaleway
    labels: cloud scaleway
+  $inventories/stackpath_compute.py:
+    maintainers: shayrybak
+  $inventories/virtualbox.py: {}
  $lookups/:
    labels: lookups
-  $lookups/onepass:
-    maintainers: samdoran
-    labels: onepassword
-  $lookups/conjur_variable.py:
-    notify: cyberark-bizdev
-    maintainers: $team_cyberark_conjur
-    labels: conjur_variable
+  $lookups/cartesian.py: {}
+  $lookups/chef_databag.py: {}
+  $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/tss.py:
-    maintainers: amigus
+  $lookups/dnstxt.py:
+    maintainers: jpmens
  $lookups/dsv.py:
    maintainers: amigus
+  $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/nios:
    maintainers: $team_networking sganesh-infoblox
    labels: infoblox networking
+  $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/random_string.py:
    maintainers: Akasurde
+  $lookups/redis.py:
+    maintainers: $team_ansible_core jpmens
+  $lookups/shelvefile.py: {}
+  $lookups/tss.py:
+    maintainers: amigus
  $module_utils/:
    labels: module_utils
  $module_utils/gitlab.py:
@@ -159,11 +250,13 @@ files:
  $module_utils/redfish_utils.py:
    maintainers: $team_redfish
    labels: redfish_utils
-  $module_utils/remote_management/lxca/common.py: navalkp prabhosa
+  $module_utils/remote_management/lxca/common.py:
+    maintainers: navalkp prabhosa
  $module_utils/scaleway.py:
    maintainers: $team_scaleway
    labels: cloud scaleway
-  $module_utils/storage/hpe3par/hpe3par.py: farhan7500 gautamphegde
+  $module_utils/storage/hpe3par/hpe3par.py:
+    maintainers: farhan7500 gautamphegde
  $module_utils/utm_utils.py:
    maintainers: $team_e_spirit
    labels: utm_utils
@@ -194,33 +287,27 @@ 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.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:
+  $modules/cloud/misc/proxmox:
    maintainers: $team_virt
    labels: proxmox virt
    keywords: kvm libvirt proxmox qemu
-  $modules/cloud/misc/proxmox_template.py:
-    maintainers: $team_virt UnderGreen
-    labels: proxmox_template virt
+  $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
    ignore: skvidal
-    keywords: kvm libvirt proxmox qemu
  $modules/cloud/misc/rhevm.py:
    maintainers: $team_virt TimothyVandenbrande
    labels: rhevm virt
@@ -262,16 +349,40 @@ 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/:
@@ -283,13 +394,17 @@ files:
  $modules/cloud/scaleway/scaleway_ip_info.py:
    maintainers: Spredzy
  $modules/cloud/scaleway/scaleway_organization_info.py:
-    maintainers: sieben
+    maintainers: sieben Spredzy
  $modules/cloud/scaleway/scaleway_security_group.py:
    maintainers: DenBeke
  $modules/cloud/scaleway/scaleway_security_group_info.py:
-    maintainers: sieben
+    maintainers: sieben Spredzy
  $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
@@ -341,6 +456,8 @@ files:
    maintainers: john-westcott-iv
  $modules/database/misc/redis.py:
    maintainers: slok
+  $modules/database/misc/redis_info.py:
+    maintainers: levonet
  $modules/database/misc/riak.py:
    maintainers: drewkerrigan jsmartin
  $modules/database/mssql/mssql_db.py:
@@ -356,10 +473,14 @@ 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
@@ -377,15 +498,24 @@ 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_realm.py:
    maintainers: kris2kris
+  $modules/identity/keycloak/keycloak_role.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:
@@ -396,6 +526,8 @@ 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:
@@ -459,10 +591,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:
@@ -486,13 +618,29 @@ 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
+    maintainers: amasolov nerzhul
+  $modules/net_tools/pritunl/:
+    maintainers: Lowess
  $modules/net_tools/nios/:
    maintainers: $team_networking
    labels: infoblox networking
+  $modules/net_tools/nios/nios_a_record.py:
+    maintainers: brampling
+  $modules/net_tools/nios/nios_aaaa_record.py:
+    maintainers: brampling
+  $modules/net_tools/nios/nios_cname_record.py:
+    maintainers: brampling
  $modules/net_tools/nios/nios_fixed_address.py:
    maintainers: sjaiswal
+  $modules/net_tools/nios/nios_member.py:
+    maintainers: krisvasudevan
+  $modules/net_tools/nios/nios_mx_record.py:
+    maintainers: brampling
+  $modules/net_tools/nios/nios_naptr_record.py:
+    maintainers: brampling
  $modules/net_tools/nios/nios_nsgroup.py:
    maintainers: ebirn sjaiswal
  $modules/net_tools/nios/nios_ptr_record.py:
@@ -505,18 +653,16 @@ files:
    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_spark.py:
+  $modules/notification/cisco_webex.py:
    maintainers: drew-russell
+  $modules/notification/discord.py:
+    maintainers: cwollinger
  $modules/notification/flowdock.py:
    maintainers: mcodd
  $modules/notification/grove.py:
@@ -544,13 +690,13 @@ files:
  $modules/notification/pushbullet.py:
    maintainers: willybarro
  $modules/notification/pushover.py:
-    maintainers: weaselkeeper
+    maintainers: weaselkeeper wopfel
  $modules/notification/rocketchat.py:
    maintainers: Deepakkothandan
    labels: rocketchat
    ignore: ramondelafuente
  $modules/notification/say.py:
-    maintainers: ansible mpdehaan
+    maintainers: $team_ansible_core mpdehaan
  $modules/notification/sendgrid.py:
    maintainers: makaimc
  $modules/notification/slack.py:
@@ -558,11 +704,13 @@ files:
  $modules/notification/syslogger.py:
    maintainers: garbled1
  $modules/notification/telegram.py:
-    maintainers: tyouxa loms
+    maintainers: tyouxa loms lomserman
  $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:
@@ -575,7 +723,7 @@ files:
  $modules/packaging/language/easy_install.py:
    maintainers: mattupstate
  $modules/packaging/language/gem.py:
-    maintainers: ansible johanwiren
+    maintainers: $team_ansible_core johanwiren
    labels: gem
  $modules/packaging/language/maven_artifact.py:
    maintainers: tumbl3w33d turb
@@ -596,6 +744,8 @@ files:
    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:
@@ -787,6 +937,8 @@ 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:
@@ -795,13 +947,6 @@ 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/:
@@ -820,6 +965,8 @@ files:
    maintainers: mulby
    labels: alternatives
    ignore: DavidWittman
+  $modules/system/aix_lvol.py:
+    maintainers: adejoux
  $modules/system/awall.py:
    maintainers: tdtrask
  $modules/system/beadm.py:
@@ -837,7 +984,7 @@ files:
  $modules/system/dpkg_divert.py:
    maintainers: quidame
  $modules/system/facter.py:
-    maintainers: ansible gamethis
+    maintainers: $team_ansible_core gamethis
    labels: facter
  $modules/system/filesystem.py:
    maintainers: pilou- abulimov quidame
@@ -855,7 +1002,7 @@ files:
  $modules/system/java_cert.py:
    maintainers: haad absynth76
  $modules/system/java_keystore.py:
-    maintainers: Mogztter
+    maintainers: Mogztter quidame
  $modules/system/kernel_blacklist.py:
    maintainers: matze
  $modules/system/launchd.py:
@@ -869,7 +1016,7 @@ files:
  $modules/system/lvg.py:
    maintainers: abulimov
  $modules/system/lvol.py:
-    maintainers: abulimov jhoekx
+    maintainers: abulimov jhoekx zigaSRC unkaputtbar112
  $modules/system/make.py:
    maintainers: LinusU
  $modules/system/mksysb.py:
@@ -882,7 +1029,7 @@ files:
  $modules/system/nosh.py:
    maintainers: tacatac
  $modules/system/ohai.py:
-    maintainers: ansible mpdehaan
+    maintainers: $team_ansible_core mpdehaan
    labels: ohai
  $modules/system/open_iscsi.py:
    maintainers: srvg
@@ -911,6 +1058,8 @@ 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:
@@ -923,6 +1072,8 @@ 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:
@@ -938,10 +1089,13 @@ files:
    maintainers: ahtik ovcharenko pyykkis
    labels: ufw
  $modules/system/vdo.py:
-    maintainers: rhawalsh
+    maintainers: rhawalsh bgurney-rh
  $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:
@@ -958,11 +1112,13 @@ files:
  $modules/web_infrastructure/gunicorn.py:
    maintainers: agmezr
  $modules/web_infrastructure/htpasswd.py:
-    maintainers: ansible
+    maintainers: $team_ansible_core
    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:
@@ -972,11 +1128,13 @@ files:
  $modules/web_infrastructure/jenkins_script.py:
    maintainers: hogarthj
  $modules/web_infrastructure/jira.py:
-    maintainers: Slezhuk tarka
+    maintainers: Slezhuk tarka pertoft DWSR
    labels: jira
  $modules/web_infrastructure/nginx_status_info.py:
    maintainers: resmo
-  $modules/web_infrastructure/:
+  $modules/web_infrastructure/rundeck_acl_policy.py:
+    maintainers: nerzhul
+  $modules/web_infrastructure/rundeck_project.py:
    maintainers: nerzhul
  $modules/web_infrastructure/sophos_utm/:
    maintainers: $team_e_spirit
@@ -987,6 +1145,14 @@ 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:
@@ -1006,17 +1172,18 @@ 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
+  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
@@ -1032,7 +1199,6 @@ 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
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@

-# 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
+# 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

 ### dotenv ###
 .env
@@ -88,7 +88,7 @@ flycheck_*.el
 .nfs*

 ### PyCharm+all ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

 # User-specific stuff
@@ -98,6 +98,9 @@ flycheck_*.el
 .idea/**/dictionaries
 .idea/**/shelf

+# AWS User-specific
+.idea/**/aws.xml
+
 # Generated files
 .idea/**/contentModel.xml

@@ -118,6 +121,9 @@ 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
@@ -198,7 +204,6 @@ parts/
 sdist/
 var/
 wheels/
-pip-wheel-metadata/
 share/python-wheels/
 *.egg-info/
 .installed.cfg
@@ -225,13 +230,25 @@ 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

@@ -239,9 +256,19 @@ coverage.xml
 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
@@ -251,12 +278,24 @@ target/
 #   install all needed dependencies.
 #Pipfile.lock

-# celery beat schedule file
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
 celerybeat-schedule
+celerybeat.pid

 # SageMath parsed files
 *.sage.py

+# Environments
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
 # Spyder project settings
 .spyderproject
 .spyproject
@@ -264,10 +303,6 @@ celerybeat-schedule
 # Rope project settings
 .ropeproject

-# Mr Developer
-.mr.developer.cfg
-.project
-
 # mkdocs documentation
 /site

@@ -279,9 +314,16 @@ 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]
@@ -299,11 +341,13 @@ tags
 [._]*.un~

 ### WebStorm ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

 # User-specific stuff

+# AWS User-specific
+
 # Generated files

 # Sensitive or high-churn files
@@ -314,6 +358,9 @@ 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
@@ -349,15 +396,27 @@ 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
@@ -384,4 +443,4 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk

-# End of https://www.gitignore.io/api/git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv
+# End of https://www.toptal.com/developers/gitignore/api/git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,188 @@ Community General Release Notes

 This changelog describes changes after version 2.0.0.

+v3.5.0
+======
+
+Release Summary
+---------------
+
+Regular bugfix and feature release.
+
+Minor Changes
+-------------
+
+- apache2_module - minor refactoring improving code quality, readability and speed (https://github.com/ansible-collections/community.general/pull/3106).
+- dnsimple - module rewrite to include support for python-dnsimple>=2.0.0; also add ``sandbox`` parameter (https://github.com/ansible-collections/community.general/pull/2946).
+- github_repo - add new option ``api_url``  to allow working with on premises installations (https://github.com/ansible-collections/community.general/pull/3038).
+- gunicorn - search for ``gunicorn`` binary in more paths (https://github.com/ansible-collections/community.general/pull/3092).
+- hana_query - added the abillity to use hdbuserstore (https://github.com/ansible-collections/community.general/pull/3125).
+- hpilo_info - added ``host_power_status`` return value to report power state of machine with ``OFF``, ``ON`` or ``UNKNOWN`` (https://github.com/ansible-collections/community.general/pull/3079).
+- nmcli - add ``dummy`` interface support (https://github.com/ansible-collections/community.general/issues/724).
+- nmcli - add ``wifi-sec`` option change detection to support managing secure Wi-Fi connections (https://github.com/ansible-collections/community.general/pull/3136).
+- nmcli - add ``wifi`` option to support managing Wi-Fi settings such as ``hidden`` or ``mode`` (https://github.com/ansible-collections/community.general/pull/3081).
+- pkgin - in case of ``pkgin`` tool failue, display returned standard output ``stdout`` and standard error ``stderr`` to ease debugging (https://github.com/ansible-collections/community.general/issues/3146).
+- proxmox inventory plugin - added snapshots to host facts (https://github.com/ansible-collections/community.general/pull/3044).
+- redfish_command - add ``boot_override_mode`` argument to BootSourceOverride commands (https://github.com/ansible-collections/community.general/issues/3134).
+- supervisorctl - using standard Ansible mechanism to validate ``signalled`` state required parameter (https://github.com/ansible-collections/community.general/pull/3068).
+
+Security Fixes
+--------------
+
+- nmcli - do not pass WiFi secrets on the ``nmcli`` command line. Use ``nmcli con edit`` instead and pass secrets as ``stdin`` (https://github.com/ansible-collections/community.general/issues/3145).
+
+Bugfixes
+--------
+
+- ali_instance_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- archive - fixing archive root determination when longest common root is ``/`` (https://github.com/ansible-collections/community.general/pull/3036).
+- deploy_helper - improved parameter checking by using standard Ansible construct (https://github.com/ansible-collections/community.general/pull/3104).
+- django_manage - refactor to call ``run_command()`` passing command as a list instead of string (https://github.com/ansible-collections/community.general/pull/3098).
+- ejabberd_user - replaced in-code check with ``required_if``, using ``get_bin_path()`` for the command, passing args to ``run_command()`` as list instead of string (https://github.com/ansible-collections/community.general/pull/3093).
+- gitlab_group_members - fixes issue when gitlab group has more then 20 members, pagination problem (https://github.com/ansible-collections/community.general/issues/3041).
+- gitlab_project_members - fixes issue when gitlab group has more then 20 members, pagination problem (https://github.com/ansible-collections/community.general/issues/3041).
+- idrac_redfish_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- ini_file - fix inconsistency between empty value and no value (https://github.com/ansible-collections/community.general/issues/3031).
+- java_cert - import private key as well as public certificate from PKCS#12 (https://github.com/ansible-collections/community.general/issues/2460).
+- memset_memstore_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- memset_server_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- oneview_datacenter_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- oneview_enclosure_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- oneview_ethernet_network_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- oneview_fc_network_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- oneview_fcoe_network_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- oneview_logical_interconnect_group_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- oneview_network_set_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- oneview_san_manager_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- openbsd_pkg - fix regexp matching crash. This bug could trigger on package names with special characters, for example ``g++`` (https://github.com/ansible-collections/community.general/pull/3161).
+- pids - avoid crashes for older ``psutil`` versions, like on RHEL6 and RHEL7 (https://github.com/ansible-collections/community.general/pull/2808).
+- proxmox inventory plugin - fixed plugin failure when a ``qemu`` guest has no ``template`` key (https://github.com/ansible-collections/community.general/pull/3052).
+- proxmox_kvm - fix result of clone, now returns ``newid`` instead of ``vmid`` (https://github.com/ansible-collections/community.general/pull/3034).
+- rax_facts - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- redfish_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- smartos_image_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- snmp_facts - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- supervisorctl - state ``signalled`` was not working (https://github.com/ansible-collections/community.general/pull/3068).
+- taiga - some constructs in the module fixed to work also in Python 3 (https://github.com/ansible-collections/community.general/pull/3067).
+- tss lookup plugin - fixed incompatibility with ``python-tss-sdk`` version 1.0.0 (https://github.com/ansible-collections/community.general/issues/3057, https://github.com/ansible-collections/community.general/pull/3139).
+- utm_aaa_group_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- utm_ca_host_key_cert_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- utm_network_interface_address_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- utm_proxy_frontend_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- utm_proxy_location_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- xenserver_facts - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+- xfconf_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+
+New Modules
+-----------
+
+Identity
+~~~~~~~~
+
+keycloak
+^^^^^^^^
+
+- keycloak_client_rolemapping - Allows administration of Keycloak client_rolemapping with the Keycloak API
+
+Packaging
+~~~~~~~~~
+
+language
+^^^^^^^^
+
+- ansible_galaxy_install - Install Ansible roles or collections using ansible-galaxy
+
+System
+~~~~~~
+
+- sap_task_list_execute - Perform SAP Task list execution
+- xfconf_info - Retrieve XFCE4 configurations
+
+v3.4.0
+======
+
+Release Summary
+---------------
+
+Regular bugfix and feature release.
+
+Minor Changes
+-------------
+
+- archive - added ``dest_state`` return value to describe final state of ``dest`` after successful task execution (https://github.com/ansible-collections/community.general/pull/2913).
+- archive - refactoring prior to fix for idempotency checks. The fix will be a breaking change and only appear in community.general 4.0.0 (https://github.com/ansible-collections/community.general/pull/2987).
+- datadog_monitor - allow creation of composite datadog monitors (https://github.com/ansible-collections/community.general/issues/2956).
+- filesystem - extend support for FreeBSD. Avoid potential data loss by checking existence of a filesystem with ``fstyp`` (native command) if ``blkid`` (foreign command) doesn't find one. Add support for character devices and ``ufs`` filesystem type (https://github.com/ansible-collections/community.general/pull/2902).
+- gitlab_project - add new options ``allow_merge_on_skipped_pipeline``, ``only_allow_merge_if_all_discussions_are_resolved``, ``only_allow_merge_if_pipeline_succeeds``, ``packages_enabled``, ``remove_source_branch_after_merge``, ``squash_option`` (https://github.com/ansible-collections/community.general/pull/3002).
+- jenkins_job_info - the ``password`` and ``token`` parameters can also be omitted to retrieve only public information (https://github.com/ansible-collections/community.general/pull/2948).
+- keycloak_authentication - enhanced diff mode to also return before and after state when the authentication flow is updated (https://github.com/ansible-collections/community.general/pull/2963).
+- keycloak_client - add ``authentication_flow_binding_overrides`` option (https://github.com/ansible-collections/community.general/pull/2949).
+- module_helper module utils - added feature flag parameters to ``CmdMixin`` to control whether ``rc``, ``out`` and ``err`` are automatically added to the module output (https://github.com/ansible-collections/community.general/pull/2922).
+- nmcli - add ``runner`` and ``runner_hwaddr_policy`` options (https://github.com/ansible-collections/community.general/issues/2901).
+- rax_mon_notification_plan - fixed validation checks by specifying type ``str`` as the ``elements`` of parameters ``ok_state``, ``warning_state`` and ``critical_state`` (https://github.com/ansible-collections/community.general/pull/2955).
+
+Bugfixes
+--------
+
+- launchd - fixed sanity check in the module's code (https://github.com/ansible-collections/community.general/pull/2960).
+- pamd - fixed problem with files containing only one or two lines (https://github.com/ansible-collections/community.general/issues/2925).
+- proxmox inventory plugin - fixed parsing failures when some cluster nodes are offline (https://github.com/ansible-collections/community.general/issues/2931).
+- redfish_command - fix extraneous error caused by missing ``bootdevice`` argument when using the ``DisableBootOverride`` sub-command (https://github.com/ansible-collections/community.general/issues/3005).
+- snap - fix formatting of ``--channel`` argument when the ``channel`` option is used (https://github.com/ansible-collections/community.general/pull/3028).
+
+New Modules
+-----------
+
+Identity
+~~~~~~~~
+
+keycloak
+^^^^^^^^
+
+- keycloak_clientscope - Allows administration of Keycloak client_scopes via Keycloak API
+- keycloak_role - Allows administration of Keycloak roles via Keycloak API
+
+Source Control
+~~~~~~~~~~~~~~
+
+gitlab
+^^^^^^
+
+- gitlab_protected_branch - (un)Marking existing branches for protection
+
+v3.3.2
+======
+
+Release Summary
+---------------
+
+Extraordinary bugfix release to fix some annoying bugs.
+
+Bugfixes
+--------
+
+- archive - fixed task failure when using the ``remove`` option with a ``path`` containing nested files for ``format``s other than ``zip`` (https://github.com/ansible-collections/community.general/issues/2919).
+- lvol - honor ``check_mode`` on thinpool (https://github.com/ansible-collections/community.general/issues/2934).
+- module_helper module utils - fixed change-tracking for dictionaries and lists (https://github.com/ansible-collections/community.general/pull/2951).
+- npm - correctly handle cases where a dependency does not have a ``version`` property because it is either missing or invalid (https://github.com/ansible-collections/community.general/issues/2917).
+- pacman - fix changed status when ignorepkg has been defined (https://github.com/ansible-collections/community.general/issues/1758).
+- snap - fixed the order of the ``--classic`` parameter in the command line invocation (https://github.com/ansible-collections/community.general/issues/2916).
+
+v3.3.1
+======
+
+Release Summary
+---------------
+
+Extraordinary bugfix release to fix a fatal bug in ``snap``.
+
+Bugfixes
+--------
+
+- keycloak_authentication - fix bug when two identical executions are in the same authentication flow (https://github.com/ansible-collections/community.general/pull/2904).
+- module_helper module utils - avoid failing when non-zero ``rc`` is present on regular exit (https://github.com/ansible-collections/community.general/pull/2912).
+- snap - fix various bugs which prevented the module from working at all, and which resulted in ``state=absent`` fail on absent snaps (https://github.com/ansible-collections/community.general/issues/2835, https://github.com/ansible-collections/community.general/issues/2906, https://github.com/ansible-collections/community.general/pull/2912).
+
 v3.3.0
 ======

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,9 +23,9 @@ 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.
-* 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 squash your commits and force-push to your branch if not needed. Reviews of your pull request are much easier with individual commits to comprehend the pull request history. All commits of your pull request branch will be squashed into one commit by GitHub upon merge.
 * Do not add merge commits to your PR. The bot will complain and you will have to rebase ([instructions for rebasing](https://docs.ansible.com/ansible/latest/dev_guide/developing_rebasing.html)) to remove them before your PR can be merged. To avoid that git automatically does merges during pulls, you can configure it to do rebases instead by running `git config pull.rebase true` inside the 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 :) )

 You can also read [our Quick-start development guide](https://github.com/ansible/community-docs/blob/main/create_pr_quick_start_guide.rst).

@@ -34,3 +34,34 @@ You can also read [our Quick-start development guide](https://github.com/ansible
 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. 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.
+
+3. 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/`.
+
+4. 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.
--- a/README.md
+++ b/README.md
@@ -58,7 +58,9 @@ See [Ansible Using collections](https://docs.ansible.com/ansible/latest/user_gui

 ## Contributing to this collection

-The content of this collection is made by good people like you, a community of individuals collaborating on making the world better through developing automation software.
+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.
+
+We are actively accepting new contributors.

 All types of contributions are very welcome.

--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1392,3 +1392,235 @@ releases:
      name: keycloak_authentication
      namespace: identity.keycloak
    release_date: '2021-06-29'
+  3.3.1:
+    changes:
+      bugfixes:
+      - keycloak_authentication - fix bug when two identical executions are in the
+        same authentication flow (https://github.com/ansible-collections/community.general/pull/2904).
+      - module_helper module utils - avoid failing when non-zero ``rc`` is present
+        on regular exit (https://github.com/ansible-collections/community.general/pull/2912).
+      - snap - fix various bugs which prevented the module from working at all, and
+        which resulted in ``state=absent`` fail on absent snaps (https://github.com/ansible-collections/community.general/issues/2835,
+        https://github.com/ansible-collections/community.general/issues/2906, https://github.com/ansible-collections/community.general/pull/2912).
+      release_summary: Extraordinary bugfix release to fix a fatal bug in ``snap``.
+    fragments:
+    - 2904-fix-bug-when-2-identical-executions-in-same-auth-flow.yml
+    - 2912-snap-module-helper.yml
+    - 3.3.1.yml
+    release_date: '2021-07-01'
+  3.3.2:
+    changes:
+      bugfixes:
+      - archive - fixed task failure when using the ``remove`` option with a ``path``
+        containing nested files for ``format``s other than ``zip`` (https://github.com/ansible-collections/community.general/issues/2919).
+      - lvol - honor ``check_mode`` on thinpool (https://github.com/ansible-collections/community.general/issues/2934).
+      - module_helper module utils - fixed change-tracking for dictionaries and lists
+        (https://github.com/ansible-collections/community.general/pull/2951).
+      - npm - correctly handle cases where a dependency does not have a ``version``
+        property because it is either missing or invalid (https://github.com/ansible-collections/community.general/issues/2917).
+      - pacman - fix changed status when ignorepkg has been defined (https://github.com/ansible-collections/community.general/issues/1758).
+      - snap - fixed the order of the ``--classic`` parameter in the command line
+        invocation (https://github.com/ansible-collections/community.general/issues/2916).
+      release_summary: Extraordinary bugfix release to fix some annoying bugs.
+    fragments:
+    - 2918-snap-param-order.yml
+    - 2923-archive-remove-bugfix.yml
+    - 2924-npm-fix-package-json.yml
+    - 2935-lvol-support_check_mode_thinpool.yml
+    - 2936-pacman-fix_changed_status_when_ignorepkg_has_been_defined.yml
+    - 2951-mh-vars-deepcopy.yml
+    - 3.3.2.yml
+    release_date: '2021-07-08'
+  3.4.0:
+    changes:
+      bugfixes:
+      - launchd - fixed sanity check in the module's code (https://github.com/ansible-collections/community.general/pull/2960).
+      - pamd - fixed problem with files containing only one or two lines (https://github.com/ansible-collections/community.general/issues/2925).
+      - proxmox inventory plugin - fixed parsing failures when some cluster nodes
+        are offline (https://github.com/ansible-collections/community.general/issues/2931).
+      - redfish_command - fix extraneous error caused by missing ``bootdevice`` argument
+        when using the ``DisableBootOverride`` sub-command (https://github.com/ansible-collections/community.general/issues/3005).
+      - snap - fix formatting of ``--channel`` argument when the ``channel`` option
+        is used (https://github.com/ansible-collections/community.general/pull/3028).
+      minor_changes:
+      - archive - added ``dest_state`` return value to describe final state of ``dest``
+        after successful task execution (https://github.com/ansible-collections/community.general/pull/2913).
+      - archive - refactoring prior to fix for idempotency checks. The fix will be
+        a breaking change and only appear in community.general 4.0.0 (https://github.com/ansible-collections/community.general/pull/2987).
+      - datadog_monitor - allow creation of composite datadog monitors (https://github.com/ansible-collections/community.general/issues/2956).
+      - filesystem - extend support for FreeBSD. Avoid potential data loss by checking
+        existence of a filesystem with ``fstyp`` (native command) if ``blkid`` (foreign
+        command) doesn't find one. Add support for character devices and ``ufs`` filesystem
+        type (https://github.com/ansible-collections/community.general/pull/2902).
+      - gitlab_project - add new options ``allow_merge_on_skipped_pipeline``, ``only_allow_merge_if_all_discussions_are_resolved``,
+        ``only_allow_merge_if_pipeline_succeeds``, ``packages_enabled``, ``remove_source_branch_after_merge``,
+        ``squash_option`` (https://github.com/ansible-collections/community.general/pull/3002).
+      - jenkins_job_info - the ``password`` and ``token`` parameters can also be omitted
+        to retrieve only public information (https://github.com/ansible-collections/community.general/pull/2948).
+      - keycloak_authentication - enhanced diff mode to also return before and after
+        state when the authentication flow is updated (https://github.com/ansible-collections/community.general/pull/2963).
+      - keycloak_client - add ``authentication_flow_binding_overrides`` option (https://github.com/ansible-collections/community.general/pull/2949).
+      - module_helper module utils - added feature flag parameters to ``CmdMixin``
+        to control whether ``rc``, ``out`` and ``err`` are automatically added to
+        the module output (https://github.com/ansible-collections/community.general/pull/2922).
+      - nmcli - add ``runner`` and ``runner_hwaddr_policy`` options (https://github.com/ansible-collections/community.general/issues/2901).
+      - rax_mon_notification_plan - fixed validation checks by specifying type ``str``
+        as the ``elements`` of parameters ``ok_state``, ``warning_state`` and ``critical_state``
+        (https://github.com/ansible-collections/community.general/pull/2955).
+      release_summary: Regular bugfix and feature release.
+    fragments:
+    - 2901-nmcli_teaming.yml
+    - 2902-filesystem_extend_freebsd_support.yml
+    - 2913-archive-dest_state.yml
+    - 2922-mh-cmd-output-feature-flag.yml
+    - 2948-jenkins_job_info-remove_necessities_on_password_or_token.yml
+    - 2949-add_authentication-flow-binding_keycloak-client.yml
+    - 2955-rax_mon_notification_plan-added-elements-to-list-params.yaml
+    - 2958-datadog_monitor_support_composites.yml
+    - 2960-launchd-validation-check.yaml
+    - 2963-improve-diff-mode-on-keycloak_authentication.yml
+    - 2967-proxmox_inventory-offline-node-fix.yml
+    - 2987-archive-stage-idempotency-fix.yml
+    - 2989-pamd-single-line.yaml
+    - 3.4.0.yml
+    - 3001-enhance_gitlab_module.yml
+    - 3006-redfish_command-bootoverride-argument-check.yaml
+    - 3028-snap-channel.yml
+    modules:
+    - description: (un)Marking existing branches for protection
+      name: gitlab_protected_branch
+      namespace: source_control.gitlab
+    - description: Allows administration of Keycloak client_scopes via Keycloak API
+      name: keycloak_clientscope
+      namespace: identity.keycloak
+    - description: Allows administration of Keycloak roles via Keycloak API
+      name: keycloak_role
+      namespace: identity.keycloak
+    release_date: '2021-07-20'
+  3.5.0:
+    changes:
+      bugfixes:
+      - ali_instance_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - archive - fixing archive root determination when longest common root is ``/``
+        (https://github.com/ansible-collections/community.general/pull/3036).
+      - deploy_helper - improved parameter checking by using standard Ansible construct
+        (https://github.com/ansible-collections/community.general/pull/3104).
+      - django_manage - refactor to call ``run_command()`` passing command as a list
+        instead of string (https://github.com/ansible-collections/community.general/pull/3098).
+      - ejabberd_user - replaced in-code check with ``required_if``, using ``get_bin_path()``
+        for the command, passing args to ``run_command()`` as list instead of string
+        (https://github.com/ansible-collections/community.general/pull/3093).
+      - gitlab_group_members - fixes issue when gitlab group has more then 20 members,
+        pagination problem (https://github.com/ansible-collections/community.general/issues/3041).
+      - gitlab_project_members - fixes issue when gitlab group has more then 20 members,
+        pagination problem (https://github.com/ansible-collections/community.general/issues/3041).
+      - idrac_redfish_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - ini_file - fix inconsistency between empty value and no value (https://github.com/ansible-collections/community.general/issues/3031).
+      - java_cert - import private key as well as public certificate from PKCS#12
+        (https://github.com/ansible-collections/community.general/issues/2460).
+      - memset_memstore_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - memset_server_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - oneview_datacenter_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - oneview_enclosure_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - oneview_ethernet_network_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - oneview_fc_network_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - oneview_fcoe_network_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - oneview_logical_interconnect_group_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - oneview_network_set_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - oneview_san_manager_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - openbsd_pkg - fix regexp matching crash. This bug could trigger on package
+        names with special characters, for example ``g++`` (https://github.com/ansible-collections/community.general/pull/3161).
+      - pids - avoid crashes for older ``psutil`` versions, like on RHEL6 and RHEL7
+        (https://github.com/ansible-collections/community.general/pull/2808).
+      - proxmox inventory plugin - fixed plugin failure when a ``qemu`` guest has
+        no ``template`` key (https://github.com/ansible-collections/community.general/pull/3052).
+      - proxmox_kvm - fix result of clone, now returns ``newid`` instead of ``vmid``
+        (https://github.com/ansible-collections/community.general/pull/3034).
+      - rax_facts - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - redfish_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - smartos_image_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - snmp_facts - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - supervisorctl - state ``signalled`` was not working (https://github.com/ansible-collections/community.general/pull/3068).
+      - taiga - some constructs in the module fixed to work also in Python 3 (https://github.com/ansible-collections/community.general/pull/3067).
+      - tss lookup plugin - fixed incompatibility with ``python-tss-sdk`` version
+        1.0.0 (https://github.com/ansible-collections/community.general/issues/3057,
+        https://github.com/ansible-collections/community.general/pull/3139).
+      - utm_aaa_group_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - utm_ca_host_key_cert_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - utm_network_interface_address_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - utm_proxy_frontend_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - utm_proxy_location_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - xenserver_facts - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      - xfconf_info - added support to check mode (https://github.com/ansible-collections/community.general/pull/3084).
+      minor_changes:
+      - apache2_module - minor refactoring improving code quality, readability and
+        speed (https://github.com/ansible-collections/community.general/pull/3106).
+      - dnsimple - module rewrite to include support for python-dnsimple>=2.0.0; also
+        add ``sandbox`` parameter (https://github.com/ansible-collections/community.general/pull/2946).
+      - github_repo - add new option ``api_url``  to allow working with on premises
+        installations (https://github.com/ansible-collections/community.general/pull/3038).
+      - gunicorn - search for ``gunicorn`` binary in more paths (https://github.com/ansible-collections/community.general/pull/3092).
+      - hana_query - added the abillity to use hdbuserstore (https://github.com/ansible-collections/community.general/pull/3125).
+      - hpilo_info - added ``host_power_status`` return value to report power state
+        of machine with ``OFF``, ``ON`` or ``UNKNOWN`` (https://github.com/ansible-collections/community.general/pull/3079).
+      - nmcli - add ``dummy`` interface support (https://github.com/ansible-collections/community.general/issues/724).
+      - nmcli - add ``wifi-sec`` option change detection to support managing secure
+        Wi-Fi connections (https://github.com/ansible-collections/community.general/pull/3136).
+      - nmcli - add ``wifi`` option to support managing Wi-Fi settings such as ``hidden``
+        or ``mode`` (https://github.com/ansible-collections/community.general/pull/3081).
+      - pkgin - in case of ``pkgin`` tool failue, display returned standard output
+        ``stdout`` and standard error ``stderr`` to ease debugging (https://github.com/ansible-collections/community.general/issues/3146).
+      - proxmox inventory plugin - added snapshots to host facts (https://github.com/ansible-collections/community.general/pull/3044).
+      - redfish_command - add ``boot_override_mode`` argument to BootSourceOverride
+        commands (https://github.com/ansible-collections/community.general/issues/3134).
+      - supervisorctl - using standard Ansible mechanism to validate ``signalled``
+        state required parameter (https://github.com/ansible-collections/community.general/pull/3068).
+      release_summary: Regular bugfix and feature release.
+      security_fixes:
+      - nmcli - do not pass WiFi secrets on the ``nmcli`` command line. Use ``nmcli
+        con edit`` instead and pass secrets as ``stdin`` (https://github.com/ansible-collections/community.general/issues/3145).
+    fragments:
+    - 2808-pids-older-psutil.yml
+    - 2946-python-dnsimple-v2-rewrite.yml
+    - 3.5.0.yml
+    - 3034-promox-kvm-return-new-id.yaml
+    - 3036-archive-root-path-fix.yml
+    - 3038-enhance_github_repo_api_url.yml
+    - 3041-fix_gitlab_group_members_gitlab_project_mambers.yml
+    - 3044-proxmox-inventory-snapshots.yml
+    - 3052_proxmox_inventory_plugin.yml
+    - 3067-taiga-bugfix.yaml
+    - 3068-supervisorctl-bugfix.yaml
+    - 3074-ini_file-3031-empty-value-inconsistency.yml
+    - 3079-report-power-state-hpilo.yaml
+    - 3080-java_cert-2460-import_private_key.yml
+    - 3081-add-wifi-option-to-nmcli-module.yml
+    - 3084-info-checkmode.yaml
+    - 3092-gunicorn-refactor.yaml
+    - 3093-ejabberd_user-refactor.yaml
+    - 3098-django_manage-cmd-list.yaml
+    - 3104-deploy_helper-required_if.yaml
+    - 3106-apache2_module-review.yaml
+    - 3125-hana-query-userstore.yaml
+    - 3132-nmcli-dummy.yaml
+    - 3135-add-redfish_command-bootoverridemode.yaml
+    - 3136-add-wifi-sec-change-detection-to-nmcli-module.yml
+    - 3139-tss-lookup-plugin-update-to-make-compatible-with-sdk-v1.yml
+    - 3160-pass-wifi-secrets-via-stdin-to-nmcli-module.yml
+    - 3161-openbsd-pkg-fix-regexp-matching-crash.yml
+    - pkgin-output-after-error.yml
+    modules:
+    - description: Install Ansible roles or collections using ansible-galaxy
+      name: ansible_galaxy_install
+      namespace: packaging.language
+    - description: Allows administration of Keycloak client_rolemapping with the Keycloak
+        API
+      name: keycloak_client_rolemapping
+      namespace: identity.keycloak
+    - description: Perform SAP Task list execution
+      name: sap_task_list_execute
+      namespace: system
+    - description: Retrieve XFCE4 configurations
+      name: xfconf_info
+      namespace: system
+    release_date: '2021-08-10'
--- a/commit-rights.md
+++ b/commit-rights.md
@@ -68,7 +68,6 @@ 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_      |                      |
 | Felix Fontein       | felixfontein         | felixfontein       |                      |
 | John R Barker       | gundalow             | gundalow           |                      |
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,6 +1,6 @@
 namespace: community
 name: general
-version: 3.3.0
+version: 3.5.0
 readme: README.md
 authors:
  - Ansible (https://github.com/ansible)
--- a/plugins/action/system/iptables_state.py
+++ b/plugins/action/system/iptables_state.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/action/system/shutdown.py
+++ b/plugins/action/system/shutdown.py
@@ -1,3 +1,4 @@
+# -*- 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>
--- a/plugins/become/doas.py
+++ b/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)
+    author: Ansible Core Team
    options:
        become_user:
            description: User you 'become' to execute the task
--- a/plugins/become/dzdo.py
+++ b/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)
+    author: Ansible Core Team
    options:
        become_user:
            description: User you 'become' to execute the task
--- a/plugins/become/ksu.py
+++ b/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)
+    author: Ansible Core Team
    options:
        become_user:
            description: User you 'become' to execute the task
--- a/plugins/become/machinectl.py
+++ b/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)
+    author: Ansible Core Team
    options:
        become_user:
            description: User you 'become' to execute the task
--- a/plugins/become/pbrun.py
+++ b/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)
+    author: Ansible Core Team
    options:
        become_user:
            description: User you 'become' to execute the task
--- a/plugins/become/pfexec.py
+++ b/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)
+    author: Ansible Core Team
    options:
        become_user:
            description:
--- a/plugins/become/pmrun.py
+++ b/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)
+    author: Ansible Core Team
    options:
        become_exe:
            description: Sudo executable
--- a/plugins/cache/memcached.py
+++ b/plugins/cache/memcached.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/cache/pickle.py
+++ b/plugins/cache/pickle.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/cache/redis.py
+++ b/plugins/cache/redis.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/cache/yaml.py
+++ b/plugins/cache/yaml.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/callback/context_demo.py
+++ b/plugins/callback/context_demo.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/callback/counter_enabled.py
+++ b/plugins/callback/counter_enabled.py
@@ -1,3 +1,4 @@
+# -*- 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)
 '''
--- a/plugins/callback/dense.py
+++ b/plugins/callback/dense.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/callback/hipchat.py
+++ b/plugins/callback/hipchat.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/callback/jabber.py
+++ b/plugins/callback/jabber.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/callback/log_plays.py
+++ b/plugins/callback/log_plays.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/callback/loganalytics.py
+++ b/plugins/callback/loganalytics.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/callback/logdna.py
+++ b/plugins/callback/logdna.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/callback/logentries.py
+++ b/plugins/callback/logentries.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/callback/logstash.py
+++ b/plugins/callback/logstash.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/callback/null.py
+++ b/plugins/callback/null.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/callback/say.py
+++ b/plugins/callback/say.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/callback/selective.py
+++ b/plugins/callback/selective.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/callback/slack.py
+++ b/plugins/callback/slack.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/callback/syslog_json.py
+++ b/plugins/callback/syslog_json.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/callback/unixy.py
+++ b/plugins/callback/unixy.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/callback/yaml.py
+++ b/plugins/callback/yaml.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/connection/chroot.py
+++ b/plugins/connection/chroot.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Based on local.py (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>
 #
 # (c) 2013, Maykel Moya <mmoya@speedyrails.com>
--- a/plugins/connection/funcd.py
+++ b/plugins/connection/funcd.py
@@ -1,3 +1,4 @@
+# -*- 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>
@@ -8,7 +9,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

 DOCUMENTATION = '''
-    author: Michael Scherer (@msherer) <misc@zarb.org>
+    author: Michael Scherer (@mscherer) <misc@zarb.org>
    name: funcd
    short_description: Use funcd to connect to target
    description:
--- a/plugins/connection/iocage.py
+++ b/plugins/connection/iocage.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Based on jail.py
 # (c) 2013, Michael Scherer <misc@zarb.org>
 # (c) 2015, Toshio Kuratomi <tkuratomi@ansible.com>
--- a/plugins/connection/jail.py
+++ b/plugins/connection/jail.py
@@ -1,3 +1,4 @@
+# -*- 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>
--- a/plugins/connection/lxc.py
+++ b/plugins/connection/lxc.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/connection/lxd.py
+++ b/plugins/connection/lxd.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/connection/qubes.py
+++ b/plugins/connection/qubes.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Based on the buildah connection plugin
 # Copyright (c) 2017 Ansible Project
 #               2018 Kushal Das
--- a/plugins/connection/saltstack.py
+++ b/plugins/connection/saltstack.py
@@ -1,3 +1,4 @@
+# -*- 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
--- a/plugins/connection/zone.py
+++ b/plugins/connection/zone.py
@@ -1,3 +1,4 @@
+# -*- 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>
--- a/plugins/doc_fragments/hpe3par.py
+++ b/plugins/doc_fragments/hpe3par.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/doc_fragments/hwc.py
+++ b/plugins/doc_fragments/hwc.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/doc_fragments/oracle.py
+++ b/plugins/doc_fragments/oracle.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/doc_fragments/oracle_creatable_resource.py
+++ b/plugins/doc_fragments/oracle_creatable_resource.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/doc_fragments/oracle_display_name_option.py
+++ b/plugins/doc_fragments/oracle_display_name_option.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/doc_fragments/oracle_name_option.py
+++ b/plugins/doc_fragments/oracle_name_option.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/doc_fragments/oracle_tags.py
+++ b/plugins/doc_fragments/oracle_tags.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/doc_fragments/oracle_wait_options.py
+++ b/plugins/doc_fragments/oracle_wait_options.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/doc_fragments/vexata.py
+++ b/plugins/doc_fragments/vexata.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/filter/dict_kv.py
+++ b/plugins/filter/dict_kv.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/filter/jc.py
+++ b/plugins/filter/jc.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2015, Filipe Niero Felisbino <filipenf@gmail.com>
 #
 # This file is part of Ansible
--- a/plugins/filter/json_query.py
+++ b/plugins/filter/json_query.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2015, Filipe Niero Felisbino <filipenf@gmail.com>
 #
 # This file is part of Ansible
--- a/plugins/filter/random_mac.py
+++ b/plugins/filter/random_mac.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2020 Ansible Project
 #
 # This file is part of Ansible
--- a/plugins/filter/version_sort.py
+++ b/plugins/filter/version_sort.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/inventory/linode.py
+++ b/plugins/inventory/linode.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/inventory/nmap.py
+++ b/plugins/inventory/nmap.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/inventory/online.py
+++ b/plugins/inventory/online.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/inventory/proxmox.py
+++ b/plugins/inventory/proxmox.py
@@ -325,6 +325,15 @@ 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")
@@ -369,6 +378,9 @@ 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'])
@@ -390,9 +402,10 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
                        elif lxc['status'] == 'running':
                            self.inventory.add_child(running_group, lxc['name'])

-                    # get LXC config for facts
+                    # get LXC config and snapshots 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())

@@ -400,7 +413,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['template']:
+                    if qemu.get('template'):
                        continue

                    self.inventory.add_host(qemu['name'])
@@ -414,9 +427,10 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
                    elif qemu['status'] == 'running':
                        self.inventory.add_child(running_group, qemu['name'])

-                    # get QEMU config for facts
+                    # get QEMU config and snapshots 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())

--- a/plugins/inventory/scaleway.py
+++ b/plugins/inventory/scaleway.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/inventory/stackpath_compute.py
+++ b/plugins/inventory/stackpath_compute.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2020 Shay Rybak <shay.rybak@stackpath.com>
 # Copyright (c) 2020 Ansible Project
 # GNU General Public License v3.0+
--- a/plugins/inventory/virtualbox.py
+++ b/plugins/inventory/virtualbox.py
@@ -1,3 +1,4 @@
+# -*- 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)

--- a/plugins/lookup/cartesian.py
+++ b/plugins/lookup/cartesian.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/lookup/chef_databag.py
+++ b/plugins/lookup/chef_databag.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/lookup/consul_kv.py
+++ b/plugins/lookup/consul_kv.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/lookup/credstash.py
+++ b/plugins/lookup/credstash.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/lookup/cyberarkpassword.py
+++ b/plugins/lookup/cyberarkpassword.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2017, Edward Nunez <edward.nunez@cyberark.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/lookup/dependent.py
+++ b/plugins/lookup/dependent.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2015-2021, Felix Fontein <felix@fontein.de>
 # (c) 2018 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -7,6 +8,7 @@ __metaclass__ = type
 DOCUMENTATION = """
 name: dependent
 short_description: Composes a list with nested elements of other lists or dicts which can depend on previous loop variables
+author: Felix Fontein (@felixfontein)
 version_added: 3.1.0
 description:
  - "Takes the input lists and returns a list with elements that are lists, dictionaries,
--- a/plugins/lookup/dig.py
+++ b/plugins/lookup/dig.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2015, Jan-Piet Mens <jpmens(at)gmail.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/lookup/dnstxt.py
+++ b/plugins/lookup/dnstxt.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2012, Jan-Piet Mens <jpmens(at)gmail.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/lookup/etcd.py
+++ b/plugins/lookup/etcd.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2013, Jan-Piet Mens <jpmens(at)gmail.com>
 # (m) 2016, Mihai Moldovanu <mihaim@tfm.ro>
 # (m) 2017, Juan Manuel Parrilla <jparrill@redhat.com>
--- a/plugins/lookup/filetree.py
+++ b/plugins/lookup/filetree.py
@@ -1,3 +1,4 @@
+# -*- 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)
--- a/plugins/lookup/flattened.py
+++ b/plugins/lookup/flattened.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2013, Serge van Ginderachter <serge@vanginderachter.be>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/lookup/hiera.py
+++ b/plugins/lookup/hiera.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2017, Juan Manuel Parrilla <jparrill@redhat.com>
 # (c) 2012-17 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/lookup/keyring.py
+++ b/plugins/lookup/keyring.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2016, Samuel Boucher <boucher.samuel.c@gmail.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/lookup/lastpass.py
+++ b/plugins/lookup/lastpass.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2016, Andrew Zenk <azenk@umn.edu>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/lookup/lmdb_kv.py
+++ b/plugins/lookup/lmdb_kv.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2017-2018, Jan-Piet Mens <jpmens(at)gmail.com>
 # (c) 2018 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/lookup/manifold.py
+++ b/plugins/lookup/manifold.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2018, Arigato Machine Inc.
 # (c) 2018, Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/lookup/nios.py
+++ b/plugins/lookup/nios.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 #  Copyright 2018 Red Hat | Ansible
 #
--- a/plugins/lookup/nios_next_ip.py
+++ b/plugins/lookup/nios_next_ip.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 #  Copyright 2018 Red Hat | Ansible
 #
--- a/plugins/lookup/nios_next_network.py
+++ b/plugins/lookup/nios_next_network.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright 2018 Red Hat | Ansible
 #
--- a/plugins/lookup/passwordstore.py
+++ b/plugins/lookup/passwordstore.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2017, Patrick Deelman <patrick@patrickdeelman.nl>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/lookup/redis.py
+++ b/plugins/lookup/redis.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2012, Jan-Piet Mens <jpmens(at)gmail.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/lookup/shelvefile.py
+++ b/plugins/lookup/shelvefile.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (c) 2015, Alejandro Guirao <lekumberri@gmail.com>
 # (c) 2012-17 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/lookup/tss.py
+++ b/plugins/lookup/tss.py
@@ -112,16 +112,17 @@ EXAMPLES = r"""
      - ansible.builtin.debug:
          msg: the password is {{ secret_password }}
 """
-
+from distutils.version import LooseVersion
 from ansible.errors import AnsibleError, AnsibleOptionsError

 sdk_is_missing = False

 try:
+    from thycotic import __version__ as sdk_version
    from thycotic.secrets.server import (
        SecretServer,
-        SecretServerAccessError,
        SecretServerError,
+        PasswordGrantAuthorizer,
    )
 except ImportError:
    sdk_is_missing = True
@@ -136,7 +137,20 @@ display = Display()
 class LookupModule(LookupBase):
    @staticmethod
    def Client(server_parameters):
-        return SecretServer(**server_parameters)
+
+        if LooseVersion(sdk_version) < LooseVersion('1.0.0'):
+            return SecretServer(**server_parameters)
+        else:
+            authorizer = PasswordGrantAuthorizer(
+                server_parameters["base_url"],
+                server_parameters["username"],
+                server_parameters["password"],
+                server_parameters["token_path_uri"],
+            )
+
+            return SecretServer(
+                server_parameters["base_url"], authorizer, server_parameters["api_path_uri"]
+            )

    def run(self, terms, variables, **kwargs):
        if sdk_is_missing:
--- a/plugins/module_utils/_mount.py
+++ b/plugins/module_utils/_mount.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # This code is part of Ansible, but is an independent component.
 # This particular file snippet, and this file snippet only, is based on
 # Lib/posixpath.py of cpython
--- a/plugins/module_utils/_netapp.py
+++ b/plugins/module_utils/_netapp.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # This code is part of Ansible, but is an independent component.
 # This particular file snippet, and this file snippet only, is BSD licensed.
 # Modules you write using this snippet, which is embedded dynamically by Ansible
--- a/plugins/module_utils/alicloud_ecs.py
+++ b/plugins/module_utils/alicloud_ecs.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # This code is part of Ansible, but is an independent component.
 # This particular file snippet, and this file snippet only, is BSD licensed.
 # Modules you write using this snippet, which is embedded dynamically by Ansible
--- a/plugins/module_utils/cloud.py
+++ b/plugins/module_utils/cloud.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # (c) 2016 Allen Sanabria, <asanabria@linuxdynasty.org>
 #
--- a/plugins/module_utils/database.py
+++ b/plugins/module_utils/database.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # This code is part of Ansible, but is an independent component.
 # This particular file snippet, and this file snippet only, is BSD licensed.
 # Modules you write using this snippet, which is embedded dynamically by Ansible
--- a/plugins/module_utils/heroku.py
+++ b/plugins/module_utils/heroku.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright: (c) 2018, Ansible Project
 # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)

--- a/plugins/module_utils/hwc_utils.py
+++ b/plugins/module_utils/hwc_utils.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright (c), Google Inc, 2017
 # Simplified BSD License (see licenses/simplified_bsd.txt or
 # https://opensource.org/licenses/BSD-2-Clause)
--- a/plugins/module_utils/ibm_sa_utils.py
+++ b/plugins/module_utils/ibm_sa_utils.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright (C) 2018 IBM CORPORATION
 # Author(s): Tzur Eliyahu <tzure@il.ibm.com>
 #
--- a/Show More
+++ b/Show More