Skip to content

Commit c550aa7

Browse files
ref(build): Move VcsInfo beside other build upload API types (#2944)
1 parent f303fd4 commit c550aa7

File tree

3 files changed

+22
-24
lines changed

3 files changed

+22
-24
lines changed

src/api/data_types/chunking/build.rs

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
use serde::{Deserialize, Serialize};
22
use sha1_smol::Digest;
33

4-
use crate::api::VcsInfo;
5-
64
use super::ChunkedFileState;
75

86
#[derive(Debug, Serialize)]
@@ -25,3 +23,24 @@ pub struct AssembleBuildResponse {
2523
pub detail: Option<String>,
2624
pub artifact_url: Option<String>,
2725
}
26+
27+
/// VCS information for build app uploads
28+
#[derive(Debug, Serialize)]
29+
pub struct VcsInfo<'a> {
30+
#[serde(skip_serializing_if = "Option::is_none")]
31+
pub head_sha: Option<&'a str>,
32+
#[serde(skip_serializing_if = "Option::is_none")]
33+
pub base_sha: Option<&'a str>,
34+
#[serde(skip_serializing_if = "Option::is_none", rename = "provider")]
35+
pub vcs_provider: Option<&'a str>,
36+
#[serde(skip_serializing_if = "Option::is_none")]
37+
pub head_repo_name: Option<&'a str>,
38+
#[serde(skip_serializing_if = "Option::is_none")]
39+
pub base_repo_name: Option<&'a str>,
40+
#[serde(skip_serializing_if = "Option::is_none")]
41+
pub head_ref: Option<&'a str>,
42+
#[serde(skip_serializing_if = "Option::is_none")]
43+
pub base_ref: Option<&'a str>,
44+
#[serde(skip_serializing_if = "Option::is_none")]
45+
pub pr_number: Option<&'a u32>,
46+
}

src/api/data_types/chunking/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ mod hash_algorithm;
1010
mod upload;
1111

1212
pub use self::artifact::{AssembleArtifactsResponse, ChunkedArtifactRequest};
13-
pub use self::build::{AssembleBuildResponse, ChunkedBuildRequest};
13+
pub use self::build::{AssembleBuildResponse, ChunkedBuildRequest, VcsInfo};
1414
pub use self::compression::ChunkCompression;
1515
pub use self::dif::{AssembleDifsRequest, AssembleDifsResponse, ChunkedDifRequest};
1616
pub use self::file_state::ChunkedFileState;

src/api/mod.rs

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2520,27 +2520,6 @@ struct LogsResponse {
25202520
data: Vec<LogEntry>,
25212521
}
25222522

2523-
/// VCS information for build app uploads
2524-
#[derive(Debug, Serialize)]
2525-
pub struct VcsInfo<'a> {
2526-
#[serde(skip_serializing_if = "Option::is_none")]
2527-
pub head_sha: Option<&'a str>,
2528-
#[serde(skip_serializing_if = "Option::is_none")]
2529-
pub base_sha: Option<&'a str>,
2530-
#[serde(skip_serializing_if = "Option::is_none", rename = "provider")]
2531-
pub vcs_provider: Option<&'a str>,
2532-
#[serde(skip_serializing_if = "Option::is_none")]
2533-
pub head_repo_name: Option<&'a str>,
2534-
#[serde(skip_serializing_if = "Option::is_none")]
2535-
pub base_repo_name: Option<&'a str>,
2536-
#[serde(skip_serializing_if = "Option::is_none")]
2537-
pub head_ref: Option<&'a str>,
2538-
#[serde(skip_serializing_if = "Option::is_none")]
2539-
pub base_ref: Option<&'a str>,
2540-
#[serde(skip_serializing_if = "Option::is_none")]
2541-
pub pr_number: Option<&'a u32>,
2542-
}
2543-
25442523
/// Log entry structure from the logs API
25452524
#[derive(Debug, Deserialize, Clone)]
25462525
pub struct LogEntry {

0 commit comments

Comments
 (0)