feat: reload config

src/bors/handlers/refresh.rs

@@ -12,6 +12,7 @@ pub async fn refresh_repository<Client: RepositoryClient>(
 ) -> anyhow::Result<()> {
  let res = cancel_timed_out_builds(repo, db).await;
  reload_permission(repo).await;
+ reload_config(repo).await?;
 
  res
 }
@@ -57,6 +58,14 @@ async fn reload_permission<Client: RepositoryClient>(repo: &mut RepositoryState<
  repo.permissions_resolver.reload().await
 }
 
+async fn reload_config<Client: RepositoryClient>(
+ repo: &mut RepositoryState<Client>,
+) -> anyhow::Result<()> {
+ let config = repo.client.load_config().await?;
+ repo.config = config;
+ Ok(())
+}
+
 #[cfg(not(test))]
 fn now() -> DateTime<Utc> {
  Utc::now()

src/bors/mod.rs

@@ -23,6 +23,9 @@ pub use handlers::handle_bors_event;
 pub trait RepositoryClient {
  fn repository(&self) -> &GithubRepoName;
 
+ /// load repository config
+ async fn load_config(&mut self) -> anyhow::Result<RepositoryConfig>;
+
  /// Return the current SHA of the given branch.
  async fn get_branch_sha(&mut self, name: &str) -> anyhow::Result<CommitSha>;
 

src/github/api/client.rs

@@ -1,10 +1,12 @@
 use anyhow::Context;
 use axum::async_trait;
+use base64::Engine;
 use octocrab::models::{Repository, RunId};
 use octocrab::{Error, Octocrab};
 use tracing::log;
 
 use crate::bors::{CheckSuite, CheckSuiteStatus, RepositoryClient};
+use crate::config::{RepositoryConfig, CONFIG_FILE_PATH};
 use crate::github::api::base_github_url;
 use crate::github::api::operations::{merge_branches, set_branch_to_commit, MergeError};
 use crate::github::{Branch, CommitSha, GithubRepoName, PullRequest, PullRequestNumber};
@@ -40,6 +42,40 @@ impl RepositoryClient for GithubRepositoryClient {
  self.name()
  }
 
+ /// Loads repository configuration from a file located at `[CONFIG_FILE_PATH]` in the main
+ /// branch.
+ async fn load_config(&mut self) -> anyhow::Result<RepositoryConfig> {
+ let mut response = self
+ .client
+ .repos(&self.repo_name.owner, &self.repo_name.name)
+ .get_content()
+ .path(CONFIG_FILE_PATH)
+ .send()
+ .await
+ .map_err(|error| {
+ anyhow::anyhow!(
+ "Could not fetch {CONFIG_FILE_PATH} from {}: {error:?}",
+ self.repo_name
+ )
+ })?;
+
+ let engine = base64::engine::general_purpose::STANDARD;
+ response
+ .take_items()
+ .into_iter()
+ .next()
+ .and_then(|content| content.content)
+ .ok_or_else(|| anyhow::anyhow!("Configuration file not found"))
+ .and_then(|content| Ok(engine.decode(content.trim())?))
+ .and_then(|content| Ok(String::from_utf8(content)?))
+ .and_then(|content| {
+ let config: RepositoryConfig = toml::from_str(&content).map_err(|error| {
+ anyhow::anyhow!("Could not deserialize repository config: {error:?}")
+ })?;
+ Ok(config)
+ })
+ }
+
  async fn get_branch_sha(&mut self, name: &str) -> anyhow::Result<CommitSha> {
  // https://docs.github.com/en/rest/branches/branches?apiVersion=2022-11-28#get-a-branch
  let branch: octocrab::models::repos::Branch = self

src/github/api/mod.rs

@@ -3,7 +3,6 @@ use std::future::Future;
 use std::pin::Pin;
 
 use anyhow::Context;
-use base64::Engine;
 use octocrab::models::{App, AppId, InstallationRepositories, Repository};
 use octocrab::Octocrab;
 use secrecy::{ExposeSecret, SecretVec};
@@ -12,8 +11,7 @@ use url::Url;
 use client::GithubRepositoryClient;
 
 use crate::bors::event::PullRequestComment;
-use crate::bors::{BorsState, RepositoryState};
-use crate::config::{RepositoryConfig, CONFIG_FILE_PATH};
+use crate::bors::{BorsState, RepositoryClient, RepositoryState};
 use crate::database::{DbClient, SeaORMClient};
 use crate::github::GithubRepoName;
 use crate::permissions::TeamApiPermissionResolver;
@@ -142,7 +140,13 @@ async fn create_repo_state(
  let name = GithubRepoName::new(&owner.login, &repo.name);
  tracing::info!("Found repository {name}");
 
- let config = match load_repository_config(&repo_client, &name).await {
+ let mut client = GithubRepositoryClient {
+ client: repo_client,
+ repo_name: name.clone(),
+ repository: repo,
+ };
+
+ let config = match client.load_config().await {
  Ok(config) => {
  tracing::info!("Loaded repository config for {name}: {config:#?}");
  config
@@ -158,12 +162,6 @@ async fn create_repo_state(
  .await
  .map_err(|error| anyhow::anyhow!("Could not load permissions for {name}: {error:?}"))?;
 
- let client = GithubRepositoryClient {
- client: repo_client,
- repo_name: name.clone(),
- repository: repo,
- };
-
  Ok(RepositoryState {
  repository: name,
  client,
@@ -172,39 +170,6 @@ async fn create_repo_state(
  })
 }
 
-/// Loads repository configuration from a file located at `[CONFIG_FILE_PATH]` in the main
-/// branch.
-async fn load_repository_config(
- gh_client: &Octocrab,
- repo: &GithubRepoName,
-) -> anyhow::Result<RepositoryConfig> {
- let mut response = gh_client
- .repos(&repo.owner, &repo.name)
- .get_content()
- .path(CONFIG_FILE_PATH)
- .send()
- .await
- .map_err(|error| {
- anyhow::anyhow!("Could not fetch {CONFIG_FILE_PATH} from {repo}: {error:?}")
- })?;
-
- let engine = base64::engine::general_purpose::STANDARD;
- response
- .take_items()
- .into_iter()
- .next()
- .and_then(|content| content.content)
- .ok_or_else(|| anyhow::anyhow!("Configuration file not found"))
- .and_then(|content| Ok(engine.decode(content.trim())?))
- .and_then(|content| Ok(String::from_utf8(content)?))
- .and_then(|content| {
- let config: RepositoryConfig = toml::from_str(&content).map_err(|error| {
- anyhow::anyhow!("Could not deserialize repository config: {error:?}")
- })?;
- Ok(config)
- })
-}
-
 impl BorsState<GithubRepositoryClient> for GithubAppState {
  fn is_comment_internal(&self, comment: &PullRequestComment) -> bool {
  comment.author.html_url == self.app.html_url

src/tests/state.rs

@@ -409,4 +409,8 @@ impl RepositoryClient for TestRepositoryClient {
  .extend(labels.to_vec());
  Ok(())
  }
+
+ async fn load_config(&mut self) -> anyhow::Result<RepositoryConfig> {
+ Ok(RepoConfigBuilder::default().create())
+ }
 }