Merge ~hemanth-n/postgresql-charm:lp1956266 into postgresql-charm:master

[Hemanth Nakkina]

Fix regex to read extra_pg_config with dot in configuration parameters

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Tom Haddon (mthaddon)]

Could we split this into a few different merge proposals, since there's the addition of data_sync_retry to pg_settings_10.json, some description changes/typo fixes, and extension_destdir addition in pg_settings_11.json which I think should be handled in a separate commit as they're unrelated to the dot configuration parameters and addition of pgaudit settings.

Unmerged commits

e0011ae... by Hemanth Nakkina on 2022-01-10

Fix regex to read extra_pg_config with dot

Fix regex to include parsing of dot in extra_pg_config
option.

Closes-Bug: #1956266

diff --git a/reactive/postgresql/postgresql.py b/reactive/postgresql/postgresql.py
index 7c5f440..c20705e 100644
--- a/reactive/postgresql/postgresql.py
+++ b/reactive/postgresql/postgresql.py
@@ -614,7 +614,7 @@ def parse_config(unparsed_config, fatal=True):
         r"""^\s*
                          (                       # key=value (1)
                            (?:
-                              (\w+)              # key (2)
+                              ([.\w]+)           # key (2)
                               (?:\s*=\s*|\s+)    # separator
                            )?
                            (?:
diff --git a/unit_tests/test_postgresql.py b/unit_tests/test_postgresql.py
index 9989318..c6ac803 100644
--- a/unit_tests/test_postgresql.py
+++ b/unit_tests/test_postgresql.py
@@ -580,6 +580,8 @@ class TestPostgresql(unittest.TestCase):
         service_reload.assert_called_once_with('postgresql@9.9-main')
 
     def test_parse_config(self):
+        dict_key_with_dot = dict()
+        dict_key_with_dot['key.10'] = '-1'
         valid = [(r'# A comment', dict()),
                  (r'key_1 = value', dict(key_1='value')),
                  (r"key_2 ='quoted valu3'", dict(key_2='quoted valu3')),
@@ -591,7 +593,8 @@ class TestPostgresql(unittest.TestCase):
                  (r"key_6='#'", dict(key_6='#')),
                  (r"key_7=42", dict(key_7='42')),
                  (r"key_8=3.142", dict(key_8='3.142')),
-                 (r'key_9=-1', dict(key_9='-1'))]
+                 (r'key_9=-1', dict(key_9='-1')),
+                 (r'key.10=-1', dict_key_with_dot)]
 
         # The above examples all parse correctly.
         for raw, expected in valid: