Browse Source

chore(hybridcloud) Move api_gateway and normalize casing (#60518)

* Move the api_gateway module under sentry.hybridcloud module
* Rename api_gateway to apigateway.
* Use hybridcloud for the test module name as we'll be converging on
that incrementally.
Mark Story 1 year ago
parent
commit
f1cf870640

+ 1 - 1
.github/CODEOWNERS

@@ -142,8 +142,8 @@ yarn.lock                                                @getsentry/owners-js-de
 
 ## Hybrid Cloud
 /src/sentry/silo/                                        @getsentry/hybrid-cloud
+/src/sentry/hybridcloud                                  @getsentry/hybrid-cloud
 /src/sentry/services/hybrid_cloud/                       @getsentry/hybrid-cloud
-/src/sentry/api_gateway/                                 @getsentry/hybrid-cloud
 /src/sentry/middleware/api_gateway.py                    @getsentry/hybrid-cloud
 /src/sentry/middleware/customer_domain.py                @getsentry/hybrid-cloud
 /src/sentry/middleware/subdomain.py                      @getsentry/hybrid-cloud

+ 0 - 3
src/sentry/api_gateway/__init__.py

@@ -1,3 +0,0 @@
-from .api_gateway import proxy_request_if_needed
-
-__all__ = ("proxy_request_if_needed",)

+ 3 - 0
src/sentry/hybridcloud/apigateway/__init__.py

@@ -0,0 +1,3 @@
+from .apigateway import proxy_request_if_needed
+
+__all__ = ("proxy_request_if_needed",)

+ 1 - 1
src/sentry/api_gateway/api_gateway.py → src/sentry/hybridcloud/apigateway/apigateway.py

@@ -6,7 +6,7 @@ from django.conf import settings
 from django.http.response import HttpResponseBase
 from rest_framework.request import Request
 
-from sentry.api_gateway.proxy import (
+from sentry.hybridcloud.apigateway.proxy import (
     proxy_region_request,
     proxy_request,
     proxy_sentryappinstallation_request,

+ 0 - 0
src/sentry/api_gateway/proxy.py → src/sentry/hybridcloud/apigateway/proxy.py


+ 1 - 1
src/sentry/middleware/api_gateway.py

@@ -5,7 +5,7 @@ from typing import Any, Callable
 from django.http.response import HttpResponseBase
 from rest_framework.request import Request
 
-from sentry.api_gateway import proxy_request_if_needed
+from sentry.hybridcloud.apigateway import proxy_request_if_needed
 
 
 class ApiGatewayMiddleware:

+ 3 - 1
src/sentry/testutils/cases.py

@@ -780,7 +780,9 @@ class APITestCase(BaseTestCase, BaseAPITestCase):
             response.raw = BytesIO(resp.content)
             return response
 
-        with mock.patch("sentry.api_gateway.proxy.external_request", new=proxy_raw_request):
+        with mock.patch(
+            "sentry.hybridcloud.apigateway.proxy.external_request", new=proxy_raw_request
+        ):
             yield
 
 

+ 0 - 0
src/sentry/testutils/helpers/api_gateway.py → src/sentry/testutils/helpers/apigateway.py


+ 0 - 0
tests/sentry/api_gateway/__init__.py → tests/sentry/hybridcloud/__init__.py


+ 0 - 0
tests/sentry/hybrid_cloud/__init__.py → tests/sentry/hybridcloud/apigateway/__init__.py


Some files were not shown because too many files changed in this diff