Remove the DbClient trait

Author: Kobzol

src/bors/context.rs

@@ -3,20 +3,20 @@ use std::{
     sync::{Arc, RwLock},
 };
 
-use crate::{bors::command::CommandParser, database::DbClient, github::GithubRepoName};
+use crate::{bors::command::CommandParser, github::GithubRepoName, PgDbClient};
 
 use super::{RepositoryClient, RepositoryState};
 
 pub struct BorsContext<Client: RepositoryClient> {
     pub parser: CommandParser,
-    pub db: Arc<dyn DbClient>,
+    pub db: Arc<PgDbClient>,
     pub repositories: RwLock<HashMap<GithubRepoName, Arc<RepositoryState<Client>>>>,
 }
 
 impl<Client: RepositoryClient> BorsContext<Client> {
     pub fn new(
         parser: CommandParser,
-        db: Arc<dyn DbClient>,
+        db: Arc<PgDbClient>,
         repositories: HashMap<GithubRepoName, Arc<RepositoryState<Client>>>,
     ) -> Self {
         let repositories = RwLock::new(repositories);

src/bors/handlers/mod.rs

@@ -13,8 +13,7 @@ use crate::bors::handlers::workflow::{
     handle_check_suite_completed, handle_workflow_completed, handle_workflow_started,
 };
 use crate::bors::{BorsContext, Comment, RepositoryClient, RepositoryLoader, RepositoryState};
-use crate::database::DbClient;
-use crate::TeamApiClient;
+use crate::{PgDbClient, TeamApiClient};
 
 #[cfg(test)]
 use crate::tests::util::TestSyncMarker;
@@ -158,7 +157,7 @@ pub async fn handle_bors_global_event<Client: RepositoryClient>(
 
 async fn handle_comment<Client: RepositoryClient>(
     repo: Arc<RepositoryState<Client>>,
-    database: Arc<dyn DbClient>,
+    database: Arc<PgDbClient>,
     ctx: Arc<BorsContext<Client>>,
     comment: PullRequestComment,
 ) -> anyhow::Result<()> {

src/bors/handlers/refresh.rs

@@ -7,12 +7,12 @@ use chrono::{DateTime, Utc};
 use crate::bors::handlers::trybuild::cancel_build_workflows;
 use crate::bors::Comment;
 use crate::bors::{RepositoryClient, RepositoryState};
-use crate::database::{BuildStatus, DbClient};
-use crate::TeamApiClient;
+use crate::database::BuildStatus;
+use crate::{PgDbClient, TeamApiClient};
 
 pub async fn refresh_repository<Client: RepositoryClient>(
     repo: Arc<RepositoryState<Client>>,
-    db: Arc<dyn DbClient>,
+    db: Arc<PgDbClient>,
     team_api_client: &TeamApiClient,
 ) -> anyhow::Result<()> {
     let repo = repo.as_ref();
@@ -30,7 +30,7 @@ pub async fn refresh_repository<Client: RepositoryClient>(
 
 async fn cancel_timed_out_builds<Client: RepositoryClient>(
     repo: &RepositoryState<Client>,
-    db: &dyn DbClient,
+    db: &PgDbClient,
 ) -> anyhow::Result<()> {
     let running_builds = db.get_running_builds(&repo.repository).await?;
     tracing::info!("Found {} running build(s)", running_builds.len());

src/bors/handlers/trybuild.rs

@@ -8,13 +8,12 @@ use crate::bors::Comment;
 use crate::bors::RepositoryClient;
 use crate::bors::RepositoryState;
 use crate::database::RunId;
-use crate::database::{
-    BuildModel, BuildStatus, DbClient, PullRequestModel, WorkflowStatus, WorkflowType,
-};
+use crate::database::{BuildModel, BuildStatus, PullRequestModel, WorkflowStatus, WorkflowType};
 use crate::github::{
     CommitSha, GithubUser, LabelTrigger, MergeError, PullRequest, PullRequestNumber,
 };
 use crate::permissions::PermissionType;
+use crate::PgDbClient;
 
 // This branch serves for preparing the final commit.
 // It will be reset to master and merged with the branch that should be tested.
@@ -32,7 +31,7 @@ pub(super) const TRY_BRANCH_NAME: &str = "automation/bors/try";
 /// Otherwise, it will use the latest commit on the main repository branch.
 pub(super) async fn command_try_build<Client: RepositoryClient>(
     repo: Arc<RepositoryState<Client>>,
-    db: Arc<dyn DbClient>,
+    db: Arc<PgDbClient>,
     pr: &PullRequest,
     author: &GithubUser,
     parent: Option<Parent>,
@@ -143,7 +142,7 @@ pub(super) async fn command_try_build<Client: RepositoryClient>(
 
 pub(super) async fn command_try_cancel<Client: RepositoryClient>(
     repo: Arc<RepositoryState<Client>>,
-    db: Arc<dyn DbClient>,
+    db: Arc<PgDbClient>,
     pr: &PullRequest,
     author: &GithubUser,
 ) -> anyhow::Result<()> {
@@ -212,7 +211,7 @@ Cancelled workflows:"#
 
 pub async fn cancel_build_workflows<Client: RepositoryClient>(
     repo: &RepositoryState<Client>,
-    db: &dyn DbClient,
+    db: &PgDbClient,
     build: &BuildModel,
 ) -> anyhow::Result<Vec<RunId>> {
     let pending_workflows = db
@@ -317,7 +316,7 @@ async fn check_try_permissions<Client: RepositoryClient>(
 mod tests {
     use crate::bors::handlers::trybuild::{TRY_BRANCH_NAME, TRY_MERGE_BRANCH_NAME};
     use crate::database::operations::get_all_workflows;
-    use crate::database::{BuildStatus, DbClient};
+    use crate::database::BuildStatus;
     use crate::github::{CommitSha, PullRequestNumber};
     use crate::tests::mocks::{
         default_pr_number, default_repo_name, run_test, BorsBuilder, Permissions, Workflow,

src/bors/handlers/workflow.rs

@@ -6,11 +6,12 @@ use crate::bors::handlers::is_bors_observed_branch;
 use crate::bors::handlers::labels::handle_label_trigger;
 use crate::bors::{CheckSuiteStatus, Comment};
 use crate::bors::{RepositoryClient, RepositoryState};
-use crate::database::{BuildStatus, DbClient, WorkflowStatus};
+use crate::database::{BuildStatus, WorkflowStatus};
 use crate::github::LabelTrigger;
+use crate::PgDbClient;
 
 pub(super) async fn handle_workflow_started(
-    db: Arc<dyn DbClient>,
+    db: Arc<PgDbClient>,
     payload: WorkflowStarted,
 ) -> anyhow::Result<()> {
     if !is_bors_observed_branch(&payload.branch) {
@@ -59,7 +60,7 @@ pub(super) async fn handle_workflow_started(
 
 pub(super) async fn handle_workflow_completed<Client: RepositoryClient>(
     repo: Arc<RepositoryState<Client>>,
-    db: Arc<dyn DbClient>,
+    db: Arc<PgDbClient>,
     payload: WorkflowCompleted,
 ) -> anyhow::Result<()> {
     if !is_bors_observed_branch(&payload.branch) {
@@ -81,7 +82,7 @@ pub(super) async fn handle_workflow_completed<Client: RepositoryClient>(
 
 pub(super) async fn handle_check_suite_completed<Client: RepositoryClient>(
     repo: Arc<RepositoryState<Client>>,
-    db: Arc<dyn DbClient>,
+    db: Arc<PgDbClient>,
     payload: CheckSuiteCompleted,
 ) -> anyhow::Result<()> {
     if !is_bors_observed_branch(&payload.branch) {
@@ -99,7 +100,7 @@ pub(super) async fn handle_check_suite_completed<Client: RepositoryClient>(
 /// Try to complete a pending build.
 async fn try_complete_build<Client: RepositoryClient>(
     repo: &RepositoryState<Client>,
-    db: &dyn DbClient,
+    db: &PgDbClient,
     payload: CheckSuiteCompleted,
 ) -> anyhow::Result<()> {
     if !is_bors_observed_branch(&payload.branch) {

src/database/client.rs

@@ -1,4 +1,3 @@
-use axum::async_trait;
 use sqlx::PgPool;
 
 use crate::database::{
@@ -12,7 +11,7 @@ use super::operations::{
     get_pull_request, get_running_builds, get_workflows_for_build, update_build_status,
     update_pr_build_id, update_workflow_status,
 };
-use super::{DbClient, RunId};
+use super::RunId;
 
 /// Provides access to a database using sqlx operations.
 #[derive(Clone)]
@@ -24,11 +23,8 @@ impl PgDbClient {
     pub fn new(pool: PgPool) -> Self {
         Self { pool }
     }
-}
 
-#[async_trait]
-impl DbClient for PgDbClient {
-    async fn get_or_create_pull_request(
+    pub async fn get_or_create_pull_request(
         &self,
         repo: &GithubRepoName,
         pr_number: PullRequestNumber,
@@ -44,14 +40,14 @@ impl DbClient for PgDbClient {
         Ok(pr)
     }
 
-    async fn find_pr_by_build(
+    pub async fn find_pr_by_build(
         &self,
         build: &BuildModel,
     ) -> anyhow::Result<Option<PullRequestModel>> {
         find_pr_by_build(&self.pool, build.id).await
     }
 
-    async fn attach_try_build(
+    pub async fn attach_try_build(
         &self,
         pr: PullRequestModel,
         branch: String,
@@ -66,7 +62,7 @@ impl DbClient for PgDbClient {
         Ok(())
     }
 
-    async fn find_build(
+    pub async fn find_build(
         &self,
         repo: &GithubRepoName,
         branch: String,
@@ -75,19 +71,22 @@ impl DbClient for PgDbClient {
         find_build(&self.pool, repo, &branch, &commit_sha).await
     }
 
-    async fn get_running_builds(&self, repo: &GithubRepoName) -> anyhow::Result<Vec<BuildModel>> {
+    pub async fn get_running_builds(
+        &self,
+        repo: &GithubRepoName,
+    ) -> anyhow::Result<Vec<BuildModel>> {
         get_running_builds(&self.pool, repo).await
     }
 
-    async fn update_build_status(
+    pub async fn update_build_status(
         &self,
         build: &BuildModel,
         status: BuildStatus,
     ) -> anyhow::Result<()> {
         update_build_status(&self.pool, build.id, status).await
     }
 
-    async fn create_workflow(
+    pub async fn create_workflow(
         &self,
         build: &BuildModel,
         name: String,
@@ -108,15 +107,15 @@ impl DbClient for PgDbClient {
         .await
     }
 
-    async fn update_workflow_status(
+    pub async fn update_workflow_status(
         &self,
         run_id: u64,
         status: WorkflowStatus,
     ) -> anyhow::Result<()> {
         update_workflow_status(&self.pool, run_id, status).await
     }
 
-    async fn get_workflows_for_build(
+    pub async fn get_workflows_for_build(
         &self,
         build: &BuildModel,
     ) -> anyhow::Result<Vec<WorkflowModel>> {

src/database/mod.rs

@@ -1,15 +1,14 @@
 //! Provides access to the database.
-mod client;
-pub(crate) mod operations;
-
 use std::fmt::{Display, Formatter};
 
-use axum::async_trait;
 use chrono::{DateTime, Utc};
 
 pub use client::PgDbClient;
 
-use crate::github::{CommitSha, GithubRepoName, PullRequestNumber};
+use crate::github::{GithubRepoName, PullRequestNumber};
+
+mod client;
+pub(crate) mod operations;
 
 type PrimaryKey = i32;
 
@@ -155,72 +154,3 @@ pub struct WorkflowModel {
     pub status: WorkflowStatus,
     pub created_at: DateTime<Utc>,
 }
-
-/// Provides access to a database.
-#[async_trait]
-pub trait DbClient: Sync + Send {
-    /// Finds a Pull request row for the given repository and PR number.
-    /// If it doesn't exist, a new row is created.
-    async fn get_or_create_pull_request(
-        &self,
-        repo: &GithubRepoName,
-        pr_number: PullRequestNumber,
-    ) -> anyhow::Result<PullRequestModel>;
-
-    /// Finds a Pull request by a build (either a try or merge one).
-    async fn find_pr_by_build(
-        &self,
-        build: &BuildModel,
-    ) -> anyhow::Result<Option<PullRequestModel>>;
-
-    /// Attaches an existing build to the given PR.
-    async fn attach_try_build(
-        &self,
-        pr: PullRequestModel,
-        branch: String,
-        commit_sha: CommitSha,
-        parent: CommitSha,
-    ) -> anyhow::Result<()>;
-
-    /// Finds a build row by its repository, commit SHA and branch.
-    async fn find_build(
-        &self,
-        repo: &GithubRepoName,
-        branch: String,
-        commit_sha: CommitSha,
-    ) -> anyhow::Result<Option<BuildModel>>;
-
-    /// Returns all builds that have not been completed yet.
-    async fn get_running_builds(&self, repo: &GithubRepoName) -> anyhow::Result<Vec<BuildModel>>;
-
-    /// Updates the status of this build in the DB.
-    async fn update_build_status(
-        &self,
-        build: &BuildModel,
-        status: BuildStatus,
-    ) -> anyhow::Result<()>;
-
-    /// Creates a new workflow attached to a build.
-    async fn create_workflow(
-        &self,
-        build: &BuildModel,
-        name: String,
-        url: String,
-        run_id: RunId,
-        workflow_type: WorkflowType,
-        status: WorkflowStatus,
-    ) -> anyhow::Result<()>;
-
-    /// Updates the status of a workflow with the given run ID in the DB.
-    async fn update_workflow_status(
-        &self,
-        run_id: u64,
-        status: WorkflowStatus,
-    ) -> anyhow::Result<()>;
-
-    /// Get all workflows attached to a build.
-    async fn get_workflows_for_build(
-        &self,
-        build: &BuildModel,
-    ) -> anyhow::Result<Vec<WorkflowModel>>;
-}