From 06b7427ede28956424042450be4d035a431dbdd5 Mon Sep 17 00:00:00 2001
From: Mark Stemm <mark.stemm@gmail.com>
Date: Tue, 11 Jan 2022 13:29:26 -0800
Subject: [PATCH] Move falco formats code out of engine

This isn't used by the engine itself anymore, now that it uses
factories to provide formatters.

This is in preparation for other changes to make the falco engine
hot-swappable while running.

Signed-off-by: Mark Stemm <mark.stemm@gmail.com>
---
 userspace/engine/CMakeLists.txt         | 3 +--
 userspace/engine/falco_engine.cpp       | 2 --
 userspace/falco/CMakeLists.txt          | 1 +
 userspace/{engine => falco}/formats.cpp | 0
 userspace/{engine => falco}/formats.h   | 0
 5 files changed, 2 insertions(+), 4 deletions(-)
 rename userspace/{engine => falco}/formats.cpp (100%)
 rename userspace/{engine => falco}/formats.h (100%)

diff --git a/userspace/engine/CMakeLists.txt b/userspace/engine/CMakeLists.txt
index 2e1ceced..d2ae8369 100644
--- a/userspace/engine/CMakeLists.txt
+++ b/userspace/engine/CMakeLists.txt
@@ -18,8 +18,7 @@ set(FALCO_ENGINE_SOURCE_FILES
     falco_engine.cpp
     falco_utils.cpp
     json_evt.cpp
-    ruleset.cpp
-    formats.cpp)
+    ruleset.cpp)
 
 add_library(falco_engine STATIC ${FALCO_ENGINE_SOURCE_FILES})
 add_dependencies(falco_engine njson lyaml lpeg string-view-lite)
diff --git a/userspace/engine/falco_engine.cpp b/userspace/engine/falco_engine.cpp
index f473d17b..277b0927 100644
--- a/userspace/engine/falco_engine.cpp
+++ b/userspace/engine/falco_engine.cpp
@@ -26,8 +26,6 @@ limitations under the License.
 #include "falco_utils.h"
 #include "falco_engine_version.h"
 
-#include "formats.h"
-
 extern "C" {
 #include "lpeg.h"
 #include "lyaml.h"
diff --git a/userspace/falco/CMakeLists.txt b/userspace/falco/CMakeLists.txt
index 86c35734..aee301ed 100644
--- a/userspace/falco/CMakeLists.txt
+++ b/userspace/falco/CMakeLists.txt
@@ -25,6 +25,7 @@ set(
   event_drops.cpp
   statsfilewriter.cpp
   falco.cpp
+  formats.cpp
 )
 
 set(
diff --git a/userspace/engine/formats.cpp b/userspace/falco/formats.cpp
similarity index 100%
rename from userspace/engine/formats.cpp
rename to userspace/falco/formats.cpp
diff --git a/userspace/engine/formats.h b/userspace/falco/formats.h
similarity index 100%
rename from userspace/engine/formats.h
rename to userspace/falco/formats.h