gitops/patroni
1
0
Fork 0
mirror of https://github.com/outbackdingo/patroni.git synced 2026-09-02 09:39:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compatibility with python 3.11 (#2718)

Browse Source 
now it checks that inside square brackets there is indeed IPv6.

In addition to that fix a little issue in the function itself so it returns exactly the same result as psycopg2.extensions.parse_dsn().

Close https://github.com/zalando/patroni/pull/2714
This commit is contained in:
Alexander Kukushkin
2023-06-21 09:48:55 +02:00
committed by GitHub
parent 2354f8f004
commit 9b01041175
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patroni/postgresql/config.py
+8 -7
View File
@@ -39,13 +39,14 @@ def conninfo_uri_parse(dsn: str) -> Dict[str, str]:
for netloc in r.netloc.split('@')[-1].split(','):
host = None
if '[' in netloc and ']' in netloc:
host = netloc.split(']')[0][1:]
tmp = netloc.split(':', 1)
tmp = netloc.split(']') + ['']
host = tmp[0][1:]
netloc = ':'.join(tmp[:2])
tmp = netloc.rsplit(':', 1)
if host is None:
host = tmp[0]
hosts.append(host)
if len(tmp) == 2:
ports.append(tmp[1])
ports.append(tmp[1] if len(tmp) == 2 else '')
if hosts:
ret['host'] = ','.join(hosts)
if ports:
@@ -113,9 +114,9 @@ def parse_dsn(value: str) -> Optional[Dict[str, str]]:
and sets the `sslmode`, 'gssencmode', and `channel_binding` to `prefer` if it is not present in
the connection string. This is necessary to simplify comparison of the old and the new values.
>>> r = parse_dsn('postgresql://u%2Fse:pass@:%2f123,[%2Fhost2]/db%2Fsdf?application_name=mya%2Fpp&ssl=true')
>>> r == {'application_name': 'mya/pp', 'host': ',/host2', 'sslmode': 'require',\
'password': 'pass', 'port': '/123', 'user': 'u/se', 'gssencmode': 'prefer', 'channel_binding': 'prefer'}
>>> r = parse_dsn('postgresql://u%2Fse:pass@:%2f123,[::1]/db%2Fsdf?application_name=mya%2Fpp&ssl=true')
>>> r == {'application_name': 'mya/pp', 'host': ',::1', 'sslmode': 'require',\
'password': 'pass', 'port': '/123,', 'user': 'u/se', 'gssencmode': 'prefer', 'channel_binding': 'prefer'}
True
>>> r = parse_dsn(" host = 'host' dbname = db\\\\ name requiressl=1 ")
>>> r == {'host': 'host', 'sslmode': 'require', 'gssencmode': 'prefer', 'channel_binding': 'prefer'}