From 76a254ec71d6fd0d3e85bafd921094d847b019ca Mon Sep 17 00:00:00 2001
From: Jason Ish <jason@codemonkey.net>
Date: Wed, 12 Jun 2024 23:37:57 -0600
Subject: [PATCH] rust: some visibility (pub) cleanup

---
 src/agent/mod.rs       |  4 ++--
 src/cli/config/mod.rs  |  2 +-
 src/cli/elastic/mod.rs |  3 ++-
 src/lib.rs             | 41 ++++++++++++++++++++---------------------
 src/queryparser.rs     |  2 +-
 src/sqlite/importer.rs |  4 +---
 6 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/src/agent/mod.rs b/src/agent/mod.rs
index ca5ed31e..9955fe95 100644
--- a/src/agent/mod.rs
+++ b/src/agent/mod.rs
@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: (C) 2020 Jason Ish <jason@codemonkey.net>
 // SPDX-License-Identifier: MIT
 
-pub mod client;
-pub mod importer;
+pub(crate) mod client;
+pub(crate) mod importer;
diff --git a/src/cli/config/mod.rs b/src/cli/config/mod.rs
index 7d07af81..a423810e 100644
--- a/src/cli/config/mod.rs
+++ b/src/cli/config/mod.rs
@@ -5,7 +5,7 @@ use clap::{CommandFactory, Parser, Subcommand};
 
 use self::users::UsersCommand;
 
-pub mod users;
+pub(crate) mod users;
 
 #[derive(Parser, Debug)]
 #[command(name = "config", about = "Configuration commands")]
diff --git a/src/cli/elastic/mod.rs b/src/cli/elastic/mod.rs
index 122b1d64..2779f81d 100644
--- a/src/cli/elastic/mod.rs
+++ b/src/cli/elastic/mod.rs
@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: (C) 2022 Jason Ish <jason@codemonkey.net>
 // SPDX-License-Identifier: MIT
 
-pub(crate) mod info;
 pub mod main;
+
+pub(crate) mod info;
 pub(crate) mod set_field_limit;
diff --git a/src/lib.rs b/src/lib.rs
index 850b3853..6e31d36a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,31 +1,30 @@
 // SPDX-FileCopyrightText: (C) 2020 Jason Ish <jason@codemonkey.net>
 // SPDX-License-Identifier: MIT
 
-#[macro_use]
+pub mod cli;
 pub mod logger;
+pub mod server;
+pub mod version;
 
-pub mod agent;
-pub mod bookmark;
-pub(crate) mod cert;
-pub mod cli;
-pub mod config;
-pub(crate) mod datetime;
+mod agent;
+mod bookmark;
+mod cert;
+mod config;
+mod datetime;
 mod elastic;
-pub mod eve;
+mod eve;
 mod eventrepo;
-pub(crate) mod file;
-pub mod geoip;
-pub mod importer;
-pub mod packet;
+mod file;
+mod geoip;
+mod importer;
+mod packet;
 mod path;
-pub mod pcap;
-pub mod queryparser;
-pub mod resource;
+mod pcap;
+mod queryparser;
+mod resource;
 mod rules;
-pub mod server;
-pub mod sqlite;
-pub(crate) mod util;
-pub mod version;
+mod sqlite;
+mod util;
 
 #[macro_use]
 extern crate lazy_static;
@@ -38,8 +37,8 @@ extern crate serde_json;
 
 lazy_static! {
     /// Environment variable to enable query logging.
-    pub static ref LOG_QUERIES: bool = std::env::var("EVEBOX_LOG_QUERIES").is_ok();
+    static ref LOG_QUERIES: bool = std::env::var("EVEBOX_LOG_QUERIES").is_ok();
 
     /// Environment variable to enable logging of query plans.
-    pub static ref LOG_QUERY_PLAN: bool = std::env::var("EVEBOX_LOG_QUERY_PLAN").is_ok();
+    static ref LOG_QUERY_PLAN: bool = std::env::var("EVEBOX_LOG_QUERY_PLAN").is_ok();
 }
diff --git a/src/queryparser.rs b/src/queryparser.rs
index 21bf0e9c..93090990 100644
--- a/src/queryparser.rs
+++ b/src/queryparser.rs
@@ -12,7 +12,7 @@ use nom::{
 use crate::datetime;
 
 #[derive(Debug, Clone)]
-pub struct QueryStringParseError(String);
+pub(crate) struct QueryStringParseError(String);
 
 impl std::error::Error for QueryStringParseError {}
 
diff --git a/src/sqlite/importer.rs b/src/sqlite/importer.rs
index f7300770..021649be 100644
--- a/src/sqlite/importer.rs
+++ b/src/sqlite/importer.rs
@@ -10,9 +10,7 @@ use std::sync::Arc;
 use tracing::{debug, error};
 
 #[derive(thiserror::Error, Debug)]
-pub enum IndexError {
-    #[error("timestamp parse error")]
-    TimestampParseError,
+pub(crate) enum IndexError {
     #[error("event has no timestamp field")]
     TimestampMissing,
 }