Don't reexport inner tedge_config::*

tedge_config! macro creates a lot of structs that clutter item list when
reexported. Instead reexport only top-level struct as that what's most
commonly used.

Signed-off-by: Marcel Guzik <marcel.guzik@cumulocity.com>

Author: Bravo555

crates/common/tedge_config/src/lib.rs

@@ -2,13 +2,15 @@ mod sudo;
 pub use sudo::SudoCommandBuilder;
 pub mod cli;
 mod system_toml;
-pub use self::system_toml::*;
+pub use system_toml::*;
 
 pub mod tedge_toml;
-pub use self::tedge_toml::error::*;
-pub use self::tedge_toml::tedge_config::*;
-pub use self::tedge_toml::tedge_config_location::*;
+pub use tedge_toml::error::*;
 pub use tedge_toml::models;
+pub use tedge_toml::tedge_config::TEdgeConfig;
+pub use tedge_toml::tedge_config::TEdgeConfigDto;
+pub use tedge_toml::tedge_config::TEdgeConfigReader;
+pub use tedge_toml::tedge_config_location::*;
 
 pub use camino::Utf8Path as Path;
 pub use camino::Utf8PathBuf as PathBuf;

crates/common/tedge_config/src/tedge_toml/error.rs

@@ -70,7 +70,7 @@ pub enum ConfigSettingError {
     Other { msg: &'static str },
 
     #[error(transparent)]
-    Write(#[from] crate::WriteError),
+    Write(#[from] super::WriteError),
 }
 
 impl TEdgeConfigError {

crates/common/tedge_config/src/tedge_toml/figment.rs

@@ -214,11 +214,11 @@ impl TEdgeEnv {
             Uncased::new(
                 tracing::subscriber::with_default(
                     tracing::subscriber::NoSubscriber::default(),
-                    || lowercase_name.parse::<crate::WritableKey>(),
+                    || lowercase_name.parse::<crate::tedge_toml::WritableKey>(),
                 )
                 .map(|key| key.to_string())
                 .map_err(|err| {
-                    let is_read_only_key = matches!(err, crate::ParseKeyError::ReadOnly(_));
+                    let is_read_only_key = matches!(err, crate::tedge_toml::ParseKeyError::ReadOnly(_));
                     if is_read_only_key && !WARNINGS.lock().unwrap().insert(lowercase_name.clone()) {
                         tracing::error!(
                             "Failed to configure tedge with environment variable `TEDGE_{name}`: {}",
@@ -236,6 +236,8 @@ impl TEdgeEnv {
 mod tests {
     use std::path::PathBuf;
 
+    use crate::tedge_toml::AppendRemoveItem;
+    use crate::tedge_toml::ReadError;
     use serde::Deserialize;
     use tedge_config_macros::define_tedge_config;
 
@@ -381,8 +383,6 @@ mod tests {
 
     #[test]
     fn environment_variables_can_override_profiled_configurations() {
-        use crate::AppendRemoveItem;
-        use crate::ReadError;
         use tedge_config_macros::*;
 
         define_tedge_config!(
@@ -417,8 +417,6 @@ mod tests {
 
     #[test]
     fn environment_variable_profile_warnings_use_key_with_correct_format() {
-        use crate::AppendRemoveItem;
-        use crate::ReadError;
         use tedge_config_macros::*;
 
         define_tedge_config!(
@@ -445,8 +443,6 @@ mod tests {
 
     #[test]
     fn toml_profile_warnings_use_key_with_correct_format() {
-        use crate::AppendRemoveItem;
-        use crate::ReadError;
         use tedge_config_macros::*;
 
         define_tedge_config!(

crates/common/tedge_config/src/tedge_toml/mod.rs

@@ -2,4 +2,6 @@ pub mod error;
 mod figment;
 pub mod models;
 pub mod tedge_config;
+pub use tedge_config::*;
+
 pub mod tedge_config_location;

crates/common/tedge_config/src/tedge_toml/tedge_config_location.rs

@@ -193,7 +193,7 @@ impl TEdgeConfigLocation {
 mod tests {
     use tedge_test_utils::fs::TempTedgeDir;
 
-    use crate::Cloud;
+    use crate::tedge_toml::Cloud;
     use crate::TEdgeConfigReader;
 
     use super::*;

crates/core/c8y_api/src/http_proxy.rs

@@ -16,10 +16,10 @@ use std::path::PathBuf;
 use std::time::Duration;
 use tedge_config::models::auth_method::AuthType;
 use tedge_config::models::TopicPrefix;
+use tedge_config::tedge_toml::ConfigNotSet;
+use tedge_config::tedge_toml::MultiError;
+use tedge_config::tedge_toml::ReadError;
 use tedge_config::CertificateError;
-use tedge_config::ConfigNotSet;
-use tedge_config::MultiError;
-use tedge_config::ReadError;
 use tedge_config::TEdgeConfig;
 use tracing::debug;
 use tracing::error;

crates/core/tedge/src/bridge/aws.rs

@@ -9,7 +9,7 @@ use tedge_api::mqtt_topics::MqttSchema;
 use tedge_config::models::HostPort;
 use tedge_config::models::TopicPrefix;
 use tedge_config::models::MQTT_TLS_PORT;
-use tedge_config::ProfileName;
+use tedge_config::tedge_toml::ProfileName;
 
 #[derive(Debug)]
 pub struct BridgeConfigAwsParams {

crates/core/tedge/src/bridge/azure.rs

@@ -9,7 +9,7 @@ use tedge_api::mqtt_topics::MqttSchema;
 use tedge_config::models::HostPort;
 use tedge_config::models::TopicPrefix;
 use tedge_config::models::MQTT_TLS_PORT;
-use tedge_config::ProfileName;
+use tedge_config::tedge_toml::ProfileName;
 
 #[derive(Debug)]
 pub struct BridgeConfigAzureParams {

crates/core/tedge/src/bridge/c8y.rs

@@ -13,7 +13,7 @@ use tedge_config::models::HostPort;
 use tedge_config::models::TemplatesSet;
 use tedge_config::models::TopicPrefix;
 use tedge_config::models::MQTT_TLS_PORT;
-use tedge_config::ProfileName;
+use tedge_config::tedge_toml::ProfileName;
 use which::which;
 
 #[derive(Debug)]

crates/core/tedge/src/cli/certificate/cli.rs

@@ -8,8 +8,8 @@ use super::upload::*;
 use anyhow::anyhow;
 use camino::Utf8PathBuf;
 use clap::ValueHint;
-use tedge_config::OptionalConfigError;
-use tedge_config::ProfileName;
+use tedge_config::tedge_toml::OptionalConfigError;
+use tedge_config::tedge_toml::ProfileName;
 use tedge_config::TEdgeConfig;
 
 use crate::cli::common::Cloud;