Add new VCS params to mobile-app command

Author: rbro112

src/api/data_types/chunking/mobile_app.rs

@@ -9,9 +9,24 @@ pub struct ChunkedMobileAppRequest<'a> {
     pub checksum: Digest,
     pub chunks: &'a [Digest],
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub git_sha: Option<&'a str>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub build_configuration: Option<&'a str>,
+    // VCS fields
+    #[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")]
+    pub 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 str>,
 }
 
 #[derive(Debug, Deserialize)]

src/api/mod.rs

@@ -1031,8 +1031,15 @@ impl<'a> AuthenticatedApi<'a> {
         project: &str,
         checksum: Digest,
         chunks: &[Digest],
-        git_sha: Option<&str>,
         build_configuration: Option<&str>,
+        head_sha: Option<&str>,
+        base_sha: Option<&str>,
+        provider: Option<&str>,
+        head_repo_name: Option<&str>,
+        base_repo_name: Option<&str>,
+        head_ref: Option<&str>,
+        base_ref: Option<&str>,
+        pr_number: Option<&str>,
     ) -> ApiResult<AssembleMobileAppResponse> {
         let url = format!(
             "/projects/{}/{}/files/preprodartifacts/assemble/",
@@ -1044,8 +1051,15 @@ impl<'a> AuthenticatedApi<'a> {
             .with_json_body(&ChunkedMobileAppRequest {
                 checksum,
                 chunks,
-                git_sha,
                 build_configuration,
+                head_sha,
+                base_sha,
+                provider,
+                head_repo_name,
+                base_repo_name,
+                head_ref,
+                base_ref,
+                pr_number,
             })?
             .send()?
             .convert_rnf(ApiErrorKind::ProjectNotFound)

src/commands/mobile_app/upload.rs

@@ -51,9 +51,44 @@ pub fn make_command(command: Command) -> Command {
                 .required(true),
         )
         .arg(
-            Arg::new("sha")
-                .long("sha")
-                .help("The git commit sha to use for the upload. If not provided, the current commit sha will be used.")
+            Arg::new("head_sha")
+                .long("head-sha")
+                .help("The VCS commit sha to use for the upload. If not provided, the current commit sha will be used.")
+        )
+        .arg(
+            Arg::new("base_sha")
+                .long("base-sha")
+                .help("The VCS commit's base sha to use for the upload. If not provided, the merge-base of the current and remote branch will be used.")
+        )
+        .arg(
+            Arg::new("vcs_provider")
+                .long("vcs-provider")
+                .help("The VCS provider to use for the upload. If not provided, the current provider will be used.")
+        )
+        .arg(
+            Arg::new("head_repo_name")
+                .long("head-repo-name")
+                .help("The name of the git repository to use for the upload (e.g. organization/repository). If not provided, the current repository will be used.")
+        )
+        .arg(
+            Arg::new("base_repo_name")
+                .long("base-repo-name")
+                .help("The name of the git repository to use for the upload (e.g. organization/repository). If not provided, the current repository will be used.")
+        )
+        .arg(
+            Arg::new("head_ref")
+                .long("head-ref")
+                .help("The reference (branch) to use for the upload. If not provided, the current reference will be used.")
+        )
+        .arg(
+            Arg::new("base_ref")
+                .long("base-ref")
+                .help("The reference (branch) to use for the upload. If not provided, the current reference will be used.")
+        )
+        .arg(
+            Arg::new("pr_number")
+                .long("pr-number")
+                .help("The pull request number to use for the upload. If not provided, the current pull request number will be used.")
         )
         .arg(
             Arg::new("build_configuration")
@@ -67,12 +102,21 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
         .get_many::<String>("paths")
         .expect("paths argument is required");
 
-    let sha = matches
-        .get_one("sha")
+    let head_sha = matches
+        .get_one("head_sha")
         .map(String::as_str)
         .map(Cow::Borrowed)
         .or_else(|| vcs::find_head().ok().map(Cow::Owned));
 
+    // TODO: Implement default values
+    let base_sha = matches.get_one("base_sha").map(String::as_str);
+    let vcs_provider = matches.get_one("vcs_provider").map(String::as_str);
+    let head_repo_name = matches.get_one("head_repo_name").map(String::as_str);
+    let base_repo_name = matches.get_one("base_repo_name").map(String::as_str);
+    let head_ref = matches.get_one("head_ref").map(String::as_str);
+    let base_ref = matches.get_one("base_ref").map(String::as_str);
+    let pr_number = matches.get_one("pr_number").map(String::as_str);
+
     let build_configuration = matches.get_one("build_configuration").map(String::as_str);
 
     let api = Api::current();
@@ -140,8 +184,15 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
             &bytes,
             &org,
             &project,
-            sha.as_deref(),
             build_configuration,
+            head_sha.as_deref(),
+            base_sha,
+            vcs_provider,
+            head_repo_name,
+            base_repo_name,
+            head_ref,
+            base_ref,
+            pr_number,
         ) {
             Ok(_) => {
                 info!("Successfully uploaded file: {}", path.display());
@@ -342,17 +393,31 @@ fn upload_file(
     bytes: &[u8],
     org: &str,
     project: &str,
-    sha: Option<&str>,
     build_configuration: Option<&str>,
+    head_sha: Option<&str>,
+    base_sha: Option<&str>,
+    vcs_provider: Option<&str>,
+    head_repo_name: Option<&str>,
+    base_repo_name: Option<&str>,
+    head_ref: Option<&str>,
+    base_ref: Option<&str>,
+    pr_number: Option<&str>,
 ) -> Result<()> {
     const SELF_HOSTED_ERROR_HINT: &str = "If you are using a self-hosted Sentry server, \
         update to the latest version of Sentry to use the mobile-app upload command.";
 
     debug!(
-        "Uploading file to organization: {}, project: {}, sha: {}, build_configuration: {}",
+        "Uploading file to organization: {}, project: {}, head_sha: {}, base_sha: {}, vcs_provider: {}, head_repo_name: {}, base_repo_name: {}, head_ref: {}, base_ref: {}, pr_number: {}, build_configuration: {}",
         org,
         project,
-        sha.unwrap_or("unknown"),
+        head_sha.unwrap_or("unknown"),
+        base_sha.unwrap_or("unknown"),
+        vcs_provider.unwrap_or("unknown"),
+        head_repo_name.unwrap_or("unknown"),
+        base_repo_name.unwrap_or("unknown"),
+        head_ref.unwrap_or("unknown"),
+        base_ref.unwrap_or("unknown"),
+        pr_number.unwrap_or("unknown"),
         build_configuration.unwrap_or("unknown")
     );
 
@@ -386,8 +451,21 @@ fn upload_file(
 
     pb.finish_with_duration("Finishing upload");
 
-    let response =
-        api.assemble_mobile_app(org, project, checksum, &checksums, sha, build_configuration)?;
+    let response = api.assemble_mobile_app(
+        org,
+        project,
+        checksum,
+        &checksums,
+        build_configuration,
+        head_sha,
+        base_sha,
+        vcs_provider,
+        head_repo_name,
+        base_repo_name,
+        head_ref,
+        base_ref,
+        pr_number,
+    )?;
     chunks.retain(|Chunk((digest, _))| response.missing_chunks.contains(digest));
 
     if !chunks.is_empty() {
@@ -406,8 +484,15 @@ fn upload_file(
         &checksums,
         org,
         project,
-        sha,
         build_configuration,
+        head_sha,
+        base_sha,
+        vcs_provider,
+        head_repo_name,
+        base_repo_name,
+        head_ref,
+        base_ref,
+        pr_number,
     )?;
     Ok(())
 }
@@ -418,8 +503,15 @@ fn poll_assemble(
     chunks: &[Digest],
     org: &str,
     project: &str,
-    sha: Option<&str>,
     build_configuration: Option<&str>,
+    head_sha: Option<&str>,
+    base_sha: Option<&str>,
+    vcs_provider: Option<&str>,
+    head_repo_name: Option<&str>,
+    base_repo_name: Option<&str>,
+    head_ref: Option<&str>,
+    base_ref: Option<&str>,
+    pr_number: Option<&str>,
 ) -> Result<()> {
     debug!("Polling assemble for checksum: {}", checksum);
 
@@ -430,8 +522,21 @@ fn poll_assemble(
     pb.set_style(progress_style);
 
     let response = loop {
-        let response =
-            api.assemble_mobile_app(org, project, checksum, chunks, sha, build_configuration)?;
+        let response = api.assemble_mobile_app(
+            org,
+            project,
+            checksum,
+            chunks,
+            build_configuration,
+            head_sha,
+            base_sha,
+            vcs_provider,
+            head_repo_name,
+            base_repo_name,
+            head_ref,
+            base_ref,
+            pr_number,
+        )?;
 
         if response.state.is_finished() {
             break response;

src/utils/vcs.rs

@@ -211,6 +211,7 @@ fn is_matching_url(a: &str, b: &str) -> bool {
     VcsUrl::parse(a) == VcsUrl::parse(b)
 }
 
+// TODO: This is not used anywhere.
 pub fn get_repo_from_remote(repo: &str) -> String {
     let obj = VcsUrl::parse(repo);
     obj.id
@@ -398,6 +399,13 @@ pub fn find_head() -> Result<String> {
     Ok(head.id().to_string())
 }
 
+pub fn find_base_sha(repo: &Repository, branch: &str) -> Result<String> {
+    let head = repo.revparse_single(branch)?;
+    Ok(head.id().to_string())
+}
+
+
+
 /// Given commit specs, repos and remote_name this returns a list of head
 /// commits from it.
 pub fn find_heads(