small tweaks

Author: NicoHinderling

src/api/data_types/chunking/mobile_app.rs

@@ -20,5 +20,5 @@ pub struct AssembleMobileAppResponse {
     pub state: ChunkedFileState,
     pub missing_chunks: Vec<Digest>,
     pub detail: Option<String>,
-    pub artifact_id: Option<String>,
+    pub artifact_url: Option<String>,
 }

src/commands/mobile_app/upload.rs

@@ -15,7 +15,7 @@ use symbolic::common::ByteView;
 use zip::write::SimpleFileOptions;
 use zip::{DateTime, ZipWriter};
 
-use crate::api::{Api, AuthenticatedApi, ChunkUploadCapability};
+use crate::api::{Api, AuthenticatedApi, ChunkUploadCapability, ChunkedFileState};
 use crate::config::Config;
 use crate::utils::args::ArgExt as _;
 use crate::utils::chunks::{upload_chunks, Chunk};
@@ -128,9 +128,8 @@ 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_and_ids = vec![];
+    let mut uploaded_paths_and_urls = vec![];
     let mut errored_paths_and_reasons = vec![];
     for (path, zip) in normalized_zips {
         info!("Uploading file: {}", path.display());
@@ -143,9 +142,9 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
             sha.as_deref(),
             build_configuration,
         ) {
-            Ok(artifact_id) => {
+            Ok(artifact_url) => {
                 info!("Successfully uploaded file: {}", path.display());
-                uploaded_paths_and_ids.push((path.to_path_buf(), artifact_id));
+                uploaded_paths_and_urls.push((path.to_path_buf(), artifact_url));
             }
             Err(e) => {
                 debug!("Failed to upload file at path {}: {}", path.display(), e);
@@ -169,22 +168,21 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
         }
     }
 
-    if uploaded_paths_and_ids.is_empty() {
+    if uploaded_paths_and_urls.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 {
+            uploaded_paths_and_urls.len(),
+            if uploaded_paths_and_urls.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());
+        if uploaded_paths_and_urls.len() < 3 {
+            for (path, artifact_url) in &uploaded_paths_and_urls {
+                println!("  - {} {artifact_url}", path.display());
             }
         }
     }
@@ -346,7 +344,7 @@ fn normalize_directory(path: &Path) -> Result<TempFile> {
     Ok(temp_file)
 }
 
-/// Returns artifact id if upload was successful.
+/// Returns artifact url if upload was successful.
 fn upload_file(
     api: &AuthenticatedApi,
     bytes: &[u8],
@@ -399,15 +397,16 @@ fn upload_file(
     // In the normal case we go through this loop exactly twice:
     // 1. state=not_found
     //    server tells us the we need to send every chunk and we do so
-    // 2. artifact_id set so we're done (likely state=created)
+    // 2. artifact_url set so we're done (likely state=created)
     //
     // In the case where all the chunks are already on the server we go
     // through only once:
-    // 1. state=ok, artifact_id set
+    // 1. state=created, artifact_url set
     //
     // In the case where something went wrong (which could be on either
     // iteration of the loop) we get:
-    // n. state=err, artifact_id unset
+    // n. state=error, artifact_url unset
+
     let result = loop {
         let response =
             api.assemble_mobile_app(org, project, checksum, &checksums, sha, build_configuration)?;
@@ -420,16 +419,14 @@ fn upload_file(
             );
             upload_chunks(&chunks, &chunk_upload_options, upload_progress_style)?;
         }
-
-        // is_err() is not_found or error and is_finished() is ok or error, so if both the the
-        // state is error
-        if response.state.is_finished() && response.state.is_err() {
+        
+        if response.state == ChunkedFileState::Error {
             let message = response.detail.as_deref().unwrap_or("unknown error");
             bail!("Failed to process uploaded files: {}", message);
         }
 
-        if let Some(artifact_id) = response.artifact_id {
-            break Ok(artifact_id);
+        if let Some(artifact_url) = response.artifact_url {
+            break Ok(artifact_url);
         }
     };