kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-07-22 16:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changed pgadmin to web-app-pgadmin

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2025-07-21 10:36:51 +02:00
parent f3aa7625fe
commit 7e58b825ea
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
group_vars/all/09_ports.yml
View File

@ -13,7 +13,7 @@ ports:
web-app-lam: 4182 web-app-lam: 4182
web-app-openproject: 4183 web-app-openproject: 4183
web-app-yourls: 4184 web-app-yourls: 4184
pgadmin: 4185 web-app-pgadmin: 4185
phpldapadmin: 4186 phpldapadmin: 4186
fusiondirectory: 4187 fusiondirectory: 4187
web-app-gitea: 4188 web-app-gitea: 4188
@ -37,7 +37,7 @@ ports:
roulette-wheel: 8013 roulette-wheel: 8013
web-app-joomla: 8014 web-app-joomla: 8014
attendize: 8015 attendize: 8015
pgadmin: 8016 web-app-pgadmin: 8016
web-app-baserow: 8017 web-app-baserow: 8017
web-app-matomo: 8018 web-app-matomo: 8018
web-app-listmonk: 8019 web-app-listmonk: 8019

2
group_vars/all/10_networks.yml
View File

@ -60,7 +60,7 @@ defaults_networks:
subnet: 192.168.102.112/28 subnet: 192.168.102.112/28
web-app-pixelfed: web-app-pixelfed:
subnet: 192.168.102.128/28 subnet: 192.168.102.128/28
pgadmin: web-app-pgadmin:
subnet: 192.168.102.144/28 subnet: 192.168.102.144/28
web-app-snipe-it: web-app-snipe-it:
subnet: 192.168.102.160/28 subnet: 192.168.102.160/28

2
roles/web-app-pgadmin/vars/main.yml
View File

@ -1,4 +1,4 @@
application_id: "pgadmin" application_id: "web-app-pgadmin"
database_type: "postgres" database_type: "postgres"
database_host: "{{ applications | get_app_conf('svc-db-postgres', 'docker.services.postgres.name', True) if applications | get_app_conf(application_id, 'features.central_database', False) }}" database_host: "{{ applications | get_app_conf('svc-db-postgres', 'docker.services.postgres.name', True) if applications | get_app_conf(application_id, 'features.central_database', False) }}"
pgadmin_user: 5050 pgadmin_user: 5050

22
tests/integration/application_id/test_application_id_deprecation.py
View File

@ -1,7 +1,6 @@
import os import os
import unittest import unittest
import yaml import yaml
import warnings
# Dynamically determine the path to the roles directory # Dynamically determine the path to the roles directory
ROLES_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'roles')) ROLES_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'roles'))
@ -10,7 +9,10 @@ class TestApplicationIdDeprecation(unittest.TestCase):
def test_application_id_matches_role_name(self): def test_application_id_matches_role_name(self):
""" """
Deprecation: application_id in vars/main.yml must match the role name. Deprecation: application_id in vars/main.yml must match the role name.
This test fails if any role violates this rule, listing all violations.
""" """
errors = []
for role in os.listdir(ROLES_DIR): for role in os.listdir(ROLES_DIR):
role_path = os.path.join(ROLES_DIR, role) role_path = os.path.join(ROLES_DIR, role)
vars_main_yml = os.path.join(role_path, 'vars', 'main.yml') vars_main_yml = os.path.join(role_path, 'vars', 'main.yml')
@ -20,17 +22,23 @@ class TestApplicationIdDeprecation(unittest.TestCase):
try: try:
data = yaml.safe_load(f) data = yaml.safe_load(f)
except Exception as e: except Exception as e:
self.fail(f"Could not parse {vars_main_yml}: {e}") errors.append(f"Could not parse {vars_main_yml}: {e}")
continue
if not isinstance(data, dict): if not isinstance(data, dict):
continue continue
app_id = data.get('application_id') app_id = data.get('application_id')
if app_id is not None and app_id != role: if app_id is not None and app_id != role:
warnings.warn( errors.append(
f"[DEPRECATION WARNING] application_id '{app_id}' in {vars_main_yml} " f"[DEPRECATION] application_id '{app_id}' in {vars_main_yml} "
f"does not match its role directory '{role}'.\n" f"does not match its role directory '{role}'."
f"Please update 'application_id' to match the role name for future compatibility.",
DeprecationWarning
) )
if errors:
self.fail(
"application_id mismatch found in one or more roles:\n\n" +
"\n".join(errors) +
"\n\nPlease update 'application_id' to match the role name for future compatibility."
)
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()