[IMP] create_domain function to use the subdomain

onesteinbv · Nov 29, 2024 · ccd331c · ccd331c
1 parent 4734ff8
commit ccd331c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/argocd_deployer/models/application_domain.py b/argocd_deployer/models/application_domain.py
@@ -47,11 +47,12 @@ def create_domain(
         i = 0
         best_available = False
         while not best_available:
-            i_as_str = str(i)
             for domain in domains:
                 domain_name = domain
                 if i:
-                    domain_name += i_as_str
+                    domain_levels = domain_name.split(".")
+                    domain_levels[0] += str(i)
+                    domain_name = ".".join(domain_levels)
                 search_domain = [("name", "=", domain_name)]
                 if scope_unique:
                     search_domain += [("scope", "=", scope)]

diff --git a/argocd_deployer/tests/test_application_domain.py b/argocd_deployer/tests/test_application_domain.py
@@ -151,3 +151,29 @@ def test_create_domain(self):
             "myapp",
             "Scope unique domain should still be available in different scope",
         )
+
+    def test_subdomain(self):
+        argocd_application_domain = self.env["argocd.application.domain"]
+        domain = argocd_application_domain.create_domain(
+            self.app_2, "myapp.saas.com", scope="website"
+        )
+        self.assertEqual(domain, "myapp.saas.com")
+        domain = argocd_application_domain.create_domain(
+            self.app_1, "myapp.saas.com", scope="website"
+        )
+        self.assertEqual(domain, "myapp1.saas.com", "it should change the subdomain")
+
+        domain = argocd_application_domain.create_domain(
+            self.app_1, "myapp.saas.com", scope="matomo"
+        )
+        self.assertEqual(domain, "myapp2.saas.com", "it should change the subdomain")
+
+        domain = argocd_application_domain.create_domain(
+            self.app_1, "nosub", scope="haystack"
+        )
+        self.assertEqual(domain, "nosub")
+
+        domain = argocd_application_domain.create_domain(
+            self.app_2, "nosub", scope="haystack"
+        )
+        self.assertEqual(domain, "nosub1")