diff --git a/codecov/settings_base.py b/codecov/settings_base.py index 58dbeb76ac..721bbfa0ca 100644 --- a/codecov/settings_base.py +++ b/codecov/settings_base.py @@ -116,7 +116,7 @@ DATABASE_ROUTERS = ["codecov.db.DatabaseRouter"] # GCS -GCS_BUCKET_NAME = "codecov" +GCS_BUCKET_NAME = get_config("services", "minio", "bucket", default="codecov") # Password validation diff --git a/codecov/settings_staging.py b/codecov/settings_staging.py index ba48264071..2872e630e7 100644 --- a/codecov/settings_staging.py +++ b/codecov/settings_staging.py @@ -72,7 +72,7 @@ COOKIE_SAME_SITE = "None" SESSION_COOKIE_SAMESITE = "None" -GCS_BUCKET_NAME = "codecov-staging" +GCS_BUCKET_NAME = get_config("services", "minio", "bucket", default="codecov-staging") CSRF_TRUSTED_ORIGINS = [ get_config("setup", "trusted_origin", default="https://*.codecov.dev") diff --git a/utils/test_results.py b/utils/test_results.py index 84127d127b..c9c45c6a77 100644 --- a/utils/test_results.py +++ b/utils/test_results.py @@ -1,10 +1,10 @@ import polars as pl +from django.conf import settings from shared.api_archive.storage import StorageService from shared.storage.exceptions import FileNotInStorageError from services.redis_configuration import get_redis_connection from services.task import TaskService -from utils.config import get_config def redis_key( @@ -53,14 +53,14 @@ def get_results( key = redis_key(repoid, branch, interval_start, interval_end) result: bytes | None = redis_conn.get(key) - bucket_name: str = get_config("services", "minio", "bucket", default="archive") # type: ignore - if result is None: # try storage storage_service = StorageService() key = storage_key(repoid, branch, interval_start, interval_end) try: - result = storage_service.read_file(bucket_name=bucket_name, path=key) + result = storage_service.read_file( + bucket_name=settings.GCS_BUCKET_NAME, path=key + ) # cache to redis TaskService().cache_test_results_redis(repoid, branch) except FileNotInStorageError: