Parse request_id in XML handler (#2716)

aws · Jun 20, 2022 · 2b09dc7 · 2b09dc7
1 parent d686636
commit 2b09dc7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/gems/aws-sdk-core/CHANGELOG.md b/gems/aws-sdk-core/CHANGELOG.md
@@ -1,6 +1,8 @@
 Unreleased Changes
 ------------------
 
+* Issue - Populate context :request_id for XML error responses.
+
 3.131.1 (2022-05-20)
 ------------------
 

diff --git a/gems/aws-sdk-core/lib/aws-sdk-core/rest/handler.rb b/gems/aws-sdk-core/lib/aws-sdk-core/rest/handler.rb
@@ -17,7 +17,7 @@ def call(context)
 
       def apply_request_id(context)
         h = context.http_response.headers
-        context[:request_id] = h['x-amz-request-id'] || h['x-amzn-requestid']
+        context[:request_id] ||= h['x-amz-request-id'] || h['x-amzn-requestid']
       end
 
     end

diff --git a/gems/aws-sdk-core/lib/aws-sdk-core/xml/error_handler.rb b/gems/aws-sdk-core/lib/aws-sdk-core/xml/error_handler.rb
@@ -24,6 +24,7 @@ def error(context)
         else
           code, message, data = extract_error(body, context)
         end
+        context[:request_id] = request_id(body)
         errors_module = context.client.class.errors_module
         error_class = errors_module.error_class(code).new(context, message, data)
         error_class
@@ -94,6 +95,12 @@ def error_message(body)
         end
       end
 
+      def request_id(body)
+        if matches = body.match(/<RequestId>(.+?)<\/RequestId>/m)
+          matches[1]
+        end
+      end
+
       def unescape(str)
         CGI.unescapeHTML(str)
       end

diff --git a/gems/aws-sdk-core/spec/aws/xml/error_handler_spec.rb b/gems/aws-sdk-core/spec/aws/xml/error_handler_spec.rb
@@ -56,7 +56,7 @@ module Xml
       <Message>Required parameter 'AvailabilityZone' is not provided.</Message>
     </Error>
   </Errors>
-  <RequestID>549b7a4f-088e-41f1-8db0-905f3c3e0e03</RequestID>
+  <RequestId>549b7a4f-088e-41f1-8db0-905f3c3e0e03</RequestId>
 </Response>
       XML
 
@@ -73,7 +73,7 @@ module Xml
 
       let(:unmodeled_error) { <<-XML.strip }
 <?xml version="1.0"?>
-<ErrorResponse xmlns="http://cloudfront.amazonaws.com/doc/2016-09-07/">
+<ErrorResponse xmlns="http://cloudfront.amazonaws.com/doc/2018-11-05/">
   <Error>
     <Type>Sender</Type>
     <Code>MalformedXML</Code>
@@ -114,6 +114,7 @@ module Xml
         }.to raise_error { |error|
           expect(error.code).to eq('AccessDenied')
           expect(error.message).to eq('foo')
+          expect(error.context[:request_id]).to eq('b25f48e8-84fd-11e6-80d9-574e0c4664cb')
         }
       end
 
@@ -133,6 +134,7 @@ module Xml
         }.to raise_error { |error|
           expect(error.code).to eq('MalformedXML')
           expect(error.message).to eq(msg)
+          expect(error.context[:request_id]).to eq('b25f48e8-84fd-11e6-80d9-574e0c4664cb')
         }
       end
 
@@ -157,6 +159,7 @@ module Xml
         }.to raise_error { |error|
           expect(error.code).to eq('InvalidRequest')
           expect(error.message).to eq('Required parameter \'AvailabilityZone\' is not provided.')
+          expect(error.context[:request_id]).to eq('549b7a4f-088e-41f1-8db0-905f3c3e0e03')
         }
       end
 
@@ -168,6 +171,7 @@ module Xml
         }.to raise_error { |error|
           expect(error.code).to eq('InvalidParameter')
           expect(error.message).to eq('Invalid parameter: TopicArn Reason: no value for required parameter')
+          expect(error.context[:request_id]).to eq('e9e9cfe5-9023-5f6f-a9fc-9f817a196bcd')
         }
       end
     end