Use cache instance directly from shared (#1266)

Author: Swatinem

api/internal/feature/views.py

@@ -7,10 +7,10 @@
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from shared.django_apps.rollouts.models import FeatureFlag
+from shared.helpers.redis import get_redis_connection
 from shared.rollouts import Feature
 
 from api.internal.feature.helpers import get_flag_cache_redis_key, get_identifier
-from services.redis_configuration import get_redis_connection
 from utils.config import get_config
 
 from .serializers import FeatureRequestSerializer

codecov_auth/commands/owner/interactors/get_uploads_number_per_user.py

@@ -1,12 +1,12 @@
 from typing import Optional
 
 from asgiref.sync import sync_to_async
+from shared.helpers.redis import get_redis_connection
 from shared.plan.service import PlanService
 from shared.upload.utils import query_monthly_coverage_measurements
 
 from codecov.commands.base import BaseInteractor
 from codecov_auth.models import Owner
-from services.redis_configuration import get_redis_connection
 
 redis = get_redis_connection()
 

codecov_auth/views/base.py

@@ -16,11 +16,11 @@
 from django.utils.timezone import now
 from shared.encryption.token import encode_token
 from shared.events.amplitude import AmplitudeEventPublisher
+from shared.helpers.redis import get_redis_connection
 from shared.license import LICENSE_ERRORS_MESSAGES, get_current_license
 
 from codecov_auth.models import Owner, OwnerProfile, Session, User
 from services.analytics import AnalyticsService
-from services.redis_configuration import get_redis_connection
 from services.refresh import RefreshService
 from utils.config import get_config
 from utils.encryption import encryptor

conftest.py

@@ -42,7 +42,7 @@ def codecov_vcr(request):
 
 @pytest.fixture
 def mock_redis(mocker):
-    m = mocker.patch("services.redis_configuration._get_redis_instance_from_url")
+    m = mocker.patch("shared.helpers.redis._get_redis_instance_from_url")
     redis_server = fakeredis.FakeStrictRedis()
     m.return_value = redis_server
     yield redis_server

core/apps.py

@@ -1,10 +1,9 @@
 import logging
 
 from django.apps import AppConfig
-from shared.helpers.cache import RedisBackend
+from shared.helpers.cache import RedisBackend, cache
+from shared.helpers.redis import get_redis_connection
 
-from services.redis_configuration import get_redis_connection
-from utils.cache import cache
 from utils.config import RUN_ENV
 
 logger = logging.getLogger(__name__)

core/management/commands/delete_rate_limit_keys.py

@@ -1,6 +1,5 @@
 from django.core.management.base import BaseCommand, CommandParser
-
-from services.redis_configuration import get_redis_connection
+from shared.helpers.redis import get_redis_connection
 
 
 class Command(BaseCommand):

core/tests/test_management_commands.py

@@ -9,8 +9,7 @@
 from shared.config import ConfigHelper
 from shared.django_apps.codecov_auth.models import Plan, Tier
 from shared.django_apps.core.tests.factories import OwnerFactory, RepositoryFactory
-
-from services.redis_configuration import get_redis_connection
+from shared.helpers.redis import get_redis_connection
 
 
 @pytest.mark.django_db

graphql_api/tests/test_test_analytics.py

@@ -6,6 +6,7 @@
 import pytest
 from shared.django_apps.codecov_auth.tests.factories import OwnerFactory
 from shared.django_apps.core.tests.factories import RepositoryFactory
+from shared.helpers.redis import get_redis_connection
 from shared.storage.exceptions import BucketAlreadyExistsError
 from shared.storage.memory import MemoryStorageService
 
@@ -20,7 +21,6 @@
     generate_test_results,
     get_results,
 )
-from services.redis_configuration import get_redis_connection
 from utils.test_results import dedup_table
 
 from .helper import GraphQLTestHelper

graphql_api/types/owner/owner.py

@@ -10,6 +10,7 @@
 from asgiref.sync import sync_to_async
 from django.conf import settings
 from graphql import GraphQLResolveInfo
+from shared.helpers.redis import get_redis_connection
 from shared.plan.constants import DEFAULT_FREE_PLAN
 from shared.plan.service import PlanService
 
@@ -43,7 +44,6 @@
 from graphql_api.types.errors.errors import NotFoundError
 from graphql_api.types.repository.repository import TOKEN_UNAVAILABLE
 from services.billing import BillingService
-from services.redis_configuration import get_redis_connection
 from timeseries.helpers import fill_sparse_measurements
 from timeseries.models import Interval
 from utils.config import get_config

graphql_api/types/repository/repository.py

@@ -9,6 +9,7 @@
 from asgiref.sync import sync_to_async
 from django.conf import settings
 from graphql.type.definition import GraphQLResolveInfo
+from shared.helpers.redis import get_redis_connection
 
 from codecov_auth.models import SERVICE_GITHUB, SERVICE_GITHUB_ENTERPRISE, Owner
 from core.models import Branch, Commit, Pull, Repository
@@ -22,7 +23,6 @@
 from graphql_api.types.enums import OrderingDirection
 from graphql_api.types.enums.enum_types import PullRequestState
 from graphql_api.types.errors.errors import NotFoundError, OwnerNotActivatedError
-from services.redis_configuration import get_redis_connection
 
 TOKEN_UNAVAILABLE = "Token Unavailable. Please contact your admin."