wip

Author: szokeasaurusrex

src/commands/upload_proguard.rs

@@ -1,4 +1,3 @@
-use std::env;
 use std::io;
 
 use anyhow::{bail, Error, Result};
@@ -8,7 +7,8 @@ use console::style;
 use symbolic::common::ByteView;
 use uuid::Uuid;
 
-use crate::api::Api;
+use crate::api::ChunkUploadCapability;
+use crate::api::{Api, DebugInfoFile};
 use crate::config::Config;
 use crate::utils::android::dump_proguard_uuids_as_properties;
 use crate::utils::args::ArgExt as _;
@@ -18,8 +18,6 @@ use crate::utils::proguard::ProguardMapping;
 use crate::utils::system::QuietExit;
 use crate::utils::ui::{copy_with_progress, make_byte_progress_bar};
 
-const CHUNK_UPLOAD_ENV_VAR: &str = "SENTRY_EXPERIMENTAL_PROGUARD_CHUNK_UPLOAD";
-
 pub fn make_command(command: Command) -> Command {
     command
         .about("Upload ProGuard mapping files to a project.")
@@ -167,67 +165,55 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
     let api = Api::current();
     let config = Config::current();
 
-    // Don't initialize these until we confirm the user did not pass the --no-upload flag,
-    // or if we are using chunked uploading. This is because auth token, org, and project
-    // are not needed for the no-upload case.
-    let authenticated_api;
-    let (org, project);
+    if mappings.is_empty() && matches.get_flag("require_one") {
+        println!();
+        eprintln!("{}", style("error: found no mapping files to upload").red());
+        return Err(QuietExit(1).into());
+    }
 
-    if env::var(CHUNK_UPLOAD_ENV_VAR) == Ok("1".into()) {
-        log::warn!(
-            "EXPERIMENTAL FEATURE: Uploading proguard mappings using chunked uploading. \
-             Some functionality may be unavailable when using chunked uploading. Please unset \
-             the {CHUNK_UPLOAD_ENV_VAR} variable if you encounter any \
-             problems."
-        );
+    // write UUIDs into the mapping file.
+    if let Some(p) = matches.get_one::<String>("write_properties") {
+        let uuids: Vec<_> = mappings.iter().map(|x| x.uuid()).collect();
+        dump_proguard_uuids_as_properties(p, &uuids)?;
+    }
 
-        authenticated_api = api.authenticated()?;
-        (org, project) = config.get_org_and_project(matches)?;
+    if matches.get_flag("no_upload") {
+        println!("{} skipping upload.", style(">").dim());
+        return Ok(());
+    }
+
+    let authenticated_api = api.authenticated()?;
+    let (org, project) = config.get_org_and_project(matches)?;
 
-        let chunk_upload_options = authenticated_api.get_chunk_upload_options(&org)?;
+    let chunk_upload_options = authenticated_api.get_chunk_upload_options(&org)?;
 
+    if chunk_upload_options.supports(ChunkUploadCapability::Proguard) {
         proguard::chunk_upload(&mappings, chunk_upload_options, &org, &project)?;
     } else {
-        if mappings.is_empty() && matches.get_flag("require_one") {
-            println!();
-            eprintln!("{}", style("error: found no mapping files to upload").red());
-            return Err(QuietExit(1).into());
-        }
-
-        println!("{} compressing mappings", style(">").dim());
-        let tf = TempFile::create()?;
-        {
-            let mut zip = zip::ZipWriter::new(tf.open()?);
-            for mapping in &mappings {
-                let pb = make_byte_progress_bar(mapping.len() as u64);
-                zip.start_file(
-                    format!("proguard/{}.txt", mapping.uuid()),
-                    zip::write::SimpleFileOptions::default(),
-                )?;
-                copy_with_progress(&pb, &mut mapping.as_ref(), &mut zip)?;
-                pb.finish_and_clear();
-            }
-        }
-
-        // write UUIDs into the mapping file.
-        if let Some(p) = matches.get_one::<String>("write_properties") {
-            let uuids: Vec<_> = mappings.iter().map(|x| x.uuid()).collect();
-            dump_proguard_uuids_as_properties(p, &uuids)?;
-        }
-
-        if matches.get_flag("no_upload") {
-            println!("{} skipping upload.", style(">").dim());
-            return Ok(());
-        }
-
-        println!("{} uploading mappings", style(">").dim());
-        (org, project) = config.get_org_and_project(matches)?;
-
-        authenticated_api = api.authenticated()?;
-
-        let rv = authenticated_api
-            .region_specific(&org)
-            .upload_dif_archive(&project, tf.path())?;
+        // println!("{} compressing mappings", style(">").dim());
+        // let tf = TempFile::create()?;
+        // {
+        //     let mut zip = zip::ZipWriter::new(tf.open()?);
+        //     for mapping in &mappings {
+        //         let pb = make_byte_progress_bar(mapping.len() as u64);
+        //         zip.start_file(
+        //             format!("proguard/{}.txt", mapping.uuid()),
+        //             zip::write::SimpleFileOptions::default(),
+        //         )?;
+        //         copy_with_progress(&pb, &mut mapping.as_ref(), &mut zip)?;
+        //         pb.finish_and_clear();
+        //     }
+        // }
+
+        // println!("{} uploading mappings", style(">").dim());
+        // (org, project) = config.get_org_and_project(matches)?;
+
+        // authenticated_api = api.authenticated()?;
+
+        // let rv = authenticated_api
+        //     .region_specific(&org)
+        //     .upload_dif_archive(&project, tf.path())?;
+        let rv: Vec<DebugInfoFile> = todo!();
         println!(
             "{} Uploaded a total of {} new mapping files",
             style(">").dim(),

tests/integration/_responses/debug_files/get-chunk-upload.json

@@ -7,5 +7,5 @@
   "concurrency": 8,
   "hashAlgorithm": "sha1",
   "compression": ["gzip"],
-  "accept": ["debug_files", "release_files", "pdbs", "portablepdbs", "sources", "bcsymbolmaps"]
+  "accept": ["debug_files", "release_files", "pdbs", "portablepdbs", "sources", "bcsymbolmaps", "proguard"]
 }

tests/integration/upload_proguard.rs

@@ -72,7 +72,6 @@ fn chunk_upload_already_there() {
             "tests/integration/_fixtures/upload_proguard/mapping.txt",
         ])
         .with_default_token()
-        .env("SENTRY_EXPERIMENTAL_PROGUARD_CHUNK_UPLOAD", "1")
         .run_and_assert(AssertCommand::Success)
 }