sentry-cli 3.4.2__tar.gz → 3.4.3__tar.gz

{sentry_cli-3.4.2 → sentry_cli-3.4.3}/Cargo.lock

@@ -2300,9 +2300,9 @@ dependencies = [
 
 [[package]]
 name = "objectstore-client"
-version = "0.1.6"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f99caa869461b61decd1985c029d7e1462d1bde8e2448040db27d567165fcc1e"
+checksum = "754d0120cf9036efad549de3d65223998b5b7ab00943686dd96acdb926a0cfe6"
 dependencies = [
  "async-compression",
  "bytes",
@@ -2323,9 +2323,9 @@ dependencies = [
 
 [[package]]
 name = "objectstore-types"
-version = "0.1.6"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c375bccef8773d1739eabb7e2b1bbd7e9a9071c8f9557e3b50dce7220e8c8736"
+checksum = "75d2e3c60712032c880ec7fc56cd01856eb438968957b4c136acd4e6d66f3580"
 dependencies = [
  "http",
  "humantime",
@@ -3391,7 +3391,7 @@ dependencies = [
 
 [[package]]
 name = "sentry-cli"
-version = "3.4.2"
+version = "3.4.3"
 dependencies = [
  "anyhow",
  "anylog",
@@ -3410,6 +3410,7 @@ dependencies = [
  "dotenvy",
  "elementtree",
  "flate2",
+ "futures-util",
  "git2",
  "glob",
  "http",

{sentry_cli-3.4.2 → sentry_cli-3.4.3}/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 build = "build.rs"
 name = "sentry-cli"
-version = "3.4.2"
+version = "3.4.3"
 edition = "2021"
 rust-version = "1.91"
 
@@ -31,6 +31,7 @@ elementtree = "1.2.3"
 flate2 = { version = "1.0.25", default-features = false, features = [
   "rust_backend",
 ] }
+futures-util = "0.3"
 git2 = { version = "0.20.4", default-features = false }
 glob = "0.3.1"
 http = "1.4.0"
@@ -44,7 +45,7 @@ java-properties = "2.0.0"
 lazy_static = "1.4.0"
 libc = "0.2.139"
 log = { version = "0.4.17", features = ["std"] }
-objectstore-client = { version = "0.1.6" , default-features = false, features = ["native-tls"] }
+objectstore-client = { version = "0.1.9" , default-features = false, features = ["native-tls"] }
 open = "3.2.0"
 parking_lot = "0.12.1"
 percent-encoding = "2.2.0"

{sentry_cli-3.4.2 → sentry_cli-3.4.3}/PKG-INFO

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

{sentry_cli-3.4.2 → sentry_cli-3.4.3}/sentry_cli.egg-info/PKG-INFO

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

{sentry_cli-3.4.2 → sentry_cli-3.4.3}/sentry_cli.egg-info/SOURCES.txt

@@ -36,6 +36,7 @@ src/api/envelopes_api.rs
 src/api/mod.rs
 src/api/pagination.rs
 src/api/serialization.rs
+src/api/updating.rs
 src/api/data_types/code_mappings.rs
 src/api/data_types/deploy.rs
 src/api/data_types/mod.rs

{sentry_cli-3.4.2 → sentry_cli-3.4.3}/src/api/mod.rs

@@ -11,6 +11,7 @@ mod encoding;
 mod errors;
 mod pagination;
 mod serialization;
+mod updating;
 
 use std::borrow::Cow;
 use std::cell::RefCell;
@@ -57,6 +58,7 @@ use encoding::{PathArg, QueryArg};
 use errors::{ApiError, ApiErrorKind, ApiResult, SentryError};
 
 pub use self::data_types::*;
+pub use crate::api::updating::ReleaseRegistryFile;
 
 lazy_static! {
     static ref API: Mutex<Option<Arc<Api>>> = Mutex::new(None);
@@ -335,13 +337,13 @@ impl Api {
 
         if resp.status() == 200 {
             let info: RegistryRelease = resp.convert()?;
-            for (filename, _download_url) in info.file_urls {
+            for (filename, _download_url) in info.files {
                 info!("Found asset {filename}");
                 if filename == ref_name {
                     return Ok(Some(SentryCliRelease {
                         version: info.version,
                         #[cfg(not(feature = "managed"))]
-                        download_url: _download_url,
+                        download_info: _download_url,
                     }));
                 }
             }
@@ -1729,17 +1731,17 @@ pub struct ReleaseCommit {
     pub id: String,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 struct RegistryRelease {
     version: String,
-    file_urls: HashMap<String, String>,
+    files: HashMap<String, ReleaseRegistryFile>,
 }
 
 /// Information about sentry CLI releases
 pub struct SentryCliRelease {
     pub version: String,
     #[cfg(not(feature = "managed"))]
-    pub download_url: String,
+    pub download_info: ReleaseRegistryFile,
 }
 
 #[derive(Debug, Deserialize, Default)]

sentry_cli-3.4.3/src/api/updating.rs

@@ -0,0 +1,80 @@
+//! Types for updating functionality.
+
+use std::ops::Deref;
+use std::str::FromStr;
+
+use anyhow::{Context as _, Error};
+use serde::de::Error as _;
+use serde::{Deserialize, Deserializer};
+
+/// A SHA-256 sum in hexadecimal representation is 64 characters long.
+const SHA256_SUM_HEX_LENGTH: usize = 64;
+
+#[derive(Debug)]
+pub struct Sha256Sum([u8; 32]);
+
+#[derive(Debug, Deserialize)]
+pub struct ReleaseRegistryFile {
+    pub url: String,
+    #[serde(rename = "checksums")]
+    #[serde(deserialize_with = "deserialize_checksums")]
+    pub checksum: Sha256Sum,
+}
+
+fn deserialize_checksums<'de, D>(deserializer: D) -> Result<Sha256Sum, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    #[derive(Deserialize)]
+    #[serde(rename_all = "kebab-case")]
+    struct RawChecksumsMapping {
+        sha256_hex: String,
+    }
+
+    let RawChecksumsMapping { sha256_hex } = RawChecksumsMapping::deserialize(deserializer)?;
+    sha256_hex.parse().map_err(D::Error::custom)
+}
+
+impl FromStr for Sha256Sum {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        if s.len() != SHA256_SUM_HEX_LENGTH {
+            anyhow::bail!(
+                "cannot parse SHA-256: expected a {SHA256_SUM_HEX_LENGTH}-character long string"
+            );
+        }
+
+        let mut bytes = [0u8; 32];
+
+        bytes
+            .iter_mut()
+            .zip(s.as_bytes().chunks(2))
+            .map(|(byte, hex_byte)| {
+                let hex_str = str::from_utf8(hex_byte)?;
+                *byte = u8::from_str_radix(hex_str, 16)?;
+                Ok::<_, Self::Err>(())
+            })
+            .map(|result| result.context("cannot parse SHA-256: not a valid hex string"))
+            .collect::<Result<Vec<()>, _>>()?;
+
+        Ok(Sha256Sum(bytes))
+    }
+}
+
+impl Deref for Sha256Sum {
+    type Target = [u8; 32];
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl<Rhs> PartialEq<Rhs> for Sha256Sum
+where
+    Rhs: Deref<Target = [u8]>,
+{
+    fn eq(&self, other: &Rhs) -> bool {
+        self.0 == **other
+    }
+}

{sentry_cli-3.4.2 → sentry_cli-3.4.3}/src/bashsupport.sh

@@ -1,5 +1,5 @@
-_SENTRY_TRACEBACK_FILE="___SENTRY_TRACEBACK_FILE___"
-_SENTRY_LOG_FILE="___SENTRY_LOG_FILE___"
+_SENTRY_TRACEBACK_FILE=___SENTRY_TRACEBACK_FILE___
+_SENTRY_LOG_FILE=___SENTRY_LOG_FILE___
 
 if [ "${SENTRY_CLI_NO_EXIT_TRAP-0}" != 1 ]; then
   trap _sentry_exit_trap EXIT
@@ -32,7 +32,7 @@ _sentry_err_trap() {
   echo "@exit_code:${_exit_code}" >> "$_SENTRY_TRACEBACK_FILE"
 
   : >> "$_SENTRY_LOG_FILE"
-  export SENTRY_LAST_EVENT=$(___SENTRY_CLI___ bash-hook --send-event --traceback "$_SENTRY_TRACEBACK_FILE" ___SENTRY_TAGS___ ___SENTRY_RELEASE___ --log "$_SENTRY_LOG_FILE" ___SENTRY_NO_ENVIRON___)
+  export SENTRY_LAST_EVENT=$(___SENTRY_CLI___ bash-hook --send-event --traceback "$_SENTRY_TRACEBACK_FILE" ___SENTRY_TAGS___ ___SENTRY_RELEASE___ ___SENTRY_ALLOW_XCODE_INFOPLIST_PREPROCESSING___ --log "$_SENTRY_LOG_FILE")
   rm -f "$_SENTRY_TRACEBACK_FILE" "$_SENTRY_LOG_FILE"
 }
 

{sentry_cli-3.4.2 → sentry_cli-3.4.3}/src/commands/bash_hook.rs

@@ -11,11 +11,12 @@ use anyhow::{format_err, Result};
 use clap::{builder::ArgPredicate, Arg, ArgAction, ArgMatches, Command};
 use lazy_static::lazy_static;
 use regex::Regex;
-use sentry::protocol::{Event, Exception, Frame, Stacktrace, User, Value};
+use sentry::protocol::{Event, Exception, Frame, Stacktrace, User};
 use uuid::Uuid;
 
 use crate::commands::send_event;
 use crate::config::Config;
+use crate::utils::args::allow_xcode_infoplist_preprocessing_arg;
 use crate::utils::event::{attach_logfile, get_sdk_info};
 use crate::utils::releases::detect_release_name;
 
@@ -40,8 +41,9 @@ pub fn make_command(command: Command) -> Command {
         .arg(
             Arg::new("no_environ")
                 .long("no-environ")
+                .hide(true)
                 .action(ArgAction::SetTrue)
-                .help("Do not send environment variables along"),
+                .help("No-op, as we never send envrionment variables."),
         )
         .arg(
             Arg::new("cli")
@@ -49,6 +51,7 @@ pub fn make_command(command: Command) -> Command {
                 .value_name("CMD")
                 .help("Explicitly set/override the sentry-cli command"),
         )
+        .arg(allow_xcode_infoplist_preprocessing_arg())
         .arg(
             Arg::new("send_event")
                 .long("send-event")
@@ -87,13 +90,15 @@ fn send_event(
     logfile: &str,
     tags: &[&String],
     release: Option<String>,
-    environ: bool,
+    allow_xcode_infoplist_preprocessing: bool,
 ) -> Result<()> {
     let config = Config::current();
 
     let mut event = Event {
         environment: config.get_environment().map(Into::into),
-        release: release.or(detect_release_name().ok()).map(Into::into),
+        release: release
+            .or(detect_release_name(allow_xcode_infoplist_preprocessing).ok())
+            .map(Into::into),
         sdk: Some(get_sdk_info()),
         user: whoami::fallible::username().ok().map(|n| User {
             username: Some(n),
@@ -112,13 +117,6 @@ fn send_event(
         event.tags.insert(key.into(), value.into());
     }
 
-    if environ {
-        event.extra.insert(
-            "environ".into(),
-            Value::Object(env::vars().map(|(k, v)| (k, Value::String(v))).collect()),
-        );
-    }
-
     let mut cmd = "unknown".to_owned();
     let mut exit_code = 1;
     let mut frames = vec![];
@@ -208,6 +206,10 @@ fn send_event(
     Ok(())
 }
 
+fn shell_quote(value: &str) -> String {
+    format!("'{}'", value.replace('\'', r"'\''"))
+}
+
 pub fn execute(matches: &ArgMatches) -> Result<()> {
     let release = Config::current().get_release(matches).ok();
 
@@ -222,7 +224,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
             matches.get_one::<String>("log").unwrap(),
             &tags,
             release,
-            !matches.get_flag("no_environ"),
+            matches.get_flag("allow_xcode_infoplist_preprocessing"),
         );
     }
 
@@ -235,15 +237,18 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
     let mut script = BASH_SCRIPT
         .replace(
             "___SENTRY_TRACEBACK_FILE___",
-            &traceback.display().to_string(),
+            &shell_quote(&traceback.display().to_string()),
         )
-        .replace("___SENTRY_LOG_FILE___", &log.display().to_string());
+        .replace(
+            "___SENTRY_LOG_FILE___",
+            &shell_quote(&log.display().to_string()),
+        );
 
     script = script.replace(
         " ___SENTRY_TAGS___",
         &tags
             .iter()
-            .map(|tag| format!(" --tag \"{tag}\""))
+            .map(|tag| format!(" --tag {}", shell_quote(tag)))
             .collect::<Vec<_>>()
             .join(""),
     );
@@ -251,26 +256,26 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
     script = match release {
         Some(release) => script.replace(
             " ___SENTRY_RELEASE___",
-            format!(" --release \"{release}\"").as_str(),
+            format!(" --release {}", shell_quote(&release)).as_str(),
         ),
         None => script.replace(" ___SENTRY_RELEASE___", ""),
     };
 
     script = script.replace(
         "___SENTRY_CLI___",
-        matches
-            .get_one::<String>("cli")
-            .map_or_else(
-                || env::current_exe().unwrap().display().to_string(),
-                String::clone,
-            )
-            .as_str(),
+        &shell_quote(&matches.get_one::<String>("cli").map_or_else(
+            || env::current_exe().unwrap().display().to_string(),
+            String::clone,
+        )),
     );
 
-    if matches.get_flag("no_environ") {
-        script = script.replace("___SENTRY_NO_ENVIRON___", "--no-environ");
+    if matches.get_flag("allow_xcode_infoplist_preprocessing") {
+        script = script.replace(
+            " ___SENTRY_ALLOW_XCODE_INFOPLIST_PREPROCESSING___",
+            " --allow-xcode-infoplist-preprocessing",
+        );
     } else {
-        script = script.replace("___SENTRY_NO_ENVIRON___", "");
+        script = script.replace(" ___SENTRY_ALLOW_XCODE_INFOPLIST_PREPROCESSING___", "");
     }
 
     if !matches.get_flag("no_exit") {
@@ -279,3 +284,16 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
     println!("{script}");
     Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::shell_quote;
+
+    #[test]
+    fn shell_quote_handles_special_characters() {
+        assert_eq!(
+            shell_quote("it's $(unsafe); && ok"),
+            "'it'\\''s $(unsafe); && ok'"
+        );
+    }
+}

{sentry_cli-3.4.2 → sentry_cli-3.4.3}/src/commands/build/snapshots.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::fs::File;
 use std::io::BufReader;
 use std::path::{Path, PathBuf};
@@ -8,9 +8,10 @@ use std::time::Duration;
 use anyhow::{Context as _, Result};
 use clap::{Arg, ArgMatches, Command};
 use console::style;
+use futures_util::StreamExt as _;
 use itertools::Itertools as _;
 use log::{debug, warn};
-use objectstore_client::{ClientBuilder, ExpirationPolicy, Usecase};
+use objectstore_client::{ClientBuilder, ExpirationPolicy, OperationResult, Usecase};
 use rayon::prelude::*;
 use secrecy::ExposeSecret as _;
 use serde_json::Value;
@@ -118,6 +119,14 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
     // Always collect git metadata, but only perform automatic inference when enabled
     let vcs_info = collect_git_metadata(matches, &config, should_collect_git_metadata);
 
+    if vcs_info.pr_number.is_some() && vcs_info.base_sha.is_none() {
+        anyhow::bail!(
+            "A PR number was provided but no base SHA could be determined. \
+             Snapshot comparisons require a base SHA to identify the base build. \
+             Pass --base-sha explicitly or ensure your CI environment exposes the merge base."
+        );
+    }
+
     debug!("Scanning for images in: {}", dir_path.display());
     debug!("Organization: {org}");
     debug!("Project: {project}");
@@ -138,9 +147,8 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
 
     validate_image_sizes(&images)?;
 
-    // Upload image files to objectstore
     println!(
-        "{} Uploading {} image {}",
+        "{} Processing {} image {}",
         style(">").dim(),
         style(images.len()).yellow(),
         if images.len() == 1 { "file" } else { "files" }
@@ -408,33 +416,69 @@ fn upload_images(
 
     let total_count = uploads.len();
 
-    let mut many_builder = session.many();
-    for prepared in uploads {
-        many_builder = many_builder.push(
-            session
-                .put_path(prepared.path.clone())
-                .key(&prepared.key)
-                .expiration_policy(expiration),
+    let existing_keys: HashSet<String> = runtime.block_on(async {
+        let mut head_builder = session.many();
+        for prepared in &uploads {
+            head_builder = head_builder.push(session.head(&prepared.key));
+        }
+
+        let mut results = head_builder.send().await;
+        let mut existing = HashSet::new();
+        while let Some(result) = results.next().await {
+            if let OperationResult::Head(key, Ok(Some(_))) = result {
+                existing.insert(key);
+            }
+        }
+        existing
+    });
+
+    let missing_uploads: Vec<_> = uploads
+        .into_iter()
+        .filter(|p| !existing_keys.contains(&p.key))
+        .collect();
+    let skipped = total_count - missing_uploads.len();
+    let upload_count = missing_uploads.len();
+
+    if skipped > 0 {
+        println!(
+            "{} {} of {total_count} {} already uploaded, uploading {} new",
+            style(">").dim(),
+            style(skipped).yellow(),
+            if total_count == 1 { "image" } else { "images" },
+            style(upload_count).yellow(),
         );
     }
 
-    let result = runtime.block_on(async { many_builder.send().await.error_for_failures().await });
-    if let Err(errors) = result {
-        let errors: Vec<_> = errors.collect();
-        let error_count = errors.len();
-        eprintln!("There were errors uploading images:");
-        for error in errors {
-            let error = anyhow::Error::new(error);
-            eprintln!("  {}", style(format!("{error:#}")).red());
+    if upload_count > 0 {
+        let mut many_builder = session.many();
+        for prepared in missing_uploads {
+            many_builder = many_builder.push(
+                session
+                    .put_path(prepared.path.clone())
+                    .key(&prepared.key)
+                    .expiration_policy(expiration),
+            );
+        }
+
+        let result =
+            runtime.block_on(async { many_builder.send().await.error_for_failures().await });
+        if let Err(errors) = result {
+            let errors: Vec<_> = errors.collect();
+            let error_count = errors.len();
+            eprintln!("There were errors uploading images:");
+            for error in errors {
+                let error = anyhow::Error::new(error);
+                eprintln!("  {}", style(format!("{error:#}")).red());
+            }
+            anyhow::bail!("Failed to upload {error_count} images");
         }
-        anyhow::bail!("Failed to upload {error_count} images");
     }
 
     println!(
-        "{} Uploaded {} image {}",
+        "{} Uploaded {} new image {}",
         style(">").dim(),
-        style(total_count).yellow(),
-        if total_count == 1 { "file" } else { "files" }
+        style(upload_count).yellow(),
+        if upload_count == 1 { "file" } else { "files" }
     );
     Ok(manifest_entries)
 }

{sentry_cli-3.4.2 → sentry_cli-3.4.3}/src/commands/react_native/xcode.rs

@@ -18,7 +18,9 @@ use serde_json::Value;
 use crate::api::Api;
 use crate::config::Config;
 use crate::constants::DEFAULT_MAX_WAIT;
-use crate::utils::args::{validate_distribution, ArgExt as _};
+use crate::utils::args::{
+    allow_xcode_infoplist_preprocessing_arg, validate_distribution, ArgExt as _,
+};
 use crate::utils::file_search::ReleaseFileSearch;
 use crate::utils::file_upload::UploadContext;
 use crate::utils::fs::TempFile;
@@ -122,6 +124,7 @@ pub fn make_command(command: Command) -> Command {
                      but at most for the given number of seconds.",
                 ),
         )
+        .arg(allow_xcode_infoplist_preprocessing_arg())
         .arg(
             Arg::new("no_auto_release")
                 .long("no-auto-release")
@@ -358,7 +361,9 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
             (Err(_), Err(_)) => {
                 // Neither environment variable is present, attempt to parse Info.plist
                 info!("Parsing Info.plist");
-                match InfoPlist::discover_from_env() {
+                match InfoPlist::discover_from_env(
+                    matches.get_flag("allow_xcode_infoplist_preprocessing"),
+                ) {
                     Ok(Some(plist)) => {
                         // Successfully discovered and parsed Info.plist
                         let dist_string = plist.build().to_owned();

sentry_cli-3.4.3/src/commands/releases/propose_version.rs

@@ -0,0 +1,19 @@
+use anyhow::Result;
+use clap::{ArgMatches, Command};
+
+use crate::utils::args::allow_xcode_infoplist_preprocessing_arg;
+use crate::utils::releases::detect_release_name;
+
+pub fn make_command(command: Command) -> Command {
+    command
+        .about("Propose a version name for a new release.")
+        .arg(allow_xcode_infoplist_preprocessing_arg())
+}
+
+pub fn execute(matches: &ArgMatches) -> Result<()> {
+    println!(
+        "{}",
+        detect_release_name(matches.get_flag("allow_xcode_infoplist_preprocessing"))?
+    );
+    Ok(())
+}

{sentry_cli-3.4.2 → sentry_cli-3.4.3}/src/commands/send_event.rs

@@ -16,7 +16,9 @@ use serde_json::Value;
 
 use crate::api::envelopes_api::EnvelopesApi;
 use crate::constants::USER_AGENT;
-use crate::utils::args::{get_timestamp, validate_distribution};
+use crate::utils::args::{
+    allow_xcode_infoplist_preprocessing_arg, get_timestamp, validate_distribution,
+};
 use crate::utils::event::{attach_logfile, get_sdk_info};
 use crate::utils::releases::detect_release_name;
 
@@ -148,6 +150,7 @@ pub fn make_command(command: Command) -> Command {
                 .long("logfile")
                 .help(format!("Send a logfile as breadcrumbs with the event (last {MAX_BREADCRUMBS} records)")),
         )
+        .arg(allow_xcode_infoplist_preprocessing_arg())
         .arg(
             Arg::new("with_categories")
                 .long("with-categories")
@@ -231,7 +234,11 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
         release: matches
             .get_one::<String>("release")
             .map(|s| Cow::Owned(s.clone()))
-            .or_else(|| detect_release_name().ok().map(Cow::from)),
+            .or_else(|| {
+                detect_release_name(matches.get_flag("allow_xcode_infoplist_preprocessing"))
+                    .ok()
+                    .map(Cow::from)
+            }),
         dist: matches
             .get_one::<String>("dist")
             .map(|s| Cow::Owned(s.clone())),