Skip to content

refactor: Deserialise separate mapper config file using existing logic for tedge.toml #3889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jarhodes314 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

refactor: Deserialise separate mapper config file using existing logic for tedge.toml #3889

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ac3ece2
refactor: Deserialise separate mapper config file using existing logi…
jarhodes314 Dec 8, 2025
7e3219d
PoC: get `tedge config get` working with new mapper config
jarhodes314 Dec 10, 2025
af2a8d6
Support `tedge config get/list` with generalised mapper config for al…
jarhodes314 Dec 11, 2025
c9a323a
Run formatter
jarhodes314 Dec 11, 2025
a640a45
Get the full `tedge config` api working for all clouds with migrated …
jarhodes314 Dec 11, 2025
4152237
Remove tedge config sync API and add some tests for migrated mapper c…
jarhodes314 Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions crates/common/tedge_config/src/tedge_toml/tedge_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,13 @@ impl<T> OptionalConfigError<T> for OptionalConfig<T> {
}
}

type AnyMap = anymap3::Map<dyn std::any::Any + Send + Sync + 'static>;

pub struct TEdgeConfig {
dto: TEdgeConfigDto,
reader: TEdgeConfigReader,
location: TEdgeConfigLocation,
cached_mapper_configs:
tokio::sync::Mutex<anymap3::Map<dyn std::any::Any + Send + Sync + 'static>>,
cached_mapper_configs: Arc<tokio::sync::Mutex<AnyMap>>,
}

impl std::ops::Deref for TEdgeConfig {
Expand All @@ -121,9 +123,10 @@ pub enum ConfigDecision {
}

impl TEdgeConfig {
pub(crate) fn from_dto(dto: &TEdgeConfigDto, location: TEdgeConfigLocation) -> Self {
pub(crate) fn from_dto(dto: TEdgeConfigDto, location: TEdgeConfigLocation) -> Self {
Self {
reader: TEdgeConfigReader::from_dto(dto, &location),
reader: TEdgeConfigReader::from_dto(&dto, &location),
dto,
location,
cached_mapper_configs: <_>::default(),
}
Expand Down Expand Up @@ -231,6 +234,7 @@ impl TEdgeConfig {
let map = load_mapper_config::<T>(
&AbsolutePath::try_new(path.as_str()).unwrap(),
self,
profile.as_deref(),
)
.await?;

Expand Down Expand Up @@ -2113,7 +2117,8 @@ mod tests {
let error = tedge_config
.mapper_config::<C8yMapperSpecificConfig>(&profile_name(None))
.await
.unwrap_err();
.err()
.unwrap();
assert_eq!(
format!("{error:#}"),
format!(
Expand Down
Loading
Loading