From 9f865dd21589d2493c1572fc7c8131eb4c0c1d96 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Fri, 8 Aug 2025 09:47:31 +0200
Subject: [PATCH] =?UTF-8?q?Removed=20catetory=20domain=20pr=C3=A4fix=20fro?=
 =?UTF-8?q?m=20redirect=20domains?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 filter_plugins/domain_redirect_mappings.py    |  8 +++--
 roles/web-opt-rdr-domains/defaults/main.yml   |  1 +
 .../filter_plugins/test_domain_mappings.py    | 34 +++++++++----------
 3 files changed, 24 insertions(+), 19 deletions(-)
 create mode 100644 roles/web-opt-rdr-domains/defaults/main.yml

diff --git a/filter_plugins/domain_redirect_mappings.py b/filter_plugins/domain_redirect_mappings.py
index 6ef524e6..4dc78307 100644
--- a/filter_plugins/domain_redirect_mappings.py
+++ b/filter_plugins/domain_redirect_mappings.py
@@ -1,4 +1,7 @@
 from ansible.errors import AnsibleFilterError
+import sys, os
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
+from module_utils.entity_name_utils import get_entity_name
 
 class FilterModule(object):
     def filters(self):
@@ -30,8 +33,9 @@ class FilterModule(object):
                     )
             return values
 
-        def default_domain(app_id, primary):
-            return f"{app_id}.{primary}"
+        def default_domain(app_id:str, primary:str):
+            subdomain = get_entity_name(app_id)
+            return f"{subdomain}.{primary}"
 
         # 1) Compute canonical domains per app (always as a list)
         canonical_map = {}
diff --git a/roles/web-opt-rdr-domains/defaults/main.yml b/roles/web-opt-rdr-domains/defaults/main.yml
new file mode 100644
index 00000000..a4cab147
--- /dev/null
+++ b/roles/web-opt-rdr-domains/defaults/main.yml
@@ -0,0 +1 @@
+redirect_domain_mappings: []  # Format [{source: target:},...]
\ No newline at end of file
diff --git a/tests/unit/filter_plugins/test_domain_mappings.py b/tests/unit/filter_plugins/test_domain_mappings.py
index c3b80e1f..8c74afea 100644
--- a/tests/unit/filter_plugins/test_domain_mappings.py
+++ b/tests/unit/filter_plugins/test_domain_mappings.py
@@ -22,27 +22,27 @@ class TestDomainMappings(unittest.TestCase):
         self.assertEqual(result, [])
 
     def test_app_without_domains(self):
-        apps = {'app1': {}}
+        apps = {'web-app-port-ui': {}}
         # no domains key → no mappings
         result = self.filter.domain_mappings(apps, self.primary)
         self.assertEqual(result, [])
 
     def test_empty_domains_cfg(self):
-        apps = {'app1': {'domains': {}}}
-        default = 'app1.example.com'
+        apps = {'web-app-port-ui': {'domains': {}}}
+        default = 'port-ui.example.com'
         expected = []
         result = self.filter.domain_mappings(apps, self.primary)
         self.assertEqual(result, expected)
 
     def test_explicit_aliases(self):
         apps = {
-            'app1': {
+            'web-app-port-ui': {
                 'server':{
                     'domains': {'aliases': ['alias.com']}
                 }
             }
         }
-        default = 'app1.example.com'
+        default = 'port-ui.example.com'
         expected = [
             {'source': 'alias.com',    'target': default},
         ]
@@ -52,21 +52,21 @@ class TestDomainMappings(unittest.TestCase):
 
     def test_canonical_not_default(self):
         apps = {
-            'app1': {
+            'web-app-port-ui': {
                 'server':{
                     'domains': {'canonical': ['foo.com']}
                 }
             }
         }
         expected = [
-            {'source': 'app1.example.com', 'target': 'foo.com'}
+            {'source': 'port-ui.example.com', 'target': 'foo.com'}
         ]
         result = self.filter.domain_mappings(apps, self.primary)
         self.assertEqual(result, expected)
 
     def test_canonical_dict(self):
         apps = {
-            'app1': {
+            'web-app-port-ui': {
                 'server':{
                     'domains': {
                         'canonical': {'one': 'one.com', 'two': 'two.com'}
@@ -76,44 +76,44 @@ class TestDomainMappings(unittest.TestCase):
         }
         # first canonical key 'one' → one.com
         expected = [
-            {'source': 'app1.example.com', 'target': 'one.com'}
+            {'source': 'port-ui.example.com', 'target': 'one.com'}
         ]
         result = self.filter.domain_mappings(apps, self.primary)
         self.assertEqual(result, expected)
 
     def test_multiple_apps(self):
         apps = {
-            'app1': {
+            'web-app-port-ui': {
                 'server':{'domains': {'aliases': ['a1.com']}}
             },
-            'app2': {
+            'web-app-mastodon': {
                 'server':{'domains': {'canonical': ['c2.com']}}
             },
         }
         expected = [
-            {'source': 'a1.com',              'target': 'app1.example.com'},
-            {'source': 'app2.example.com',    'target': 'c2.com'},
+            {'source': 'a1.com',              'target': 'port-ui.example.com'},
+            {'source': 'mastodon.example.com',    'target': 'c2.com'},
         ]
         result = self.filter.domain_mappings(apps, self.primary)
         self.assertCountEqual(result, expected)
         
     def test_multiple_aliases(self):
         apps = {
-            'app1': {
+            'web-app-port-ui': {
                 'server':{'domains': {'aliases': ['a1.com','a2.com']}
                 }
             }
         }
         expected = [
-            {'source': 'a1.com', 'target': 'app1.example.com'},
-            {'source': 'a2.com', 'target': 'app1.example.com'}
+            {'source': 'a1.com', 'target': 'port-ui.example.com'},
+            {'source': 'a2.com', 'target': 'port-ui.example.com'}
         ]
         result = self.filter.domain_mappings(apps, self.primary)
         self.assertCountEqual(result, expected)
 
     def test_invalid_aliases_type(self):
         apps = {
-            'app1': {'server':{'domains': {'aliases': 123}}}
+            'web-app-port-ui': {'server':{'domains': {'aliases': 123}}}
         }
         with self.assertRaises(AnsibleFilterError):
             self.filter.domain_mappings(apps, self.primary)