Skip to content

Commit 3344c13

Browse files
Merge pull request #3518 from jarhodes314/feat/env-var-fromstr
feat: parse `TEDGE_` environment variables using `FromStr` implementation
2 parents cad4f53 + fa24f84 commit 3344c13

File tree

10 files changed

+554
-587
lines changed

10 files changed

+554
-587
lines changed

Cargo.lock

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ rustls-native-certs = "0.8.1"
172172
rustls-pemfile = "2.2"
173173
sd-listen-fds = "0.2.0"
174174
serde = "1.0"
175-
serde_ignored = "0.1"
176175
serde_json = "1.0"
177176
sha1 = "0.10"
178177
sha256 = "1.1"

crates/common/tedge_config/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ regex = { workspace = true }
2727
reqwest = { workspace = true, features = ["rustls-tls-native-roots"] }
2828
rustls = { workspace = true }
2929
serde = { workspace = true, features = ["rc"] }
30-
serde_ignored = { workspace = true }
3130
strum = { workspace = true }
3231
strum_macros = { workspace = true }
3332
tedge_config_macros = { workspace = true }

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ pub enum TEdgeConfigError {
3535

3636
#[error(transparent)]
3737
FromAtomFileError(#[from] tedge_utils::fs::AtomFileError),
38+
39+
#[error(transparent)]
40+
Anyhow(#[from] anyhow::Error),
3841
}
3942

4043
pub type ConfigSettingResult<T> = Result<T, ConfigSettingError>;

0 commit comments

Comments
 (0)