postgresql_set - Fix GUC_LIST_QUOTE parameters

changelogs/fragments/521-postgresql_set.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- postgresql_set - fixed GUC_LIST_QUOTE parameters (https://github.com/ansible-collections/community.postgresql/pull/521).

plugins/modules/postgresql_set.py

@@ -194,12 +194,54 @@
 # To allow to set value like 1mb instead of 1MB, etc:
 LOWERCASE_SIZE_UNITS = ("mb", "gb", "tb")
 
+# GUC_LIST_QUOTE parameters list for each version where they changed (from PG_REQ_VER).
+# It is a tuple of tuples as we need to iterate it in order.
+PARAMETERS_GUC_LIST_QUOTE = (
+    (140000, (
+        'local_preload_libraries',
+        'search_path',
+        'session_preload_libraries',
+        'shared_preload_libraries',
+        'temp_tablespaces',
+        'unix_socket_directories'
+    )),
+    (90400, (
+        'local_preload_libraries',
+        'search_path',
+        'session_preload_libraries',
+        'shared_preload_libraries',
+        'temp_tablespaces'
+    )),
+)
+
+
 # ===========================================
 # PostgreSQL module specific support methods.
 #
 
 
-def param_get(cursor, module, name):
+def param_is_guc_list_quote(server_version, name):
+    for guc_list_quote_ver, guc_list_quote_params in PARAMETERS_GUC_LIST_QUOTE:
+        if server_version >= guc_list_quote_ver:
+            return name in guc_list_quote_params
+    return False
+
+
+def param_guc_list_unquote(value):
+    # unquote GUC_LIST_QUOTE parameter (each element can be quoted or not)
+    value_unquoted = []
+    for v in value.split(','):
+        v = v.strip()  # strip whitespaces at start/end
+        if v and v[0] == v[-1] == '"':
+            # is quoted -> strip quotes
+            value_unquoted.append(v[1:-1])
+        else:
+            # is not quoted -> no changes
+            value_unquoted.append(v)
+    return ', '.join(value_unquoted)
+
+
+def param_get(cursor, module, name, is_guc_list_quote):
     query = ("SELECT name, setting, unit, context, boot_val "
              "FROM pg_settings WHERE name = %(name)s")
     try:
@@ -216,15 +258,16 @@ def param_get(cursor, module, name):
                              "Please check its spelling or presence in your PostgreSQL version "
                              "(https://www.postgresql.org/docs/current/runtime-config.html)" % name)
 
+    current_val = val[name]
     raw_val = info['setting']
     unit = info['unit']
     context = info['context']
     boot_val = info['boot_val']
 
-    if val[name] == 'True':
-        val[name] = 'on'
-    elif val[name] == 'False':
-        val[name] = 'off'
+    if current_val == 'True':
+        current_val = 'on'
+    elif current_val == 'False':
+        current_val = 'off'
 
     if unit == 'kB':
         if int(raw_val) > 0:
@@ -242,8 +285,12 @@ def param_get(cursor, module, name):
 
         unit = 'b'
 
+    if is_guc_list_quote:
+        current_val = param_guc_list_unquote(current_val)
+        raw_val = param_guc_list_unquote(raw_val)
+
     return {
-        'current_val': val[name],
+        'current_val': current_val,
         'raw_val': raw_val,
         'unit': unit,
         'boot_val': boot_val,
@@ -317,16 +364,21 @@ def pretty_to_bytes(pretty_val):
         return pretty_val
 
 
-def param_set(cursor, module, name, value, context):
+def param_set(cursor, module, name, value, context, server_version):
     try:
         if str(value).lower() == 'default':
             query = "ALTER SYSTEM SET %s = DEFAULT" % name
         else:
-            if isinstance(value, str) and ',' in value and not name.endswith(('_command', '_prefix')):
+            if isinstance(value, str) and \
+                    ',' in value and \
+                    not name.endswith(('_command', '_prefix')) and \
+                    not (server_version < 140000 and name == 'unix_socket_directories'):
                 # Issue https://github.com/ansible-collections/community.postgresql/issues/78
                 # Change value from 'one, two, three' -> "'one','two','three'"
                 # PR https://github.com/ansible-collections/community.postgresql/pull/400
                 # Parameter names ends with '_command' or '_prefix' can contains commas but are not lists
+                # PR https://github.com/ansible-collections/community.postgresql/pull/521
+                # unix_socket_directories up to PostgreSQL 13 lacks GUC_LIST_INPUT and GUC_LIST_QUOTE options so it is a single value parameter
                 value = ','.join(["'" + elem.strip() + "'" for elem in value.split(',')])
                 query = "ALTER SYSTEM SET %s = %s" % (name, value)
             else:
@@ -409,14 +461,17 @@ def main():
         db_connection.close()
         module.exit_json(**kw)
 
+    # Check parameter is GUC_LIST_QUOTE (done once as depend only on server version)
+    is_guc_list_quote = param_is_guc_list_quote(ver, name)
+
     # Set default returned values:
     restart_required = False
     changed = False
     kw['name'] = name
     kw['restart_required'] = False
 
     # Get info about param state:
-    res = param_get(cursor, module, name)
+    res = param_get(cursor, module, name, is_guc_list_quote)
     current_val = res['current_val']
     raw_val = res['raw_val']
     unit = res['unit']
@@ -459,7 +514,7 @@ def main():
 
     # Set param (value can be an empty string):
     if value is not None and value != current_val:
-        changed = param_set(cursor, module, name, value, context)
+        changed = param_set(cursor, module, name, value, context, ver)
 
         kw['value_pretty'] = value
 
@@ -473,7 +528,7 @@ def main():
             )
             module.exit_json(**kw)
 
-        changed = param_set(cursor, module, name, boot_val, context)
+        changed = param_set(cursor, module, name, boot_val, context, ver)
 
     cursor.close()
     db_connection.close()
@@ -483,7 +538,7 @@ def main():
         db_connection, dummy = connect_to_db(module, conn_params, autocommit=True)
         cursor = db_connection.cursor(cursor_factory=DictCursor)
 
-        res = param_get(cursor, module, name)
+        res = param_get(cursor, module, name, is_guc_list_quote)
         # f_ means 'final'
         f_value = res['current_val']
         f_raw_val = res['raw_val']

tests/integration/targets/postgresql_set/tasks/options_coverage.yml

@@ -28,8 +28,21 @@
         wal_level: replica
         log_statement: mod
         track_functions: none
-        shared_preload_libraries: 'pg_stat_statements, pgaudit'
+        shared_preload_libraries: 'pg_stat_statements, pgcrypto'
         log_line_prefix: 'db=%d,user=%u,app=%a,client=%h '
+        unix_socket_directories: '/var/run/postgresql, /var/run/postgresql2'
+
+  - name: Ensure unix_socket_directories exist
+    file:
+      state: directory
+      path: "{{ item }}"
+      owner: "{{ pg_user }}"
+      group: "{{ pg_user }}"
+      mode: '0777'
+    become: true
+    with_list:
+      - /var/run/postgresql
+      - /var/run/postgresql2
 
   # Check mode:
   - name: Set settings in check mode
@@ -51,16 +64,33 @@
     with_dict: '{{ setting_map }}'
 
   # https://github.com/ansible-collections/community.postgresql/issues/78
-  - name: Test param with comma containing values
+  - name: Test param with comma containing values but no quotes
     <<: *task_parameters
     shell: "grep shared_preload_libraries {{ pg_auto_conf }}"
     register: result
 
   - assert:
       that:
-      - result.stdout == "shared_preload_libraries = 'pg_stat_statements, pgaudit'"
-
-  # Test for single-value params with commas and spaces in value
+      - result.stdout == "shared_preload_libraries = 'pg_stat_statements, pgcrypto'"
+
+  # https://github.com/ansible-collections/community.postgresql/pull/521
+  # unix_socket_directories is a GUC_LIST_QUOTE parameter only from PostgreSQL 14
+  - name: Test param with comma containing values and quotes
+    <<: *task_parameters
+    shell: "grep unix_socket_directories {{ pg_auto_conf }}"
+    register: result
+
+  - assert:
+      that:
+      - result.stdout == "unix_socket_directories = '/var/run/postgresql, /var/run/postgresql2'"
+    when: postgres_version_resp.stdout is version('14', '<')
+
+  - assert:
+      that:
+      - result.stdout == "unix_socket_directories = '\"/var/run/postgresql\", \"/var/run/postgresql2\"'"
+    when: postgres_version_resp.stdout is version('14', '>=')
+
+  # https://github.com/ansible-collections/community.postgresql/pull/400
   - name: Test single-value param with commas and spaces in value
     <<: *task_parameters
     shell: "grep log_line_prefix {{ pg_auto_conf }}"
@@ -69,3 +99,25 @@
   - assert:
       that:
       - result.stdout == "log_line_prefix = 'db=%d,user=%u,app=%a,client=%h '"
+
+  # Restart PostgreSQL:
+  - name: Restart PostgreSQL
+    become: true
+    service:
+      name: "{{ postgresql_service }}"
+      state: restarted
+
+  # Idempotence:
+  - name: Set settings in actual mode again after restart for idempotence
+    <<: *task_parameters
+    postgresql_set:
+      <<: *pg_parameters
+      name: '{{ item.key }}'
+      value: '{{ item.value }}'
+    register: test_idempotence
+    with_dict: '{{ setting_map }}'
+
+  - name: Check idempotence after restart
+    assert:
+      that: not item.changed
+    with_items: '{{ test_idempotence.results }}'

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

@@ -75,7 +75,7 @@
     become: true
     apt:
       autoremove: true
-  
+
   - name: Create the file repository configuration
     lineinfile:
       create: true
@@ -127,7 +127,7 @@
   when: ansible_os_family == "RedHat" and ansible_service_mgr != "systemd"
 
 - name: Initialize postgres (Debian)
-  shell: . /usr/share/postgresql-common/maintscripts-functions && set_system_locale && /usr/bin/pg_createcluster -u postgres {{ pg_ver }} main
+  shell: . /usr/share/postgresql-common/maintscripts-functions && set_system_locale && /usr/bin/pg_createcluster -u postgres {{ pg_ver }} main
   args:
     creates: /etc/postgresql/{{ pg_ver }}/
   when: ansible_os_family == 'Debian'

tests/integration/targets/setup_postgresql_db/vars/RedHat-py3.yml

@@ -1,5 +1,6 @@
 postgresql_packages:
   - "postgresql-server"
+  - "postgresql-contrib"
   - "python3-psycopg2"
   - "bzip2"
   - "xz"

tests/integration/targets/setup_postgresql_db/vars/RedHat.yml

@@ -1,5 +1,6 @@
 postgresql_packages:
   - "postgresql-server"
+  - "postgresql-contrib"
   - "python-psycopg2"
   - "bzip2"