sentry-cli 3.2.3__tar.gz → 3.3.0__tar.gz

{sentry_cli-3.2.3 → sentry_cli-3.3.0}/Cargo.lock

@@ -2322,9 +2322,9 @@ dependencies = [
 
 [[package]]
 name = "objectstore-client"
-version = "0.0.19"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcaf8bc0ea7c50905631df108126c6a075ce5a9c16713ec4b68cc872a408e08"
+checksum = "033eedf125e31b30962c0172842e964fc9983bbccd99d9ff033e7e413946861c"
 dependencies = [
  "async-compression",
  "async-stream",
@@ -2346,9 +2346,9 @@ dependencies = [
 
 [[package]]
 name = "objectstore-types"
-version = "0.0.19"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f190038e8988112a4e593f1796612941117d88753574ef6476f99324d4605aae"
+checksum = "956cbdef3971ea108a15e5248625d6229870da3a3c637b6e7aada213526f8014"
 dependencies = [
  "http",
  "humantime",
@@ -3414,7 +3414,7 @@ dependencies = [
 
 [[package]]
 name = "sentry-cli"
-version = "3.2.3"
+version = "3.3.0"
 dependencies = [
  "anyhow",
  "anylog",

{sentry_cli-3.2.3 → sentry_cli-3.3.0}/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 build = "build.rs"
 name = "sentry-cli"
-version = "3.2.3"
+version = "3.3.0"
 edition = "2021"
 rust-version = "1.91"
 
@@ -44,7 +44,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.0.19" , default-features = false, features = ["native-tls"] }
+objectstore-client = { version = "0.1.2" , default-features = false, features = ["native-tls"] }
 open = "3.2.0"
 parking_lot = "0.12.1"
 percent-encoding = "2.2.0"

{sentry_cli-3.2.3 → sentry_cli-3.3.0}/PKG-INFO

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

{sentry_cli-3.2.3 → sentry_cli-3.3.0}/sentry_cli.egg-info/PKG-INFO

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

{sentry_cli-3.2.3 → sentry_cli-3.3.0}/sentry_cli.egg-info/SOURCES.txt

@@ -92,6 +92,9 @@ src/commands/monitors/mod.rs
 src/commands/monitors/run.rs
 src/commands/organizations/list.rs
 src/commands/organizations/mod.rs
+src/commands/proguard/mod.rs
+src/commands/proguard/upload.rs
+src/commands/proguard/uuid.rs
 src/commands/projects/list.rs
 src/commands/projects/mod.rs
 src/commands/react_native/gradle.rs

{sentry_cli-3.2.3 → sentry_cli-3.3.0}/src/api/data_types/snapshots.rs

@@ -10,6 +10,7 @@ use serde::{Deserialize, Serialize};
 pub struct CreateSnapshotResponse {
     pub artifact_id: String,
     pub image_count: u64,
+    pub snapshot_url: Option<String>,
 }
 
 // Keep in sync with https://github.com/getsentry/sentry/blob/master/src/sentry/preprod/snapshots/manifest.py

{sentry_cli-3.2.3 → sentry_cli-3.3.0}/src/commands/build/snapshots.rs

@@ -123,6 +123,14 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
         }
     );
 
+    if let Some(url) = &response.snapshot_url {
+        println!(
+            "{} View snapshots at {}",
+            style(">").dim(),
+            style(url).cyan()
+        );
+    }
+
     Ok(())
 }
 

{sentry_cli-3.2.3 → sentry_cli-3.3.0}/src/commands/mod.rs

@@ -32,6 +32,7 @@ mod login;
 mod logs;
 mod monitors;
 mod organizations;
+mod proguard;
 mod projects;
 mod react_native;
 mod releases;
@@ -60,6 +61,7 @@ macro_rules! each_subcommand {
         $mac!(logs);
         $mac!(monitors);
         $mac!(organizations);
+        $mac!(proguard);
         $mac!(projects);
         $mac!(react_native);
         $mac!(releases);

sentry_cli-3.3.0/src/commands/proguard/mod.rs

@@ -0,0 +1,45 @@
+use anyhow::Result;
+use clap::{ArgMatches, Command};
+
+pub mod upload;
+pub mod uuid;
+
+macro_rules! each_subcommand {
+    ($mac:ident) => {
+        $mac!(upload);
+        $mac!(uuid);
+    };
+}
+
+pub fn make_command(mut command: Command) -> Command {
+    macro_rules! add_subcommand {
+        ($name:ident) => {{
+            command = command.subcommand(crate::commands::proguard::$name::make_command(
+                Command::new(stringify!($name).replace('_', "-")),
+            ));
+        }};
+    }
+
+    command = command
+        .about("Manage ProGuard mapping files.")
+        .subcommand_required(true)
+        .arg_required_else_help(true);
+
+    each_subcommand!(add_subcommand);
+    command
+}
+
+pub fn execute(matches: &ArgMatches) -> Result<()> {
+    macro_rules! execute_subcommand {
+        ($name:ident) => {{
+            if let Some(sub_matches) =
+                matches.subcommand_matches(&stringify!($name).replace('_', "-"))
+            {
+                return crate::commands::proguard::$name::execute(&sub_matches);
+            }
+        }};
+    }
+
+    each_subcommand!(execute_subcommand);
+    unreachable!();
+}

sentry_cli-3.2.3/src/commands/upload_proguard.rs → sentry_cli-3.3.0/src/commands/proguard/upload.rs

@@ -59,13 +59,15 @@ pub fn make_command(command: Command) -> Command {
                 .short('u')
                 .value_name("UUID")
                 .value_parser(Uuid::parse_str)
+                .hide(true)
                 .help(
-                    "Explicitly override the UUID of the mapping file with another one.{n}\
-                     This should be used with caution as it means that you can upload \
-                     multiple mapping files if you don't take care.  This however can \
-                     be useful if you have a build process in which you need to know \
-                     the UUID of the proguard file before it was created.  If you upload \
-                     a file with a forced UUID you can only upload a single proguard file.",
+                    "[DEPRECATED] Manually override the UUID for the uploaded mapping.\n\
+                    We no longer recommend using this option. \
+                    If you use this option, you must use it consistently, and you must \
+                    ensure the UUID is generated deterministically based on the ProGuard \
+                    mapping. \n\
+                    If you need to know the UUID before upload, we recommend using the \
+                    `proguard uuid` command.",
                 ),
         )
 }

sentry_cli-3.3.0/src/commands/proguard/uuid.rs

@@ -0,0 +1,37 @@
+use anyhow::{Context as _, Result};
+use clap::{Arg, ArgMatches, Command};
+use symbolic::common::ByteView;
+
+use crate::utils::proguard::ProguardMapping;
+
+pub fn make_command(command: Command) -> Command {
+    command
+        .about("Compute the UUID for a ProGuard mapping file.")
+        .long_about(
+            "Compute the UUID for a ProGuard mapping file.\n\n\
+            This command computes and prints to stdout the UUID of the ProGuard \
+            mapping at the specified path. This is the UUID that will be set by \
+            the `proguard upload` command. The UUID is deterministicly computed \
+            based on the file contents.",
+        )
+        .arg(
+            Arg::new("path")
+                .value_name("PATH")
+                .help("The path to the mapping file.")
+                .required(true),
+        )
+}
+
+pub fn execute(matches: &ArgMatches) -> Result<()> {
+    let path = matches
+        .get_one::<String>("path")
+        .expect("required argument");
+
+    let byteview = ByteView::open(path)
+        .with_context(|| format!("failed to open proguard mapping '{path}'"))?;
+    let mapping = ProguardMapping::try_from(byteview)
+        .with_context(|| format!("failed to parse proguard mapping '{path}'"))?;
+
+    println!("{}", mapping.uuid());
+    Ok(())
+}

sentry_cli-3.3.0/src/commands/upload_proguard.rs

@@ -0,0 +1,11 @@
+use anyhow::Result;
+use clap::{ArgMatches, Command};
+
+pub fn make_command(command: Command) -> Command {
+    // Retained as a top-level command for backward compatibility.
+    crate::commands::proguard::upload::make_command(command)
+}
+
+pub fn execute(matches: &ArgMatches) -> Result<()> {
+    crate::commands::proguard::upload::execute(matches)
+}

{sentry_cli-3.2.3 → sentry_cli-3.3.0}/src/utils/releases.rs

@@ -107,6 +107,13 @@ pub fn detect_release_name() -> Result<String> {
     }
 
     // try Heroku #2: https://docs.sentry.io/product/integrations/deployment/heroku/#configure-releases
+    if let Ok(release) = env::var("HEROKU_BUILD_COMMIT") {
+        if !release.is_empty() {
+            return Ok(release);
+        }
+    }
+
+    // Try Heroku #3: Deprecated env var (now, HEROKU_BUILD_COMMIT is preferred)
     if let Ok(release) = env::var("HEROKU_SLUG_COMMIT") {
         if !release.is_empty() {
             return Ok(release);