Release 3.8.8.

* Add simplified_bsd.txt and adjust references.

* Add changelog.

(cherry picked from commit 0be68bf04b)

.azure-pipelines/azure-pipelines.yml

@@ -24,15 +24,13 @@ schedules:
     always: true
     branches:
       include:
-        - stable-3
         - stable-4
   - cron: 0 11 * * 0
     displayName: Weekly (old stable branches)
     always: true
     branches:
       include:
-        - stable-1
-        - stable-2
+        - stable-3
 
 variables:
   - name: checkoutPath
@@ -249,8 +247,8 @@ stages:
               test: rhel/7.9
             - name: RHEL 8.3
               test: rhel/8.3
-            - name: FreeBSD 12.2
-              test: freebsd/12.2
+            #- name: FreeBSD 12.2
+            #  test: freebsd/12.2
           groups:
             - 1
             - 2
@@ -281,8 +279,8 @@ stages:
               test: rhel/8.2
             - name: RHEL 7.8
               test: rhel/7.8
-            - name: FreeBSD 12.0
-              test: freebsd/12.0
+            #- name: FreeBSD 12.0
+            #  test: freebsd/12.0
           groups:
             - 1
             - 2

.github/BOTMETA.yml

@@ -124,15 +124,23 @@ files:
     maintainers: giner
   $filters/from_csv.py:
     maintainers: Ajpantuso
-  $filters/groupby:
+  $filters/groupby.py:
     maintainers: felixfontein
-  $filters/hashids:
+  $filters/groupby_as_dict.yml:
+    maintainers: felixfontein
+  $filters/hashids.py:
+    maintainers: Ajpantuso
+  $filters/hashids_decode.yml:
+    maintainers: Ajpantuso
+  $filters/hashids_encode.yml:
     maintainers: Ajpantuso
   $filters/jc.py:
     maintainers: kellyjonbrazil
   $filters/json_query.py: {}
   $filters/list.py:
     maintainers: vbotka
+  $filters/lists_mergeby.yml:
+    maintainers: vbotka
   $filters/path_join_shim.py:
     maintainers: felixfontein
   $filters/random_mac.py: {}
@@ -140,6 +148,24 @@ files:
     maintainers: resmo
   $filters/unicode_normalize.py:
     maintainers: Ajpantuso
+  $filters/to_days.yml:
+    maintainers: resmo
+  $filters/to_hours.yml:
+    maintainers: resmo
+  $filters/to_milliseconds.yml:
+    maintainers: resmo
+  $filters/to_minutes.yml:
+    maintainers: resmo
+  $filters/to_months.yml:
+    maintainers: resmo
+  $filters/to_seconds.yml:
+    maintainers: resmo
+  $filters/to_time_unit.yml:
+    maintainers: resmo
+  $filters/to_weeks.yml:
+    maintainers: resmo
+  $filters/to_years.yml:
+    maintainers: resmo
   $filters/version_sort.py:
     maintainers: ericzolf
   $inventories/:

CHANGELOG.rst

@@ -6,6 +6,47 @@ Community General Release Notes
 
 This changelog describes changes after version 2.0.0.
 
+v3.8.8
+======
+
+Release Summary
+---------------
+
+Maintenance and bugfix release.
+
+Bugfixes
+--------
+
+- Include ``simplified_bsd.txt`` license file for various module utils, the ``lxca_common`` docs fragment, and the ``utm_utils`` unit tests.
+- consul - fixed bug introduced in PR 4590 (https://github.com/ansible-collections/community.general/issues/4680).
+
+v3.8.7
+======
+
+Release Summary
+---------------
+
+Regular maintenance release.
+
+Major Changes
+-------------
+
+- The community.general 3.x.y release stream will from now on only receive major bugfixes and security fixes. There will be no more regular bugfix releases, or regular bugfixes backported to the ``stable-3`` branch.
+
+Bugfixes
+--------
+
+- Include ``PSF-license.txt`` file for ``plugins/module_utils/_version.py``.
+- consul - fixed bug where class ``ConsulService`` was overwriting the field ``checks``, preventing the addition of checks to a service (https://github.com/ansible-collections/community.general/pull/4590).
+- dnsmadeeasy - fix failure on deleting DNS entries when API response does not contain monitor value (https://github.com/ansible-collections/community.general/issues/3620).
+- gconftool2 - properly escape values when passing them to ``gconftool-2`` (https://github.com/ansible-collections/community.general/pull/4647).
+- keycloak - fix parameters types for ``defaultDefaultClientScopes`` and ``defaultOptionalClientScopes`` from list of dictionaries to list of strings (https://github.com/ansible-collections/community.general/pull/4526).
+- onepassword - search all valid configuration locations and use the first found (https://github.com/ansible-collections/community.general/pull/4640).
+- opentelemetry callback plugin - fix warning for the include_tasks (https://github.com/ansible-collections/community.general/pull/4623).
+- pritunl - fixed bug where pritunl plugin api add unneeded data in ``auth_string`` parameter (https://github.com/ansible-collections/community.general/issues/4527).
+- terraform - fix list initialization to support both Python 2 and Python 3 (https://github.com/ansible-collections/community.general/issues/4531).
+- xbps - fix error message that is reported when installing packages fails (https://github.com/ansible-collections/community.general/pull/4438).
+
 v3.8.6
 ======
 

PSF-license.txt

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

changelogs/changelog.yaml

@@ -2140,3 +2140,52 @@ releases:
     - 4421-zypper_package_version_handling_fix.yml
     - 4422-warn-user-if-incorrect-SDK-version-is-installed.yaml
     release_date: '2022-04-05'
+  3.8.7:
+    changes:
+      bugfixes:
+      - Include ``PSF-license.txt`` file for ``plugins/module_utils/_version.py``.
+      - consul - fixed bug where class ``ConsulService`` was overwriting the field
+        ``checks``, preventing the addition of checks to a service (https://github.com/ansible-collections/community.general/pull/4590).
+      - dnsmadeeasy - fix failure on deleting DNS entries when API response does not
+        contain monitor value (https://github.com/ansible-collections/community.general/issues/3620).
+      - gconftool2 - properly escape values when passing them to ``gconftool-2`` (https://github.com/ansible-collections/community.general/pull/4647).
+      - keycloak - fix parameters types for ``defaultDefaultClientScopes`` and ``defaultOptionalClientScopes``
+        from list of dictionaries to list of strings (https://github.com/ansible-collections/community.general/pull/4526).
+      - onepassword - search all valid configuration locations and use the first found
+        (https://github.com/ansible-collections/community.general/pull/4640).
+      - opentelemetry callback plugin - fix warning for the include_tasks (https://github.com/ansible-collections/community.general/pull/4623).
+      - pritunl - fixed bug where pritunl plugin api add unneeded data in ``auth_string``
+        parameter (https://github.com/ansible-collections/community.general/issues/4527).
+      - terraform - fix list initialization to support both Python 2 and Python 3
+        (https://github.com/ansible-collections/community.general/issues/4531).
+      - xbps - fix error message that is reported when installing packages fails (https://github.com/ansible-collections/community.general/pull/4438).
+      major_changes:
+      - The community.general 3.x.y release stream will from now on only receive major
+        bugfixes and security fixes. There will be no more regular bugfix releases,
+        or regular bugfixes backported to the ``stable-3`` branch.
+      release_summary: Regular maintenance release.
+    fragments:
+    - 3.8.7.yml
+    - 4065-onepassword-config.yml
+    - 4438-fix-error-message.yaml
+    - 4459-only-get-monitor-if-it-is-not-null-api-response.yaml
+    - 4526-keycloak-realm-types.yaml
+    - 4530-fix-unauthorized-pritunl-request.yaml
+    - 4590-consul-fix-service-checks.yaml
+    - 4621-terraform-py2-compat.yml
+    - 4623-opentelemetry_bug_fix_include_tasks.yml
+    - 4647-gconftool2-command-arg.yaml
+    - psf-license.yml
+    release_date: '2022-05-16'
+  3.8.8:
+    changes:
+      bugfixes:
+      - Include ``simplified_bsd.txt`` license file for various module utils, the
+        ``lxca_common`` docs fragment, and the ``utm_utils`` unit tests.
+      - consul - fixed bug introduced in PR 4590 (https://github.com/ansible-collections/community.general/issues/4680).
+      release_summary: Maintenance and bugfix release.
+    fragments:
+    - 3.8.8.yml
+    - 4712-consul-bugfix.yaml
+    - simplified-bsd-license.yml
+    release_date: '2022-06-06'

galaxy.yml

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

plugins/callback/logstash.py

@@ -45,7 +45,7 @@ DOCUMENTATION = r'''
             version_added: 1.0.0
         default: ansible
       pre_command:
-        description: Executes command before run and result put to ansible_pre_command_output field.
+        description: Executes command before run and its result is added to the C(ansible_pre_command_output) logstash field.
         version_added: 2.0.0
         ini:
           - section: callback_logstash

plugins/callback/opentelemetry.py

@@ -198,7 +198,7 @@ class OpenTelemetrySource(object):
 
         task = tasks_data[task_uuid]
 
-        if self.ansible_version is None and result._task_fields['args'].get('_ansible_version'):
+        if self.ansible_version is None and hasattr(result, '_task_fields') and result._task_fields['args'].get('_ansible_version'):
             self.ansible_version = result._task_fields['args'].get('_ansible_version')
 
         task.add_host(HostData(host_uuid, host_name, status, result))

plugins/doc_fragments/lxca_common.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2017 Lenovo, Inc.
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/filter/dict.py

@@ -6,6 +6,60 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+DOCUMENTATION = '''
+  name: dict
+  short_description: Convert a list of tuples into a dictionary
+  version_added: 3.0.0
+  author: Felix Fontein (@felixfontein)
+  description:
+    - Convert a list of tuples into a dictionary. This is a filter version of the C(dict) function.
+  options:
+    _input:
+      description: A list of tuples (with exactly two elements).
+      type: list
+      elements: tuple
+      required: true
+'''
+
+EXAMPLES = '''
+- name: Convert list of tuples into dictionary
+  ansible.builtin.set_fact:
+    dictionary: "{{ [[1, 2], ['a', 'b']] | community.general.dict }}"
+    # Result is {1: 2, 'a': 'b'}
+
+- name: Create a list of dictionaries with map and the community.general.dict filter
+  ansible.builtin.debug:
+    msg: >-
+      {{ values | map('zip', ['k1', 'k2', 'k3'])
+                | map('map', 'reverse')
+                | map('community.general.dict') }}
+  vars:
+    values:
+      - - foo
+        - 23
+        - a
+      - - bar
+        - 42
+        - b
+  # Produces the following list of dictionaries:
+  #   {
+  #     "k1": "foo",
+  #     "k2": 23,
+  #     "k3": "a"
+  #   },
+  #   {
+  #     "k1": "bar",
+  #     "k2": 42,
+  #     "k3": "b"
+  #   }
+'''
+
+RETURN = '''
+  _value:
+    description: The dictionary having the provided key-value pairs.
+    type: boolean
+'''
+
 
 def dict_filter(sequence):
     '''Convert a list of tuples to a dictionary.

plugins/filter/dict_kv.py

@@ -5,6 +5,38 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+DOCUMENTATION = '''
+  name: dict_kv
+  short_description: Convert a value to a dictionary with a single key-value pair
+  version_added: 1.3.0
+  author: Stanislav German-Evtushenko (@giner)
+  description:
+    - Convert a value to a dictionary with a single key-value pair.
+  positional: key
+  options:
+    _input:
+      description: The value for the single key-value pair.
+      type: any
+      required: true
+    key:
+      description: The key for the single key-value pair.
+      type: any
+      required: true
+'''
+
+EXAMPLES = '''
+- name: Create a one-element dictionary from a value
+  ansible.builtin.debug:
+    msg: "{{ 'myvalue' | dict_kv('mykey') }}"
+    # Produces the dictionary {'mykey': 'myvalue'}
+'''
+
+RETURN = '''
+  _value:
+    description: A dictionary with a single key-value pair.
+    type: dictionary
+'''
+
 
 def dict_kv(value, key):
     '''Return a dictionary with a single key-value pair

plugins/filter/from_csv.py

@@ -7,6 +7,78 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+DOCUMENTATION = '''
+  name: from_csv
+  short_description: Converts CSV text input into list of dicts
+  version_added: 2.3.0
+  author: Andrew Pantuso (@Ajpantuso)
+  description:
+    - Converts CSV text input into list of dictionaries.
+  options:
+    _input:
+      description: A string containing a CSV document.
+      type: string
+      required: true
+    dialect:
+      description:
+        - The CSV dialect to use when parsing the CSV file.
+        - Possible values include C(excel), C(excel-tab) or C(unix).
+      type: str
+      default: excel
+    fieldnames:
+      description:
+        - A list of field names for every column.
+        - This is needed if the CSV does not have a header.
+      type: list
+      elements: str
+    delimiter:
+      description:
+        - A one-character string used to separate fields.
+        - When using this parameter, you change the default value used by I(dialect).
+        - The default value depends on the dialect used.
+      type: str
+    skipinitialspace:
+      description:
+        - Whether to ignore any whitespaces immediately following the delimiter.
+        - When using this parameter, you change the default value used by I(dialect).
+        - The default value depends on the dialect used.
+      type: bool
+    strict:
+      description:
+        - Whether to raise an exception on bad CSV input.
+        - When using this parameter, you change the default value used by I(dialect).
+        - The default value depends on the dialect used.
+      type: bool
+'''
+
+EXAMPLES = '''
+- name: Parse a CSV file's contents
+  ansible.builtin.debug:
+    msg: >-
+      {{ csv_data | community.genera.from_csv(dialect='unix') }}
+  vars:
+    csv_data: |
+      Column 1,Value
+      foo,23
+      bar,42
+  # Produces the following list of dictionaries:
+  #   {
+  #     "Column 1": "foo",
+  #     "Value": "23",
+  #   },
+  #   {
+  #     "Column 1": "bar",
+  #     "Value": "42",
+  #   }
+'''
+
+RETURN = '''
+  _value:
+    description: A list with one dictionary per row.
+    type: list
+    elements: dictionary
+'''
+
 from ansible.errors import AnsibleFilterError
 from ansible.module_utils.common.text.converters import to_native
 

plugins/filter/groupby_as_dict.yml

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

plugins/filter/hashids_decode.yml

@@ -0,0 +1,38 @@
+DOCUMENTATION:
+  name: hashids_decode
+  short_description: Decodes a sequence of numbers from a YouTube-like hash
+  version_added: 3.0.0
+  author: Andrew Pantuso (@Ajpantuso)
+  description:
+    - Decodes a sequence of numbers from a YouTube-like hash.
+  options:
+    _input:
+      description: A YouTube-like hash.
+      type: string
+      required: true
+    salt:
+      description:
+        - String to use as salt when hashing.
+      type: str
+      default: excel
+    alphabet:
+      description:
+        - String of 16 or more unique characters to produce a hash.
+      type: list
+      elements: str
+    min_length:
+      description:
+        - Minimum length of hash produced.
+      type: integer
+
+EXAMPLES: |
+  - name: Convert hash to list of integers
+    ansible.builtin.debug:
+      msg: "{{ 'o2fXhV' | community.general.hashids_decode }}"
+      # Produces: [1, 2, 3]
+
+RETURN:
+  _value:
+    description: A list of integers.
+    type: list
+    elements: integer

plugins/filter/hashids_encode.yml

@@ -0,0 +1,38 @@
+DOCUMENTATION:
+  name: hashids_encode
+  short_description: Encodes YouTube-like hashes from a sequence of integers
+  version_added: 3.0.0
+  author: Andrew Pantuso (@Ajpantuso)
+  description:
+    - Encodes YouTube-like hashes from a sequence of integers.
+  options:
+    _input:
+      description: A list of integers.
+      type: list
+      elements: integer
+      required: true
+    salt:
+      description:
+        - String to use as salt when hashing.
+      type: str
+      default: excel
+    alphabet:
+      description:
+        - String of 16 or more unique characters to produce a hash.
+      type: list
+      elements: str
+    min_length:
+      description:
+        - Minimum length of hash produced.
+      type: integer
+
+EXAMPLES: |
+  - name: Convert list of integers to hash
+    ansible.builtin.debug:
+      msg: "{{ [1, 2, 3] | community.general.hashids_encode }}"
+      # Produces: 'o2fXhV'
+
+RETURN:
+  _value:
+    description: A YouTube-like hash.
+    type: string

plugins/filter/jc.py

@@ -21,6 +21,67 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+DOCUMENTATION = '''
+  name: jc
+  short_description: Convert output of many shell commands and file-types to JSON
+  version_added: 1.1.0
+  author: Kelly Brazil (@kellyjonbrazil)
+  description:
+    - Convert output of many shell commands and file-types to JSON.
+    - Uses the L(jc library,https://github.com/kellyjonbrazil/jc).
+  positional: parser
+  options:
+    _input:
+      description: The data to convert.
+      type: string
+      required: true
+    parser:
+      description:
+        - The correct parser for the input data.
+        - For exmaple C(ifconfig).
+        - See U(https://github.com/kellyjonbrazil/jc#parsers) for the latest list of parsers.
+      type: string
+      required: true
+    quiet:
+      description: Set to C(false) to not suppress warnings.
+      type: boolean
+      default: true
+    raw:
+      description: Set to C(true) to return pre-processed JSON.
+      type: boolean
+      default: false
+  requirements:
+    - jc (https://github.com/kellyjonbrazil/jc)
+'''
+
+EXAMPLES = '''
+- name: Run command
+  ansible.builtin.command: uname -a
+  register: result
+
+- name: Convert command's result to JSON
+  ansible.builtin.debug:
+    msg: "{{ result.stdout | community.general.jc('uname') }}"
+  # Possible output:
+  #
+  # "msg": {
+  #   "hardware_platform": "x86_64",
+  #   "kernel_name": "Linux",
+  #   "kernel_release": "4.15.0-112-generic",
+  #   "kernel_version": "#113-Ubuntu SMP Thu Jul 9 23:41:39 UTC 2020",
+  #   "machine": "x86_64",
+  #   "node_name": "kbrazil-ubuntu",
+  #   "operating_system": "GNU/Linux",
+  #   "processor": "x86_64"
+  # }
+'''
+
+RETURN = '''
+  _value:
+    description: The processed output.
+    type: any
+'''
+
 from ansible.errors import AnsibleError, AnsibleFilterError
 import importlib
 

plugins/filter/json_query.py

@@ -19,6 +19,107 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+DOCUMENTATION = '''
+  name: json_query
+  short_description: Select a single element or a data subset from a complex data structure
+  description:
+    - This filter lets you query a complex JSON structure and iterate over it using a loop structure.
+  positional: expr
+  options:
+    _input:
+      description:
+        - The JSON data to query.
+      type: any
+      required: true
+    expr:
+      description:
+        - The query expression.
+        - See U(http://jmespath.org/examples.html) for examples.
+      type: string
+      required: true
+  requirements:
+    - jmespath
+'''
+
+EXAMPLES = '''
+- name: Define data to work on in the examples below
+  ansible.builtin.set_fact:
+    domain_definition:
+      domain:
+        cluster:
+          - name: cluster1
+          - name: cluster2
+        server:
+          - name: server11
+            cluster: cluster1
+            port: '8080'
+          - name: server12
+            cluster: cluster1
+            port: '8090'
+          - name: server21
+            cluster: cluster2
+            port: '9080'
+          - name: server22
+            cluster: cluster2
+            port: '9090'
+        library:
+          - name: lib1
+            target: cluster1
+          - name: lib2
+            target: cluster2
+
+- name: Display all cluster names
+  ansible.builtin.debug:
+    var: item
+  loop: "{{ domain_definition | community.general.json_query('domain.cluster[*].name') }}"
+
+- name: Display all server names
+  ansible.builtin.debug:
+    var: item
+  loop: "{{ domain_definition | community.general.json_query('domain.server[*].name') }}"
+
+- name: Display all ports from cluster1
+  ansible.builtin.debug:
+    var: item
+  loop: "{{ domain_definition | community.general.json_query(server_name_cluster1_query) }}"
+  vars:
+    server_name_cluster1_query: "domain.server[?cluster=='cluster1'].port"
+
+- name: Display all ports from cluster1 as a string
+  ansible.builtin.debug:
+    msg: "{{ domain_definition | community.general.json_query('domain.server[?cluster==`cluster1`].port') | join(', ') }}"
+
+- name: Display all ports from cluster1
+  ansible.builtin.debug:
+    var: item
+  loop: "{{ domain_definition | community.general.json_query('domain.server[?cluster==''cluster1''].port') }}"
+
+- name: Display all server ports and names from cluster1
+  ansible.builtin.debug:
+    var: item
+  loop: "{{ domain_definition | community.general.json_query(server_name_cluster1_query) }}"
+  vars:
+    server_name_cluster1_query: "domain.server[?cluster=='cluster2'].{name: name, port: port}"
+
+- name: Display all ports from cluster1
+  ansible.builtin.debug:
+    msg: "{{ domain_definition | to_json | from_json | community.general.json_query(server_name_query) }}"
+  vars:
+    server_name_query: "domain.server[?starts_with(name,'server1')].port"
+
+- name: Display all ports from cluster1
+  ansible.builtin.debug:
+    msg: "{{ domain_definition | to_json | from_json | community.general.json_query(server_name_query) }}"
+  vars:
+    server_name_query: "domain.server[?contains(name,'server1')].port"
+'''
+
+RETURN = '''
+  _value:
+    description: The result of the query.
+    type: any
+'''
+
 from ansible.errors import AnsibleError, AnsibleFilterError
 
 try:

plugins/filter/lists_mergeby.yml

@@ -0,0 +1,62 @@
+DOCUMENTATION:
+  name: lists_mergeby
+  short_description: Merge two lists of dictionaries by a given attribute
+  version_added: 2.0.0
+  author: Vladimir Botka (@vbotka)
+  description:
+    - Merge two lists by attribute I(index).
+  positional: another_list, index
+  options:
+    _input:
+      description: A list of dictionaries.
+      type: list
+      elements: dictionary
+      required: true
+    another_list:
+      description: Another list of dictionaries.
+      type: list
+      elements: dictionary
+      required: true
+    index:
+      description:
+        - The dictionary key that must be present in every dictionary in every list that is used to
+          merge the lists.
+      type: string
+      required: true
+
+EXAMPLES: |
+  - name: Merge two lists
+    ansible.builtin.debug:
+      msg: >-
+        {{ list1 | community.general.lists_mergeby(list2, 'index') }}"
+    vars:
+      list1:
+        - index: a
+          value: 123
+        - index: b
+          value: 42
+      list2:
+        - index: a
+          foo: bar
+        - index: c
+          foo: baz
+    # Produces the following list of dictionaries:
+    #   {
+    #     "index": "a",
+    #     "foo": "bar",
+    #     "value": 123
+    #   },
+    #   {
+    #     "index": "b",
+    #     "value": 42
+    #   },
+    #   {
+    #     "index": "c",
+    #     "foo": "baz"
+    #   }
+
+RETURN:
+  _value:
+    description: The merged list.
+    type: list
+    elements: dictionary

plugins/filter/random_mac.py

@@ -20,6 +20,41 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+DOCUMENTATION = '''
+  name: random_mac
+  short_description: Generate a random MAC address
+  description:
+    - Generates random networking interfaces MAC addresses for a given prefix.
+  options:
+    _input:
+      description: A string prefix to use as a basis for the random MAC generated.
+      type: string
+      required: true
+    seed:
+      description:
+        - A randomization seed to initialize the process, used to get repeatable results.
+        - If no seed is provided, a system random source such as C(/dev/urandom) is used.
+      required: false
+      type: string
+'''
+
+EXAMPLES = '''
+- name: Random MAC given a prefix
+  ansible.builtin.debug:
+    msg: "{{ '52:54:00' | community.general.random_mac }}"
+    # => '52:54:00:ef:1c:03'
+
+- name: With a seed
+  ansible.builtin.debug:
+    msg: "{{ '52:54:00' | community.general.random_mac(seed=inventory_hostname) }}"
+'''
+
+RETURN = '''
+  _value:
+    description: The generated MAC.
+    type: string
+'''
+
 import re
 from random import Random, SystemRandom
 

plugins/filter/to_days.yml

@@ -0,0 +1,40 @@
+DOCUMENTATION:
+  name: to_days
+  short_description: Converte a duration string to days
+  version_added: 0.2.0
+  description:
+    - Parse a human readable time duration string and convert to days.
+  options:
+    _input:
+      description:
+        - The time string to convert.
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
+        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
+      type: string
+      required: true
+    year:
+      description:
+        - Number of days per year.
+      default: 365
+      type: float
+    month:
+      description:
+        - Number of days per month.
+      default: 30
+      type: float
+  author:
+    - René Moser (@resmo)
+
+EXAMPLES: |
+  - name: Convert a duration into days
+    ansible.builtin.debug:
+      msg: "{{ '1y 7m 5d 30h' | community.general.to_days }}"
+
+RETURN:
+  _value:
+    description: Number of days.
+    type: float

plugins/filter/to_hours.yml

@@ -0,0 +1,40 @@
+DOCUMENTATION:
+  name: to_hours
+  short_description: Converte a duration string to hours
+  version_added: 0.2.0
+  description:
+    - Parse a human readable time duration string and convert to hours.
+  options:
+    _input:
+      description:
+        - The time string to convert.
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
+        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
+      type: string
+      required: true
+    year:
+      description:
+        - Number of days per year.
+      default: 365
+      type: float
+    month:
+      description:
+        - Number of days per month.
+      default: 30
+      type: float
+  author:
+    - René Moser (@resmo)
+
+EXAMPLES: |
+  - name: Convert a duration into hours
+    ansible.builtin.debug:
+      msg: "{{ '7d 30h 20m 10s 123ms' | community.general.to_hours }}"
+
+RETURN:
+  _value:
+    description: Number of hours.
+    type: float

plugins/filter/to_milliseconds.yml

@@ -0,0 +1,40 @@
+DOCUMENTATION:
+  name: to_milliseconds
+  short_description: Converte a duration string to milliseconds
+  version_added: 0.2.0
+  description:
+    - Parse a human readable time duration string and convert to milliseconds.
+  options:
+    _input:
+      description:
+        - The time string to convert.
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
+        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
+      type: string
+      required: true
+    year:
+      description:
+        - Number of days per year.
+      default: 365
+      type: float
+    month:
+      description:
+        - Number of days per month.
+      default: 30
+      type: float
+  author:
+    - René Moser (@resmo)
+
+EXAMPLES: |
+  - name: Convert a duration into milliseconds
+    ansible.builtin.debug:
+      msg: "{{ '30h 20m 10s 123ms' | community.general.to_milliseconds }}"
+
+RETURN:
+  _value:
+    description: Number of milliseconds.
+    type: float

plugins/filter/to_minutes.yml

@@ -0,0 +1,40 @@
+DOCUMENTATION:
+  name: to_minutes
+  short_description: Converte a duration string to minutes
+  version_added: 0.2.0
+  description:
+    - Parse a human readable time duration string and convert to minutes.
+  options:
+    _input:
+      description:
+        - The time string to convert.
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
+        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
+      type: string
+      required: true
+    year:
+      description:
+        - Number of days per year.
+      default: 365
+      type: float
+    month:
+      description:
+        - Number of days per month.
+      default: 30
+      type: float
+  author:
+    - René Moser (@resmo)
+
+EXAMPLES: |
+  - name: Convert a duration into minutes
+    ansible.builtin.debug:
+      msg: "{{ '30h 20m 10s 123ms' | community.general.to_minutes }}"
+
+RETURN:
+  _value:
+    description: Number of minutes.
+    type: float

plugins/filter/to_months.yml

@@ -0,0 +1,40 @@
+DOCUMENTATION:
+  name: to_months
+  short_description: Converte a duration string to months
+  version_added: 0.2.0
+  description:
+    - Parse a human readable time duration string and convert to months.
+  options:
+    _input:
+      description:
+        - The time string to convert.
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
+        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
+      type: string
+      required: true
+    year:
+      description:
+        - Number of days per year.
+      default: 365
+      type: float
+    month:
+      description:
+        - Number of days per month.
+      default: 30
+      type: float
+  author:
+    - René Moser (@resmo)
+
+EXAMPLES: |
+  - name: Convert a duration into months
+    ansible.builtin.debug:
+      msg: "{{ '1y 7m 5d 30h' | community.general.to_months }}"
+
+RETURN:
+  _value:
+    description: Number of months.
+    type: float

plugins/filter/to_seconds.yml

@@ -0,0 +1,40 @@
+DOCUMENTATION:
+  name: to_seconds
+  short_description: Converte a duration string to seconds
+  version_added: 0.2.0
+  description:
+    - Parse a human readable time duration string and convert to seconds.
+  options:
+    _input:
+      description:
+        - The time string to convert.
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
+        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
+      type: string
+      required: true
+    year:
+      description:
+        - Number of days per year.
+      default: 365
+      type: float
+    month:
+      description:
+        - Number of days per month.
+      default: 30
+      type: float
+  author:
+    - René Moser (@resmo)
+
+EXAMPLES: |
+  - name: Convert a duration into seconds
+    ansible.builtin.debug:
+      msg: "{{ '30h 20m 10s 123ms' | community.general.to_seconds }}"
+
+RETURN:
+  _value:
+    description: Number of seconds.
+    type: float

plugins/filter/to_time_unit.yml

@@ -0,0 +1,84 @@
+DOCUMENTATION:
+  name: to_time_unit
+  short_description: Converte a duration string to the given time unit
+  version_added: 0.2.0
+  description:
+    - Parse a human readable time duration string and convert to the given time unit.
+  positional: unit
+  options:
+    _input:
+      description:
+        - The time string to convert.
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
+        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
+      type: string
+      required: true
+    unit:
+      description:
+        - Time unit to convert the duration to.
+      default: ms
+      choices:
+        - millisecond
+        - milliseconds
+        - ms
+        - msec
+        - msecs
+        - msecond
+        - mseconds
+        - s
+        - sec
+        - secs
+        - second
+        - seconds
+        - h
+        - hour
+        - hours
+        - hs
+        - m
+        - min
+        - mins
+        - minute
+        - minutes
+        - d
+        - ds
+        - day
+        - days
+        - w
+        - ws
+        - week
+        - weeks
+        - mo
+        - mos
+        - month
+        - months
+        - y
+        - ys
+        - year
+        - years
+      type: string
+    year:
+      description:
+        - Number of days per year.
+      default: 365
+      type: float
+    month:
+      description:
+        - Number of days per month.
+      default: 30
+      type: float
+  author:
+    - René Moser (@resmo)
+
+EXAMPLES: |
+  - name: Convert a duration into seconds
+    ansible.builtin.debug:
+      msg: "{{ '1053d 17h 53m -10s 391ms' | community.general.to_time_unit('s') }}"
+
+RETURN:
+  _value:
+    description: Number of time units.
+    type: float

plugins/filter/to_weeks.yml

@@ -0,0 +1,40 @@
+DOCUMENTATION:
+  name: to_weeks
+  short_description: Converte a duration string to weeks
+  version_added: 0.2.0
+  description:
+    - Parse a human readable time duration string and convert to weeks.
+  options:
+    _input:
+      description:
+        - The time string to convert.
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
+        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
+      type: string
+      required: true
+    year:
+      description:
+        - Number of days per year.
+      default: 365
+      type: float
+    month:
+      description:
+        - Number of days per month.
+      default: 30
+      type: float
+  author:
+    - René Moser (@resmo)
+
+EXAMPLES: |
+  - name: Convert a duration into weeks
+    ansible.builtin.debug:
+      msg: "{{ '1y 7m 5d 30h' | community.general.to_weeks }}"
+
+RETURN:
+  _value:
+    description: Number of weeks.
+    type: float

plugins/filter/to_years.yml

@@ -0,0 +1,40 @@
+DOCUMENTATION:
+  name: to_years
+  short_description: Converte a duration string to years
+  version_added: 0.2.0
+  description:
+    - Parse a human readable time duration string and convert to years.
+  options:
+    _input:
+      description:
+        - The time string to convert.
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
+        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
+      type: string
+      required: true
+    year:
+      description:
+        - Number of days per year.
+      default: 365
+      type: float
+    month:
+      description:
+        - Number of days per month.
+      default: 30
+      type: float
+  author:
+    - René Moser (@resmo)
+
+EXAMPLES: |
+  - name: Convert a duration into years
+    ansible.builtin.debug:
+      msg: "{{ '1053d 30h' | community.general.to_years }}"
+
+RETURN:
+  _value:
+    description: Number of years.
+    type: float

plugins/filter/unicode_normalize.py

@@ -6,6 +6,46 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+DOCUMENTATION = '''
+  name: unicode_normalize
+  short_description: Normalizes unicode strings to facilitate comparison of characters with normalized forms
+  version_added: 3.7.0
+  author: Andrew Pantuso (@Ajpantuso)
+  description:
+    - Normalizes unicode strings to facilitate comparison of characters with normalized forms.
+  positional: form
+  options:
+    _input:
+      description: A unicode string.
+      type: string
+      required: true
+    form:
+      description:
+        - The normal form to use.
+        - See U(https://docs.python.org/3/library/unicodedata.html#unicodedata.normalize) for details.
+      type: string
+      default: NFC
+      choices:
+        - NFC
+        - NFD
+        - NFKC
+        - NFKD
+'''
+
+EXAMPLES = '''
+- name: Normalize unicode string
+  ansible.builtin.set_fact:
+    dictionary: "{{ 'ä' | community.general.unicode_normalize('NFKD') }}"
+    # The resulting string has length 2: one letter is 'a', the other
+    # the diacritic combiner.
+'''
+
+RETURN = '''
+  _value:
+    description: The normalized unicode string of the specified normal form.
+    type: string
+'''
+
 from unicodedata import normalize
 
 from ansible.errors import AnsibleFilterError, AnsibleFilterTypeError

plugins/filter/version_sort.py

@@ -5,6 +5,35 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+DOCUMENTATION = '''
+  name: version_sort
+  short_description: Sort a list according to version order instead of pure alphabetical one
+  version_added: 2.2.0
+  author: Eric L. (@ericzolf)
+  description:
+    - Sort a list according to version order instead of pure alphabetical one.
+  options:
+    _input:
+      description: A list of strings to sort.
+      type: list
+      elements: string
+      required: true
+'''
+
+EXAMPLES = '''
+- name: Convert list of tuples into dictionary
+  ansible.builtin.set_fact:
+    dictionary: "{{ ['2.1', '2.10', '2.9'] | community.general.version_sort }}"
+    # Result is ['2.1', '2.9', '2.10']
+'''
+
+RETURN = '''
+  _value:
+    description: The list of strings sorted by version.
+    type: list
+    elements: string
+'''
+
 from ansible_collections.community.general.plugins.module_utils.version import LooseVersion
 
 

plugins/lookup/cyberarkpassword.py

@@ -57,14 +57,19 @@ EXAMPLES = """
 """
 
 RETURN = """
-  password:
-    description:
-      - The actual value stored
-  passprops:
-    description: properties assigned to the entry
-    type: dictionary
-  passwordchangeinprocess:
-    description: did the password change?
+_result:
+  description: A list containing one dictionary.
+  type: list
+  elements: dictionary
+  contains:
+    password:
+      description:
+        - The actual value stored
+    passprops:
+      description: properties assigned to the entry
+      type: dictionary
+    passwordchangeinprocess:
+      description: did the password change?
 """
 
 import os

plugins/lookup/onepassword.py

@@ -45,8 +45,8 @@ DOCUMENTATION = '''
         description: Vault containing the item to retrieve (case-insensitive). If absent will search all vaults.
     notes:
       - This lookup will use an existing 1Password session if one exists. If not, and you have already
-        performed an initial sign in (meaning C(~/.op/config exists)), then only the C(master_password) is required.
-        You may optionally specify C(subdomain) in this scenario, otherwise the last used subdomain will be used by C(op).
+        performed an initial sign in (meaning C(~/.op/config), C(~/.config/op/config) or C(~/.config/.op/config) exists), then only the
+        C(master_password) is required. You may optionally specify C(subdomain) in this scenario, otherwise the last used subdomain will be used by C(op).
       - This lookup can perform an initial login by providing C(subdomain), C(username), C(secret_key), and C(master_password).
       - Due to the B(very) sensitive nature of these credentials, it is B(highly) recommended that you only pass in the minimal credentials
         needed at any given time. Also, store these credentials in an Ansible Vault using a key that is equal to or greater in strength
@@ -105,12 +105,12 @@ from ansible.plugins.lookup import LookupBase
 from ansible.errors import AnsibleLookupError
 from ansible.module_utils.common.text.converters import to_bytes, to_text
 
+from ansible_collections.community.general.plugins.module_utils.onepassword import OnePasswordConfig
+
 
 class OnePass(object):
-
     def __init__(self, path='op'):
         self.cli_path = path
-        self.config_file_path = os.path.expanduser('~/.op/config')
         self.logged_in = False
         self.token = None
         self.subdomain = None
@@ -119,9 +119,11 @@ class OnePass(object):
         self.secret_key = None
         self.master_password = None
 
+        self._config = OnePasswordConfig()
+
     def get_token(self):
         # If the config file exists, assume an initial signin has taken place and try basic sign in
-        if os.path.isfile(self.config_file_path):
+        if os.path.isfile(self._config.config_file_path):
 
             if not self.master_password:
                 raise AnsibleLookupError('Unable to sign in to 1Password. master_password is required.')
@@ -281,4 +283,5 @@ class LookupModule(LookupBase):
         values = []
         for term in terms:
             values.append(op.get_field(term, field, section, vault))
+
         return values

plugins/module_utils/_version.py

@@ -3,7 +3,7 @@
 # Implements multiple version numbering conventions for the
 # Python Module Distribution Utilities.
 #
-# PSF License (see licenses/PSF-license.txt or https://opensource.org/licenses/Python-2.0)
+# PSF License (see PSF-license.txt or https://opensource.org/licenses/Python-2.0)
 #
 
 """Provides classes to represent module version numbers (one class for

plugins/module_utils/alicloud_ecs.py

@@ -7,7 +7,7 @@
 #
 # Copyright (c) 2017-present Alibaba Group Holding Limited. He Guimin <heguimin36@163.com>
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/database.py

@@ -7,7 +7,7 @@
 #
 # Copyright (c) 2014, Toshio Kuratomi <tkuratomi@ansible.com>
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/gandi_livedns_api.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright: (c) 2019 Gregory Thiemonge <gregory.thiemonge@gmail.com>
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type

plugins/module_utils/heroku.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright: (c) 2018, Ansible Project
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type

plugins/module_utils/hwc_utils.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright (c), Google Inc, 2017
-# Simplified BSD License (see licenses/simplified_bsd.txt or
+# Simplified BSD License (see simplified_bsd.txt or
 # https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)

plugins/module_utils/ibm_sa_utils.py

@@ -2,7 +2,7 @@
 # Copyright (C) 2018 IBM CORPORATION
 # Author(s): Tzur Eliyahu <tzure@il.ibm.com>
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type

plugins/module_utils/influxdb.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Copyright: (c) 2017, Ansible Project
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type

plugins/module_utils/ipa.py

@@ -7,7 +7,7 @@
 #
 # Copyright (c) 2016 Thomas Krahn (@Nosmoht)
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/known_hosts.py

@@ -7,7 +7,7 @@
 #
 # Copyright (c), Michael DeHaan <michael.dehaan@gmail.com>, 2012-2013
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/linode.py

@@ -7,7 +7,7 @@
 #
 # Copyright (c), Luke Murphy @decentral1se
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/lxd.py

@@ -8,7 +8,7 @@
 # still belong to the author of the module, and may assign their own license
 # to the complete work.
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/manageiq.py

@@ -8,7 +8,7 @@
 # still belong to the author of the module, and may assign their own license
 # to the complete work.
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/memset.py

@@ -7,7 +7,7 @@
 #
 # Copyright (c) 2018, Simon Weald <ansible@simonweald.com>
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/mh/base.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # (c) 2020, Alexei Znamensky <russoz@gmail.com>
 # Copyright: (c) 2020, Ansible Project
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type

plugins/module_utils/mh/deco.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # (c) 2020, Alexei Znamensky <russoz@gmail.com>
 # Copyright: (c) 2020, Ansible Project
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type

plugins/module_utils/mh/exceptions.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # (c) 2020, Alexei Znamensky <russoz@gmail.com>
 # Copyright: (c) 2020, Ansible Project
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type

plugins/module_utils/mh/mixins/cmd.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # (c) 2020, Alexei Znamensky <russoz@gmail.com>
 # Copyright: (c) 2020, Ansible Project
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type

plugins/module_utils/mh/mixins/deps.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # (c) 2020, Alexei Znamensky <russoz@gmail.com>
 # Copyright: (c) 2020, Ansible Project
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type

plugins/module_utils/mh/mixins/state.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # (c) 2020, Alexei Znamensky <russoz@gmail.com>
 # Copyright: (c) 2020, Ansible Project
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type

plugins/module_utils/mh/mixins/vars.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # (c) 2020, Alexei Znamensky <russoz@gmail.com>
 # Copyright: (c) 2020, Ansible Project
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type

plugins/module_utils/mh/module_helper.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # (c) 2020, Alexei Znamensky <russoz@gmail.com>
 # Copyright: (c) 2020, Ansible Project
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type

plugins/module_utils/module_helper.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # (c) 2020, Alexei Znamensky <russoz@gmail.com>
 # Copyright: (c) 2020, Ansible Project
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type

plugins/module_utils/net_tools/nios/api.py

@@ -7,7 +7,7 @@
 #
 # (c) 2018 Red Hat Inc.
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/net_tools/pritunl/api.py

@@ -337,7 +337,6 @@ def pritunl_auth_request(
 
     auth_string = "&".join(
         [api_token, auth_timestamp, auth_nonce, method.upper(), path]
-        + ([data] if data else [])
     )
 
     auth_signature = base64.b64encode(

plugins/module_utils/oneandone.py

@@ -5,7 +5,7 @@
 # still belong to the author of the module, and may assign their own license
 # to the complete work.
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/onepassword.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+import os
+
+
+class OnePasswordConfig(object):
+    _config_file_paths = (
+        "~/.op/config",
+        "~/.config/op/config",
+        "~/.config/.op/config",
+    )
+
+    def __init__(self):
+        self._config_file_path = ""
+
+    @property
+    def config_file_path(self):
+        if self._config_file_path:
+            return self._config_file_path
+
+        for path in self._config_file_paths:
+            realpath = os.path.expanduser(path)
+            if os.path.exists(realpath):
+                self._config_file_path = realpath
+                return self._config_file_path

plugins/module_utils/oneview.py

@@ -7,7 +7,7 @@
 #
 # Copyright (2016-2017) Hewlett Packard Enterprise Development LP
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/online.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/opennebula.py

@@ -2,7 +2,7 @@
 #
 # Copyright 2018 www.privaz.io Valletech AB
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/pure.py

@@ -7,7 +7,7 @@
 # to the complete work.
 #
 # Copyright (c), Simon Dodsley <simon@purestorage.com>,2017
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/rax.py

@@ -7,7 +7,7 @@
 #
 # Copyright (c), Michael DeHaan <michael.dehaan@gmail.com>, 2012-2013
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/redhat.py

@@ -7,7 +7,7 @@
 #
 # Copyright (c), James Laska
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/remote_management/lxca/common.py

@@ -6,7 +6,7 @@
 # own license to the complete work.
 #
 # Copyright (C) 2017 Lenovo, Inc.
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 #
 # Contains LXCA common class
 # Lenovo xClarity Administrator (LXCA)

plugins/module_utils/saslprep.py

@@ -8,7 +8,7 @@
 
 # Copyright: (c) 2020, Andrew Klychkov (@Andersson007) <aaklychkov@mail.ru>
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/source_control/bitbucket.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/storage/emc/emc_vnx.py

@@ -7,7 +7,7 @@
 #
 # (c) 2018 Luca 'remix_tj' Lorenzetto
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/storage/hpe3par/hpe3par.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright: (c) 2018, Hewlett Packard Enterprise Development LP
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/univention_umc.py

@@ -9,7 +9,7 @@
 # Copyright (c) 2016, Adfinis SyGroup AG
 # Tobias Rueetschi <tobias.ruetschi@adfinis-sygroup.ch>
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/utm_utils.py

@@ -7,7 +7,7 @@
 #
 # Copyright: (c) 2018, Johannes Brunswicker <johannes.brunswicker@gmail.com>
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/module_utils/vexata.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright: (c) 2019, Sandeep Kasargod <sandeep@vexata.com>
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

plugins/modules/cloud/misc/terraform.py

@@ -324,7 +324,7 @@ def build_plan(command, project_path, variables_args, state_file, targets, state
     if plan_path is None:
         f, plan_path = tempfile.mkstemp(suffix='.tfplan')
 
-    local_command = command.copy()
+    local_command = command[:]
 
     plan_command = [command[0], 'plan']
 

plugins/modules/clustering/consul/consul.py

@@ -333,7 +333,7 @@ def add_service(module, service):
                      service_id=result.id,
                      service_name=result.name,
                      service_port=result.port,
-                     checks=[check.to_dict() for check in service.checks],
+                     checks=[check.to_dict() for check in service.checks()],
                      tags=result.tags)
 
 
@@ -411,7 +411,7 @@ class ConsulService(object):
         self.address = address
         self.port = port
         self.tags = tags
-        self.checks = []
+        self._checks = []
         if loaded:
             self.id = loaded['ID']
             self.name = loaded['Service']
@@ -424,8 +424,8 @@ class ConsulService(object):
         if self.port:
             optional['port'] = self.port
 
-        if len(self.checks) > 0:
-            optional['check'] = self.checks[0].check
+        if len(self._checks) > 0:
+            optional['check'] = self._checks[0].check
 
         consul_api.agent.service.register(
             self.name,
@@ -435,13 +435,13 @@ class ConsulService(object):
             **optional)
 
     def add_check(self, check):
-        self.checks.append(check)
+        self._checks.append(check)
 
     def checks(self):
-        return self.checks
+        return self._checks
 
     def has_checks(self):
-        return len(self.checks) > 0
+        return len(self._checks) > 0
 
     def __eq__(self, other):
         return (isinstance(other, self.__class__) and
@@ -459,8 +459,8 @@ class ConsulService(object):
             data['port'] = self.port
         if self.tags and len(self.tags) > 0:
             data['tags'] = self.tags
-        if len(self.checks) > 0:
-            data['check'] = self.checks[0].to_dict()
+        if len(self._checks) > 0:
+            data['check'] = self._checks[0].to_dict()
         return data
 
 

plugins/modules/files/read_csv.py

@@ -48,19 +48,19 @@ options:
   delimiter:
     description:
     - A one-character string used to separate fields.
-    - When using this parameter, you change the default value used by C(dialect).
+    - When using this parameter, you change the default value used by I(dialect).
     - The default value depends on the dialect used.
     type: str
   skipinitialspace:
     description:
     - Whether to ignore any whitespaces immediately following the delimiter.
-    - When using this parameter, you change the default value used by C(dialect).
+    - When using this parameter, you change the default value used by I(dialect).
     - The default value depends on the dialect used.
     type: bool
   strict:
     description:
     - Whether to raise an exception on bad CSV input.
-    - When using this parameter, you change the default value used by C(dialect).
+    - When using this parameter, you change the default value used by I(dialect).
     - The default value depends on the dialect used.
     type: bool
 notes:

plugins/modules/identity/keycloak/keycloak_realm.py

@@ -155,7 +155,7 @@ options:
         aliases:
             - defaultDefaultClientScopes
         type: list
-        elements: dict
+        elements: str
     default_groups:
         description:
             - The realm default groups.
@@ -175,7 +175,7 @@ options:
         aliases:
             - defaultOptionalClientScopes
         type: list
-        elements: dict
+        elements: str
     default_roles:
         description:
             - The realm default roles.
@@ -618,10 +618,10 @@ def main():
         brute_force_protected=dict(type='bool', aliases=['bruteForceProtected']),
         client_authentication_flow=dict(type='str', aliases=['clientAuthenticationFlow']),
         client_scope_mappings=dict(type='dict', aliases=['clientScopeMappings']),
-        default_default_client_scopes=dict(type='list', elements='dict', aliases=['defaultDefaultClientScopes']),
+        default_default_client_scopes=dict(type='list', elements='str', aliases=['defaultDefaultClientScopes']),
         default_groups=dict(type='list', elements='dict', aliases=['defaultGroups']),
         default_locale=dict(type='str', aliases=['defaultLocale']),
-        default_optional_client_scopes=dict(type='list', elements='dict', aliases=['defaultOptionalClientScopes']),
+        default_optional_client_scopes=dict(type='list', elements='str', aliases=['defaultOptionalClientScopes']),
         default_roles=dict(type='list', elements='dict', aliases=['defaultRoles']),
         default_signature_algorithm=dict(type='str', aliases=['defaultSignatureAlgorithm']),
         direct_grant_flow=dict(type='str', aliases=['directGrantFlow']),

plugins/modules/identity/onepassword_info.py

@@ -166,6 +166,8 @@ from subprocess import Popen, PIPE
 from ansible.module_utils.common.text.converters import to_bytes, to_native
 from ansible.module_utils.basic import AnsibleModule
 
+from ansible_collections.community.general.plugins.module_utils.onepassword import OnePasswordConfig
+
 
 class AnsibleModuleError(Exception):
     def __init__(self, results):
@@ -179,7 +181,6 @@ class OnePasswordInfo(object):
 
     def __init__(self):
         self.cli_path = module.params.get('cli_path')
-        self.config_file_path = '~/.op/config'
         self.auto_login = module.params.get('auto_login')
         self.logged_in = False
         self.token = None
@@ -187,6 +188,8 @@ class OnePasswordInfo(object):
         terms = module.params.get('search_terms')
         self.terms = self.parse_search_terms(terms)
 
+        self._config = OnePasswordConfig()
+
     def _run(self, args, expected_rc=0, command_input=None, ignore_errors=False):
         if self.token:
             # Adds the session token to all commands if we're logged in.
@@ -299,7 +302,7 @@ class OnePasswordInfo(object):
 
     def get_token(self):
         # If the config file exists, assume an initial signin has taken place and try basic sign in
-        if os.path.isfile(self.config_file_path):
+        if os.path.isfile(self._config.config_file_path):
 
             if self.auto_login is not None:
 

plugins/modules/net_tools/dnsmadeeasy.py

@@ -623,7 +623,7 @@ def main():
     # Fetch existing monitor if the A record indicates it should exist and build the new monitor
     current_monitor = dict()
     new_monitor = dict()
-    if current_record and current_record['type'] == 'A':
+    if current_record and current_record['type'] == 'A' and current_record.get('monitor'):
         current_monitor = DME.getMonitor(current_record['id'])
 
     # Build the new monitor

plugins/modules/packaging/language/gem.py

@@ -72,8 +72,8 @@ options:
     default: false
     description:
     - Avoid loading any C(.gemrc) file. Ignored for RubyGems prior to 2.5.2.
-    - "The current default value will be deprecated in community.general 4.0.0: if the value is not explicitly specified, a deprecation message will be shown."
-    - From community.general 5.0.0 on, the default will be changed to C(true).
+    - "The current default value will be deprecated in community.general 5.0.0: if the value is not explicitly specified, a deprecation message will be shown."
+    - From community.general 6.0.0 on, the default will be changed to C(true).
     version_added: 3.3.0
   env_shebang:
     description:

plugins/modules/packaging/os/xbps.py

@@ -230,7 +230,9 @@ def install_packages(module, xbps_path, state, packages):
         module.params['upgrade_xbps'] = False
         install_packages(module, xbps_path, state, packages)
     elif rc != 0 and not (state == 'latest' and rc == 17):
-        module.fail_json(msg="failed to install %s" % (package))
+        module.fail_json(msg="failed to install %s packages(s)"
+                         % (len(toInstall)),
+                         packages=toInstall)
 
     module.exit_json(changed=True, msg="installed %s package(s)"
                      % (len(toInstall)),

plugins/modules/source_control/gitlab/gitlab_user.py

@@ -51,7 +51,6 @@ options:
     description:
       - The password of the user.
       - GitLab server enforces minimum password length to 8, set this value with 8 or more characters.
-      - Required only if C(state) is set to C(present).
     type: str
   reset_password:
     description:

plugins/modules/system/gconftool2.py

@@ -99,45 +99,41 @@ class GConf2Preference(object):
 
     def call(self, call_type, fail_onerr=True):
         """ Helper function to perform gconftool-2 operations """
-        config_source = ''
-        direct = ''
+        config_source = []
+        direct = []
         changed = False
         out = ''
 
         # If the configuration source is different from the default, create
         # the argument
         if self.config_source is not None and len(self.config_source) > 0:
-            config_source = "--config-source " + self.config_source
+            config_source = ["--config-source", self.config_source]
 
         # If direct is true, create the argument
         if self.direct:
-            direct = "--direct"
+            direct = ["--direct"]
 
         # Execute the call
-        cmd = "gconftool-2 "
+        cmd = ["gconftool-2"]
         try:
             # If the call is "get", then we don't need as many parameters and
             # we can ignore some
             if call_type == 'get':
-                cmd += "--get {0}".format(self.key)
+                cmd.extend(["--get", self.key])
             # Otherwise, we will use all relevant parameters
             elif call_type == 'set':
-                cmd += "{0} {1} --type {2} --{3} {4} \"{5}\"".format(direct,
-                                                                     config_source,
-                                                                     self.value_type,
-                                                                     call_type,
-                                                                     self.key,
-                                                                     self.value)
+                cmd.extend(direct)
+                cmd.extend(config_source)
+                cmd.extend(["--type", self.value_type, "--{3}".format(call_type), self.key, self.value])
             elif call_type == 'unset':
-                cmd += "--unset {0}".format(self.key)
+                cmd.extend(["--unset", self.key])
 
             # Start external command
-            rc, out, err = self.ansible.run_command(cmd, use_unsafe_shell=True)
+            rc, out, err = self.ansible.run_command(cmd)
 
-            if len(err) > 0:
-                if fail_onerr:
-                    self.ansible.fail_json(msg='gconftool-2 failed with '
-                                               'error: %s' % (str(err)))
+            if err and fail_onerr:
+                self.ansible.fail_json(msg='gconftool-2 failed with '
+                                           'error: %s' % (str(err)))
             else:
                 changed = True
 

simplified_bsd.txt

@@ -0,0 +1,8 @@
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

tests/integration/targets/consul/meta/main.yml

@@ -3,3 +3,4 @@ dependencies:
   - setup_pkg_mgr
   - setup_openssl
   - setup_remote_tmp_dir
+  - setup_remote_constraints

tests/integration/targets/consul/tasks/main.yml

@@ -15,12 +15,14 @@
   - name: Install requests<2.20 (CentOS/RHEL 6)
     pip:
       name: requests<2.20
+      extra_args: "-c {{ remote_constraints }}"
     register: result
     until: result is success
     when: ansible_distribution_file_variety|default() == 'RedHat' and ansible_distribution_major_version is version('6', '<=')
   - name: Install python-consul
     pip:
       name: python-consul
+      extra_args: "-c {{ remote_constraints }}"
     register: result
     until: result is success
   - when: pyopenssl_version.stdout is version('0.15', '>=')

tests/integration/targets/one_host/aliases

@@ -1,2 +1,3 @@
 cloud/opennebula
 shippable/cloud/group1
+disabled  # FIXME

tests/integration/targets/one_template/aliases

@@ -1,2 +1,3 @@
 cloud/opennebula
 shippable/cloud/group1
+disabled  # FIXME

tests/sanity/extra/aliases.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright (c) Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-"""Check extra collection docs with antsibull-lint."""
+"""Check extra collection docs with antsibull-docs."""
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 

tests/sanity/extra/extra-docs.json

@@ -5,6 +5,6 @@
     ],
     "output": "path-line-column-message",
     "requirements": [
-        "antsibull"
+        "antsibull-docs"
     ]
 }

tests/sanity/extra/extra-docs.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright (c) Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-"""Check extra collection docs with antsibull-lint."""
+"""Check extra collection docs with antsibull-docs."""
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 

tests/unit/plugins/callback/test_opentelemetry.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # (C) 2021, Victor Martinez <VictorMartinezRubio@gmail.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
@@ -91,6 +92,21 @@ class TestOpentelemetry(unittest.TestCase):
         self.assertEqual(host_data.uuid, 'include')
         self.assertEqual(host_data.name, 'include')
         self.assertEqual(host_data.status, 'ok')
+        self.assertEqual(self.opentelemetry.ansible_version, None)
+
+    def test_finish_task_include_with_ansible_version(self):
+        task_fields = {'args': {'_ansible_version': '1.2.3'}}
+        result = TaskResult(host=None, task=self.mock_task, return_data={}, task_fields=task_fields)
+        tasks_data = OrderedDict()
+        tasks_data['myuuid'] = self.my_task
+
+        self.opentelemetry.finish_task(
+            tasks_data,
+            'ok',
+            result
+        )
+
+        self.assertEqual(self.opentelemetry.ansible_version, '1.2.3')
 
     def test_get_error_message(self):
         test_cases = (

tests/unit/plugins/module_utils/test_utm_utils.py

@@ -6,7 +6,7 @@
 #
 # Copyright: (c) 2018, Johannes Brunswicker <johannes.brunswicker@gmail.com>
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

tests/unit/plugins/modules/database/saphana/test_hana_query.py

@@ -6,7 +6,7 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
-from ansible_collections.community.general.plugins.modules import hana_query
+from ansible_collections.community.general.plugins.modules.database.saphana import hana_query
 from ansible_collections.community.general.tests.unit.plugins.modules.utils import (
     AnsibleExitJson,
     AnsibleFailJson,

tests/unit/plugins/modules/source_control/gitlab/test_gitlab_protected_branch.py

@@ -7,7 +7,8 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 import pytest
-from distutils.version import LooseVersion
+
+from ansible_collections.community.general.plugins.module_utils.version import LooseVersion
 
 from ansible_collections.community.general.plugins.modules.source_control.gitlab.gitlab_protected_branch import GitlabProtectedBranch
 

tests/utils/constraints.txt

@@ -1,3 +1,4 @@
+certifi < 2022.5.18 ; python_version < '3.5' # certifi 2022.5.18 requires Python 3.5 or later
 coverage >= 4.2, < 5.0.0, != 4.3.2 ; python_version <= '3.7' # features in 4.2+ required, avoid known bug in 4.3.2 on python 2.6, coverage 5.0+ incompatible
 coverage >= 4.5.4, < 5.0.0 ; python_version > '3.7' # coverage had a bug in < 4.5.4 that would cause unit tests to hang in Python 3.8, coverage 5.0+ incompatible
 cryptography < 2.2 ; python_version < '2.7' # cryptography 2.2 drops support for python 2.6