Tweaks

Author: rbro112

src/api/data_types/chunking/mobile_app.rs

@@ -26,7 +26,7 @@ pub struct ChunkedMobileAppRequest<'a> {
     #[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>,
+    pub pr_number: Option<i32>,
 }
 
 #[derive(Debug, Deserialize)]

src/api/mod.rs

@@ -1039,7 +1039,7 @@ impl<'a> AuthenticatedApi<'a> {
         base_repo_name: Option<&str>,
         head_ref: Option<&str>,
         base_ref: Option<&str>,
-        pr_number: Option<&str>,
+        pr_number: Option<i32>,
     ) -> ApiResult<AssembleMobileAppResponse> {
         let url = format!(
             "/projects/{}/{}/files/preprodartifacts/assemble/",

src/commands/mobile_app/upload.rs

@@ -115,7 +115,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
     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 pr_number = matches.get_one("pr_number").map(String::as_str).and_then(|s| s.parse::<i32>().ok());
 
     let build_configuration = matches.get_one("build_configuration").map(String::as_str);
 
@@ -401,7 +401,7 @@ fn upload_file(
     base_repo_name: Option<&str>,
     head_ref: Option<&str>,
     base_ref: Option<&str>,
-    pr_number: Option<&str>,
+    pr_number: Option<i32>,
 ) -> 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.";
@@ -417,7 +417,10 @@ fn upload_file(
         base_repo_name.unwrap_or("unknown"),
         head_ref.unwrap_or("unknown"),
         base_ref.unwrap_or("unknown"),
-        pr_number.unwrap_or("unknown"),
+        pr_number
+            .map(|n| n.to_string())
+            .as_deref()
+            .unwrap_or("unknown"),
         build_configuration.unwrap_or("unknown")
     );
 
@@ -511,7 +514,7 @@ fn poll_assemble(
     base_repo_name: Option<&str>,
     head_ref: Option<&str>,
     base_ref: Option<&str>,
-    pr_number: Option<&str>,
+    pr_number: Option<i32>,
 ) -> Result<()> {
     debug!("Polling assemble for checksum: {}", checksum);
 

src/utils/vcs.rs

@@ -399,13 +399,6 @@ 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(