From ddc736057f32d418735378c3e6598f31482eb9bd Mon Sep 17 00:00:00 2001
From: Luca Guerra <luca@guerra.sh>
Date: Fri, 6 Sep 2024 16:15:43 +0000
Subject: [PATCH] cleanup(falco): apply review suggestion about
 extra_output_field_t

Signed-off-by: Luca Guerra <luca@guerra.sh>
Co-authored-by: Federico Di Pierro <nierro92@gmail.com>
---
 userspace/engine/falco_common.h   | 2 ++
 userspace/engine/falco_engine.h   | 2 +-
 userspace/engine/falco_rule.h     | 2 +-
 userspace/engine/formats.cpp      | 2 +-
 userspace/engine/formats.h        | 2 +-
 userspace/falco/falco_outputs.cpp | 2 +-
 userspace/falco/falco_outputs.h   | 2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/userspace/engine/falco_common.h b/userspace/engine/falco_common.h
index 704ea044..95b2ef62 100644
--- a/userspace/engine/falco_common.h
+++ b/userspace/engine/falco_common.h
@@ -72,3 +72,5 @@ namespace falco_common
 
 	bool parse_rule_matching(const std::string& v, rule_matching& out);
 };
+
+typedef std::unordered_map<std::string, std::pair<std::string, bool>> extra_output_field_t;
diff --git a/userspace/engine/falco_engine.h b/userspace/engine/falco_engine.h
index ce7c1f00..5af6d1c9 100644
--- a/userspace/engine/falco_engine.h
+++ b/userspace/engine/falco_engine.h
@@ -221,7 +221,7 @@ public:
 		std::string format;
 		std::set<std::string> exception_fields;
 		std::set<std::string> tags;
-		std::unordered_map<std::string, std::pair<std::string, bool>> extra_output_fields;
+		extra_output_field_t extra_output_fields;
 	};
 
 	//
diff --git a/userspace/engine/falco_rule.h b/userspace/engine/falco_rule.h
index 10d1fb4e..f002646d 100644
--- a/userspace/engine/falco_rule.h
+++ b/userspace/engine/falco_rule.h
@@ -79,7 +79,7 @@ struct falco_rule
 	std::string name;
 	std::string description;
 	std::string output;
-	std::unordered_map<std::string, std::pair<std::string, bool>> extra_output_fields;
+	extra_output_field_t extra_output_fields;
 	std::set<std::string> tags;
 	std::set<std::string> exception_fields;
 	falco_common::priority_type priority;
diff --git a/userspace/engine/formats.cpp b/userspace/engine/formats.cpp
index d4e7919e..4f4ff41b 100644
--- a/userspace/engine/formats.cpp
+++ b/userspace/engine/formats.cpp
@@ -35,7 +35,7 @@ falco_formats::~falco_formats()
 
 std::string falco_formats::format_event(sinsp_evt *evt, const std::string &rule, const std::string &source,
 				   const std::string &level, const std::string &format, const std::set<std::string> &tags,
-				   const std::string &hostname, const std::unordered_map<std::string, std::pair<std::string, bool>> &extra_fields) const
+				   const std::string &hostname, const extra_output_field_t &extra_fields) const
 {
 	std::string line;
 
diff --git a/userspace/engine/formats.h b/userspace/engine/formats.h
index 97d82261..e2d73258 100644
--- a/userspace/engine/formats.h
+++ b/userspace/engine/formats.h
@@ -31,7 +31,7 @@ public:
 
 	std::string format_event(sinsp_evt *evt, const std::string &rule, const std::string &source,
 				 const std::string &level, const std::string &format, const std::set<std::string> &tags,
-				 const std::string &hostname, const std::unordered_map<std::string, std::pair<std::string, bool>> &extra_fields) const;
+				 const std::string &hostname, const extra_output_field_t &extra_fields) const;
 
 	std::string format_string(sinsp_evt *evt, const std::string &format, const std::string &source) const;
 
diff --git a/userspace/falco/falco_outputs.cpp b/userspace/falco/falco_outputs.cpp
index dcbfb07e..8585d462 100644
--- a/userspace/falco/falco_outputs.cpp
+++ b/userspace/falco/falco_outputs.cpp
@@ -128,7 +128,7 @@ void falco_outputs::add_output(const falco::outputs::config &oc)
 
 void falco_outputs::handle_event(sinsp_evt *evt, const std::string &rule, const std::string &source,
 				 falco_common::priority_type priority, const std::string &format, std::set<std::string> &tags,
-				 std::unordered_map<std::string, std::pair<std::string, bool>> &extra_fields)
+				 extra_output_field_t &extra_fields)
 {
 	falco_outputs::ctrl_msg cmsg = {};
 	cmsg.ts = evt->get_ts();
diff --git a/userspace/falco/falco_outputs.h b/userspace/falco/falco_outputs.h
index 61de4be9..c3c2cdbe 100644
--- a/userspace/falco/falco_outputs.h
+++ b/userspace/falco/falco_outputs.h
@@ -60,7 +60,7 @@ public:
 	*/
 	void handle_event(sinsp_evt *evt, const std::string &rule, const std::string &source,
 			falco_common::priority_type priority, const std::string &format, std::set<std::string> &tags,
-			std::unordered_map<std::string, std::pair<std::string, bool>> &extra_fields);
+			extra_output_field_t &extra_fields);
 
 	/*!
 		\brief Format then send a generic message to all outputs.