Merge pull request #9702 from Turbo87/team-repo-crate

Turbo87 · web-flow · commit 72a2b22f760b · 2024-10-19T21:23:50.000+02:00
Extract `crates_io_team_repo` crate
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -55,6 +55,7 @@ crates_io_github = { path = "crates/crates_io_github" }
 crates_io_index = { path = "crates/crates_io_index" }
 crates_io_markdown = { path = "crates/crates_io_markdown" }
 crates_io_tarball = { path = "crates/crates_io_tarball" }
+crates_io_team_repo = { path = "crates/crates_io_team_repo" }
 crates_io_worker = { path = "crates/crates_io_worker" }
 csv = "=1.3.0"
 chrono = { version = "=0.4.38", default-features = false, features = ["serde"] }
diff --git a/crates/crates_io_team_repo/Cargo.toml b/crates/crates_io_team_repo/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "crates_io_team_repo"
+version = "0.0.0"
+license = "MIT OR Apache-2.0"
+edition = "2021"
+
+[lints]
+workspace = true
+
+[dependencies]
+anyhow = "=1.0.90"
+async-trait = "=0.1.83"
+mockall = "=0.13.0"
+reqwest = { version = "=0.12.8", features = ["gzip", "json"] }
+serde = { version = "=1.0.210", features = ["derive"] }
+
+[dev-dependencies]
+tokio = { version = "=1.40.0", features = ["macros", "rt-multi-thread"] }
diff --git a/crates/crates_io_team_repo/examples/basic.rs b/crates/crates_io_team_repo/examples/basic.rs
@@ -0,0 +1,9 @@
+use crates_io_team_repo::{TeamRepo, TeamRepoImpl};
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+    let team_repo = TeamRepoImpl::default();
+    let permission = team_repo.get_permission("crates_io_admin").await?;
+    println!("{permission:#?}");
+    Ok(())
+}
diff --git a/crates/crates_io_team_repo/src/certs.rs b/crates/crates_io_team_repo/src/certs.rs
@@ -0,0 +1,5 @@
+/// Certificate from <https://letsencrypt.org/certificates/>.
+pub const ISRG_ROOT_X1: &[u8] = include_bytes!("./isrg-root-x1.pem");
+
+/// Certificate from <https://letsencrypt.org/certificates/>.
+pub const ISRG_ROOT_X2: &[u8] = include_bytes!("./isrg-root-x2.pem");
diff --git a/crates/crates_io_team_repo/src/isrg-root-x1.pem b/crates/crates_io_team_repo/src/isrg-root-x1.pem
diff --git a/crates/crates_io_team_repo/src/isrg-root-x2.pem b/crates/crates_io_team_repo/src/isrg-root-x2.pem
diff --git a/crates/crates_io_team_repo/src/lib.rs b/crates/crates_io_team_repo/src/lib.rs
@@ -5,10 +5,12 @@
 //! purposes. The [TeamRepoImpl] struct is the actual implementation of
 //! the trait.
 
-use crate::certs;
 use async_trait::async_trait;
 use mockall::automock;
 use reqwest::{Certificate, Client};
+use serde::Deserialize;
+
+mod certs;
 
 #[automock]
 #[async_trait]
@@ -68,7 +70,7 @@ impl TeamRepo for TeamRepoImpl {
 
 #[cfg(test)]
 mod tests {
-    use crate::team_repo::build_client;
+    use crate::build_client;
 
     /// This test is here to make sure that the client is built
     /// correctly without panicking.
diff --git a/src/bin/background-worker.rs b/src/bin/background-worker.rs
@@ -18,12 +18,12 @@ use crates_io::cloudfront::CloudFront;
 use crates_io::db::make_manager_config;
 use crates_io::fastly::Fastly;
 use crates_io::storage::Storage;
-use crates_io::team_repo::TeamRepoImpl;
 use crates_io::worker::{Environment, RunnerExt};
 use crates_io::{config, Emails};
 use crates_io::{db, ssh};
 use crates_io_env_vars::var;
 use crates_io_index::RepositoryConfig;
+use crates_io_team_repo::TeamRepoImpl;
 use crates_io_worker::Runner;
 use diesel_async::pooled_connection::deadpool::Pool;
 use diesel_async::pooled_connection::AsyncDieselConnectionManager;
diff --git a/src/certs/mod.rs b/src/certs/mod.rs
@@ -1,8 +1,2 @@
-/// Certificate from <https://letsencrypt.org/certificates/>.
-pub const ISRG_ROOT_X1: &[u8] = include_bytes!("./isrg-root-x1.pem");
-
-/// Certificate from <https://letsencrypt.org/certificates/>.
-pub const ISRG_ROOT_X2: &[u8] = include_bytes!("./isrg-root-x2.pem");
-
 /// crates.io team certificate from <https://crunchybridge.com/>.
 pub const CRUNCHY: &[u8] = include_bytes!("./crunchy.pem");
diff --git a/src/lib.rs b/src/lib.rs
@@ -56,7 +56,6 @@ pub mod sqs;
 pub mod ssh;
 pub mod storage;
 pub mod tasks;
-pub mod team_repo;
 mod test_util;
 #[cfg(test)]
 pub mod tests;
diff --git a/src/tests/util/test_app.rs b/src/tests/util/test_app.rs
@@ -8,13 +8,13 @@ use crate::models::User;
 use crate::rate_limiter::{LimitedAction, RateLimiterConfig};
 use crate::schema::users;
 use crate::storage::StorageConfig;
-use crate::team_repo::MockTeamRepo;
 use crate::tests::util::chaosproxy::ChaosProxy;
 use crate::tests::util::github::{MockGitHubClient, MOCK_GITHUB_DATA};
 use crate::worker::{Environment, RunnerExt};
 use crate::{App, Emails, Env};
 use crates_io_index::testing::UpstreamIndex;
 use crates_io_index::{Credentials, RepositoryConfig};
+use crates_io_team_repo::MockTeamRepo;
 use crates_io_test_db::TestDatabase;
 use crates_io_worker::Runner;
 use diesel::PgConnection;
diff --git a/src/tests/worker/sync_admins.rs b/src/tests/worker/sync_admins.rs
@@ -1,7 +1,7 @@
 use crate::schema::{emails, users};
-use crate::team_repo::{MockTeamRepo, Permission, Person};
 use crate::tests::util::TestApp;
 use crate::worker::jobs::SyncAdmins;
+use crates_io_team_repo::{MockTeamRepo, Permission, Person};
 use crates_io_worker::BackgroundJob;
 use diesel::prelude::*;
 use diesel::{PgConnection, QueryResult, RunQueryDsl};
diff --git a/src/worker/environment.rs b/src/worker/environment.rs
@@ -1,12 +1,12 @@
 use crate::cloudfront::CloudFront;
 use crate::fastly::Fastly;
 use crate::storage::Storage;
-use crate::team_repo::TeamRepo;
 use crate::typosquat;
 use crate::util::diesel::Conn;
 use crate::Emails;
 use anyhow::Context;
 use crates_io_index::{Repository, RepositoryConfig};
+use crates_io_team_repo::TeamRepo;
 use derive_builder::Builder;
 use diesel_async::pooled_connection::deadpool::Pool;
 use diesel_async::AsyncPgConnection;
