mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-05-22 08:53:57 +02:00
Code Issues Actions10 Packages Projects Releases Wiki Activity

fix instance config when missing from default path

Browse source
This commit is contained in:
Sinny Supernova 2025-05-01 22:47:58 +02:00
parent f2d4f65bc6
commit a424724a95
No known key found for this signature in database
GPG key ID: 47097CDA49EB079B
1 changed files with 12 additions and 11 deletions

23
tools/cli/src/cli/common.rs
View file

@ -27,23 +27,24 @@ pub enum ToClientError {
impl CommonOpt {
pub fn to_unauth_client(&self) -> KanidmClient {
let config_path: String = shellexpand::tilde(DEFAULT_CLIENT_CONFIG_PATH_HOME).into_owned();
let instance_name: Option<&str> = self.instance.as_deref();
let client_builder = KanidmClientBuilder::new()
.read_options_from_optional_instance_config(DEFAULT_CLIENT_CONFIG_PATH, instance_name)
.map_err(|e| {
error!(
"Failed to parse config ({:?}) -- {:?}",
DEFAULT_CLIENT_CONFIG_PATH, e
.or_else(|e| {
let home_config_path: std::borrow::Cow<str> =
shellexpand::tilde(DEFAULT_CLIENT_CONFIG_PATH_HOME);
debug!(
"Failed to parse default config ({:?}) -- {:?}. Attempting to parse {:?}",
DEFAULT_CLIENT_CONFIG_PATH, e, home_config_path
);
e
})
.and_then(|cb| {
cb.read_options_from_optional_instance_config(&config_path, instance_name)
KanidmClientBuilder::new()
.read_options_from_optional_instance_config(
home_config_path.as_ref(),
instance_name,
)
.map_err(|e| {
error!("Failed to parse config ({:?}) -- {:?}", config_path, e);
error!("Failed to parse config ({:?}) -- {:?}", home_config_path, e);
e
})
})