Fix error code parsing in aws query compatible json services (#2852)

Author: mullermp

gems/aws-sdk-core/CHANGELOG.md

@@ -1,6 +1,8 @@
 Unreleased Changes
 ------------------
 
+* Issue - Fix error code parsing in AWS query compatible JSON services.
+
 3.171.0 (2023-03-22)
 ------------------
 

gems/aws-sdk-core/lib/aws-sdk-core/json/error_handler.rb

@@ -26,11 +26,13 @@ def extract_error(body, context)
       end
 
       def error_code(json, context)
-        code = if aws_query_error?(context)
-          context.http_response.headers['x-amzn-query-error'].split(';')[0]
-        else
-          json['__type']
-        end
+        code =
+          if aws_query_error?(context)
+            error = context.http_response.headers['x-amzn-query-error'].split(';')[0]
+            remove_prefix(error, context)
+          else
+            json['__type']
+          end
         code ||= json['code']
         code ||= context.http_response.headers['x-amzn-errortype']
         if code
@@ -45,6 +47,14 @@ def aws_query_error?(context)
           context.http_response.headers['x-amzn-query-error']
       end
 
+      def remove_prefix(error_code, context)
+        if prefix = context.config.api.metadata['errorPrefix']
+          error_code.sub(/^#{prefix}/, '')
+        else
+          error_code
+        end
+      end
+
       def error_message(code, json)
         if code == 'RequestEntityTooLarge'
           'Request body must be less than 1 MB'

gems/aws-sdk-core/spec/aws/json/error_handler_spec.rb

@@ -106,7 +106,8 @@ module Json
               'awsQueryCompatible' => {},
               'protocol' => 'json',
               'endpointPrefix' => 'svc',
-              'signatureVersion' => 'v4'
+              'signatureVersion' => 'v4',
+              'errorPrefix' => 'Prefix' # service customization needs to set this
             },
             'operations' => {
               'Foo' => {
@@ -136,7 +137,7 @@ module Json
         it 'extracts code and message from x-amzn-query-error' do
           stub_request(:post, "https://svc.us-west-2.amazonaws.com/").
             to_return(:status => 400, headers: {
-              'x-amzn-query-error': 'AwsQueryError;Sender'
+              'x-amzn-query-error': 'Prefix.AwsQueryError;Sender'
             }, :body => error_resp)
           expect {
             client_aws_query_compatible.foo()

gems/aws-sdk-sqs/features/client.feature

@@ -17,5 +17,5 @@ Feature: Amazon Simple Queue Service
     Then I expect the response error code to be "NonExistentQueue"
     And I expect the response error message to include:
     """
-    The specified queue does not exist for this wsdl version.
+    The specified queue does not exist.
     """