1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
|
pub mod cli;
mod log_level;
use std::path::PathBuf;
use clap::ValueEnum;
pub use cli::Cli;
pub use cli::Commands;
use serde::Deserialize;
use tracing_subscriber::EnvFilter;
use crate::WardenError;
use crate::config::cli::CliEnvironment;
use crate::config::cli::database::Database;
macro_rules! pick {
($cli:expr, $file:expr, $name:expr, $missing:expr) => {{
let val = $cli.clone().or($file.clone());
if val.is_none() {
$missing.push($name);
}
val
}};
}
#[derive(Deserialize, Default, Debug, ValueEnum, Clone, Copy)]
#[serde(rename_all = "lowercase")]
pub enum Environment {
Development,
#[default]
Production,
}
impl From<CliEnvironment> for Environment {
fn from(value: CliEnvironment) -> Self {
match value {
CliEnvironment::Dev | CliEnvironment::Development => Self::Development,
CliEnvironment::Prod | CliEnvironment::Production => Self::Production,
}
}
}
#[derive(Debug, Clone)]
pub struct Configuration {
pub server: Server,
pub database: Database,
}
#[derive(Debug, Clone)]
pub struct Server {
pub port: u16,
pub environment: Environment,
pub log_level: EnvFilter,
pub log_dir: PathBuf,
pub timeout_secs: u64,
pub pagination_limit: i64,
}
impl Server {
pub fn merge(cli: &Cli, file: &Cli, missing: &mut Vec<&str>) -> Result<Self, WardenError> {
let port = pick!(cli.server.port, file.server.port, "server.port", missing);
let timeout = pick!(
cli.server.timeout_secs,
file.server.timeout_secs,
"server.timeout",
missing
);
let log_dir = pick!(
cli.server.log_dir.clone(),
file.server.log_dir.clone(),
"server.log_dir",
missing
);
let env = pick!(
cli.server.environment,
file.server.environment,
"server.environment",
missing
);
let raw_log_level = pick!(
cli.server.log_level.clone(),
file.server.log_level.clone(),
"server.log_level",
missing
);
let pagination_limit = pick!(
cli.server.pagination_limit.clone(),
file.server.pagination_limit.clone(),
"server.pagination_limit",
missing
);
if !missing.is_empty() {
let err_msg = missing
.iter()
.map(|f| format!(" - {}", f))
.collect::<Vec<_>>()
.join("\n");
return Err(WardenError::Config(format!(
"Missing required fields:\n{}",
err_msg
)));
}
let log_level = tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| raw_log_level.unwrap().into());
Ok(Self {
port: port.unwrap(),
environment: env.unwrap().into(),
log_dir: log_dir.unwrap(),
timeout_secs: timeout.unwrap(),
log_level,
pagination_limit: pagination_limit.unwrap(),
})
}
}
impl Configuration {
pub fn merge(cli: &Cli, file: &Cli) -> Result<Self, WardenError> {
let mut missing = Vec::new();
let server = Server::merge(cli, file, &mut missing)?;
let database = Database::merge(&cli.database, &file.database)?;
Ok(Self { server, database })
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_merge_config() {
let mut cli = Cli::default();
cli.server.port = Some(8080);
let timeout = 30;
cli.server.timeout_secs = Some(timeout);
let file = Cli {
server: cli::Server {
environment: Some(CliEnvironment::Dev),
log_level: Some("info".into()),
log_dir: Some(PathBuf::from("/tmp")),
timeout_secs: Some(timeout),
..Default::default()
},
..Default::default()
};
let result = Configuration::merge(&cli, &file);
assert!(
result.is_ok(),
"Merge should succeed when all fields are covered"
);
let server = result.unwrap();
assert_eq!(server.server.port, 8080);
}
#[test]
fn test_merge_all_fields_present_success() {
let mut cli = Cli::default();
cli.server.port = Some(8080);
let timeout = 30;
cli.server.timeout_secs = Some(timeout);
let file = Cli {
server: cli::Server {
environment: Some(CliEnvironment::Dev),
log_level: Some("info".into()),
log_dir: Some(PathBuf::from("/tmp")),
timeout_secs: Some(timeout),
..Default::default()
},
..Default::default()
};
let mut missing = vec![];
let result = Server::merge(&cli, &file, &mut missing);
assert!(
result.is_ok(),
"Merge should succeed when all fields are covered"
);
let server = result.unwrap();
assert_eq!(server.port, 8080);
assert_eq!(server.timeout_secs, timeout);
}
#[test]
fn test_merge_error_accumulation() {
let cli = Cli {
server: cli::Server {
port: None,
environment: None,
log_level: None,
log_dir: None,
timeout_secs: None,
pagination_limit: None,
},
..Default::default()
};
let mut missing = vec![];
let result = Server::merge(&cli, &cli, &mut missing);
dbg!(&result);
match result {
Err(WardenError::Config(msg)) => {
assert!(msg.contains("server.port"));
assert!(msg.contains("server.environment"));
}
_ => panic!("Expected a Config error with multiple missing fields"),
}
}
#[test]
fn test_cli_priority_over_file() {
let mut cli = Cli::default();
cli.server.port = Some(9999);
let file = Cli {
server: cli::Server {
port: Some(1111), // This should be ignored
environment: Some(CliEnvironment::Prod),
log_level: Some("error".into()),
log_dir: Some(PathBuf::from("/var/log")),
timeout_secs: Some(60),
..Default::default()
},
..Default::default()
};
let mut missing = vec![];
let server = Server::merge(&cli, &file, &mut missing).expect("Merge failed");
assert_eq!(server.port, 9999, "CLI port must override File port");
}
#[test]
fn test_env_filter_from_raw_string() {
let log_level = "warn";
let cli = Cli {
server: cli::Server {
port: Some(80),
environment: Some(CliEnvironment::Production),
log_level: Some(log_level.to_string()),
log_dir: Some(PathBuf::from(".")),
timeout_secs: Some(5),
..Default::default()
},
..Default::default()
};
let file = Cli::default();
let mut missing = vec![];
let server = Server::merge(&cli, &file, &mut missing).unwrap();
assert_eq!(&server.log_level.to_string(), log_level)
}
}
|