Skip to content

Commit

Permalink
Fix connect_params being ignored
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnAtOlo committed Apr 18, 2023
1 parent 444c1c1 commit bc3bbf5
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions plugins/modules/postgresql_privs.py
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@
pg_quote_identifier,
check_input,
)
from ansible_collections.community.postgresql.plugins.module_utils.postgres import postgres_common_argument_spec
from ansible_collections.community.postgresql.plugins.module_utils.postgres import postgres_common_argument_spec, get_conn_params
from ansible.module_utils._text import to_native

VALID_PRIVS = frozenset(('SELECT', 'INSERT', 'UPDATE', 'DELETE', 'TRUNCATE',
Expand Down Expand Up @@ -507,13 +507,7 @@ def __init__(self, params, module):
"ca_cert": "sslrootcert"
}

kw = dict((params_map[k], getattr(params, k)) for k in params_map
if getattr(params, k) != '' and getattr(params, k) is not None)

# If a login_unix_socket is specified, incorporate it here.
is_localhost = "host" not in kw or kw["host"] == "" or kw["host"] == "localhost"
if is_localhost and params.login_unix_socket != "":
kw["host"] = params.login_unix_socket
conn_params = get_conn_params(module, module.params, warn_db_default=False)

sslrootcert = params.ca_cert
if psycopg2.__version__ < '2.4.3' and sslrootcert is not None:
Expand Down

0 comments on commit bc3bbf5

Please sign in to comment.