diff --git a/src/api/data_types/chunking/build.rs b/src/api/data_types/chunking/build.rs index 6de0099c3b..e46091515e 100644 --- a/src/api/data_types/chunking/build.rs +++ b/src/api/data_types/chunking/build.rs @@ -1,8 +1,6 @@ use serde::{Deserialize, Serialize}; use sha1_smol::Digest; -use crate::api::VcsInfo; - use super::ChunkedFileState; #[derive(Debug, Serialize)] @@ -25,3 +23,24 @@ pub struct AssembleBuildResponse { pub detail: Option, pub artifact_url: Option, } + +/// VCS information for build app uploads +#[derive(Debug, Serialize)] +pub struct VcsInfo<'a> { + #[serde(skip_serializing_if = "Option::is_none")] + pub head_sha: Option<&'a str>, + #[serde(skip_serializing_if = "Option::is_none")] + pub base_sha: Option<&'a str>, + #[serde(skip_serializing_if = "Option::is_none", rename = "provider")] + pub vcs_provider: Option<&'a str>, + #[serde(skip_serializing_if = "Option::is_none")] + pub head_repo_name: Option<&'a str>, + #[serde(skip_serializing_if = "Option::is_none")] + pub base_repo_name: Option<&'a str>, + #[serde(skip_serializing_if = "Option::is_none")] + pub head_ref: Option<&'a str>, + #[serde(skip_serializing_if = "Option::is_none")] + pub base_ref: Option<&'a str>, + #[serde(skip_serializing_if = "Option::is_none")] + pub pr_number: Option<&'a u32>, +} diff --git a/src/api/data_types/chunking/mod.rs b/src/api/data_types/chunking/mod.rs index 79aed0dac1..54b1fae405 100644 --- a/src/api/data_types/chunking/mod.rs +++ b/src/api/data_types/chunking/mod.rs @@ -10,7 +10,7 @@ mod hash_algorithm; mod upload; pub use self::artifact::{AssembleArtifactsResponse, ChunkedArtifactRequest}; -pub use self::build::{AssembleBuildResponse, ChunkedBuildRequest}; +pub use self::build::{AssembleBuildResponse, ChunkedBuildRequest, VcsInfo}; pub use self::compression::ChunkCompression; pub use self::dif::{AssembleDifsRequest, AssembleDifsResponse, ChunkedDifRequest}; pub use self::file_state::ChunkedFileState; diff --git a/src/api/mod.rs b/src/api/mod.rs index fc8e0006be..418d17749c 100644 --- a/src/api/mod.rs +++ b/src/api/mod.rs @@ -2520,27 +2520,6 @@ struct LogsResponse { data: Vec, } -/// VCS information for build app uploads -#[derive(Debug, Serialize)] -pub struct VcsInfo<'a> { - #[serde(skip_serializing_if = "Option::is_none")] - pub head_sha: Option<&'a str>, - #[serde(skip_serializing_if = "Option::is_none")] - pub base_sha: Option<&'a str>, - #[serde(skip_serializing_if = "Option::is_none", rename = "provider")] - pub vcs_provider: Option<&'a str>, - #[serde(skip_serializing_if = "Option::is_none")] - pub head_repo_name: Option<&'a str>, - #[serde(skip_serializing_if = "Option::is_none")] - pub base_repo_name: Option<&'a str>, - #[serde(skip_serializing_if = "Option::is_none")] - pub head_ref: Option<&'a str>, - #[serde(skip_serializing_if = "Option::is_none")] - pub base_ref: Option<&'a str>, - #[serde(skip_serializing_if = "Option::is_none")] - pub pr_number: Option<&'a u32>, -} - /// Log entry structure from the logs API #[derive(Debug, Deserialize, Clone)] pub struct LogEntry {