removed BF variables

Author: sanderegg

.env-devel

@@ -250,8 +250,6 @@ SMTP_PROTOCOL=UNENCRYPTED
 SMTP_USERNAME=it_doesnt_matter
 
 # STORAGE ----
-BF_API_KEY=none
-BF_API_SECRET=none
 STORAGE_ENDPOINT=storage:8080
 STORAGE_HOST=storage
 STORAGE_LOGLEVEL=INFO

services/docker-compose.yml

@@ -1153,8 +1153,6 @@ services:
     init: true
     hostname: "sto-{{.Node.Hostname}}-{{.Task.Slot}}"
     environment:
-      BF_API_KEY: ${BF_API_KEY}
-      BF_API_SECRET: ${BF_API_SECRET}
       DATCORE_ADAPTER_HOST: ${DATCORE_ADAPTER_HOST:-datcore-adapter}
       LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
       LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}

services/storage/src/simcore_service_storage/core/settings.py

@@ -36,13 +36,6 @@ class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
     STORAGE_MONITORING_ENABLED: bool = False
     STORAGE_PROFILING: bool = False
 
-    BF_API_KEY: str | None = Field(
-        None, description="Pennsieve API key ONLY for testing purposes"
-    )
-    BF_API_SECRET: str | None = Field(
-        None, description="Pennsieve API secret ONLY for testing purposes"
-    )
-
     STORAGE_POSTGRES: PostgresSettings | None = Field(
         json_schema_extra={"auto_default_from_env": True}
     )

services/storage/src/simcore_service_storage/modules/db/tokens.py

@@ -7,7 +7,6 @@
 from simcore_postgres_database.storage_models import tokens
 from sqlalchemy.ext.asyncio import AsyncEngine
 
-from ...core.settings import get_application_settings
 from . import get_db_engine
 
 _logger = logging.getLogger(__name__)
@@ -27,17 +26,11 @@ async def _get_tokens_from_db(engine: AsyncEngine, user_id: UserID) -> dict[str,
 async def get_api_token_and_secret(
     app: FastAPI, user_id: UserID
 ) -> tuple[str | None, str | None]:
-    # from the client side together with the userid?
     engine = get_db_engine(app)
-    app_settings = get_application_settings(app)
-    # defaults from config if any, othewise None
-    api_token = app_settings.BF_API_KEY
-    api_secret = app_settings.BF_API_SECRET
-
     data = await _get_tokens_from_db(engine, user_id)
 
     data = data.get("token_data", {})
-    api_token = data.get("token_key", api_token)
-    api_secret = data.get("token_secret", api_secret)
+    api_token = data.get("token_key")
+    api_secret = data.get("token_secret")
 
     return api_token, api_secret