ssm

Author: pcrespov

packages/settings-library/src/settings_library/ec2.py

@@ -1,24 +1,17 @@
 from typing import Annotated
 
-from pydantic import AnyHttpUrl, BeforeValidator, Field, TypeAdapter
+from pydantic import BeforeValidator, Field
 from pydantic_settings import SettingsConfigDict
 
 from .base import BaseCustomSettings
-
-ANY_HTTP_URL_ADAPTER: TypeAdapter = TypeAdapter(AnyHttpUrl)
-
-
-def _validate_url(value: str | None) -> str | None:
-    if value is not None:
-        return str(ANY_HTTP_URL_ADAPTER.validate_python(value))
-    return value
+from .utils_validators import validate_nullable_url
 
 
 class EC2Settings(BaseCustomSettings):
     EC2_ACCESS_KEY_ID: str
     EC2_ENDPOINT: Annotated[
         str | None,
-        BeforeValidator(_validate_url),
+        BeforeValidator(validate_nullable_url),
         Field(description="do not define if using standard AWS"),
     ] = None
     EC2_REGION_NAME: str = "us-east-1"

packages/settings-library/src/settings_library/ssm.py

@@ -1,20 +1,19 @@
 from typing import Annotated
 
-from pydantic import AnyHttpUrl, BeforeValidator, Field, SecretStr, TypeAdapter
+from pydantic import BeforeValidator, Field, SecretStr
 from pydantic_settings import SettingsConfigDict
 
 from .base import BaseCustomSettings
+from .utils_validators import validate_nullable_url
 
 
 class SSMSettings(BaseCustomSettings):
     SSM_ACCESS_KEY_ID: SecretStr
-    SSM_ENDPOINT: (
-        Annotated[
-            str,
-            BeforeValidator(lambda x: str(TypeAdapter(AnyHttpUrl).validate_python(x))),
-        ]
-        | None
-    ) = Field(default=None, description="do not define if using standard AWS")
+    SSM_ENDPOINT: Annotated[
+        str | None,
+        BeforeValidator(validate_nullable_url),
+        Field(description="do not define if using standard AWS"),
+    ] = None
     SSM_REGION_NAME: str = "us-east-1"
     SSM_SECRET_ACCESS_KEY: SecretStr
 

packages/settings-library/src/settings_library/utils_validators.py

@@ -0,0 +1,9 @@
+from pydantic import AnyHttpUrl, TypeAdapter
+
+ANY_HTTP_URL_ADAPTER: TypeAdapter = TypeAdapter(AnyHttpUrl)
+
+
+def validate_nullable_url(value: str | None) -> str | None:
+    if value is not None:
+        return str(ANY_HTTP_URL_ADAPTER.validate_python(value))
+    return value