From 3be060267e9f21194fc3f648e1b1b911d7d1ee41 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 10 Feb 2025 06:12:24 +0100 Subject: [PATCH] Adding upstream version 0.6.0. Signed-off-by: Daniel Baumann --- .cargo_vcs_info.json | 2 +- .woodpecker/integration.yml | 6 +- Cargo.toml | 6 +- Cargo.toml.orig | 6 +- src/generated/methods.rs | 553 +++--- src/generated/structs.rs | 3441 +++++++++++++++++++++++++++++++++-- swagger.v1.json | 2103 ++++++++++++++++++++- tests/admin.rs | 10 +- tests/organization.rs | 2 +- tests/repo.rs | 5 +- tests/user.rs | 10 +- 11 files changed, 5674 insertions(+), 470 deletions(-) diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index d8b9678..8bfb4d2 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "c49e0c3fc6ec4b8821e2c28dad38e1ac04571b0b" + "sha1": "041a56ecea92e78400f8dea7dad2b7f9c175c22a" }, "path_in_vcs": "" } \ No newline at end of file diff --git a/.woodpecker/integration.yml b/.woodpecker/integration.yml index 9e100cd..c058601 100644 --- a/.woodpecker/integration.yml +++ b/.woodpecker/integration.yml @@ -4,12 +4,12 @@ steps: test: image: rust environment: - - "FORGEJO_API_CI_INSTANCE_URL=http://forgejo-testing:3000/" - - FORGEJO_API_CI_TOKEN=6eaba97c49d9f1bbe54f8975ea884af54826c9fe + FORGEJO_API_CI_INSTANCE_URL: http://forgejo-testing:3000/ + FORGEJO_API_CI_TOKEN: 6d727f8db0df8a2852c9dfd38dca6b830741c079 commands: - cargo test services: forgejo-testing: pull: true - image: code.cartoon-aa.xyz/cyborus/ci-forgejo:9.0.0 + image: code.cartoon-aa.xyz/cyborus/ci-forgejo:10.0.0 diff --git a/Cargo.toml b/Cargo.toml index 04d7e23..990cbf9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ [package] edition = "2021" name = "forgejo-api" -version = "0.5.0" +version = "0.6.0" build = false autolib = false autobins = false @@ -51,7 +51,7 @@ version = "1.6.0" version = "1.5.0" [dependencies.reqwest] -version = "0.11.18" +version = "0.12" features = [ "json", "multipart", @@ -93,7 +93,7 @@ version = "1.7.0" version = "0.6.9" [dev-dependencies.reqwest] -version = "0.11.18" +version = "0.12" features = ["cookies"] [dev-dependencies.tokio] diff --git a/Cargo.toml.orig b/Cargo.toml.orig index a4c0b88..9d4356a 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,7 +1,7 @@ workspace = { members = ["generator"] } [package] name = "forgejo-api" -version = "0.5.0" +version = "0.6.0" edition = "2021" license = "Apache-2.0 OR MIT" repository = "https://codeberg.org/Cyborus/forgejo-api" @@ -10,7 +10,7 @@ description = "Interface to Forgejo's Web API" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -reqwest = { version = "0.11.18", features = ["json", "multipart"] } +reqwest = { version = "0.12", features = ["json", "multipart"] } soft_assert = "0.1.1" thiserror = "1.0.43" tokio = { version = "1.29.1", features = ["net"] } @@ -24,5 +24,5 @@ zeroize = "1.7.0" [dev-dependencies] eyre = "0.6.9" -reqwest = { version = "0.11.18", features = ["cookies"] } +reqwest = { version = "0.12", features = ["cookies"] } tokio = { version = "1.29.1", features = ["net", "fs", "rt", "macros"] } diff --git a/src/generated/methods.rs b/src/generated/methods.rs index f49d61f..ff00cf2 100644 --- a/src/generated/methods.rs +++ b/src/generated/methods.rs @@ -93,11 +93,11 @@ impl crate::Forgejo { pub async fn admin_cron_list( &self, query: AdminCronListQuery, - ) -> Result, ForgejoError> { + ) -> Result<(CronListHeaders, Vec), ForgejoError> { let request = self.get(&format!("admin/cron?{query}")).build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -119,11 +119,11 @@ impl crate::Forgejo { pub async fn admin_get_all_emails( &self, query: AdminGetAllEmailsQuery, - ) -> Result, ForgejoError> { + ) -> Result<(EmailListHeaders, Vec), ForgejoError> { let request = self.get(&format!("admin/emails?{query}")).build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -133,11 +133,11 @@ impl crate::Forgejo { pub async fn admin_search_emails( &self, query: AdminSearchEmailsQuery, - ) -> Result, ForgejoError> { + ) -> Result<(EmailListHeaders, Vec), ForgejoError> { let request = self.get(&format!("admin/emails/search?{query}")).build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -147,11 +147,11 @@ impl crate::Forgejo { pub async fn admin_list_hooks( &self, query: AdminListHooksQuery, - ) -> Result, ForgejoError> { + ) -> Result<(HookListHeaders, Vec), ForgejoError> { let request = self.get(&format!("admin/hooks?{query}")).build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -217,21 +217,23 @@ impl crate::Forgejo { pub async fn admin_get_all_orgs( &self, query: AdminGetAllOrgsQuery, - ) -> Result, ForgejoError> { + ) -> Result<(OrganizationListHeaders, Vec), ForgejoError> { let request = self.get(&format!("admin/orgs?{query}")).build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } /// List the available quota groups - pub async fn admin_list_quota_groups(&self) -> Result, ForgejoError> { + pub async fn admin_list_quota_groups( + &self, + ) -> Result<(QuotaGroupListHeaders, Vec), ForgejoError> { let request = self.get("admin/quota/groups").build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -332,13 +334,13 @@ impl crate::Forgejo { pub async fn admin_list_users_in_quota_group( &self, quotagroup: &str, - ) -> Result, ForgejoError> { + ) -> Result<(UserListHeaders, Vec), ForgejoError> { let request = self .get(&format!("admin/quota/groups/{quotagroup}/users")) .build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -382,11 +384,13 @@ impl crate::Forgejo { } /// List the available quota rules - pub async fn admin_list_quota_rules(&self) -> Result, ForgejoError> { + pub async fn admin_list_quota_rules( + &self, + ) -> Result<(QuotaRuleInfoListHeaders, Vec), ForgejoError> { let request = self.get("admin/quota/rules").build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -528,11 +532,11 @@ impl crate::Forgejo { pub async fn admin_search_users( &self, query: AdminSearchUsersQuery, - ) -> Result, ForgejoError> { + ) -> Result<(UserListHeaders, Vec), ForgejoError> { let request = self.get(&format!("admin/users?{query}")).build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -721,11 +725,13 @@ impl crate::Forgejo { } /// Returns a list of all gitignore templates - pub async fn list_gitignores_templates(&self) -> Result, ForgejoError> { + pub async fn list_gitignores_templates( + &self, + ) -> Result<(GitignoreTemplateListHeaders, Vec), ForgejoError> { let request = self.get("gitignore/templates").build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -746,11 +752,13 @@ impl crate::Forgejo { } /// Returns a list of all label templates - pub async fn list_label_templates(&self) -> Result, ForgejoError> { + pub async fn list_label_templates( + &self, + ) -> Result<(LabelTemplateListHeaders, Vec), ForgejoError> { let request = self.get("label/templates").build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -773,11 +781,11 @@ impl crate::Forgejo { /// Returns a list of all license templates pub async fn list_license_templates( &self, - ) -> Result, ForgejoError> { + ) -> Result<(LicenseTemplateListHeaders, Vec), ForgejoError> { let request = self.get("licenses").build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -850,11 +858,11 @@ impl crate::Forgejo { pub async fn notify_get_list( &self, query: NotifyGetListQuery, - ) -> Result, ForgejoError> { + ) -> Result<(NotificationThreadListHeaders, Vec), ForgejoError> { let request = self.get(&format!("notifications?{query}")).build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -864,11 +872,11 @@ impl crate::Forgejo { pub async fn notify_read_list( &self, query: NotifyReadListQuery, - ) -> Result, ForgejoError> { + ) -> Result<(NotificationThreadListHeaders, Vec), ForgejoError> { let request = self.put(&format!("notifications?{query}")).build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 205 => Ok(response.json().await?), + 205 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -935,11 +943,11 @@ impl crate::Forgejo { pub async fn org_get_all( &self, query: OrgGetAllQuery, - ) -> Result, ForgejoError> { + ) -> Result<(OrganizationListHeaders, Vec), ForgejoError> { let request = self.get(&format!("orgs?{query}")).build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -1024,13 +1032,13 @@ impl crate::Forgejo { &self, org: &str, query: OrgListActionsSecretsQuery, - ) -> Result, ForgejoError> { + ) -> Result<(SecretListHeaders, Vec), ForgejoError> { let request = self .get(&format!("orgs/{org}/actions/secrets?{query}")) .build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -1080,13 +1088,13 @@ impl crate::Forgejo { &self, org: &str, query: GetOrgVariablesListQuery, - ) -> Result, ForgejoError> { + ) -> Result<(VariableListHeaders, Vec), ForgejoError> { let request = self .get(&format!("orgs/{org}/actions/variables?{query}")) .build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -1184,13 +1192,13 @@ impl crate::Forgejo { &self, org: &str, query: OrgListActivityFeedsQuery, - ) -> Result, ForgejoError> { + ) -> Result<(ActivityFeedsListHeaders, Vec), ForgejoError> { let request = self .get(&format!("orgs/{org}/activities/feeds?{query}")) .build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -1247,11 +1255,11 @@ impl crate::Forgejo { &self, org: &str, query: OrgListHooksQuery, - ) -> Result, ForgejoError> { + ) -> Result<(HookListHeaders, Vec), ForgejoError> { let request = self.get(&format!("orgs/{org}/hooks?{query}")).build()?; let response = self.execute(request).await?; match response.status().as_u16() { - 200 => Ok(response.json().await?), + 200 => Ok((response.headers().try_into()?, response.json().await?)), _ => Err(ForgejoError::UnexpectedStatusCode(response.status())), } } @@ -1331,11 +1339,11 @@ impl crate::Forgejo { &self, org: &str, query: OrgListLabelsQuery, - ) -> Result, ForgejoError> { + ) -> Result<(LabelListHeaders, Vec