fix: reuse config_utils

.gitignore

@@ -1,5 +1,6 @@
 /target
 /data
+/env
 .cargo_check/
 .vscode
 .env

.pre-commit-config.yaml

@@ -21,7 +21,7 @@
 # ```
 # - If docker-compose-up fails to install, try installing docker-compose and installing the latest docker version.
 # If you get an error related to unavailable ports, you might have an instance of redis-server running on the same port. If so, stop the redis-server with the following command: `sudo systemctl stop redis-server.service` and relaunch the pre-commit hooks.
-exclude: crate/client/datasets/users.json
+exclude: test_data
 repos:
   - repo: https://github.com/compilerla/conventional-pre-commit
     rev: v3.4.0

Cargo.toml

@@ -46,11 +46,13 @@ actix-server = { version = "2.5", default-features = false }
 actix-web = { version = "4.9.0", default-features = false }
 base64 = "0.21"
 clap = { version = "4.5", default-features = false }
-cosmian_http_client = { git = "https://www.github.com/Cosmian/http_client_server", branch = "add_http_client" }
-# cosmian_http_client = { path ="../../core/client_server/crate/http_client" }
-cosmian_logger = { git = "https://www.github.com/Cosmian/http_client_server", branch = "add_http_client" }
 # cloudproof_findex = { path = "../cloudproof_rust/crates/findex" }
 cloudproof_findex = { git = "https://www.github.com/Cosmian/cloudproof_rust", branch = "feat/add_basic_findex_rest_client" }
+# cosmian_config_utils = { path ="../../core/client_server/crate/config_utils" }
+# cosmian_http_client = { path ="../../core/client_server/crate/http_client" }
+cosmian_http_client = { git = "https://www.github.com/Cosmian/http_client_server", branch = "add_http_client" }
+cosmian_config_utils = { git = "https://www.github.com/Cosmian/http_client_server", branch = "add_http_client" }
+cosmian_logger = { git = "https://www.github.com/Cosmian/http_client_server", branch = "add_http_client" }
 der = { version = "0.7", default-features = false }
 openssl = { version = "0.10", default-features = false }
 pem = "3.0"

crate/cli/Cargo.toml

@@ -32,6 +32,7 @@ clap = { workspace = true, features = [
   "cargo",
 ] }
 cloudproof_findex = { workspace = true, features = ["rest-interface"] }
+cosmian_config_utils = { workspace = true }
 cosmian_logger = { workspace = true }
 cosmian_findex_client = { path = "../client" }
 cosmian_findex_structs = { path = "../structs" }

crate/cli/src/actions/login.rs

@@ -1,4 +1,5 @@
 use clap::Parser;
+use cosmian_config_utils::ConfigUtils;
 use cosmian_findex_client::reexport::{
     cosmian_findex_config::{FindexClientConfig, FindexConfigError},
     cosmian_http_client::LoginState,

crate/cli/src/actions/logout.rs

@@ -1,4 +1,5 @@
 use clap::Parser;
+use cosmian_config_utils::ConfigUtils;
 use cosmian_findex_client::reexport::cosmian_findex_config::{
     FindexClientConfig, FindexConfigError,
 };

crate/cli/src/actions/mod.rs

@@ -2,6 +2,5 @@ pub mod console;
 pub mod findex;
 pub mod login;
 pub mod logout;
-pub mod markdown;
 pub mod permissions;
 pub mod version;

crate/cli/src/commands.rs

@@ -1,6 +1,7 @@
 use std::path::PathBuf;
 
 use clap::{Parser, Subcommand};
+use cosmian_config_utils::ConfigUtils;
 use cosmian_findex_client::{reexport::cosmian_findex_config::FindexClientConfig, FindexClient};
 use cosmian_logger::log_init;
 use tracing::info;

crate/cli/src/error/mod.rs

@@ -6,6 +6,7 @@ use cloudproof_findex::{
     db_interfaces::DbInterfaceError,
     reexport::{cosmian_crypto_core::CryptoCoreError, cosmian_findex},
 };
+use cosmian_config_utils::ConfigUtilsError;
 use cosmian_findex_client::{
     reexport::{cosmian_findex_config::FindexConfigError, cosmian_http_client::HttpClientError},
     FindexClientError,
@@ -77,6 +78,9 @@ pub enum CliError {
 
     #[error(transparent)]
     ConfigError(#[from] FindexConfigError),
+
+    #[error(transparent)]
+    ConfigUtilsError(#[from] ConfigUtilsError),
 }
 
 impl From<der::Error> for CliError {