Skip to content

Commit a2ad761

Browse files
Bravo555reubenmiller
authored andcommitted
Add default value for device.cryptoki.socket_path
Signed-off-by: Marcel Guzik <marcel.guzik@cumulocity.com>
1 parent 5b6c68f commit a2ad761

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ define_tedge_config! {
155155
/// A path to the tedge-p11-server socket.
156156
///
157157
/// Needs to be set when `device.cryptoki.mode` is set to `module`
158-
#[tedge_config(example = "/run/tedge-p11-server/tedge-p11-server.sock")]
158+
#[tedge_config(default(value = "/run/tedge-p11-server/tedge-p11-server.sock"), example = "/run/tedge-p11-server/tedge-p11-server.sock")]
159159
#[doku(as = "PathBuf")]
160160
socket_path: Utf8PathBuf,
161161
},

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,7 @@ impl TEdgeConfigReaderDeviceCryptoki {
207207
serial: None,
208208
}))),
209209
Cryptoki::Socket => Ok(Some(CryptokiConfig::SocketService {
210-
socket_path: self
211-
.socket_path
212-
.or_config_not_set()
213-
.context("required because `device.cryptoki.mode` is set to `socket`")?
214-
.clone(),
210+
socket_path: self.socket_path.clone(),
215211
})),
216212
}
217213
}

0 commit comments

Comments
 (0)