Don't reexport tedge_config::tedge_toml::models::*

Exporting all these items globally under tedge_config clutters the
suggestion list. Instead make them available under
`tedge_config::models`.

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

Author: Bravo555

crates/common/tedge_config/src/lib.rs

@@ -1,14 +1,15 @@
 mod sudo;
-pub mod tedge_toml;
 pub use sudo::SudoCommandBuilder;
 pub mod cli;
 mod system_toml;
-
 pub use self::system_toml::*;
+
+pub mod tedge_toml;
 pub use self::tedge_toml::error::*;
-pub use self::tedge_toml::models::*;
 pub use self::tedge_toml::tedge_config::*;
 pub use self::tedge_toml::tedge_config_location::*;
+pub use tedge_toml::models;
+
 pub use camino::Utf8Path as Path;
 pub use camino::Utf8PathBuf as PathBuf;
 pub use certificate::CertificateError;

crates/common/tedge_config/src/tedge_toml/models/host_port.rs

@@ -1,5 +1,5 @@
-use crate::ConnectUrl;
-use crate::Port;
+use super::ConnectUrl;
+use super::Port;
 use serde::Deserialize;
 use serde::Serialize;
 use std::fmt;
@@ -19,7 +19,7 @@ use url::Host;
 /// # Examples
 ///
 /// ```
-/// # use tedge_config::{HostPort, Port, HTTPS_PORT};
+/// # use tedge_config::models::{HostPort, Port, HTTPS_PORT};
 ///
 /// // use a fallback port if not present in string
 /// let http = HostPort::<HTTPS_PORT>::try_from("my-tenant.cumulocity.com".to_string()).unwrap();
@@ -142,8 +142,9 @@ pub enum ParseHostPortError {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::HTTPS_PORT;
-    use crate::MQTT_TLS_PORT;
+
+    use super::super::HTTPS_PORT;
+    use super::super::MQTT_TLS_PORT;
     use test_case::test_case;
 
     #[test_case(HostPort::<HTTPS_PORT>::try_from("test.com").unwrap(), "test.com:443")]

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

@@ -33,6 +33,7 @@ pub use self::port::*;
 pub use self::seconds::*;
 pub use self::templates_set::*;
 pub use tedge_utils::timestamp;
+pub use tedge_utils::timestamp::TimeFormat;
 pub use topic_prefix::TopicPrefix;
 
 #[derive(

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

@@ -4,21 +4,21 @@ use version::TEdgeTomlVersion;
 mod append_remove;
 pub use append_remove::AppendRemoveItem;
 
+use super::models::auth_method::AuthMethod;
 use super::models::timestamp::TimeFormat;
-use crate::auth_method::AuthMethod;
-use crate::AptConfig;
-use crate::AutoFlag;
-use crate::AutoLogUpload;
-use crate::ConnectUrl;
-use crate::HostPort;
-use crate::MqttPayloadLimit;
-use crate::SecondsOrHumanTime;
-use crate::SoftwareManagementApiFlag;
-use crate::TEdgeConfigLocation;
-use crate::TemplatesSet;
-use crate::TopicPrefix;
-use crate::HTTPS_PORT;
-use crate::MQTT_TLS_PORT;
+use super::models::AptConfig;
+use super::models::AutoFlag;
+use super::models::AutoLogUpload;
+use super::models::ConnectUrl;
+use super::models::HostPort;
+use super::models::MqttPayloadLimit;
+use super::models::SecondsOrHumanTime;
+use super::models::SoftwareManagementApiFlag;
+use super::models::TemplatesSet;
+use super::models::TopicPrefix;
+use super::models::HTTPS_PORT;
+use super::models::MQTT_TLS_PORT;
+use super::tedge_config_location::TEdgeConfigLocation;
 use anyhow::anyhow;
 use anyhow::Context;
 use camino::Utf8Path;

crates/core/c8y_api/src/http_proxy.rs

@@ -14,13 +14,13 @@ use reqwest::header::InvalidHeaderValue;
 use reqwest::Url;
 use std::path::PathBuf;
 use std::time::Duration;
-use tedge_config::auth_method::AuthType;
+use tedge_config::models::auth_method::AuthType;
+use tedge_config::models::TopicPrefix;
 use tedge_config::CertificateError;
 use tedge_config::ConfigNotSet;
 use tedge_config::MultiError;
 use tedge_config::ReadError;
 use tedge_config::TEdgeConfig;
-use tedge_config::TopicPrefix;
 use tracing::debug;
 use tracing::error;
 use tracing::info;

crates/core/c8y_api/src/json_c8y_deserializer.rs

@@ -12,7 +12,7 @@ use tedge_api::mqtt_topics::EntityTopicId;
 use tedge_api::SoftwareModule;
 use tedge_api::SoftwareModuleUpdate;
 use tedge_api::SoftwareUpdateCommand;
-use tedge_config::TopicPrefix;
+use tedge_config::models::TopicPrefix;
 use time::OffsetDateTime;
 
 pub struct C8yDeviceControlTopic;

crates/core/c8y_api/src/smartrest/inventory.rs

@@ -13,7 +13,7 @@ use crate::smartrest::topic::publish_topic_from_parent;
 use crate::smartrest::topic::C8yTopic;
 use mqtt_channel::MqttMessage;
 use std::time::Duration;
-use tedge_config::TopicPrefix;
+use tedge_config::models::TopicPrefix;
 
 use super::message_ids::CHILD_DEVICE_CREATION;
 use super::message_ids::SERVICE_CREATION;

crates/core/c8y_api/src/smartrest/topic.rs

@@ -4,7 +4,7 @@ use mqtt_channel::Topic;
 use mqtt_channel::TopicFilter;
 use tedge_api::entity::EntityExternalId;
 use tedge_api::entity::EntityType;
-use tedge_config::TopicPrefix;
+use tedge_config::models::TopicPrefix;
 
 const SMARTREST_PUBLISH_TOPIC: &str = "s/us";
 const SMARTREST_SUBSCRIBE_TOPIC: &str = "s/ds";

crates/core/c8y_api/src/utils.rs

@@ -2,7 +2,7 @@ pub mod child_device {
     use crate::smartrest::message_ids::CHILD_DEVICE_CREATION;
     use crate::smartrest::topic::C8yTopic;
     use mqtt_channel::MqttMessage;
-    use tedge_config::TopicPrefix;
+    use tedge_config::models::TopicPrefix;
 
     pub fn new_child_device_message(child_id: &str, prefix: &TopicPrefix) -> MqttMessage {
         MqttMessage::new(

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

@@ -6,10 +6,10 @@ use std::time::Duration;
 use tedge_api::mqtt_topics::Channel;
 use tedge_api::mqtt_topics::EntityTopicId;
 use tedge_api::mqtt_topics::MqttSchema;
-use tedge_config::HostPort;
+use tedge_config::models::HostPort;
+use tedge_config::models::TopicPrefix;
+use tedge_config::models::MQTT_TLS_PORT;
 use tedge_config::ProfileName;
-use tedge_config::TopicPrefix;
-use tedge_config::MQTT_TLS_PORT;
 
 #[derive(Debug)]
 pub struct BridgeConfigAwsParams {