From 19a0179608393d1093805589c441d59cef549fac Mon Sep 17 00:00:00 2001
From: Robert Lewis <ralewis85@gmail.com>
Date: Fri, 18 Jan 2019 07:52:47 -0800
Subject: [PATCH] Use regex to populate requestId XML tag

---
 moto/core/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/moto/core/utils.py b/moto/core/utils.py
index 777a0375..ca670e87 100644
--- a/moto/core/utils.py
+++ b/moto/core/utils.py
@@ -280,7 +280,7 @@ def amzn_request_id(f):
 
         # Update request ID in XML
         try:
-            body = body.replace('{{ requestid }}', request_id)
+            body = re.sub(r'(?<=<RequestId>).*(?=<\/RequestId>)', request_id, body)
         except Exception:  # Will just ignore if it cant work on bytes (which are str's on python2)
             pass