Skip to content

refactor: Split out config elements #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gtema merged 1 commit into from
Jan 5, 2026
Merged

refactor: Split out config elements #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
690 changes: 7 additions & 683 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ futures-util = { version = "0.3" }
itertools = { version = "0.14" }
mockall_double = { version = "0.3" }
nix = { version = "0.30", default-features = false, features = ["fs", "user"] }
opa-wasm = { version = "^0.1", optional = true }
# opa-wasm = { version = "^0.1", optional = true }
openidconnect = { version = "4.0" }
rand = { version = "0.9" }
regex = { version = "1.12" }
Expand All @@ -75,6 +75,7 @@ tower-http = { version = "0.6", features = ["compression-full", "request-id", "s
tracing = { version = "0.1" }
tracing-subscriber = { version = "0.3", features = [] }
url = { version = "2.5", features = ["serde"] }
url-macro = { version = "0.2" }
utoipa = { version = "5.4", features = ["axum_extras", "chrono", "yaml"] }
utoipa-axum = { version = "0.2" }
utoipa-swagger-ui = { version = "9.0", features = ["axum", "vendored"], default-features = false }
Expand Down Expand Up @@ -102,7 +103,7 @@ webauthn-rs = { version = "0.5", features = ["danger-credential-internals"] }

[features]
default = []
wasm = ["dep:opa-wasm"]
# wasm = ["dep:opa-wasm"]
bench_internals = []

[profile.release]
Expand Down
20 changes: 5 additions & 15 deletions src/bin/keystone.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ use uuid::Uuid;

use openstack_keystone::api;
use openstack_keystone::config::Config;
use openstack_keystone::error::KeystoneError;
use openstack_keystone::federation::FederationApi;
use openstack_keystone::keystone::{Service, ServiceState};
use openstack_keystone::plugin_manager::PluginManager;
Expand Down Expand Up @@ -117,10 +116,10 @@ async fn main() -> Result<(), Report> {
2 => LevelFilter::DEBUG,
_ => LevelFilter::TRACE,
})
.with_target("cranelift_codegen", Level::INFO)
.with_target("wasmtime_codegen", Level::INFO)
.with_target("wasmtime_cranelift", Level::INFO)
.with_target("wasmtime::runtime", Level::INFO);
.with_target("cranelift_codegen", Level::INFO);
// .with_target("wasmtime_codegen", Level::INFO)
// .with_target("wasmtime_cranelift", Level::INFO)
// .with_target("wasmtime::runtime", Level::INFO);

let log_layer = tracing_subscriber::fmt::layer()
.with_writer(io::stderr)
Expand Down Expand Up @@ -166,16 +165,7 @@ async fn main() -> Result<(), Report> {

let provider = Provider::new(cfg.clone(), plugin_manager)?;

let policy = if let Some(opa_base_url) = &cfg.api_policy.opa_base_url {
PolicyFactory::http(opa_base_url.clone()).await?
} else {
#[cfg(feature = "wasm")]
{
let path = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("policy.wasm");
PolicyFactory::from_wasm(&path).await?
}
return Err(KeystoneError::PolicyEnforcementNotAvailable)?;
};
let policy = PolicyFactory::http(cfg.api_policy.opa_base_url.clone()).await?;

let shared_state = Arc::new(Service::new(cfg, conn, provider, policy)?);

Expand Down
Loading
Loading