Skip to content

Commit ada1b6e

Browse files
committed
refactor: rename tedge_config_cli -> tedge_toml to go with system_toml
Signed-off-by: James Rhodes <jarhodes314@gmail.com>
1 parent 7200f3d commit ada1b6e

File tree

28 files changed

+53
-78
lines changed

28 files changed

+53
-78
lines changed

crates/common/tedge_config/src/lib.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
pub mod mqtt_config;
21
mod sudo;
3-
pub mod tedge_config_cli;
2+
pub mod tedge_toml;
43
pub use sudo::SudoCommandBuilder;
54
pub mod cli;
65
mod system_toml;
76

87
pub use self::system_toml::*;
9-
pub use self::tedge_config_cli::config_setting::*;
10-
pub use self::tedge_config_cli::error::*;
11-
pub use self::tedge_config_cli::models::*;
12-
pub use self::tedge_config_cli::tedge_config::*;
13-
pub use self::tedge_config_cli::tedge_config_location::*;
8+
pub use self::tedge_toml::error::*;
9+
pub use self::tedge_toml::models::*;
10+
pub use self::tedge_toml::tedge_config::*;
11+
pub use self::tedge_toml::tedge_config_location::*;
1412
pub use camino::Utf8Path as Path;
1513
pub use camino::Utf8PathBuf as PathBuf;
1614
pub use certificate::CertificateError;

crates/common/tedge_config/src/mqtt_config.rs

Lines changed: 0 additions & 11 deletions
This file was deleted.

crates/common/tedge_config/src/tedge_config_cli/config_setting.rs

Lines changed: 0 additions & 34 deletions
This file was deleted.

crates/common/tedge_config/src/tedge_config_cli/error.rs renamed to crates/common/tedge_config/src/tedge_toml/error.rs

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub enum TEdgeConfigError {
1313
FromConfigSetting(#[from] crate::ConfigSettingError),
1414

1515
#[error(transparent)]
16-
FromInvalidConfigUrl(#[from] crate::tedge_config_cli::models::InvalidConnectUrl),
16+
FromInvalidConfigUrl(#[from] crate::tedge_toml::models::InvalidConnectUrl),
1717

1818
#[error("Config file not found: {0}")]
1919
ConfigFileNotFound(std::path::PathBuf),
@@ -31,12 +31,48 @@ pub enum TEdgeConfigError {
3131
DirNotFound(#[from] tedge_utils::paths::PathsError),
3232

3333
#[error(transparent)]
34-
FromParseHostPortError(#[from] crate::tedge_config_cli::models::host_port::ParseHostPortError),
34+
FromParseHostPortError(#[from] crate::tedge_toml::models::host_port::ParseHostPortError),
3535

3636
#[error(transparent)]
3737
FromAtomFileError(#[from] tedge_utils::fs::AtomFileError),
3838
}
3939

40+
pub type ConfigSettingResult<T> = Result<T, ConfigSettingError>;
41+
42+
#[derive(thiserror::Error, Debug)]
43+
/// An error encountered while updating a value in tedge.toml
44+
pub enum ConfigSettingError {
45+
#[error(
46+
r#"A value for `{key}` is missing.
47+
A value can be set with `tedge config set {key} <value>`"#
48+
)]
49+
ConfigNotSet { key: &'static str },
50+
51+
#[error("Readonly setting: {message}")]
52+
ReadonlySetting { message: &'static str },
53+
54+
#[error("Conversion from String failed")]
55+
ConversionFromStringFailed,
56+
57+
#[error("Conversion into String failed")]
58+
ConversionIntoStringFailed,
59+
60+
#[error("Derivation for `{key}` failed: {cause}")]
61+
DerivationFailed { key: &'static str, cause: String },
62+
63+
#[error("Config value {key}, cannot be configured: {message} ")]
64+
SettingIsNotConfigurable {
65+
key: &'static str,
66+
message: &'static str,
67+
},
68+
69+
#[error("An error occurred: {msg}")]
70+
Other { msg: &'static str },
71+
72+
#[error(transparent)]
73+
Write(#[from] crate::WriteError),
74+
}
75+
4076
impl TEdgeConfigError {
4177
pub fn multiple_errors(mut errors: Vec<Self>) -> Self {
4278
match errors.len() {
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
pub mod config_setting;
21
pub mod error;
3-
pub mod tedge_config_location;
4-
52
mod figment;
63
pub mod models;
74
pub mod tedge_config;
5+
pub mod tedge_config_location;

0 commit comments

Comments
 (0)