Browse Source

chore(hybrid-cloud): Delete ControlSiloClient (#60645)

Alberto Leal 1 year ago
parent
commit
d5166f4027
2 changed files with 1 additions and 29 deletions
  1. 0 18
      src/sentry/silo/client.py
  2. 1 11
      tests/sentry/silo/test_client.py

+ 0 - 18
src/sentry/silo/client.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 from typing import Any, Iterable, Mapping
 
-from django.conf import settings
 from django.http import HttpResponse
 from django.http.request import HttpRequest
 from requests import Request
@@ -122,20 +121,3 @@ class RegionSiloClient(BaseSiloClient):
         # Ensure the region is registered
         self.region = get_region_by_name(region.name)
         self.base_url = self.region.address
-
-
-class ControlSiloClient(BaseSiloClient):
-    access_modes = [SiloMode.REGION]
-
-    metrics_prefix = "silo_client.control"
-    log_path = "sentry.silo.client.control"
-    silo_client_name = "control"
-
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.base_url = getattr(settings, "SENTRY_CONTROL_ADDRESS")
-        if not self.base_url:
-            raise AttributeError(
-                "Configure 'SENTRY_CONTROL_ADDRESS' in sentry configuration settings to use the ControlSiloClient"
-            )

+ 1 - 11
tests/sentry/silo/test_client.py

@@ -4,7 +4,7 @@ from pytest import raises
 
 from sentry.shared_integrations.response.base import BaseApiResponse
 from sentry.silo import SiloMode
-from sentry.silo.client import ControlSiloClient, RegionSiloClient, SiloClientError
+from sentry.silo.client import RegionSiloClient, SiloClientError
 from sentry.silo.util import PROXY_DIRECT_LOCATION_HEADER, PROXY_SIGNATURE_HEADER
 from sentry.testutils.cases import TestCase
 from sentry.testutils.region import override_regions
@@ -22,18 +22,12 @@ class SiloClientTest(TestCase):
 
     @override_settings(SILO_MODE=SiloMode.MONOLITH)
     def test_init_clients_from_monolith(self):
-        with raises(SiloClientError):
-            ControlSiloClient()
-
         with raises(SiloClientError):
             RegionSiloClient(self.region)
 
     @override_settings(SILO_MODE=SiloMode.CONTROL)
     def test_init_clients_from_control(self):
         with override_regions(self.region_config):
-            with raises(SiloClientError):
-                ControlSiloClient()
-
             with raises(SiloClientError):
                 RegionSiloClient("atlantis")  # type: ignore[arg-type]
 
@@ -51,10 +45,6 @@ class SiloClientTest(TestCase):
         with raises(SiloClientError):
             RegionSiloClient(self.region)
 
-        client = ControlSiloClient()
-        assert client.base_url is not None
-        assert self.dummy_address in client.base_url
-
     @responses.activate
     @override_settings(SILO_MODE=SiloMode.CONTROL)
     def test_client_request(self):