includes: Move tables.h

osquery · Jul 19, 2020 · 7cf35e9 · 7cf35e9
1 parent c777ed4
commit 7cf35e9
Show file tree

Hide file tree

Showing 287 changed files with 320 additions and 318 deletions.
diff --git a/osquery/config/config.cpp b/osquery/config/config.cpp
@@ -19,6 +19,7 @@
 #include <boost/iterator/filter_iterator.hpp>
 
 #include <osquery/config/config.h>
+#include <osquery/core/tables.h>
 #include <osquery/database.h>
 #include <osquery/events/events.h>
 #include <osquery/flagalias.h>
@@ -29,7 +30,6 @@
 #include <osquery/registry/registry.h>
 #include <osquery/shutdown.h>
 #include <osquery/system.h>
-#include <osquery/tables.h>
 
 #include <osquery/utils/conversions/split.h>
 #include <osquery/utils/conversions/tryto.h>

diff --git a/osquery/core/CMakeLists.txt b/osquery/core/CMakeLists.txt
@@ -105,14 +105,16 @@ function(generateOsqueryCore)
     ${dependencies}
   )
 
+  set(public_header_files
+    tables.h
+  )
+
   if(DEFINED PLATFORM_WINDOWS)
-    list(APPEND windows_public_header_files
+    list(APPEND public_header_files
       windows/handle.h
       windows/ntapi.h
       windows/wmi.h
     )
-
-    generateIncludeNamespace(osquery_core "osquery/core" "FULL_PATH" ${windows_public_header_files})
   endif()
 
   generateIncludeNamespace(osquery_core "osquery/core" "FILE_ONLY" ${public_header_files})

diff --git a/osquery/core/tables.cpp b/osquery/core/tables.cpp
@@ -8,11 +8,11 @@
 
 #include <osquery/utils/json/json.h>
 
+#include <osquery/core/tables.h>
 #include <osquery/database.h>
 #include <osquery/flags.h>
 #include <osquery/logger.h>
 #include <osquery/registry/registry_factory.h>
-#include <osquery/tables.h>
 #include <osquery/utils/conversions/tryto.h>
 
 #include <climits>

diff --git a/osquery/include/osquery/tables.h → osquery/core/tables.h b/osquery/include/osquery/tables.h → osquery/core/tables.h
diff --git a/osquery/core/tests/tables_tests.cpp b/osquery/core/tests/tables_tests.cpp
@@ -9,10 +9,10 @@
 #include <gtest/gtest.h>
 #include <gflags/gflags.h>
 
+#include <osquery/core/tables.h>
 #include <osquery/database.h>
 #include <osquery/registry/registry.h>
 #include <osquery/system.h>
-#include <osquery/tables.h>
 
 namespace osquery {
 

diff --git a/osquery/core/tests/watcher_tests.cpp b/osquery/core/tests/watcher_tests.cpp
@@ -11,9 +11,9 @@
 
 #include <osquery/config/config.h>
 #include <osquery/core.h>
+#include <osquery/core/tables.h>
 #include <osquery/registry/registry.h>
 #include <osquery/system.h>
-#include <osquery/tables.h>
 
 #include "osquery/core/watcher.h"
 #include "osquery/tests/test_util.h"

diff --git a/osquery/core/windows/wmi.h b/osquery/core/windows/wmi.h
@@ -19,7 +19,7 @@
 
 #include <WbemIdl.h>
 
-#include <osquery/tables.h>
+#include <osquery/core/tables.h>
 
 namespace osquery {
 

diff --git a/osquery/events/benchmarks/events_benchmarks.cpp b/osquery/events/benchmarks/events_benchmarks.cpp
@@ -9,9 +9,9 @@
 #include <benchmark/benchmark.h>
 
 #include <osquery/config/config.h>
+#include <osquery/core/tables.h>
 #include <osquery/events/events.h>
 #include <osquery/registry/registry_factory.h>
-#include <osquery/tables.h>
 
 #include "osquery/tests/test_util.h"
 

diff --git a/osquery/events/darwin/diskarbitration.cpp b/osquery/events/darwin/diskarbitration.cpp
@@ -9,11 +9,11 @@
 #include <fstream>
 #include <iomanip>
 
+#include <osquery/core/tables.h>
 #include <osquery/events/darwin/diskarbitration.h>
 #include <osquery/filesystem/filesystem.h>
 #include <osquery/logger.h>
 #include <osquery/registry/registry_factory.h>
-#include <osquery/tables.h>
 #include <osquery/utils/conversions/darwin/cfdata.h>
 #include <osquery/utils/conversions/darwin/cfnumber.h>
 #include <osquery/utils/conversions/darwin/cfstring.h>

diff --git a/osquery/events/darwin/fsevents.cpp b/osquery/events/darwin/fsevents.cpp
@@ -11,10 +11,10 @@
 #include <boost/filesystem.hpp>
 
 #include <osquery/config/config.h>
+#include <osquery/core/tables.h>
 #include <osquery/filesystem/filesystem.h>
 #include <osquery/logger.h>
 #include <osquery/registry/registry_factory.h>
-#include <osquery/tables.h>
 
 #include "osquery/events/darwin/fsevents.h"
 

diff --git a/osquery/events/darwin/iokit.cpp b/osquery/events/darwin/iokit.cpp
@@ -8,10 +8,10 @@
 
 #include <IOKit/IOMessage.h>
 
+#include <osquery/core/tables.h>
 #include <osquery/events/darwin/iokit.h>
 #include <osquery/logger.h>
 #include <osquery/registry/registry_factory.h>
-#include <osquery/tables.h>
 #include <osquery/utils/conversions/darwin/iokit.h>
 
 namespace osquery {

diff --git a/osquery/events/events.h b/osquery/events/events.h
@@ -20,8 +20,8 @@
 #include <gtest/gtest_prod.h>
 
 #include <osquery/core.h>
+#include <osquery/core/tables.h>
 #include <osquery/dispatcher.h>
-#include <osquery/tables.h>
 #include <osquery/utils/status/status.h>
 
 namespace osquery {

diff --git a/osquery/events/tests/darwin/fsevents_tests.cpp b/osquery/events/tests/darwin/fsevents_tests.cpp
@@ -11,13 +11,13 @@
 
 #include <gtest/gtest.h>
 
+#include <osquery/core/tables.h>
 #include <osquery/database.h>
 #include <osquery/events/darwin/fsevents.h>
 #include <osquery/events/events.h>
 #include <osquery/filesystem/filesystem.h>
 #include <osquery/flags.h>
 #include <osquery/registry/registry_factory.h>
-#include <osquery/tables.h>
 #include <osquery/utils/info/tool_type.h>
 
 namespace fs = boost::filesystem;

diff --git a/osquery/events/tests/events_database_tests.cpp b/osquery/events/tests/events_database_tests.cpp
@@ -16,13 +16,13 @@
 #include <osquery/config/config.h>
 #include <osquery/core.h>
 #include <osquery/core/sql/row.h>
+#include <osquery/core/tables.h>
 #include <osquery/database.h>
 #include <osquery/events/events.h>
 #include <osquery/flags.h>
 #include <osquery/logger.h>
 #include <osquery/registry/registry_factory.h>
 #include <osquery/system.h>
-#include <osquery/tables.h>
 #include <osquery/utils/system/time.h>
 
 namespace osquery {

diff --git a/osquery/events/tests/events_tests.cpp b/osquery/events/tests/events_tests.cpp
@@ -12,10 +12,10 @@
 #include <gtest/gtest.h>
 
 #include <osquery/config/config.h>
+#include <osquery/core/tables.h>
 #include <osquery/database.h>
 #include <osquery/events/events.h>
 #include <osquery/registry/registry_factory.h>
-#include <osquery/tables.h>
 #include <osquery/utils/info/tool_type.h>
 
 namespace osquery {

diff --git a/osquery/events/tests/linux/audit_tests.cpp b/osquery/events/tests/linux/audit_tests.cpp
@@ -15,9 +15,9 @@
 
 #include <sstream>
 
+#include <osquery/core/tables.h>
 #include <osquery/events/events.h>
 #include <osquery/flags.h>
-#include <osquery/tables.h>
 
 #include "osquery/events/linux/auditdnetlink.h"
 #include "osquery/tests/test_util.h"

diff --git a/osquery/events/tests/linux/inotify_tests.cpp b/osquery/events/tests/linux/inotify_tests.cpp
@@ -14,12 +14,12 @@
 #include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
+#include <osquery/core/tables.h>
 #include <osquery/database.h>
 #include <osquery/events/events.h>
 #include <osquery/events/linux/inotify.h>
 #include <osquery/filesystem/filesystem.h>
 #include <osquery/registry/registry_factory.h>
-#include <osquery/tables.h>
 #include <osquery/utils/info/tool_type.h>
 
 namespace fs = boost::filesystem;

diff --git a/osquery/events/tests/linux/process_file_events_tests.cpp b/osquery/events/tests/linux/process_file_events_tests.cpp
@@ -16,10 +16,10 @@
 #include <vector>
 #include <sstream>
 
+#include <osquery/core/tables.h>
 #include <osquery/events/events.h>
 #include <osquery/events/linux/auditeventpublisher.h>
 #include <osquery/flags.h>
-#include <osquery/tables.h>
 #include <osquery/tables/events/linux/process_file_events.h>
 
 namespace osquery {

diff --git a/osquery/sdk/sdk.h b/osquery/sdk/sdk.h
@@ -14,14 +14,14 @@
 
 #include <osquery/config/config.h>
 #include <osquery/core.h>
+#include <osquery/core/tables.h>
 #include <osquery/database.h>
 #include <osquery/events/events.h>
 #include <osquery/extensions/extensions.h>
 #include <osquery/flags.h>
 #include <osquery/logger.h>
 #include <osquery/registry/registry.h>
 #include <osquery/sql/sql.h>
-#include <osquery/tables.h>
 #include <osquery/utils/status/status.h>
 
 namespace osquery {

diff --git a/osquery/sql/benchmarks/sql_benchmarks.cpp b/osquery/sql/benchmarks/sql_benchmarks.cpp
@@ -9,9 +9,9 @@
 #include <benchmark/benchmark.h>
 
 #include <osquery/core.h>
+#include <osquery/core/tables.h>
 #include <osquery/registry/registry.h>
 #include <osquery/sql/sql.h>
-#include <osquery/tables.h>
 
 #include "osquery/sql/virtual_table.h"
 

diff --git a/osquery/sql/sql.cpp b/osquery/sql/sql.cpp
@@ -9,10 +9,10 @@
 #include <sstream>
 
 #include <osquery/core.h>
+#include <osquery/core/tables.h>
 #include <osquery/logger.h>
 #include <osquery/registry/registry.h>
 #include <osquery/sql/sql.h>
-#include <osquery/tables.h>
 
 #include <osquery/plugins/sql.h>
 

diff --git a/osquery/sql/sql.h b/osquery/sql/sql.h
@@ -12,9 +12,9 @@
 #include <string>
 #include <vector>
 
+#include <osquery/core/tables.h>
 #include <osquery/flags.h>
 #include <osquery/query.h>
-#include <osquery/tables.h>
 
 namespace osquery {
 

diff --git a/osquery/sql/tests/sql.cpp b/osquery/sql/tests/sql.cpp
@@ -10,12 +10,12 @@
 #include <gtest/gtest.h>
 
 #include <osquery/core.h>
+#include <osquery/core/tables.h>
 #include <osquery/registry/registry.h>
 #include <osquery/sql/dynamic_table_row.h>
 #include <osquery/sql/sql.h>
 #include <osquery/sql/tests/sql_test_utils.h>
 #include <osquery/system.h>
-#include <osquery/tables.h>
 
 namespace osquery {
 

diff --git a/osquery/sql/virtual_table.h b/osquery/sql/virtual_table.h
@@ -12,7 +12,7 @@
 
 #include <boost/noncopyable.hpp>
 
-#include <osquery/tables.h>
+#include <osquery/core/tables.h>
 #include <osquery/sql/sqlite_util.h>
 
 namespace osquery {

diff --git a/osquery/tables/applications/atom_packages.cpp b/osquery/tables/applications/atom_packages.cpp
@@ -11,9 +11,9 @@
 
 #include <boost/filesystem.hpp>
 
+#include <osquery/core/tables.h>
 #include <osquery/filesystem/filesystem.h>
 #include <osquery/logger.h>
-#include <osquery/tables.h>
 #include <osquery/tables/system/system_utils.h>
 #include <osquery/utils/json/json.h>
 

diff --git a/osquery/tables/applications/browser_firefox.cpp b/osquery/tables/applications/browser_firefox.cpp
@@ -8,9 +8,9 @@
 
 #include <boost/property_tree/json_parser.hpp>
 
+#include <osquery/core/tables.h>
 #include <osquery/filesystem/filesystem.h>
 #include <osquery/logger.h>
-#include <osquery/tables.h>
 #include <osquery/tables/applications/browser_utils.h>
 #include <osquery/tables/system/system_utils.h>
 

diff --git a/osquery/tables/applications/browser_utils.h b/osquery/tables/applications/browser_utils.h
@@ -16,8 +16,8 @@
 #pragma warning(pop)
 #endif
 
+#include <osquery/core/tables.h>
 #include <osquery/filesystem/filesystem.h>
-#include <osquery/tables.h>
 #include <osquery/utils/conversions/tryto.h>
 
 namespace fs = boost::filesystem;

diff --git a/osquery/tables/applications/darwin/browser_plugins.cpp b/osquery/tables/applications/darwin/browser_plugins.cpp
@@ -10,13 +10,13 @@ extern "C" {
 #include <xar/xar.h>
 }
 
-#include <osquery/utils/darwin/plist.h>
+#include <osquery/core/tables.h>
 #include <osquery/filesystem/filesystem.h>
 #include <osquery/logger.h>
 #include <osquery/system.h>
-#include <osquery/tables.h>
 #include <osquery/tables/applications/browser_utils.h>
 #include <osquery/tables/system/system_utils.h>
+#include <osquery/utils/darwin/plist.h>
 
 namespace fs = boost::filesystem;
 namespace pt = boost::property_tree;

diff --git a/osquery/tables/applications/posix/carbon_black.cpp b/osquery/tables/applications/posix/carbon_black.cpp
@@ -13,9 +13,9 @@
 #include <boost/property_tree/ptree.hpp>
 
 #include <osquery/core.h>
+#include <osquery/core/tables.h>
 #include <osquery/filesystem/filesystem.h>
 #include <osquery/logger.h>
-#include <osquery/tables.h>
 
 namespace fs = boost::filesystem;
 

diff --git a/osquery/tables/applications/posix/docker.cpp b/osquery/tables/applications/posix/docker.cpp
@@ -28,9 +28,9 @@
 #error Boost error: Local sockets not available
 #endif
 
+#include <osquery/core/tables.h>
 #include <osquery/flags.h>
 #include <osquery/logger.h>
-#include <osquery/tables.h>
 #include <osquery/utils/conversions/join.h>
 #include <osquery/utils/info/platform_type.h>
 #include <osquery/utils/json/json.h>

diff --git a/osquery/tables/applications/posix/lxd.cpp b/osquery/tables/applications/posix/lxd.cpp
@@ -18,9 +18,9 @@
 #error Boost error: Local sockets not available
 #endif
 
+#include <osquery/core/tables.h>
 #include <osquery/flags.h>
 #include <osquery/logger.h>
-#include <osquery/tables.h>
 
 namespace pt = boost::property_tree;
 namespace local = boost::asio::local;

diff --git a/osquery/tables/applications/posix/prometheus_metrics.cpp b/osquery/tables/applications/posix/prometheus_metrics.cpp
@@ -17,7 +17,7 @@
 #include <osquery/config/config.h>
 #include <plugins/config/parsers/prometheus_targets.h>
 #include <osquery/logger.h>
-#include <osquery/tables.h>
+#include <osquery/core/tables.h>
 #include <osquery/tables/applications/posix/prometheus_metrics.h>
 #include <osquery/utils/conversions/split.h>
 

diff --git a/osquery/tables/applications/posix/prometheus_metrics.h b/osquery/tables/applications/posix/prometheus_metrics.h
@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-#include <osquery/tables.h>
+#include <osquery/core/tables.h>
 
 namespace osquery {
 namespace tables {