Merge branch 'main' of https://github.com/ansible-collections/communi…

…ty.postgresql * 'main' of https://github.com/ansible-collections/community.postgresql: Release 2.1.5 commit (ansible-collections#275) docs: add PSF license file (ansible-collections#272) Issue 240 (ansible-collections#260) Add new maintainer and contributors (ansible-collections#264) Fix README (ansible-collections#263) Add clarification for RDS with regard to (NO)SUPERUSER attributes (ansible-collections#261)
jchancojr · Jun 2, 2022 · c7028dc · c7028dc
2 parents 7b958ce + 9c58c40
commit c7028dc
Show file tree

Hide file tree

Showing 12 changed files with 101 additions and 11 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -5,4 +5,4 @@
 # the repo. Unless a later match takes precedence,
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
-*       @Andersson007 @hunleyd
+*       @Andersson007 @hunleyd @jchancojr
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,6 +5,22 @@ Community PostgreSQL Collection Release Notes
 .. contents:: Topics
 
 
+v2.1.5
+======
+
+Release Summary
+---------------
+
+This is the bugfix release of the ``community.postgresql`` collection.
+This changelog contains all changes to the modules in this collection that
+have been added after the release of ``community.postgresql`` 2.1.4
+
+Bugfixes
+--------
+
+- Include ``PSF-license.txt`` file for ``plugins/module_utils/_version.py``.
+- collection core functions - fix attribute error `nonetype` by always calling `ensure_required_libs` (https://github.com/ansible-collections/community.postgresql/issues/252).
+
 v2.1.4
 ======
 

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -37,16 +37,19 @@ billietl
 binf
 blackstar257
 bladypirat
+blindrood
 braderhart
 brophyja
 cans
+caseyandgina
 chamini2
 Changaco
 char543
 cjewo
 cocoy
 CoffeDriven
 Cohedrin
+coopengo-glecomte
 csamarajeewa
 cThrice
 czenderink
@@ -99,6 +102,7 @@ jamescassell
 jamesRUS52
 jborean93
 jbscalia
+jchancojr
 jd-boyd
 jensdepuydt
 jerri
@@ -153,6 +157,7 @@ nerzhul
 nh2
 nodiscc
 nskalis
+ojc97
 pbaisla
 perezjasonr
 PeteDevoy

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -1,3 +1,4 @@
+jchancojr
 hunleyd
 tcraxs
 Andersson007 (andersson007_ Matrix channels)
diff --git a/PSF-license.txt b/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.
diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ The PostgreSQL modules rely on the [Psycopg2](https://www.psycopg.org/docs/) Pos
 
 ## Tested with ansible-core
 
-Tested with the following Ansible releases:
+Tested with the following `ansible-core` releases:
 - 2.11
 - 2.12
 - 2.13

diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -311,3 +311,20 @@ releases:
     - 2.1.4.yml
     - remove-2.9-2.10-compatability.yml
     release_date: '2022-04-28'
+  2.1.5:
+    changes:
+      bugfixes:
+      - Include ``PSF-license.txt`` file for ``plugins/module_utils/_version.py``.
+      - collection core functions - fix attribute error `nonetype` by always calling
+        `ensure_required_libs` (https://github.com/ansible-collections/community.postgresql/issues/252).
+      release_summary: 'This is the bugfix release of the ``community.postgresql``
+        collection.
+
+        This changelog contains all changes to the modules in this collection that
+
+        have been added after the release of ``community.postgresql`` 2.1.4'
+    fragments:
+    - 2.1.5.yml
+    - 252-fix-none-attribute-error.yml
+    - psf-license.yml
+    release_date: '2022-05-16'
diff --git a/changelogs/fragments/252-fix-none-attribute-error.yml b/changelogs/fragments/252-fix-none-attribute-error.yml
diff --git a/galaxy.yml b/galaxy.yml
@@ -1,6 +1,6 @@
 namespace: community
 name: postgresql
-version: 2.1.4
+version: 2.1.5
 readme: README.md
 authors:
   - Ansible PostgreSQL community

diff --git a/plugins/module_utils/_version.py b/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

diff --git a/plugins/modules/postgresql_owner.py b/plugins/modules/postgresql_owner.py
@@ -36,9 +36,11 @@
     - type
   reassign_owned_by:
     description:
-    - The list of role names. The ownership of all the objects within the current database,
-      and of all shared objects (databases, tablespaces), owned by this role(s) will be reassigned to I(owner).
-    - Pay attention - it reassigns all objects owned by this role(s) in the I(instance)!
+    - Caution - the ownership of all the objects within the specified I(db),
+      owned by this role(s) will be reassigned to I(new_owner).
+    - REASSIGN OWNED is often used to prepare for the removal of one or more roles.
+    - REASSIGN OWNED does not affect objects within other databases.
+    - Execute this command in each database that contains objects owned by a role that is to be removed.
     - If role(s) exists, always returns changed True.
     - Cannot reassign ownership of objects that are required by the database system.
     - Mutually exclusive with C(obj_type).
@@ -119,13 +121,13 @@
     obj_name: ssd
     obj_type: tablespace
 
-- name: Reassign all object in database bar owned by bob to alice
+- name: Reassign all databases owned by bob to alice and all objects in database bar owned by bob to alice
   community.postgresql.postgresql_owner:
     db: bar
     new_owner: alice
     reassign_owned_by: bob
 
-- name: Reassign all object in database bar owned by bob and bill to alice
+- name: Reassign all databases owned by bob or bill to alice and all objects in database bar owned by bob or bill to alice
   community.postgresql.postgresql_owner:
     db: bar
     new_owner: alice

diff --git a/plugins/modules/postgresql_user.py b/plugins/modules/postgresql_user.py
@@ -168,6 +168,9 @@
   the current and desired C(password). In this case, the module assumes that the passwords are
   different and changes it reporting that the state has been changed.
   To skip all password related checks for existing users, use I(no_password_changes=yes).
+- On some systems (such as AWS RDS), C(SUPERUSER) is unavailable. This means the C(SUPERUSER) and
+  C(NOSUPERUSER) I(role_attr_flags) should not be specified to preserve idempotency and avoid
+  InsufficientPrivilege errors.
 - Supports ``check_mode``.
 seealso:
 - module: community.postgresql.postgresql_privs