diff --git a/Cargo.lock b/Cargo.lock index bbc8288..a6ccdef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -669,7 +669,7 @@ dependencies = [ [[package]] name = "k2v-client" version = "0.1.0" -source = "git+https://git.deuxfleurs.fr/Deuxfleurs/garage.git?branch=improve-k2v-client#a73f174ada005f71a77f12e185da154aa5c254a9" +source = "git+https://git.deuxfleurs.fr/Deuxfleurs/garage.git?branch=main#9f303f6308a313c8310c3597ecb6828e46352821" dependencies = [ "base64", "http", diff --git a/Cargo.toml b/Cargo.toml index 0fabd23..df484d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,5 +31,9 @@ tokio = "1.17.0" toml = "0.5" zstd = { version = "0.9", default-features = false } -k2v-client = { git = "https://git.deuxfleurs.fr/Deuxfleurs/garage.git", branch = "improve-k2v-client" } +k2v-client = { git = "https://git.deuxfleurs.fr/Deuxfleurs/garage.git", branch = "main" } #k2v-client = { path = "../garage/src/k2v-client" } + +[[bin]] +name = "test" +path = "src/test.rs" diff --git a/src/config.rs b/src/config.rs index b77288b..6c3801c 100644 --- a/src/config.rs +++ b/src/config.rs @@ -3,9 +3,9 @@ use std::io::Read; use std::path::PathBuf; use anyhow::Result; -use serde::Deserialize; +use serde::{Serialize,Deserialize}; -#[derive(Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone)] pub struct Config { pub s3_endpoint: String, pub k2v_endpoint: String, @@ -15,13 +15,13 @@ pub struct Config { pub login_ldap: Option, } -#[derive(Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone)] pub struct LoginStaticConfig { pub default_bucket: Option, pub users: HashMap, } -#[derive(Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone)] pub struct LoginStaticUser { pub password: String, @@ -37,7 +37,7 @@ pub struct LoginStaticUser { pub secret_key: Option, } -#[derive(Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone)] pub struct LoginLdapConfig { pub ldap_server: String, diff --git a/src/test.rs b/src/test.rs new file mode 100644 index 0000000..4d32a6f --- /dev/null +++ b/src/test.rs @@ -0,0 +1,31 @@ +mod config; + +use serde::Serialize; +use std::collections::HashMap; + +fn main() { + let config = config::Config { + s3_endpoint: "http://127.0.0.1:3900".to_string(), + k2v_endpoint: "http://127.0.0.1:3904".to_string(), + aws_region: "garage".to_string(), + login_static: Some(config::LoginStaticConfig { + default_bucket: Some("mailrage".to_string()), + users: HashMap::from([ + ("quentin".to_string(), config::LoginStaticUser { + password: "toto".to_string(), + aws_access_key_id: "GKxxx".to_string(), + aws_secret_access_key: "ffff".to_string(), + bucket: Some("mailrage-quentin".to_string()), + user_secret: "xxx".to_string(), + alternate_user_secrets: vec![], + master_key: None, + secret_key: None, + }), + ]), + }), + login_ldap: None, + }; + + let ser = toml::to_string(&config).unwrap(); + println!("{}", ser); +}