sentry-cli 2.42.0__tar.gz → 2.42.2__tar.gz

{sentry_cli-2.42.0 → sentry_cli-2.42.2}/Cargo.lock

@@ -2696,7 +2696,7 @@ dependencies = [
 
 [[package]]
 name = "sentry-cli"
-version = "2.42.0"
+version = "2.42.2"
 dependencies = [
  "anyhow",
  "anylog",

{sentry_cli-2.42.0 → sentry_cli-2.42.2}/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Armin Ronacher <armin.ronacher@active-4.com>"]
 build = "build.rs"
 name = "sentry-cli"
-version = "2.42.0"
+version = "2.42.2"
 edition = "2021"
 rust-version = "1.80"
 

{sentry_cli-2.42.0 → sentry_cli-2.42.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sentry_cli
-Version: 2.42.0
+Version: 2.42.2
 Summary: A command line utility to work with Sentry.
 Home-page: https://github.com/getsentry/sentry-cli
 Author: Sentry

{sentry_cli-2.42.0 → sentry_cli-2.42.2}/sentry_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sentry_cli
-Version: 2.42.0
+Version: 2.42.2
 Summary: A command line utility to work with Sentry.
 Home-page: https://github.com/getsentry/sentry-cli
 Author: Sentry

{sentry_cli-2.42.0 → sentry_cli-2.42.2}/src/api/data_types/chunking/artifact.rs

@@ -9,7 +9,7 @@ pub struct ChunkedArtifactRequest<'a> {
     pub chunks: &'a [Digest],
     #[serde(skip_serializing_if = "Vec::is_empty")]
     pub projects: Vec<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(skip_serializing_if = "version_is_empty")]
     pub version: Option<&'a str>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub dist: Option<&'a str>,
@@ -22,3 +22,10 @@ pub struct AssembleArtifactsResponse {
     pub missing_chunks: Vec<Digest>,
     pub detail: Option<String>,
 }
+
+fn version_is_empty(version: &Option<&str>) -> bool {
+    match version {
+        Some(v) => v.is_empty(),
+        None => true,
+    }
+}

{sentry_cli-2.42.0 → sentry_cli-2.42.2}/src/config.rs

@@ -363,8 +363,12 @@ impl Config {
         matches
             .get_one::<String>("release")
             .cloned()
-            .or_else(|| env::var("SENTRY_RELEASE").ok())
-            .ok_or_else(|| format_err!("A release slug is required (provide with --release)"))
+            .or_else(|| {
+                env::var("SENTRY_RELEASE")
+                    .ok()
+                    .filter(|v| !v.is_empty())
+            })
+            .ok_or_else(|| format_err!("A release slug is required (provide with --release or by setting the SENTRY_RELEASE environment variable)"))
     }
 
     // Backward compatibility with `releases files <VERSION>` commands.

{sentry_cli-2.42.0 → sentry_cli-2.42.2}/src/utils/file_upload.rs

@@ -75,7 +75,7 @@ pub fn initialize_legacy_release_upload(context: &UploadContext) -> Result<()> {
             },
         )?;
     } else {
-        bail!("This version of Sentry does not support artifact bundles. A release slug is required (provide with --release)");
+        bail!("This version of Sentry does not support artifact bundles. A release slug is required (provide with --release or by setting the SENTRY_RELEASE environment variable)");
     }
     Ok(())
 }
@@ -96,7 +96,7 @@ pub struct UploadContext<'a> {
 impl UploadContext<'_> {
     pub fn release(&self) -> Result<&str> {
         self.release
-            .ok_or_else(|| anyhow!("A release slug is required (provide with --release)"))
+            .ok_or_else(|| anyhow!("A release slug is required (provide with --release or by setting the SENTRY_RELEASE environment variable)"))
     }
 }
 
@@ -510,6 +510,8 @@ fn build_artifact_bundle(
         bundle.set_attribute("dist".to_owned(), dist.to_owned());
     }
 
+    let mut bundle_file_count = 0;
+
     for file in files.values() {
         pb.inc(1);
         pb.set_message(&file.url);
@@ -533,6 +535,7 @@ fn build_artifact_bundle(
                 return Err(e.into());
             }
         }
+        bundle_file_count += 1;
     }
 
     bundle.finish()?;
@@ -542,8 +545,8 @@ fn build_artifact_bundle(
     println!(
         "{} Bundled {} {} for upload",
         style(">").dim(),
-        style(files.len()).yellow(),
-        match files.len() {
+        style(bundle_file_count).yellow(),
+        match bundle_file_count {
             1 => "file",
             _ => "files",
         }