[DPE-7510] Fix the auth username pattern (#987)

* Fix auth username pattern

Signed-off-by: Marcelo Henrique Neppel <[email protected]>

* Fix unit test

Signed-off-by: Marcelo Henrique Neppel <[email protected]>

* Fix another ocurrence of the pattern

Signed-off-by: Marcelo Henrique Neppel <[email protected]>

---------

Signed-off-by: Marcelo Henrique Neppel <[email protected]>

Author: marceloneppel

lib/charms/postgresql_k8s/v0/postgresql.py

@@ -35,7 +35,7 @@
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 54
+LIBPATCH = 55
 
 # Groups to distinguish HBA access
 ACCESS_GROUP_IDENTITY = "identity_access"
@@ -751,7 +751,7 @@ def list_users_from_relation(self, current_host=False) -> Set[str]:
                     "SELECT usename "
                     "FROM pg_catalog.pg_user "
                     "WHERE usename LIKE 'relation_id_%' OR usename LIKE 'relation-%' "
-                    "OR usename LIKE 'pgbouncer_auth_relation_id_%' OR usename LIKE '%_user_%_%';"
+                    "OR usename LIKE 'pgbouncer_auth_relation_%' OR usename LIKE '%_user_%_%';"
                 )
                 usernames = cursor.fetchall()
                 return {username[0] for username in usernames}
@@ -830,7 +830,7 @@ def set_up_database(self) -> None:
                   END IF;
                 END LOOP;
                 -- Remove users that don't exist anymore from the pg_hba file.
-                FOR rec IN SELECT h.lines FROM pg_hba AS h LEFT JOIN relation_users AS r ON SPLIT_PART(h.lines, ' ', 3) = r.user WHERE r.user IS NULL AND (SPLIT_PART(h.lines, ' ', 3) LIKE 'relation_id_%' OR SPLIT_PART(h.lines, ' ', 3) LIKE 'pgbouncer_auth_relation_id_%' OR SPLIT_PART(h.lines, ' ', 3) LIKE '%_user_%_%')
+                FOR rec IN SELECT h.lines FROM pg_hba AS h LEFT JOIN relation_users AS r ON SPLIT_PART(h.lines, ' ', 3) = r.user WHERE r.user IS NULL AND (SPLIT_PART(h.lines, ' ', 3) LIKE 'relation_id_%' OR SPLIT_PART(h.lines, ' ', 3) LIKE 'pgbouncer_auth_relation_%' OR SPLIT_PART(h.lines, ' ', 3) LIKE '%_user_%_%')
                 LOOP
                   DELETE FROM pg_hba WHERE lines = rec.lines;
                   changes := changes + 1;

tests/unit/test_postgresql.py

@@ -227,7 +227,7 @@ def test_grant_relation_access_group_memberships(harness):
                 "SELECT usename "
                 "FROM pg_catalog.pg_user "
                 "WHERE usename LIKE 'relation_id_%' OR usename LIKE 'relation-%' "
-                "OR usename LIKE 'pgbouncer_auth_relation_id_%' OR usename LIKE '%_user_%_%';"
+                "OR usename LIKE 'pgbouncer_auth_relation_%' OR usename LIKE '%_user_%_%';"
             ),
         ])