Fix triagebot mq format (#1627)

mozilla · May 12, 2020 · 7ab2665 · 7ab2665
1 parent ae17a0a
commit 7ab2665
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/mq/plugins/triage_bot.py b/mq/plugins/triage_bot.py
@@ -203,6 +203,12 @@ def process(msg, meta, api_cfg):
     if not update_succeeded:
         return (None, None)
 
+    # Transform the message before sending it back to ES.  The `user` field
+    # in particular is reserved, so we will expand ours' contents out.
+    del msg["details"]["user"]
+    msg["details"]["email"] = email
+    msg["details"]["slack"] = slack
+
     return (msg, meta)
 
 

diff --git a/tests/mq/plugins/test_triage_bot.py b/tests/mq/plugins/test_triage_bot.py
@@ -67,7 +67,33 @@ def test_process_invokes_update_for_good_messages(self):
             mock.post(cfg.url + "/alertstatus", json={"error": None})
             (new_msg, new_meta) = bot.process(msg, {}, cfg)
 
-            assert new_msg == msg
+    def test_process_reformats_messages_for_elasticsearch(self):
+        msg = {
+            "details": {
+                "identifier": "id",
+                "user": {
+                    "email": "tester@site.com",
+                    "slack": "tester",
+                },
+                "identityConfidence": "high",
+                "response": "yes",
+            },
+        }
+
+        cfg = bot.RESTConfig("http://mock.site", "token")
+
+        with requests_mock.mock() as mock:
+            mock.post(cfg.url + "/alertstatus", json={"error": None})
+            (new_msg, new_meta) = bot.process(msg, {}, cfg)
+
+            assert "user" not in msg["details"]
+            assert msg["details"] == {
+                "identifier": "id",
+                "email": "tester@site.com",
+                "slack": "tester",
+                "identityConfidence": "high",
+                "response": "yes",
+            }
 
 
 class TestLambda: