diff --git a/.woodpecker/integration.yml b/.woodpecker/integration.yml index f6df423..025fa7d 100644 --- a/.woodpecker/integration.yml +++ b/.woodpecker/integration.yml @@ -5,10 +5,10 @@ steps: image: rust environment: - "FORGEJO_API_CI_INSTANCE_URL=http://forgejo-testing:3000/" - - FORGEJO_API_CI_TOKEN=0889eabbb0006f15be4af017c4e0d3f51df78f98 + - FORGEJO_API_CI_TOKEN=3226a46b52e29804bfb9b8ba21a5f91291fb86eb commands: - cargo test services: forgejo-testing: - image: code.cartoon-aa.xyz/cyborus/ci-forgejo + image: code.cartoon-aa.xyz/cyborus/ci-forgejo:1.21.2-0 diff --git a/Cargo.lock b/Cargo.lock index 436e2be..61464a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -74,7 +74,6 @@ version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ - "jobserver", "libc", ] @@ -171,9 +170,9 @@ name = "forgejo-api" version = "0.1.0" dependencies = [ "eyre", - "git2", "reqwest", "serde", + "serde_json", "soft_assert", "thiserror", "time", @@ -235,21 +234,6 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" -[[package]] -name = "git2" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" -dependencies = [ - "bitflags 2.4.1", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] - [[package]] name = "h2" version = "0.3.21" @@ -384,15 +368,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" -[[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - [[package]] name = "js-sys" version = "0.3.65" @@ -414,46 +389,6 @@ version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" -[[package]] -name = "libgit2-sys" -version = "0.16.1+1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" -dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libssh2-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "linux-raw-sys" version = "0.4.11" @@ -478,6 +413,16 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "miniz_oxide" version = "0.7.1" @@ -652,6 +597,7 @@ dependencies = [ "js-sys", "log", "mime", + "mime_guess", "native-tls", "once_cell", "percent-encoding", @@ -996,6 +942,15 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + [[package]] name = "unicode-bidi" version = "0.3.13" @@ -1035,6 +990,12 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + [[package]] name = "want" version = "0.3.1" diff --git a/Cargo.toml b/Cargo.toml index 6989702..eb21559 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,15 +6,15 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -reqwest = { version = "0.11.18", features = ["json"] } +reqwest = { version = "0.11.18", features = ["json", "multipart"] } soft_assert = "0.1.1" thiserror = "1.0.43" tokio = { version = "1.29.1", features = ["net"] } url = { version = "2.4.0", features = ["serde"] } serde = { version = "1.0.168", features = ["derive"] } time = { version = "0.3.22", features = ["parsing", "serde", "formatting"] } +serde_json = "1.0.108" [dev-dependencies] eyre = "0.6.9" tokio = { version = "1.29.1", features = ["net", "fs", "rt", "macros"] } -git2 = "0.18.1" diff --git a/src/lib.rs b/src/lib.rs index a6a7daf..bb0bd74 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -30,28 +30,18 @@ pub enum ForgejoError { HostRequired, #[error("scheme must be http or https")] HttpRequired, - #[error("{0}")] // for some reason, you can't use `source` and `transparent` together - ReqwestError(#[source] reqwest::Error), + #[error(transparent)] + ReqwestError(#[from] reqwest::Error), #[error("API key should be ascii")] KeyNotAscii, #[error("the response from forgejo was not properly structured")] - BadStructure(#[source] reqwest::Error), + BadStructure(#[source] serde_json::Error, String), #[error("unexpected status code {} {}", .0.as_u16(), .0.canonical_reason().unwrap_or(""))] UnexpectedStatusCode(StatusCode), #[error("{} {}: {}", .0.as_u16(), .0.canonical_reason().unwrap_or(""), .1)] ApiError(StatusCode, String), } -impl From for ForgejoError { - fn from(e: reqwest::Error) -> Self { - if e.is_decode() { - ForgejoError::BadStructure(e) - } else { - ForgejoError::ReqwestError(e) - } - } -} - impl Forgejo { pub fn new(api_key: &str, url: Url) -> Result { Self::with_user_agent(api_key, url, "forgejo-api-rs") @@ -98,6 +88,12 @@ impl Forgejo { self.execute_str(request).await } + async fn get_exists(&self, path: &str) -> Result { + let url = self.url.join("api/v1/").unwrap().join(path).unwrap(); + let request = self.client.get(url).build()?; + self.execute_exists(request).await + } + async fn post( &self, path: &str, @@ -108,13 +104,13 @@ impl Forgejo { self.execute(request).await } - async fn post_form( + async fn post_multipart( &self, path: &str, - body: &T, - ) -> Result { + body: reqwest::multipart::Form, + ) -> Result { let url = self.url.join("api/v1/").unwrap().join(path).unwrap(); - let request = self.client.post(url).form(body).build()?; + let request = self.client.post(url).multipart(body).build()?; self.execute(request).await } @@ -128,6 +124,16 @@ impl Forgejo { self.execute_str(request).await } + async fn post_unit( + &self, + path: &str, + body: &T, + ) -> Result<(), ForgejoError> { + let url = self.url.join("api/v1/").unwrap().join(path).unwrap(); + let request = self.client.post(url).json(body).build()?; + self.execute_unit(request).await + } + async fn post_raw( &self, path: &str, @@ -141,7 +147,7 @@ impl Forgejo { async fn delete(&self, path: &str) -> Result<(), ForgejoError> { let url = self.url.join("api/v1/").unwrap().join(path).unwrap(); let request = self.client.delete(url).build()?; - self.execute(request).await + self.execute_unit(request).await } async fn patch( @@ -163,10 +169,14 @@ impl Forgejo { async fn execute(&self, request: Request) -> Result { let response = self.client.execute(request).await?; match response.status() { - status if status.is_success() => Ok(response.json::().await?), + status if status.is_success() => { + let body = response.text().await?; + let out = serde_json::from_str(&body).map_err(|e| ForgejoError::BadStructure(e, body))?; + Ok(out) + }, status if status.is_client_error() => Err(ForgejoError::ApiError( status, - response.json::().await?.message, + response.json::().await?.message.unwrap_or_else(|| String::from("[no message]")), )), status => Err(ForgejoError::UnexpectedStatusCode(status)), } @@ -179,7 +189,20 @@ impl Forgejo { status if status.is_success() => Ok(response.text().await?), status if status.is_client_error() => Err(ForgejoError::ApiError( status, - response.json::().await?.message, + response.json::().await?.message.unwrap_or_else(|| String::from("[no message]")), + )), + status => Err(ForgejoError::UnexpectedStatusCode(status)), + } + } + + /// Like `execute`, but returns unit. + async fn execute_unit(&self, request: Request) -> Result<(), ForgejoError> { + let response = self.client.execute(request).await?; + match response.status() { + status if status.is_success() => Ok(()), + status if status.is_client_error() => Err(ForgejoError::ApiError( + status, + response.json::().await?.message.unwrap_or_else(|| String::from("[no message]")), )), status => Err(ForgejoError::UnexpectedStatusCode(status)), } @@ -192,11 +215,32 @@ impl Forgejo { ) -> Result, ForgejoError> { let response = self.client.execute(request).await?; match response.status() { - status if status.is_success() => Ok(Some(response.json::().await?)), + status if status.is_success() => { + let body = response.text().await?; + let out = serde_json::from_str(&body).map_err(|e| ForgejoError::BadStructure(e, body))?; + Ok(out) + }, StatusCode::NOT_FOUND => Ok(None), status if status.is_client_error() => Err(ForgejoError::ApiError( status, - response.json::().await?.message, + response.json::().await?.message.unwrap_or_else(|| String::from("[no message]")), + )), + status => Err(ForgejoError::UnexpectedStatusCode(status)), + } + } + + /// Like `execute`, but returns `false` on 404. + async fn execute_exists( + &self, + request: Request, + ) -> Result { + let response = self.client.execute(request).await?; + match response.status() { + status if status.is_success() => Ok(true), + StatusCode::NOT_FOUND => Ok(false), + status if status.is_client_error() => Err(ForgejoError::ApiError( + status, + response.json::().await?.message.unwrap_or_else(|| String::from("[no message]")), )), status => Err(ForgejoError::UnexpectedStatusCode(status)), } @@ -205,7 +249,7 @@ impl Forgejo { #[derive(serde::Deserialize)] struct ErrorMessage { - message: String, + message: Option, // intentionally ignored, no need for now // url: Url } diff --git a/src/repository.rs b/src/repository.rs index 0564f5d..8b063a0 100644 --- a/src/repository.rs +++ b/src/repository.rs @@ -32,9 +32,7 @@ impl Forgejo { } pub async fn is_merged(&self, owner: &str, repo: &str, pr: u64) -> Result { - self.get_opt::<()>(&format!("repos/{owner}/{repo}/pulls/{pr}/merge")) - .await - .map(|o| o.is_some()) + self.get_exists(&format!("repos/{owner}/{repo}/pulls/{pr}/merge")).await } pub async fn merge_pr( @@ -44,7 +42,7 @@ impl Forgejo { pr: u64, opts: MergePullRequestOption, ) -> Result<(), ForgejoError> { - self.post(&format!("repos/{owner}/{repo}/pulls/{pr}/merge"), &opts) + self.post_unit(&format!("repos/{owner}/{repo}/pulls/{pr}/merge"), &opts) .await } @@ -142,11 +140,12 @@ impl Forgejo { repo: &str, id: u64, name: &str, - file: &[u8], + file: Vec, ) -> Result { - self.post_form( + self.post_multipart( &format!("repos/{owner}/{repo}/releases/{id}/assets?name={name}"), - &file, + reqwest::multipart::Form::new() + .part("attachment", reqwest::multipart::Part::bytes(file).file_name("file").mime_str("*/*").unwrap()), ) .await } @@ -352,17 +351,17 @@ pub struct PullRequest { pub is_locked: bool, pub labels: Vec