Show mobile-app upload show analysis URL

Author: chromy

src/api/data_types/chunking/mobile_app.rs

@@ -9,7 +9,7 @@ pub struct ChunkedMobileAppRequest<'a> {
     pub checksum: Digest,
     pub chunks: &'a [Digest],
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub git_sha: Option<&'a str>,
+    pub head_sha: Option<&'a str>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub build_configuration: Option<&'a str>,
 }
@@ -20,4 +20,5 @@ pub struct AssembleMobileAppResponse {
     pub state: ChunkedFileState,
     pub missing_chunks: Vec<Digest>,
     pub detail: Option<String>,
+    pub artifact_id: Option<String>,
 }

src/api/mod.rs

@@ -1036,7 +1036,7 @@ impl<'a> AuthenticatedApi<'a> {
         project: &str,
         checksum: Digest,
         chunks: &[Digest],
-        git_sha: Option<&str>,
+        head_sha: Option<&str>,
         build_configuration: Option<&str>,
     ) -> ApiResult<AssembleMobileAppResponse> {
         let url = format!(
@@ -1049,7 +1049,7 @@ impl<'a> AuthenticatedApi<'a> {
             .with_json_body(&ChunkedMobileAppRequest {
                 checksum,
                 chunks,
-                git_sha,
+                head_sha,
                 build_configuration,
             })?
             .send()?

src/commands/mobile_app/upload.rs

@@ -11,15 +11,14 @@ use clap::{Arg, ArgAction, ArgMatches, Command};
 use indicatif::ProgressStyle;
 use itertools::Itertools as _;
 use log::{debug, info, warn};
-use sha1_smol::Digest;
 use symbolic::common::ByteView;
 use zip::write::SimpleFileOptions;
 use zip::{DateTime, ZipWriter};
 
 use crate::api::{Api, AuthenticatedApi, ChunkUploadCapability};
 use crate::config::Config;
 use crate::utils::args::ArgExt as _;
-use crate::utils::chunks::{upload_chunks, Chunk, ASSEMBLE_POLL_INTERVAL};
+use crate::utils::chunks::{upload_chunks, Chunk};
 use crate::utils::fs::get_sha1_checksums;
 #[cfg(all(target_os = "macos", target_arch = "aarch64"))]
 use crate::utils::fs::TempDir;
@@ -129,9 +128,10 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
 
     let config = Config::current();
     let (org, project) = config.get_org_and_project(matches)?;
+    let base_url = config.get_base_url()?;
 
-    let mut uploaded_paths = vec![];
-    let mut errored_paths = vec![];
+    let mut uploaded_paths_and_ids = vec![];
+    let mut errored_paths_and_reasons = vec![];
     for (path, zip) in normalized_zips {
         info!("Uploading file: {}", path.display());
         let bytes = ByteView::open(zip.path())?;
@@ -143,41 +143,50 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
             sha.as_deref(),
             build_configuration,
         ) {
-            Ok(_) => {
+            Ok(artifact_id) => {
                 info!("Successfully uploaded file: {}", path.display());
-                uploaded_paths.push(path.to_path_buf());
+                uploaded_paths_and_ids.push((path.to_path_buf(), artifact_id));
             }
             Err(e) => {
                 debug!("Failed to upload file at path {}: {}", path.display(), e);
-                errored_paths.push(path.to_path_buf());
+                errored_paths_and_reasons.push((path.to_path_buf(), e));
             }
         }
     }
 
-    if !errored_paths.is_empty() {
+    if !errored_paths_and_reasons.is_empty() {
         warn!(
             "Failed to upload {} file{}:",
-            errored_paths.len(),
-            if errored_paths.len() == 1 { "" } else { "s" }
+            errored_paths_and_reasons.len(),
+            if errored_paths_and_reasons.len() == 1 {
+                ""
+            } else {
+                "s"
+            }
         );
-        for path in errored_paths {
-            warn!("  - {}", path.display());
-        }
-    }
-
-    println!(
-        "Successfully uploaded {} file{} to Sentry",
-        uploaded_paths.len(),
-        if uploaded_paths.len() == 1 { "" } else { "s" }
-    );
-    if uploaded_paths.len() < 3 {
-        for path in &uploaded_paths {
-            println!("  - {}", path.display());
+        for (path, reason) in errored_paths_and_reasons {
+            warn!("  - {} ({})", path.display(), reason);
         }
     }
 
-    if uploaded_paths.is_empty() {
+    if uploaded_paths_and_ids.is_empty() {
         bail!("Failed to upload any files");
+    } else {
+        println!(
+            "Successfully uploaded {} file{} to Sentry",
+            uploaded_paths_and_ids.len(),
+            if uploaded_paths_and_ids.len() == 1 {
+                ""
+            } else {
+                "s"
+            }
+        );
+        if uploaded_paths_and_ids.len() < 3 {
+            for (path, artifact_id) in &uploaded_paths_and_ids {
+                let url = format!("{base_url}/{org}/preprod/{project}/{artifact_id}");
+                println!("  - {} {url}", path.display());
+            }
+        }
     }
     Ok(())
 }
@@ -337,14 +346,15 @@ fn normalize_directory(path: &Path) -> Result<TempFile> {
     Ok(temp_file)
 }
 
+/// Returns artifact id if upload was successful.
 fn upload_file(
     api: &AuthenticatedApi,
     bytes: &[u8],
     org: &str,
     project: &str,
     sha: Option<&str>,
     build_configuration: Option<&str>,
-) -> Result<()> {
+) -> Result<String> {
     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.";
 
@@ -371,7 +381,7 @@ fn upload_file(
     }
 
     let progress_style =
-        ProgressStyle::default_spinner().template("{spinner} Optimizing bundle for upload...");
+        ProgressStyle::default_spinner().template("{spinner} Preparing for upload...");
     let pb = ProgressBar::new_spinner();
     pb.enable_steady_tick(100);
     pb.set_style(progress_style);
@@ -384,76 +394,33 @@ fn upload_file(
         .map(|(data, checksum)| Chunk((*checksum, data)))
         .collect::<Vec<_>>();
 
-    pb.finish_with_duration("Finishing upload");
-
-    let response =
-        api.assemble_mobile_app(org, project, checksum, &checksums, sha, build_configuration)?;
-    chunks.retain(|Chunk((digest, _))| response.missing_chunks.contains(digest));
-
-    if !chunks.is_empty() {
-        let upload_progress_style = ProgressStyle::default_bar().template(
-            "{prefix:.dim} Uploading files...\
-             \n{wide_bar}  {bytes}/{total_bytes} ({eta})",
-        );
-        upload_chunks(&chunks, &chunk_upload_options, upload_progress_style)?;
-    } else {
-        println!("Nothing to upload, all files are on the server");
-    }
-
-    poll_assemble(
-        api,
-        checksum,
-        &checksums,
-        org,
-        project,
-        sha,
-        build_configuration,
-    )?;
-    Ok(())
-}
-
-fn poll_assemble(
-    api: &AuthenticatedApi,
-    checksum: Digest,
-    chunks: &[Digest],
-    org: &str,
-    project: &str,
-    sha: Option<&str>,
-    build_configuration: Option<&str>,
-) -> Result<()> {
-    debug!("Polling assemble for checksum: {}", checksum);
-
-    let progress_style = ProgressStyle::default_spinner().template("{spinner} Processing files...");
-    let pb = ProgressBar::new_spinner();
-
-    pb.enable_steady_tick(100);
-    pb.set_style(progress_style);
+    pb.finish_with_duration("Preparing for upload");
 
-    let response = loop {
+    let result = loop {
         let response =
-            api.assemble_mobile_app(org, project, checksum, chunks, sha, build_configuration)?;
+            api.assemble_mobile_app(org, project, checksum, &checksums, sha, build_configuration)?;
+        chunks.retain(|Chunk((digest, _))| response.missing_chunks.contains(digest));
+
+        if !chunks.is_empty() {
+            let upload_progress_style = ProgressStyle::default_bar().template(
+                "{prefix:.dim} Uploading files...\
+               \n{wide_bar}  {bytes}/{total_bytes} ({eta})",
+            );
+            upload_chunks(&chunks, &chunk_upload_options, upload_progress_style)?;
+        }
 
-        if response.state.is_finished() {
-            break response;
+        // is_err() is not_found or error and is_finished() is ok or error, the both is only error
+        if response.state.is_finished() && response.state.is_err() {
+            let message = response.detail.as_deref().unwrap_or("unknown error");
+            bail!("Failed to process uploaded files: {}", message);
         }
 
-        std::thread::sleep(ASSEMBLE_POLL_INTERVAL);
+        if let Some(artifact_id) = response.artifact_id {
+            break Ok(artifact_id);
+        }
     };
 
-    pb.finish_with_duration("Processing");
-
-    if response.state.is_err() {
-        let message = response.detail.as_deref().unwrap_or("unknown error");
-        bail!("Failed to process uploaded files: {}", message);
-    }
-
-    if response.state.is_pending() {
-        info!("File upload complete (processing pending on server)");
-    } else {
-        info!("File processing complete");
-    }
-
-    Ok(())
+    result
 }
 
 #[cfg(not(windows))]

tests/integration/_cases/mobile_app/mobile_app-upload-apk-all-uploaded.trycmd

@@ -4,6 +4,6 @@ $ sentry-cli mobile-app upload tests/integration/_fixtures/mobile_app/apk.apk
 [..]WARN[..]EXPERIMENTAL: The mobile-app subcommand is experimental. The command is subject to breaking changes and may be removed without notice in any release.
 Nothing to upload, all files are on the server
 Successfully uploaded 1 file to Sentry
-  - tests/integration/_fixtures/mobile_app/apk.apk
+  - tests/integration/_fixtures/mobile_app/apk.apk http[..]/wat-org/preprod/wat-project/42
 
 ```

tests/integration/_cases/mobile_app/mobile_app-upload-apk.trycmd

@@ -3,6 +3,6 @@ $ sentry-cli mobile-app upload tests/integration/_fixtures/mobile_app/apk.apk --
 ? success
 [..]WARN[..]EXPERIMENTAL: The mobile-app subcommand is experimental. The command is subject to breaking changes and may be removed without notice in any release.
 Successfully uploaded 1 file to Sentry
-  - tests/integration/_fixtures/mobile_app/apk.apk
+  - tests/integration/_fixtures/mobile_app/apk.apk http[..]/wat-org/preprod/wat-project/42
 
 ```

tests/integration/_cases/mobile_app/mobile_app-upload-ipa.trycmd

@@ -3,6 +3,6 @@ $ sentry-cli mobile-app upload tests/integration/_fixtures/mobile_app/ipa.ipa --
 ? success
 [..]WARN[..]EXPERIMENTAL: The mobile-app subcommand is experimental. The command is subject to breaking changes and may be removed without notice in any release.
 Successfully uploaded 1 file to Sentry
-  - tests/integration/_fixtures/mobile_app/ipa.ipa
+  - tests/integration/_fixtures/mobile_app/ipa.ipa http[..]/wat-org/preprod/wat-project/some-text-id
 
 ```

tests/integration/mobile_app/upload.rs

@@ -86,7 +86,7 @@ fn command_mobile_app_upload_apk_all_uploaded() {
                 "POST",
                 "/api/0/projects/wat-org/wat-project/files/preprodartifacts/assemble/",
             )
-            .with_response_body(r#"{"state":"ok","missingChunks":[]}"#),
+            .with_response_body(r#"{"state":"ok","missingChunks":[],"artifactId":"42"}"#),
         )
         .register_trycmd_test("mobile_app/mobile_app-upload-apk-all-uploaded.trycmd")
         .with_default_token();
@@ -169,7 +169,8 @@ fn command_mobile_app_upload_apk_chunked() {
                 } else {
                     r#"{
                         "state": "ok",
-                        "missingChunks": []
+                        "missingChunks": [],
+                        "artifactId": "42"
                     }"#
                 }
                 .into()
@@ -223,7 +224,8 @@ fn command_mobile_app_upload_ipa_chunked() {
                 } else {
                     r#"{
                         "state": "ok",
-                        "missingChunks": []
+                        "missingChunks": [],
+                        "artifactId": "some-text-id"
                     }"#
                 }
                 .into()