mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-05-24 09:53:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not require instances to exist during optional config load

Browse source 
We were incorrectly requiring every config file to have the named
instance be present during configuration loading. This led to a
situation where if /etc/kanidm/config didn't have a user configured
instance from their ~/.config/kanidm, that the cli would fail to
load.
This commit is contained in:
William Brown 2025-05-02 10:49:07 +10:00 committed by James Hodgkinson
parent f2d4f65bc6
commit 64a5cc7763
1 changed files with 8 additions and 5 deletions

13
libs/client/src/lib.rs
View file

@ -375,12 +375,15 @@ impl KanidmClientBuilder {
if let Some(instance_config) = config.instances.remove(instance_name) {
self.apply_config_options(instance_config)
} else {
let emsg = format!(
"instance {} does not exist in config file {:?}",
instance_name, config_path
info!(
"instance {} does not exist in config file {}",
instance_name,
config_path.as_ref().display()
);
error!(%emsg);
Err(ClientError::ConfigParseIssue(emsg))
// It's not an error if the instance isn't present, the build step
// will fail if there is insufficent information to proceed.
return Ok(self);
}
} else {
self.apply_config_options(config.default)