review

Author: matusdrobuliak66

services/web/server/src/simcore_service_webserver/fogbugz/_client.py

@@ -9,7 +9,7 @@
 
 import httpx
 from aiohttp import web
-from pydantic import BaseModel, Field
+from pydantic import AnyUrl, BaseModel, Field, SecretStr
 
 from ..products import products_service
 from ..products.models import Product
@@ -20,6 +20,10 @@
 _JSON_CONTENT_TYPE = "application/json"
 _UNKNOWN_ERROR_MESSAGE = "Unknown error occurred"
 
+_FOGBUGZ_TIMEOUT: float = Field(
+    default=45.0, description="API request timeout in seconds"
+)
+
 
 class FogbugzCaseCreate(BaseModel):
     fogbugz_project_id: str = Field(description="Project ID in Fogbugz")
@@ -30,10 +34,8 @@ class FogbugzCaseCreate(BaseModel):
 class FogbugzRestClient:
     """REST client for Fogbugz API"""
 
-    def __init__(
-        self, client: httpx.AsyncClient, api_token: str, base_url: str
-    ) -> None:
-        self._client = client
+    def __init__(self, api_token: SecretStr, base_url: AnyUrl) -> None:
+        self._client = httpx.AsyncClient(timeout=_FOGBUGZ_TIMEOUT)
         self._api_token = api_token
         self._base_url = base_url
 
@@ -53,7 +55,7 @@ async def create_case(self, data: FogbugzCaseCreate) -> str:
         """Create a new case in Fogbugz"""
         json_payload = {
             "cmd": "new",
-            "token": self._api_token,
+            "token": self._api_token.get_secret_value(),
             "ixProject": data.fogbugz_project_id,
             "sTitle": data.title,
             "sEvent": data.description,
@@ -73,7 +75,7 @@ async def resolve_case(self, case_id: str) -> None:
         """Resolve a case in Fogbugz"""
         json_payload = {
             "cmd": "resolve",
-            "token": self._api_token,
+            "token": self._api_token.get_secret_value(),
             "ixBug": case_id,
         }
 
@@ -89,7 +91,7 @@ async def get_case_status(self, case_id: str) -> str:
         """Get the status of a case in Fogbugz"""
         json_payload = {
             "cmd": "search",
-            "token": self._api_token,
+            "token": self._api_token.get_secret_value(),
             "q": case_id,
             "cols": "sStatus",
         }
@@ -143,7 +145,7 @@ async def reopen_case(self, case_id: str, assigned_fogbugz_person_id: str) -> No
 
         json_payload = {
             "cmd": cmd,
-            "token": self._api_token,
+            "token": self._api_token.get_secret_value(),
             "ixBug": case_id,
             "ixPersonAssignedTo": assigned_fogbugz_person_id,
         }
@@ -158,9 +160,6 @@ async def reopen_case(self, case_id: str, assigned_fogbugz_person_id: str) -> No
 
 
 _APP_KEY = f"{__name__}.{FogbugzRestClient.__name__}"
-_FOGBUGZ_TIMEOUT: float = Field(
-    default=45.0, description="API request timeout in seconds"
-)
 
 
 async def setup_fogbugz_rest_client(app: web.Application) -> None:
@@ -193,9 +192,7 @@ async def setup_fogbugz_rest_client(app: web.Application) -> None:
                 product.name,
             )
 
-    httpx_client = httpx.AsyncClient(timeout=_FOGBUGZ_TIMEOUT)
     client = FogbugzRestClient(
-        client=httpx_client,
         api_token=settings.FOGBUGZ_API_TOKEN,
         base_url=settings.FOGBUGZ_URL,
     )

services/web/server/src/simcore_service_webserver/fogbugz/settings.py

@@ -1,11 +1,12 @@
 from aiohttp import web
+from pydantic import AnyUrl, SecretStr
 from servicelib.aiohttp.application_keys import APP_SETTINGS_KEY
 from settings_library.base import BaseCustomSettings
 
 
 class FogbugzSettings(BaseCustomSettings):
-    FOGBUGZ_API_TOKEN: str
-    FOGBUGZ_URL: str
+    FOGBUGZ_API_TOKEN: SecretStr
+    FOGBUGZ_URL: AnyUrl
 
 
 def get_plugin_settings(app: web.Application) -> FogbugzSettings: