Replace global_config() getter with a public config field
diff --git a/quire-server/src/bin/quire/main.rs b/quire-server/src/bin/quire/main.rs
index 637e5eb..cf9ed24 100644
--- a/quire-server/src/bin/quire/main.rs
+++ b/quire-server/src/bin/quire/main.rs
@@ -118,7 +118,7 @@ async fn main() -> Result<()> {
let _guard = telemetry::init_telemetry(
miette_layer,
FmtMode::AutoJson,
- quire.global_config().sentry.as_ref(),
+ quire.config.sentry.as_ref(),
VERSION,
)?;
diff --git a/quire-server/src/bin/quire/server.rs b/quire-server/src/bin/quire/server.rs
index b9aec0d..bb47f03 100644
--- a/quire-server/src/bin/quire/server.rs
+++ b/quire-server/src/bin/quire/server.rs
@@ -28,7 +28,7 @@ async fn index() -> String {
}
pub async fn run(quire: &Quire, web_routes: axum::Router, api_routes: axum::Router) -> Result<()> {
- let addr = SocketAddr::from(([0, 0, 0, 0], quire.global_config().port));
+ let addr = SocketAddr::from(([0, 0, 0, 0], quire.config.port));
// Set up event socket.
let socket_path = quire.socket_path();
diff --git a/quire-server/src/ci/mod.rs b/quire-server/src/ci/mod.rs
index 2735732..5d729b5 100644
--- a/quire-server/src/ci/mod.rs
+++ b/quire-server/src/ci/mod.rs
@@ -127,7 +127,7 @@ pub fn trigger(quire: &crate::Quire, event: &PushEvent) {
}
};
- let config = quire.global_config();
+ let config = &quire.config;
let sentry_dsn = config.sentry.as_ref().and_then(|s| match s.dsn.reveal() {
Ok(dsn) => Some(dsn.to_string()),
diff --git a/quire-server/src/mirror.rs b/quire-server/src/mirror.rs
index 631957f..a96171f 100644
--- a/quire-server/src/mirror.rs
+++ b/quire-server/src/mirror.rs
@@ -42,7 +42,7 @@ pub fn trigger(quire: &Quire, event: &PushEvent) -> miette::Result<()> {
return Err(MirrorError::RepoNotFound(event.repo.clone()).into());
}
- let config = quire.global_config();
+ let config = &quire.config;
let Some(mirror_token) = config
.github
.mirror_token
diff --git a/quire-server/src/quire/mod.rs b/quire-server/src/quire/mod.rs
index bd6d796..e5e6794 100644
--- a/quire-server/src/quire/mod.rs
+++ b/quire-server/src/quire/mod.rs
@@ -232,7 +232,7 @@ pub struct RepoGithubConfig {
#[derive(Clone)]
pub struct Quire {
base_dir: PathBuf,
- config: GlobalConfig,
+ pub config: GlobalConfig,
db_pool: Arc<OnceLock<Mutex<rusqlite::Connection>>>,
}
@@ -292,11 +292,6 @@ impl Quire {
})
}
- /// Return the global configuration loaded at launch.
- pub fn global_config(&self) -> &GlobalConfig {
- &self.config
- }
-
/// Validate a repository name and return its resolved path.
///
/// Delegates to `Repo::new` for name validation.
diff --git a/quire-server/src/quire/web/api.rs b/quire-server/src/quire/web/api.rs
index 9c2d9d8..c01f96a 100644
--- a/quire-server/src/quire/web/api.rs
+++ b/quire-server/src/quire/web/api.rs
@@ -217,7 +217,7 @@ async fn get_secret(
) -> Result<axum::Json<serde_json::Value>, ApiError> {
let value = tokio::task::spawn_blocking(move || -> std::result::Result<String, ApiError> {
Ok(quire
- .global_config()
+ .config
.secrets
.get(&name)
.ok_or(ApiError::NotFound)?