fix: [#57397] fix sdmox when org_unit is None

Author: Skeen

.gitlab-ci.yml

@@ -40,7 +40,7 @@ variables:
 .lint-default: &lint-default
   stage: lint
   needs: []
-  image: python:3.7
+  image: python:3.11
   services: []
 
 TypeCheck Python:

Dockerfile

@@ -2,13 +2,10 @@
 #
 # SPDX-License-Identifier: MPL-2.0
 
-FROM tiangolo/uvicorn-gunicorn-fastapi:python3.8
+FROM tiangolo/uvicorn-gunicorn-fastapi:python3.11
 
 # Install mora_helpers
 WORKDIR /srv/
-RUN git clone https://github.com/OS2mo/os2mo-data-import-and-export && \
-    pip install --no-cache-dir -e os2mo-data-import-and-export/os2mo_data_import
-
 COPY ./requirements.txt /app/requirements.txt
 COPY ./requirements /app/requirements
 RUN pip install --no-cache-dir -r /app/requirements.txt

app/config.py

@@ -12,7 +12,7 @@
 
 
 class Settings(BaseSettings):
-    mora_url: AnyHttpUrl = parse_obj_as(AnyHttpUrl, "https://morademo.magenta.dk/")
+    mora_url: AnyHttpUrl = parse_obj_as(AnyHttpUrl, "https://moradev.magentahosted.dk")
     saml_token: Optional[UUID] = None
 
     triggered_uuids: List[UUID]

app/pydantic_types.py

@@ -4,7 +4,7 @@
 
 from typing import TYPE_CHECKING, Any, Optional, no_type_check
 
-from pydantic.errors import UrlHostError, UrlPortError
+from pydantic.errors import UrlHostError
 from pydantic.fields import ModelField
 from pydantic.main import BaseConfig
 from pydantic.networks import ascii_domain_regex, int_domain_regex
@@ -31,9 +31,6 @@ def validate(cls, value: Any) -> "Port":
         if not isinstance(value, int):
             raise TypeError("Integer required")
 
-        if value is not None and value > 65_535:
-            raise UrlPortError()
-
         return cls(value)
 
     def __repr__(self) -> str:
@@ -66,9 +63,9 @@ def validate(cls, value: Any) -> "Domain":
         host = value
 
         is_international = False
-        d = ascii_domain_regex().fullmatch(host)
+        d = ascii_domain_regex().fullmatch(host)  # type: ignore
         if d is None:
-            d = int_domain_regex().fullmatch(host)
+            d = int_domain_regex().fullmatch(host)  # type: ignore
             if d is None:
                 raise UrlHostError()
             is_international = True

app/routers/trigger_api.py

@@ -94,7 +94,7 @@ async def triggers_ou_create(
     # We will never create a top level organization unit with SDMox.
     # Thus we cannot accept requests with no parent set, or the parent set to the
     # root organization.
-    parent_uuid = payload.request.get("parent", {}).get("uuid")
+    parent_uuid = (payload.request.get("parent") or {}).get("uuid")
     o_uuid = mora_helper.read_organisation()
     if not parent_uuid or parent_uuid == o_uuid:
         raise HTTPException(
@@ -157,7 +157,7 @@ async def triggers_address_create(
     """Create an addresses."""
     dry_run = dry_run or False
 
-    unit_uuid = payload.request.get("org_unit", {}).get("uuid")
+    unit_uuid = (payload.request.get("org_unit") or {}).get("uuid")
     if not unit_uuid:  # Probably an employee address
         return {"status": "NOOP"}
     # We will never create an addresses for units outside non-triggered uuid.
@@ -185,7 +185,7 @@ async def triggers_address_edit(
     """Edit an address."""
     dry_run = dry_run or False
 
-    unit_uuid = payload.request.get("org_unit", {}).get("uuid")
+    unit_uuid = (payload.request.get("org_unit") or {}).get("uuid")
     if not unit_uuid:  # Probably an employee address
         return {"status": "NOOP"}
     # We will never create an addresses for units outside non-triggered uuid.

app/util.py

@@ -58,7 +58,7 @@ async def sleepy(seconds):
 
     @wraps(func)
     def wrapper(*args, **kwargs) -> CallableReturnType:
-        return asyncio.run(func(*args, **kwargs))
+        return asyncio.run(func(*args, **kwargs))  # type: ignore
 
     return wrapper
 

requirements/common.txt

@@ -4,8 +4,10 @@
 
 structlog
 pika
+os2mo-data-import==5.4.3
 
-more-itertools==8.6.0
+requests
+more-itertools
 os2mo-fastapi-utils==0.0.3
 os2mo-http-trigger-protocol==0.0.3
 os2mo-sd-connector==0.0.1

requirements/test.txt

@@ -5,3 +5,4 @@
 -r common.txt
 pytest
 pytest-cov
+freezegun

tests/test_pydantic_types.py

@@ -36,9 +36,6 @@ def test_valid_port(self):
         PortModel(port=5432)
 
     def test_invalid_port(self):
-        with self.assertRaises(ValidationError):
-            PortModel(port=70000)
-
         with self.assertRaises(ValidationError):
             PortModel(port="80")