Fix test for Anyurl.

elixir-cloud-aai · Apr 16, 2024 · d1bb112 · d1bb112
1 parent 18a2411
commit d1bb112
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/compliance_suite/models/v1_0_0_specs.py b/compliance_suite/models/v1_0_0_specs.py
@@ -337,14 +337,17 @@ class Service(BaseModel):
     def check_url_or_email(cls, value):
         if value.startswith("mailto:"):
             email = value[len("mailto:"):]
-            if EmailStr.validate(email):
+            try:
+                EmailStr.validate(email)
                 return value
-            else:
+            except ValidationError:
                 raise ValueError("Invalid email address")
-        elif AnyUrl.validate(value):
-            return value
         else:
-            raise ValueError("Invalid URL")
+            try:
+                parse_obj_as(AnyUrl, value)
+                return value
+            except ValidationError:
+                raise ValueError("Invalid URL")
 
 
 class TesServiceType(ServiceType):

diff --git a/compliance_suite/models/v1_1_0_specs.py b/compliance_suite/models/v1_1_0_specs.py
@@ -383,14 +383,17 @@ class Service(BaseModel):
     def check_url_or_email(cls, value):
         if value.startswith("mailto:"):
             email = value[len("mailto:"):]
-            if EmailStr.validate(email):
+            try:
+                EmailStr.validate(email)
                 return value
-            else:
+            except ValidationError:
                 raise ValueError("Invalid email address")
-        elif AnyUrl.validate(value):
-            return value
         else:
-            raise ValueError("Invalid URL")
+            try:
+                parse_obj_as(AnyUrl, value)
+                return value
+            except ValidationError:
+                raise ValueError("Invalid URL")
 
 
 class TesServiceType(ServiceType):