AWS Service handlers:move NotImplementedError handling from skeleton to service

k-a-il · k-a-il · commit 1bd72eacfd11 · 2025-08-28T14:12:13.000+02:00
diff --git a/localstack-core/localstack/aws/handlers/service.py b/localstack-core/localstack/aws/handlers/service.py
@@ -11,6 +11,7 @@
 from localstack.http import Response
 from localstack.utils.coverage_docs import get_coverage_link_for_service
 
+from ...utils import analytics
 from ..api import CommonServiceException, RequestContext, ServiceException
 from ..api.core import ServiceOperation
 from ..chain import CompositeResponseHandler, ExceptionHandler, Handler, HandlerChain
@@ -178,6 +179,9 @@ def create_exception_response(self, exception: Exception, context: RequestContex
             message = exception_message or get_coverage_link_for_service(service_name, action_name)
             LOG.info(message)
             error = CommonServiceException("InternalFailure", message, status_code=501)
+            analytics.log.event(
+                "services_notimplemented", payload={"s": service_name, "a": action_name}
+            )
             context.service_exception = error
 
         elif not isinstance(exception, ServiceException):
diff --git a/localstack-core/localstack/aws/skeleton.py b/localstack-core/localstack/aws/skeleton.py
@@ -7,7 +7,6 @@
 from botocore.model import ServiceModel
 
 from localstack.aws.api import (
-    CommonServiceException,
     RequestContext,
     ServiceException,
 )
@@ -16,8 +15,6 @@
 from localstack.aws.protocol.serializer import ResponseSerializer, create_serializer
 from localstack.aws.spec import load_service
 from localstack.http import Response
-from localstack.utils import analytics
-from localstack.utils.coverage_docs import get_coverage_link_for_service
 
 LOG = logging.getLogger(__name__)
 
@@ -153,8 +150,6 @@ def invoke(self, context: RequestContext) -> Response:
             return self.dispatch_request(serializer, context, instance)
         except ServiceException as e:
             return self.on_service_exception(serializer, context, e)
-        except NotImplementedError as e:
-            return self.on_not_implemented_error(serializer, context, e)
 
     def dispatch_request(
         self, serializer: ResponseSerializer, context: RequestContext, instance: ServiceRequest
@@ -193,35 +188,3 @@ def on_service_exception(
         return serializer.serialize_error_to_response(
             exception, context.operation, context.request.headers, context.request_id
         )
-
-    def on_not_implemented_error(
-        self,
-        serializer: ResponseSerializer,
-        context: RequestContext,
-        exception: NotImplementedError,
-    ) -> Response:
-        """
-        Called by invoke if either the dispatch table did not contain an entry for the operation, or the service
-        provider raised a NotImplementedError
-        :param serializer: the serialzier which should be used to serialize the NotImplementedError
-        :param context: the request context
-        :param exception: the NotImplementedError that was raised
-        :return: a Response object
-        """
-        operation = context.operation
-
-        action_name = operation.name
-        service_name = operation.service_model.service_name
-        exception_message: str | None = exception.args[0] if exception.args else None
-        message = exception_message or get_coverage_link_for_service(service_name, action_name)
-        LOG.info(message)
-        error = CommonServiceException("InternalFailure", message, status_code=501)
-        # record event
-        analytics.log.event(
-            "services_notimplemented", payload={"s": service_name, "a": action_name}
-        )
-        context.service_exception = error
-
-        return serializer.serialize_error_to_response(
-            error, operation, context.request.headers, context.request_id
-        )
