Merge pull request #11113 from Turbo87/trustpub-create-config

Implement `PUT /api/v1/trusted_publishing/github_configs` API endpoint

Author: Turbo87

Cargo.lock

@@ -74,6 +74,7 @@ crates_io_pagerduty = { path = "crates/crates_io_pagerduty" }
 crates_io_session = { path = "crates/crates_io_session" }
 crates_io_tarball = { path = "crates/crates_io_tarball" }
 crates_io_team_repo = { path = "crates/crates_io_team_repo" }
+crates_io_trustpub = { path = "crates/crates_io_trustpub" }
 crates_io_worker = { path = "crates/crates_io_worker" }
 csv = "=1.3.1"
 chrono = { version = "=0.4.41", default-features = false, features = ["serde"] }

Cargo.toml

@@ -33,5 +33,6 @@ pub mod krate;
 mod owner;
 pub mod team;
 pub mod token;
+pub mod trustpub;
 pub mod user;
 pub mod version;

crates/crates_io_database/src/models/mod.rs

@@ -0,0 +1,37 @@
+use crate::schema::trustpub_configs_github;
+use chrono::{DateTime, Utc};
+use diesel::prelude::*;
+use diesel_async::{AsyncPgConnection, RunQueryDsl};
+
+#[derive(Debug, Identifiable, Queryable, Selectable)]
+#[diesel(table_name = trustpub_configs_github, check_for_backend(diesel::pg::Pg))]
+pub struct GitHubConfig {
+    pub id: i32,
+    pub created_at: DateTime<Utc>,
+    pub crate_id: i32,
+    pub repository_owner: String,
+    pub repository_owner_id: i32,
+    pub repository_name: String,
+    pub workflow_filename: String,
+    pub environment: Option<String>,
+}
+
+#[derive(Debug, Insertable)]
+#[diesel(table_name = trustpub_configs_github, check_for_backend(diesel::pg::Pg))]
+pub struct NewGitHubConfig<'a> {
+    pub crate_id: i32,
+    pub repository_owner: &'a str,
+    pub repository_owner_id: i32,
+    pub repository_name: &'a str,
+    pub workflow_filename: &'a str,
+    pub environment: Option<&'a str>,
+}
+
+impl NewGitHubConfig<'_> {
+    pub async fn insert(&self, conn: &mut AsyncPgConnection) -> QueryResult<GitHubConfig> {
+        self.insert_into(trustpub_configs_github::table)
+            .returning(GitHubConfig::as_returning())
+            .get_result(conn)
+            .await
+    }
+}

crates/crates_io_database/src/models/trustpub/github_config.rs

@@ -0,0 +1,3 @@
+mod github_config;
+
+pub use self::github_config::{GitHubConfig, NewGitHubConfig};

crates/crates_io_database/src/models/trustpub/mod.rs

@@ -12,6 +12,11 @@ enum Request {
         #[clap(long, env = "GITHUB_ACCESS_TOKEN", hide_env_values = true)]
         access_token: SecretString,
     },
+    GetUser {
+        name: String,
+        #[clap(long, env = "GITHUB_ACCESS_TOKEN", hide_env_values = true)]
+        access_token: SecretString,
+    },
     OrgByName {
         org_name: String,
         #[clap(long, env = "GITHUB_ACCESS_TOKEN", hide_env_values = true)]
@@ -58,6 +63,11 @@ async fn main() -> Result<()> {
             let response = github_client.current_user(&access_token).await?;
             println!("{response:#?}");
         }
+        Request::GetUser { name, access_token } => {
+            let access_token = AccessToken::new(access_token.expose_secret().into());
+            let response = github_client.get_user(&name, &access_token).await?;
+            println!("{response:#?}");
+        }
         Request::OrgByName {
             org_name,
             access_token,

crates/crates_io_github/examples/test_github_client.rs

@@ -20,6 +20,7 @@ type Result<T> = std::result::Result<T, GitHubError>;
 #[async_trait]
 pub trait GitHubClient: Send + Sync {
     async fn current_user(&self, auth: &AccessToken) -> Result<GitHubUser>;
+    async fn get_user(&self, name: &str, auth: &AccessToken) -> Result<GitHubUser>;
     async fn org_by_name(&self, org_name: &str, auth: &AccessToken) -> Result<GitHubOrganization>;
     async fn team_by_name(
         &self,
@@ -102,6 +103,11 @@ impl GitHubClient for RealGitHubClient {
         self.request("/user", auth).await
     }
 
+    async fn get_user(&self, name: &str, auth: &AccessToken) -> Result<GitHubUser> {
+        let url = format!("/users/{name}");
+        self.request(&url, auth).await
+    }
+
     async fn org_by_name(&self, org_name: &str, auth: &AccessToken) -> Result<GitHubOrganization> {
         let url = format!("/orgs/{org_name}");
         self.request(&url, auth).await

crates/crates_io_github/src/lib.rs

@@ -0,0 +1,16 @@
+[package]
+name = "crates_io_trustpub"
+version = "0.0.0"
+license = "MIT OR Apache-2.0"
+edition = "2024"
+
+[lints]
+workspace = true
+
+[dependencies]
+regex = "=1.11.1"
+thiserror = "=2.0.12"
+
+[dev-dependencies]
+claims = "=0.8.0"
+insta = "=1.43.1"

crates/crates_io_trustpub/Cargo.toml

@@ -0,0 +1,3 @@
+# crates_io_trustpub
+
+This crate contains code related to the "[Trusted Publishing](https://github.com/rust-lang/rfcs/pull/3691)" feature of crates.io.

crates/crates_io_trustpub/README.md

@@ -0,0 +1 @@
+pub mod validation;