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 <[email protected]>

Author: Bravo555

crates/common/tedge_config/src/lib.rs

@@ -6,9 +6,11 @@ pub use self::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::models;
+pub use tedge_toml::tedge_config::TEdgeConfig;
+pub use tedge_toml::tedge_config::TEdgeConfigDto;
+pub use tedge_toml::tedge_config::TEdgeConfigReader;
 
 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] crate::tedge_toml::tedge_config::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;

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

@@ -5,7 +5,7 @@ use clap_complete::CompletionCandidate;
 use std::borrow::Cow;
 use std::fmt;
 use tedge_config::get_config_dir;
-use tedge_config::ProfileName;
+use tedge_config::tedge_toml::ProfileName;
 use tedge_config::TEdgeConfigLocation;
 
 #[derive(clap::Subcommand, Debug, Clone, PartialEq, Eq)]
@@ -103,12 +103,12 @@ impl fmt::Display for MaybeBorrowedCloud<'_> {
     }
 }
 
-impl<'a> From<&'a MaybeBorrowedCloud<'a>> for tedge_config::Cloud<'a> {
-    fn from(value: &'a MaybeBorrowedCloud<'a>) -> tedge_config::Cloud<'a> {
+impl<'a> From<&'a MaybeBorrowedCloud<'a>> for tedge_config::tedge_toml::Cloud<'a> {
+    fn from(value: &'a MaybeBorrowedCloud<'a>) -> tedge_config::tedge_toml::Cloud<'a> {
         match value {
-            MaybeBorrowedCloud::C8y(p) => tedge_config::Cloud::C8y(p.as_deref()),
-            MaybeBorrowedCloud::Azure(p) => tedge_config::Cloud::Az(p.as_deref()),
-            MaybeBorrowedCloud::Aws(p) => tedge_config::Cloud::Aws(p.as_deref()),
+            MaybeBorrowedCloud::C8y(p) => tedge_config::tedge_toml::Cloud::C8y(p.as_deref()),
+            MaybeBorrowedCloud::Azure(p) => tedge_config::tedge_toml::Cloud::Az(p.as_deref()),
+            MaybeBorrowedCloud::Aws(p) => tedge_config::tedge_toml::Cloud::Aws(p.as_deref()),
         }
     }
 }

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

@@ -3,9 +3,9 @@ use crate::cli::config::commands::*;
 use crate::command::*;
 use crate::ConfigError;
 use clap_complete::ArgValueCandidates;
-use tedge_config::ProfileName;
-use tedge_config::ReadableKey;
-use tedge_config::WritableKey;
+use tedge_config::tedge_toml::ProfileName;
+use tedge_config::tedge_toml::ReadableKey;
+use tedge_config::tedge_toml::WritableKey;
 
 #[derive(clap::Subcommand, Debug)]
 pub enum ConfigCmd {

crates/core/tedge/src/cli/config/commands/add.rs

@@ -1,7 +1,7 @@
 use crate::command::Command;
 use crate::log::MaybeFancy;
+use tedge_config::tedge_toml::WritableKey;
 use tedge_config::TEdgeConfigLocation;
-use tedge_config::WritableKey;
 
 pub struct AddConfigCommand {
     pub key: WritableKey,

crates/core/tedge/src/cli/config/commands/get.rs

@@ -1,4 +1,4 @@
-use tedge_config::ReadableKey;
+use tedge_config::tedge_toml::ReadableKey;
 
 use crate::command::Command;
 use crate::log::MaybeFancy;
@@ -18,11 +18,11 @@ impl Command for GetConfigCommand {
             Ok(value) => {
                 println!("{}", value);
             }
-            Err(tedge_config::ReadError::ConfigNotSet { .. }) => {
+            Err(tedge_config::tedge_toml::ReadError::ConfigNotSet { .. }) => {
                 eprintln!("The provided config key: '{}' is not set", self.key);
                 std::process::exit(1)
             }
-            Err(tedge_config::ReadError::ReadOnlyNotFound { message, key }) => {
+            Err(tedge_config::tedge_toml::ReadError::ReadOnlyNotFound { message, key }) => {
                 eprintln!("The provided config key: '{key}' is not configured: {message}",);
                 std::process::exit(1)
             }

crates/core/tedge/src/cli/config/commands/list.rs

@@ -3,8 +3,8 @@ use crate::log::MaybeFancy;
 use pad::PadStr;
 use std::io::stdout;
 use std::io::IsTerminal;
+use tedge_config::tedge_toml::READABLE_KEYS;
 use tedge_config::TEdgeConfig;
-use tedge_config::READABLE_KEYS;
 use yansi::Paint;
 
 pub struct ListConfigCommand {

crates/core/tedge/src/cli/config/commands/remove.rs

@@ -1,7 +1,7 @@
 use crate::command::Command;
 use crate::log::MaybeFancy;
+use tedge_config::tedge_toml::WritableKey;
 use tedge_config::TEdgeConfigLocation;
-use tedge_config::WritableKey;
 
 pub struct RemoveConfigCommand {
     pub key: WritableKey,

crates/core/tedge/src/cli/config/commands/set.rs

@@ -1,7 +1,7 @@
 use crate::command::Command;
 use crate::log::MaybeFancy;
+use tedge_config::tedge_toml::WritableKey;
 use tedge_config::TEdgeConfigLocation;
-use tedge_config::WritableKey;
 
 pub struct SetConfigCommand {
     pub key: WritableKey,

crates/core/tedge/src/cli/config/commands/unset.rs

@@ -1,7 +1,7 @@
 use crate::command::Command;
 use crate::log::MaybeFancy;
+use tedge_config::tedge_toml::WritableKey;
 use tedge_config::TEdgeConfigLocation;
-use tedge_config::WritableKey;
 
 pub struct UnsetConfigCommand {
     pub key: WritableKey,

crates/core/tedge/src/cli/connect/c8y_direct_connection.rs

@@ -17,7 +17,7 @@ use rumqttc::Packet;
 use rumqttc::QoS;
 use rumqttc::TlsError;
 use rumqttc::Transport;
-use tedge_config::MqttAuthConfigCloudBroker;
+use tedge_config::tedge_toml::MqttAuthConfigCloudBroker;
 
 const CONNECTION_ERROR_CONTEXT: &str = "Connection error while creating device in Cumulocity";
 

crates/core/tedge/src/cli/connect/command.rs

@@ -43,11 +43,17 @@ use tedge_api::mqtt_topics::EntityTopicId;
 use tedge_api::mqtt_topics::MqttSchema;
 use tedge_api::mqtt_topics::TopicIdError;
 use tedge_api::service_health_topic;
+use tedge_config;
 use tedge_config::models::auth_method::AuthType;
 use tedge_config::models::HostPort;
 use tedge_config::models::TopicPrefix;
+use tedge_config::tedge_toml::MultiError;
+use tedge_config::tedge_toml::ProfileName;
+use tedge_config::tedge_toml::ReadableKey;
+use tedge_config::tedge_toml::TEdgeConfigReaderMqtt;
 use tedge_config::TEdgeConfig;
-use tedge_config::*;
+use tedge_config::TEdgeConfigError;
+use tedge_config::TEdgeConfigLocation;
 use tedge_utils::paths::create_directories;
 use tedge_utils::paths::ok_if_not_found;
 use tedge_utils::paths::DraftFile;

crates/core/tedge/src/cli/connect/error.rs

@@ -56,7 +56,7 @@ pub enum ConnectError {
     CertificateError(#[from] certificate::CertificateError),
 
     #[error(transparent)]
-    MultiError(#[from] tedge_config::MultiError),
+    MultiError(#[from] tedge_config::tedge_toml::MultiError),
 
     #[error(transparent)]
     Anyhow(#[from] anyhow::Error),

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

@@ -12,8 +12,8 @@ use clap::Args;
 use reqwest::blocking;
 use reqwest::Identity;
 use std::fs::File;
+use tedge_config::tedge_toml::ProfileName;
 use tedge_config::OptionalConfig;
-use tedge_config::ProfileName;
 
 #[derive(clap::Subcommand, Debug)]
 pub enum TEdgeHttpCli {

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

@@ -11,7 +11,7 @@ use crate::system_services::SystemServiceManager;
 use camino::Utf8Path;
 use tedge_config::models::auth_method::AuthMethod;
 use tedge_config::models::auth_method::AuthType;
-use tedge_config::MultiError;
+use tedge_config::tedge_toml::MultiError;
 use yansi::Paint as _;
 
 use crate::bridge::BridgeConfig;

crates/core/tedge/src/cli/mqtt/publish.rs

@@ -15,7 +15,7 @@ use rumqttc::Packet;
 use rumqttc::QoS::AtLeastOnce;
 use rumqttc::QoS::AtMostOnce;
 use rumqttc::QoS::ExactlyOnce;
-use tedge_config::MqttAuthClientConfig;
+use tedge_config::tedge_toml::MqttAuthClientConfig;
 
 const DEFAULT_QUEUE_CAPACITY: usize = 10;
 use super::MAX_PACKET_SIZE;

crates/core/tedge/src/cli/mqtt/subscribe.rs

@@ -14,7 +14,7 @@ use rumqttc::Packet;
 use rumqttc::QoS;
 use std::sync::atomic::Ordering;
 use std::time::Duration;
-use tedge_config::MqttAuthClientConfig;
+use tedge_config::tedge_toml::MqttAuthClientConfig;
 
 const DEFAULT_QUEUE_CAPACITY: usize = 10;
 use super::MAX_PACKET_SIZE;

crates/core/tedge/src/cli/upload/mod.rs

@@ -5,7 +5,7 @@ use crate::ConfigError;
 use c8y_api::http_proxy::C8yEndPoint;
 use std::collections::HashMap;
 use std::path::PathBuf;
-use tedge_config::ProfileName;
+use tedge_config::tedge_toml::ProfileName;
 
 mod c8y;
 

crates/core/tedge/src/command.rs

@@ -33,8 +33,8 @@ use crate::log::MaybeFancy;
 /// ```
 /// use tedge::command::Command;
 /// use tedge_config::TEdgeConfig;
-/// use tedge_config::ReadError;
-/// use tedge_config::ReadableKey;
+/// use tedge_config::tedge_toml::ReadError;
+/// use tedge_config::tedge_toml::ReadableKey;
 /// use tedge::log::MaybeFancy;
 ///
 /// struct GetConfigKey {
@@ -84,7 +84,7 @@ pub trait Command {
     /// The `BuildCommand::build_command()` method has to return a box around a new command.
     ///
     /// ```
-    /// use tedge_config::ReadableKey;
+    /// use tedge_config::tedge_toml::ReadableKey;
     /// use tedge_config::TEdgeConfig;
     /// use tedge::cli::config::GetConfigCommand;
     /// use tedge::ConfigError;

crates/core/tedge/src/error.rs

@@ -1,4 +1,4 @@
-use tedge_config::MultiError;
+use tedge_config::tedge_toml::MultiError;
 
 #[derive(thiserror::Error, Debug)]
 #[allow(clippy::enum_variant_names)]
@@ -31,10 +31,10 @@ pub enum TEdgeError {
     FromSystemToml(#[from] tedge_config::SystemTomlError),
 
     #[error(transparent)]
-    FromTEdgeConfigRead(#[from] tedge_config::ReadError),
+    FromTEdgeConfigRead(#[from] tedge_config::tedge_toml::ReadError),
 
     #[error(transparent)]
-    FromConfigNotSet(#[from] tedge_config::ConfigNotSet),
+    FromConfigNotSet(#[from] tedge_config::tedge_toml::ConfigNotSet),
 
     #[error(transparent)]
     FromMultiError(#[from] MultiError),

crates/core/tedge/src/system_services/services.rs

@@ -1,5 +1,5 @@
 use std::fmt;
-use tedge_config::ProfileName;
+use tedge_config::tedge_toml::ProfileName;
 
 /// An enumeration of all supported system services.
 #[derive(Debug, Copy, Clone, strum_macros::IntoStaticStr)]

crates/core/tedge_agent/src/agent.rs

@@ -46,7 +46,7 @@ use tedge_api::mqtt_topics::MqttSchema;
 use tedge_api::mqtt_topics::Service;
 use tedge_api::path::DataDir;
 use tedge_api::EntityStore;
-use tedge_config::TEdgeConfigReaderService;
+use tedge_config::tedge_toml::TEdgeConfigReaderService;
 use tedge_config_manager::ConfigManagerBuilder;
 use tedge_config_manager::ConfigManagerConfig;
 use tedge_config_manager::ConfigManagerOptions;

crates/core/tedge_mapper/src/aws/mapper.rs

@@ -12,10 +12,10 @@ use tedge_actors::NoConfig;
 use tedge_api::mqtt_topics::EntityTopicId;
 use tedge_api::mqtt_topics::MqttSchema;
 use tedge_api::service_health_topic;
-use tedge_config::ProfileName;
-use tedge_config::TEdgeConfig;
-use tedge_config::TEdgeConfigReaderAws;
 use tedge_config::models::TopicPrefix;
+use tedge_config::tedge_toml::ProfileName;
+use tedge_config::tedge_toml::TEdgeConfigReaderAws;
+use tedge_config::TEdgeConfig;
 use tedge_mqtt_bridge::use_key_and_cert;
 use tedge_mqtt_bridge::BridgeConfig;
 use tedge_mqtt_bridge::MqttBridgeActorBuilder;