Set entity name as default domain instead of application_id

This commit is contained in:
2025-07-20 15:44:28 +02:00
parent 4cbd29735f
commit 257d0c4673
2 changed files with 67 additions and 22 deletions

View File

@@ -24,39 +24,39 @@ class TestDomainFilters(unittest.TestCase):
self.assertEqual(result, expected)
def test_canonical_without_domains(self):
apps = {'app1': {}}
expected = {'app1': ['app1.example.com']}
apps = {'web-app-app1': {}}
expected = {'web-app-app1': ['app1.example.com']}
result = self.filter_module.canonical_domains_map(apps, self.primary)
self.assertEqual(result, expected)
def test_canonical_with_list(self):
apps = {
'app1': {
'web-app-app1': {
'domains': {'canonical': ['foo.com', 'bar.com']}
}
}
result = self.filter_module.canonical_domains_map(apps, self.primary)
self.assertCountEqual(
result['app1'],
result['web-app-app1'],
['foo.com', 'bar.com']
)
def test_canonical_with_dict(self):
apps = {
'app1': {
'web-app-app1': {
'domains': {'canonical': {'one': 'one.com', 'two': 'two.com'}}
}
}
result = self.filter_module.canonical_domains_map(apps, self.primary)
self.assertEqual(
result['app1'],
result['web-app-app1'],
{'one': 'one.com', 'two': 'two.com'}
)
def test_canonical_duplicate_raises(self):
apps = {
'app1': {'domains': {'canonical': ['dup.com']}},
'app2': {'domains': {'canonical': ['dup.com']}},
'web-app-app1': {'domains': {'canonical': ['dup.com']}},
'web-app-app2': {'domains': {'canonical': ['dup.com']}},
}
with self.assertRaises(AnsibleFilterError) as cm:
self.filter_module.canonical_domains_map(apps, self.primary)
@@ -65,10 +65,48 @@ class TestDomainFilters(unittest.TestCase):
def test_invalid_canonical_type(self):
apps = {
'app1': {'domains': {'canonical': 123}}
'web-app-app1': {'domains': {'canonical': 123}}
}
with self.assertRaises(AnsibleFilterError):
self.filter_module.canonical_domains_map(apps, self.primary)
def test_non_web_apps_are_ignored(self):
"""
Applications not starting with 'web-' should be skipped entirely,
resulting in an empty mapping when only non-web apps are provided.
"""
apps = {
'db-app-app1': {'domains': {'canonical': ['db.example.com']}},
'service-app-app2': {}
}
result = self.filter_module.canonical_domains_map(apps, self.primary)
self.assertEqual(result, {})
def test_mixed_web_and_non_web_apps(self):
"""
Only 'web-' prefixed applications should be processed;
non-web apps should be ignored alongside valid web apps.
"""
apps = {
'db-app-app1': {'domains': {'canonical': ['db.example.com']}},
'web-app-app1': {}
}
expected = {'web-app-app1': ['app1.example.com']}
result = self.filter_module.canonical_domains_map(apps, self.primary)
self.assertEqual(result, expected)
def test_non_web_invalid_config_no_error(self):
"""
Invalid configurations for non-web apps should not raise errors
since they are ignored by the filter.
"""
apps = {
'nonweb-app-app1': 'not-a-dict',
'another': 12345
}
# Should simply return an empty result without exceptions
result = self.filter_module.canonical_domains_map(apps, self.primary)
self.assertEqual(result, {})
if __name__ == "__main__":
unittest.main()