feat: uses aws secrets manager

Author: jtyoung84

aind-tars-service-server/pyproject.toml

@@ -18,7 +18,7 @@ dynamic = ["version"]
 
 dependencies = [
     'pydantic>=2.0',
-    'pydantic-settings>=2.0',
+    'aind-settings-utils>=0.1.0',
     'fastapi[standard]>=0.114.0',
     'azure-identity>=1.15.0',
     'fastapi-cache2[redis]>=0.2.2',

aind-tars-service-server/src/aind_tars_service_server/configs.py

@@ -3,11 +3,12 @@
 from typing import Optional
 from urllib.parse import urljoin
 
+from aind_settings_utils.aws import SecretsManagerBaseSettings
 from pydantic import Field, HttpUrl, RedisDsn, SecretStr
-from pydantic_settings import BaseSettings, SettingsConfigDict
+from pydantic_settings import SettingsConfigDict
 
 
-class Settings(BaseSettings):
+class Settings(SecretsManagerBaseSettings):
     """Settings needed to connect to TARS."""
 
     # noinspection SpellCheckingInspection
@@ -57,6 +58,4 @@ def molecules_url(self) -> HttpUrl:
         )
 
 
-def get_settings() -> Settings:
-    """Utility method to return a settings object."""
-    return Settings()
+settings = Settings()

aind-tars-service-server/src/aind_tars_service_server/main.py

@@ -16,7 +16,7 @@
 from redis.asyncio import from_url  # noqa
 
 from aind_tars_service_server import __version__ as service_version
-from aind_tars_service_server.configs import get_settings
+from aind_tars_service_server.configs import settings
 from aind_tars_service_server.route import router
 
 # The log level can be set by adding an environment variable before launch.
@@ -34,7 +34,6 @@
 @asynccontextmanager
 async def lifespan(_: FastAPI) -> AsyncIterator[None]:
     """Init cache and add to lifespan of app"""
-    settings = get_settings()
     if settings.redis_url is not None:
         redis = from_url(settings.redis_url.unicode_string())
         FastAPICache.init(RedisBackend(redis), prefix="fastapi-cache")

aind-tars-service-server/src/aind_tars_service_server/route.py

@@ -4,11 +4,11 @@
 
 from azure.core.credentials import AccessToken
 from azure.identity import ClientSecretCredential
-from fastapi import APIRouter, Depends, Path, Query, status
+from fastapi import APIRouter, Path, Query, status
 from fastapi_cache.decorator import cache
 from httpx import AsyncClient
 
-from aind_tars_service_server.configs import Settings, get_settings
+from aind_tars_service_server.configs import settings
 from aind_tars_service_server.handler import SessionHandler
 from aind_tars_service_server.models import (
     HealthCheck,
@@ -39,13 +39,10 @@ async def get_health() -> HealthCheck:
 
 
 @cache(expire=3500)
-async def get_access_token(settings: Settings) -> str:
+async def get_access_token() -> str:
     """
     Get access token from either Azure or cache. Token is valid for 60 minutes.
     We set cache ttl to 3500 seconds.
-    Parameters
-    ----------
-    settings : Settings
 
     Returns
     -------
@@ -100,13 +97,12 @@ async def get_viral_prep_lots(
             }
         },
     ),
-    settings: Settings = Depends(get_settings),
 ):
     """
     ## TARS Endpoint to retrieve viral prep lot data.
     Retrieves viral prep lot information from TARS for a prep_lot_id.
     """
-    bearer_token = await get_access_token(settings=settings)
+    bearer_token = await get_access_token()
     headers = {
         "Authorization": f"Bearer {bearer_token}",
         "Content-Type": "application/json",
@@ -169,12 +165,11 @@ async def get_molecules(
             }
         },
     ),
-    settings: Settings = Depends(get_settings),
 ):
     """
     ## TARS Endpoint to molecule data.
     """
-    bearer_token = await get_access_token(settings=settings)
+    bearer_token = await get_access_token()
     headers = {
         "Authorization": f"Bearer {bearer_token}",
         "Content-Type": "application/json",
@@ -237,12 +232,11 @@ async def get_viruses(
             }
         },
     ),
-    settings: Settings = Depends(get_settings),
 ):
     """
     ## TARS Endpoint to virus data.
     """
-    bearer_token = await get_access_token(settings=settings)
+    bearer_token = await get_access_token()
     headers = {
         "Authorization": f"Bearer {bearer_token}",
         "Content-Type": "application/json",

aind-tars-service-server/tests/conftest.py

@@ -90,7 +90,7 @@ def client_with_redis() -> Generator[TestClient, Any, None]:
     )
     with (
         patch(
-            "aind_tars_service_server.main.get_settings",
+            "aind_tars_service_server.main.settings",
             return_value=settings_with_redis,
         ),
         patch("aind_tars_service_server.main.from_url", return_value=None),

aind-tars-service-server/tests/test_route.py

@@ -7,7 +7,6 @@
 from azure.core.credentials import AccessToken
 from fastapi.testclient import TestClient
 
-from aind_tars_service_server.configs import Settings
 from aind_tars_service_server.route import (
     get_access_token,
 )
@@ -29,7 +28,7 @@ async def test_get_access_token(self, mock_azure_credentials: MagicMock):
         mock_azure_credentials.return_value.get_token.return_value = (
             AccessToken(token="abc", expires_on=100)
         )
-        token = await get_access_token(settings=Settings())
+        token = await get_access_token()
         mock_azure_credentials.assert_has_calls(
             [
                 call(