From 3fc9f7bbdba369765c09a9b3cdfc560cf4338424 Mon Sep 17 00:00:00 2001 From: Brad Stein Date: Tue, 13 Jan 2026 12:07:03 -0300 Subject: [PATCH] iac: localize configmap scripts --- scripts/tests/test_mailu_sync.py | 8 +++++++- services/keycloak/kustomization.yaml | 6 +++--- .../scripts}/sso_portal_e2e_client_secret_sync.sh | 0 .../scripts}/tests/test_keycloak_execute_actions_email.py | 0 .../keycloak/scripts}/tests/test_portal_token_exchange.py | 0 services/mailu/kustomization.yaml | 4 ++-- {scripts => services/mailu/scripts}/mailu_sync.py | 0 .../mailu/scripts}/mailu_sync_listener.py | 0 services/nextcloud-mail-sync/kustomization.yaml | 2 +- .../nextcloud-mail-sync/scripts}/nextcloud-mail-sync.sh | 0 services/nextcloud/kustomization.yaml | 2 +- .../nextcloud/scripts}/nextcloud-maintenance.sh | 0 12 files changed, 14 insertions(+), 8 deletions(-) rename {scripts => services/keycloak/scripts}/sso_portal_e2e_client_secret_sync.sh (100%) rename {scripts => services/keycloak/scripts}/tests/test_keycloak_execute_actions_email.py (100%) rename {scripts => services/keycloak/scripts}/tests/test_portal_token_exchange.py (100%) rename {scripts => services/mailu/scripts}/mailu_sync.py (100%) rename {scripts => services/mailu/scripts}/mailu_sync_listener.py (100%) rename {scripts => services/nextcloud-mail-sync/scripts}/nextcloud-mail-sync.sh (100%) rename {scripts => services/nextcloud/scripts}/nextcloud-maintenance.sh (100%) diff --git a/scripts/tests/test_mailu_sync.py b/scripts/tests/test_mailu_sync.py index 9e5f383..49bd2e4 100644 --- a/scripts/tests/test_mailu_sync.py +++ b/scripts/tests/test_mailu_sync.py @@ -20,7 +20,13 @@ def load_sync_module(monkeypatch): } for k, v in env.items(): monkeypatch.setenv(k, v) - module_path = pathlib.Path(__file__).resolve().parents[1] / "mailu_sync.py" + module_path = ( + pathlib.Path(__file__).resolve().parents[2] + / "services" + / "mailu" + / "scripts" + / "mailu_sync.py" + ) spec = importlib.util.spec_from_file_location("mailu_sync_testmod", module_path) module = importlib.util.module_from_spec(spec) assert spec.loader is not None diff --git a/services/keycloak/kustomization.yaml b/services/keycloak/kustomization.yaml index 05639e5..ddb4ab2 100644 --- a/services/keycloak/kustomization.yaml +++ b/services/keycloak/kustomization.yaml @@ -26,8 +26,8 @@ generatorOptions: configMapGenerator: - name: portal-e2e-tests files: - - test_portal_token_exchange.py=../../scripts/tests/test_portal_token_exchange.py - - test_keycloak_execute_actions_email.py=../../scripts/tests/test_keycloak_execute_actions_email.py + - test_portal_token_exchange.py=scripts/tests/test_portal_token_exchange.py + - test_keycloak_execute_actions_email.py=scripts/tests/test_keycloak_execute_actions_email.py - name: portal-e2e-client-secret-sync-script files: - - sso_portal_e2e_client_secret_sync.sh=../../scripts/sso_portal_e2e_client_secret_sync.sh + - sso_portal_e2e_client_secret_sync.sh=scripts/sso_portal_e2e_client_secret_sync.sh diff --git a/scripts/sso_portal_e2e_client_secret_sync.sh b/services/keycloak/scripts/sso_portal_e2e_client_secret_sync.sh similarity index 100% rename from scripts/sso_portal_e2e_client_secret_sync.sh rename to services/keycloak/scripts/sso_portal_e2e_client_secret_sync.sh diff --git a/scripts/tests/test_keycloak_execute_actions_email.py b/services/keycloak/scripts/tests/test_keycloak_execute_actions_email.py similarity index 100% rename from scripts/tests/test_keycloak_execute_actions_email.py rename to services/keycloak/scripts/tests/test_keycloak_execute_actions_email.py diff --git a/scripts/tests/test_portal_token_exchange.py b/services/keycloak/scripts/tests/test_portal_token_exchange.py similarity index 100% rename from scripts/tests/test_portal_token_exchange.py rename to services/keycloak/scripts/tests/test_portal_token_exchange.py diff --git a/services/mailu/kustomization.yaml b/services/mailu/kustomization.yaml index 9e9359b..af4b2b1 100644 --- a/services/mailu/kustomization.yaml +++ b/services/mailu/kustomization.yaml @@ -19,10 +19,10 @@ configMapGenerator: - name: mailu-sync-script namespace: mailu-mailserver files: - - sync.py=../../scripts/mailu_sync.py + - sync.py=scripts/mailu_sync.py options: disableNameSuffixHash: true - name: mailu-sync-listener namespace: mailu-mailserver files: - - listener.py=../../scripts/mailu_sync_listener.py + - listener.py=scripts/mailu_sync_listener.py diff --git a/scripts/mailu_sync.py b/services/mailu/scripts/mailu_sync.py similarity index 100% rename from scripts/mailu_sync.py rename to services/mailu/scripts/mailu_sync.py diff --git a/scripts/mailu_sync_listener.py b/services/mailu/scripts/mailu_sync_listener.py similarity index 100% rename from scripts/mailu_sync_listener.py rename to services/mailu/scripts/mailu_sync_listener.py diff --git a/services/nextcloud-mail-sync/kustomization.yaml b/services/nextcloud-mail-sync/kustomization.yaml index fb18550..fb2a077 100644 --- a/services/nextcloud-mail-sync/kustomization.yaml +++ b/services/nextcloud-mail-sync/kustomization.yaml @@ -8,6 +8,6 @@ resources: configMapGenerator: - name: nextcloud-mail-sync-script files: - - sync.sh=../../scripts/nextcloud-mail-sync.sh + - sync.sh=scripts/nextcloud-mail-sync.sh options: disableNameSuffixHash: true diff --git a/scripts/nextcloud-mail-sync.sh b/services/nextcloud-mail-sync/scripts/nextcloud-mail-sync.sh similarity index 100% rename from scripts/nextcloud-mail-sync.sh rename to services/nextcloud-mail-sync/scripts/nextcloud-mail-sync.sh diff --git a/services/nextcloud/kustomization.yaml b/services/nextcloud/kustomization.yaml index 8192690..14e0ec1 100644 --- a/services/nextcloud/kustomization.yaml +++ b/services/nextcloud/kustomization.yaml @@ -15,6 +15,6 @@ resources: configMapGenerator: - name: nextcloud-maintenance-script files: - - maintenance.sh=../../scripts/nextcloud-maintenance.sh + - maintenance.sh=scripts/nextcloud-maintenance.sh options: disableNameSuffixHash: true diff --git a/scripts/nextcloud-maintenance.sh b/services/nextcloud/scripts/nextcloud-maintenance.sh similarity index 100% rename from scripts/nextcloud-maintenance.sh rename to services/nextcloud/scripts/nextcloud-maintenance.sh