Close opa client session

Author: tpoliaw

src/blueapi/service/authorization.py

@@ -28,6 +28,9 @@ def __init__(self, instrument: str, config: OpaConfig):
     def for_token(self, token: str) -> "OpaUserClient":
         return OpaUserClient(self, token)
 
+    async def close(self):
+        await self._session.close()
+
     async def _call_opa(self, endpoint, data: Mapping[str, Any]) -> bool:
         try:
             resp = await self._session.post(

src/blueapi/service/main.py

@@ -98,13 +98,17 @@ async def inner(app: FastAPI):
         if not config.env.metadata:
             raise ValueError("Instrument name is required in metadata")
         setup_runner(config)
-        if config.env.metadata and config.opa:
-            app.state.authz = OpaClient(config.env.metadata.instrument, config.opa)
-            if isinstance(config.tiled.authentication, ServiceAccount) and config.oidc:
-                await validate_tiled_config(
-                    config.tiled.authentication, config.oidc, app.state.authz
-                )
-        yield
+        try:
+            if config.env.metadata and config.opa:
+                app.state.authz = OpaClient(config.env.metadata.instrument, config.opa)
+                if isinstance(config.tiled.authentication, ServiceAccount) and config.oidc:
+                    await validate_tiled_config(
+                        config.tiled.authentication, config.oidc, app.state.authz
+                    )
+            yield
+        finally:
+            if app.state.authz:
+                await app.state.authz.close()
         teardown_runner()
 
     return inner