Skip to content

Commit fc6ee2f

Browse files
committed
refactor: Split out config elements
Split config sections into individual modules for the better maintainability.
1 parent e4774ad commit fc6ee2f

25 files changed

+1073
-1416
lines changed

Cargo.lock

Lines changed: 7 additions & 683 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ futures-util = { version = "0.3" }
5151
itertools = { version = "0.14" }
5252
mockall_double = { version = "0.3" }
5353
nix = { version = "0.30", default-features = false, features = ["fs", "user"] }
54-
opa-wasm = { version = "^0.1", optional = true }
54+
# opa-wasm = { version = "^0.1", optional = true }
5555
openidconnect = { version = "4.0" }
5656
rand = { version = "0.9" }
5757
regex = { version = "1.12" }
@@ -75,6 +75,7 @@ tower-http = { version = "0.6", features = ["compression-full", "request-id", "s
7575
tracing = { version = "0.1" }
7676
tracing-subscriber = { version = "0.3", features = [] }
7777
url = { version = "2.5", features = ["serde"] }
78+
url-macro = { version = "0.2" }
7879
utoipa = { version = "5.4", features = ["axum_extras", "chrono", "yaml"] }
7980
utoipa-axum = { version = "0.2" }
8081
utoipa-swagger-ui = { version = "9.0", features = ["axum", "vendored"], default-features = false }
@@ -102,7 +103,7 @@ webauthn-rs = { version = "0.5", features = ["danger-credential-internals"] }
102103

103104
[features]
104105
default = []
105-
wasm = ["dep:opa-wasm"]
106+
# wasm = ["dep:opa-wasm"]
106107
bench_internals = []
107108

108109
[profile.release]

src/bin/keystone.rs

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ use uuid::Uuid;
4848

4949
use openstack_keystone::api;
5050
use openstack_keystone::config::Config;
51-
use openstack_keystone::error::KeystoneError;
5251
use openstack_keystone::federation::FederationApi;
5352
use openstack_keystone::keystone::{Service, ServiceState};
5453
use openstack_keystone::plugin_manager::PluginManager;
@@ -117,10 +116,10 @@ async fn main() -> Result<(), Report> {
117116
2 => LevelFilter::DEBUG,
118117
_ => LevelFilter::TRACE,
119118
})
120-
.with_target("cranelift_codegen", Level::INFO)
121-
.with_target("wasmtime_codegen", Level::INFO)
122-
.with_target("wasmtime_cranelift", Level::INFO)
123-
.with_target("wasmtime::runtime", Level::INFO);
119+
.with_target("cranelift_codegen", Level::INFO);
120+
// .with_target("wasmtime_codegen", Level::INFO)
121+
// .with_target("wasmtime_cranelift", Level::INFO)
122+
// .with_target("wasmtime::runtime", Level::INFO);
124123

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

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

169-
let policy = if let Some(opa_base_url) = &cfg.api_policy.opa_base_url {
170-
PolicyFactory::http(opa_base_url.clone()).await?
171-
} else {
172-
#[cfg(feature = "wasm")]
173-
{
174-
let path = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("policy.wasm");
175-
PolicyFactory::from_wasm(&path).await?
176-
}
177-
return Err(KeystoneError::PolicyEnforcementNotAvailable)?;
178-
};
168+
let policy = PolicyFactory::http(cfg.api_policy.opa_base_url.clone()).await?;
179169

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

0 commit comments

Comments
 (0)