mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 12:37:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(server/config): reduce string allocations (#3350)

Browse source 
Previously the code would do `key.replace("KANIDM_", "")`, this
allocates a new string, which is unnecessary, as we can simply call
`strip_prefix("KANIDM_")`.

This removes the `KANIDM_` prefix from a bunch of places, and doubles as
a check that the variable is prefixed with `KANIDM_`. Overall I believe
this change makes the code more robust and slightly reduces allocations,
speeding up an admittedly cold function (only called very infrequently).
This commit is contained in:
Jalil David Salamé Messina 2025-01-11 00:20:15 +01:00 committed by GitHub
parent 1a29aa7301
commit c4bc1ff546
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
server/core/src/config.rs
View file

@ -250,31 +250,28 @@ impl ServerConfig {
/// Updates the ServerConfig from environment variables starting with `KANIDM_` /// Updates the ServerConfig from environment variables starting with `KANIDM_`
fn try_from_env(mut self) -> Result<Self, String> { fn try_from_env(mut self) -> Result<Self, String> {
for (key, value) in std::env::vars() { for (key, value) in std::env::vars() {
if !key.starts_with("KANIDM_") { let Some(key) = key.strip_prefix("KANIDM_") else {
continue; continue;
} };
let ignorable_build_fields = [ let ignorable_build_fields = [
"KANIDM_CPU_FLAGS", "CPU_FLAGS",
"KANIDM_CPU_FLAGS", "DEFAULT_CONFIG_PATH",
"KANIDM_DEFAULT_CONFIG_PATH", "DEFAULT_UNIX_SHELL_PATH",
"KANIDM_DEFAULT_CONFIG_PATH", "HTMX_UI_PKG_PATH",
"KANIDM_DEFAULT_UNIX_SHELL_PATH", "PKG_VERSION",
"KANIDM_DEFAULT_UNIX_SHELL_PATH", "PKG_VERSION_HASH",
"KANIDM_HTMX_UI_PKG_PATH", "PRE_RELEASE",
"KANIDM_PKG_VERSION_HASH", "PROFILE_NAME",
"KANIDM_PKG_VERSION",
"KANIDM_PRE_RELEASE",
"KANIDM_PROFILE_NAME",
]; ];
if ignorable_build_fields.contains(&key.as_str()) { if ignorable_build_fields.contains(&key) {
#[cfg(any(debug_assertions, test))] #[cfg(any(debug_assertions, test))]
eprintln!("-- Ignoring build-time env var {}", key); eprintln!("-- Ignoring build-time env var KANIDM_{key}");
continue; continue;
} }
match key.replace("KANIDM_", "").as_str() { match key {
"DOMAIN" => { "DOMAIN" => {
self.domain = Some(value.to_string()); self.domain = Some(value.to_string());
} }
@ -414,7 +411,7 @@ impl ServerConfig {
self.otel_grpc_url = Some(value.to_string()); self.otel_grpc_url = Some(value.to_string());
} }
_ => eprintln!("Ignoring env var {}", key), _ => eprintln!("Ignoring env var KANIDM_{key}"),
} }
} }