remove Logs AwsApiListener extension

localstack · alexrashed · Aug 30, 2022 · May 24, 2022 · Jul 27, 2022 · Aug 16, 2022
commit 1c06be6d583d82dbd3c0ea1ffb4f37f32334c9e2
diff --git a/localstack/services/logs/provider.py b/localstack/services/logs/provider.py
@@ -23,10 +23,7 @@
     PutLogEventsResponse,
     SequenceToken,
 )
-from localstack.aws.proxy import AwsApiListener
-from localstack.constants import APPLICATION_AMZ_JSON_1_1
-from localstack.services.messages import Request, Response
-from localstack.services.moto import MotoFallbackDispatcher, call_moto
+from localstack.services.moto import call_moto
 from localstack.services.plugins import ServiceLifecycleHook
 from localstack.utils.aws import aws_stack
 from localstack.utils.common import is_number
@@ -75,22 +72,6 @@ def put_log_events(
         return call_moto(context)
 
 
-class LogsAwsApiListener(AwsApiListener):
-    def __init__(self):
-        self.provider = self._create_provider()
-        super().__init__("logs", MotoFallbackDispatcher(self.provider))
-
-    def _create_provider(self):
-        return LogsProvider()
-
-    def request(self, request: Request) -> Response:
-        response = super().request(request)
-        # Fix Incorrect response content-type header from cloudwatch logs #1343.
-        # True for all logs api responses.
-        response.headers["content-type"] = APPLICATION_AMZ_JSON_1_1
-        return response
-
-
 def get_pattern_matcher(pattern: str) -> Callable[[str, Dict], bool]:
     """Returns a pattern matcher. Can be patched by plugins to return a more sophisticated pattern matcher."""
     return lambda _pattern, _log_event: True

diff --git a/localstack/services/providers.py b/localstack/services/providers.py
@@ -211,9 +211,10 @@ def awslambda_asf():
 
 @aws_provider()
 def logs():
-    from localstack.services.logs.provider import LogsAwsApiListener
+    from localstack.services.logs.provider import LogsProvider
 
-    listener = LogsAwsApiListener()
+    provider = LogsProvider()
+    listener = AwsApiListener("logs", MotoFallbackDispatcher(provider))
     return Service("logs", listener=listener)