From 0006352c329a020f3075b2d2a5d47a99c61316e0 Mon Sep 17 00:00:00 2001
From: Peter Benjamin <135638833+pbnj-dragon@users.noreply.github.com>
Date: Tue, 29 Oct 2024 13:04:10 -0700
Subject: [PATCH 1/2] feat: include accountId in aws_guardduty_context (#1404)

Co-authored-by: Ariel Ropek <79653153+arielkr256@users.noreply.github.com>
---
 global_helpers/panther_aws_helpers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/global_helpers/panther_aws_helpers.py b/global_helpers/panther_aws_helpers.py
index 4da927105..5986c9cdd 100644
--- a/global_helpers/panther_aws_helpers.py
+++ b/global_helpers/panther_aws_helpers.py
@@ -49,6 +49,7 @@ def aws_guardduty_context(event: dict):
         "type": event.get("type", "<MISSING TYPE>"),
         "resource": event.get("resource", {}),
         "service": event.get("service", {}),
+        "accountId": event.get("accountId", "<MISSING ACCOUNT ID>"),
     }
 
 

From 514e5834bedbac4a41dc6534cd80f9235fa64b87 Mon Sep 17 00:00:00 2001
From: Glenn <94080224+glenn-sq@users.noreply.github.com>
Date: Tue, 29 Oct 2024 16:12:32 -0400
Subject: [PATCH 2/2] fix typo in Makefile (#1411)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 37f486500..a666eb027 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-dirs := $(shell ls | egrep 'policies|rules|helpers|models|templates|queries' | xargs)
+dirs := $(shell ls | egrep 'policies|rules|global_helpers|models|templates|queries' | xargs)
 UNAME := $(shell uname)
 TEST_ARGS :=