sentry-cli 3.2.0__tar.gz → 3.2.2__tar.gz

{sentry_cli-3.2.0 → sentry_cli-3.2.2}/Cargo.lock

@@ -2668,7 +2668,7 @@ dependencies = [
 
 [[package]]
 name = "sentry-cli"
-version = "3.2.0"
+version = "3.2.2"
 dependencies = [
  "anyhow",
  "anylog",

{sentry_cli-3.2.0 → sentry_cli-3.2.2}/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 build = "build.rs"
 name = "sentry-cli"
-version = "3.2.0"
+version = "3.2.2"
 edition = "2021"
 rust-version = "1.91"
 

{sentry_cli-3.2.0 → sentry_cli-3.2.2}/PKG-INFO

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

{sentry_cli-3.2.0 → sentry_cli-3.2.2}/sentry_cli.egg-info/PKG-INFO

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

{sentry_cli-3.2.0 → sentry_cli-3.2.2}/src/api/errors/mod.rs

@@ -14,17 +14,12 @@ pub(super) struct ProjectRenamedError(pub(super) String);
 pub(super) type ApiResult<T> = Result<T, ApiError>;
 
 #[derive(Debug, thiserror::Error)]
-#[error("request failed with retryable status code {}", .body.status)]
-pub(super) struct RetryError {
-    body: ApiResponse,
-}
-
-impl RetryError {
-    pub fn new(body: ApiResponse) -> Self {
-        Self { body }
-    }
-
-    pub fn into_body(self) -> ApiResponse {
-        self.body
-    }
+pub(super) enum RetryError {
+    #[error("request failed with retryable status code {}", body.status)]
+    Status { body: ApiResponse },
+    #[error("request failed with retryable error: {source}")]
+    ApiError {
+        #[from]
+        source: ApiError,
+    },
 }

{sentry_cli-3.2.0 → sentry_cli-3.2.2}/src/api/mod.rs

@@ -15,11 +15,12 @@ mod serialization;
 use std::borrow::Cow;
 use std::cell::RefCell;
 use std::collections::HashMap;
+use std::error::Error as _;
 #[cfg(any(target_os = "macos", not(feature = "managed")))]
 use std::fs::File;
 use std::io::{self, Read as _, Write};
 use std::rc::Rc;
-use std::sync::Arc;
+use std::sync::{Arc, LazyLock};
 use std::{fmt, thread};
 
 use anyhow::{Context as _, Result};
@@ -39,11 +40,12 @@ use serde::{Deserialize, Serialize};
 use sha1_smol::Digest;
 use symbolic::common::DebugId;
 use symbolic::debuginfo::ObjectKind;
+use url::Url;
 use uuid::Uuid;
 
 use crate::api::errors::{ProjectRenamedError, RetryError};
 use crate::config::{Auth, Config};
-use crate::constants::{ARCH, EXT, PLATFORM, RELEASE_REGISTRY_LATEST_URL, VERSION};
+use crate::constants::{ARCH, DEFAULT_HOST, EXT, PLATFORM, RELEASE_REGISTRY_LATEST_URL, VERSION};
 use crate::utils::http::{self, is_absolute_url};
 use crate::utils::non_empty::NonEmptySlice;
 use crate::utils::progress::{ProgressBar, ProgressBarMode};
@@ -111,6 +113,7 @@ pub struct ApiRequest {
     is_authenticated: bool,
     body: Option<Vec<u8>>,
     progress_bar_mode: ProgressBarMode,
+    url: String,
 }
 
 /// Represents an API response.
@@ -180,7 +183,7 @@ impl Api {
         region_url: Option<&str>,
     ) -> ApiResult<ApiRequest> {
         let (url, auth) = self.resolve_base_url_and_auth(url, region_url)?;
-        self.construct_api_request(method, &url, auth)
+        self.construct_api_request(method, url, auth)
     }
 
     fn resolve_base_url_and_auth(
@@ -210,7 +213,7 @@ impl Api {
     fn construct_api_request(
         &self,
         method: Method,
-        url: &str,
+        url: String,
         auth: Option<&Auth>,
     ) -> ApiResult<ApiRequest> {
         let mut handle = self
@@ -1161,7 +1164,7 @@ impl ApiRequest {
     fn create(
         mut handle: r2d2::PooledConnection<CurlConnectionManager>,
         method: &Method,
-        url: &str,
+        url: String,
         auth: Option<&Auth>,
         pipeline_env: Option<String>,
         global_headers: Option<Vec<String>>,
@@ -1196,7 +1199,7 @@ impl ApiRequest {
             Method::Delete => handle.custom_request("DELETE")?,
         }
 
-        handle.url(url)?;
+        handle.url(&url)?;
 
         let request = ApiRequest {
             handle,
@@ -1204,6 +1207,7 @@ impl ApiRequest {
             is_authenticated: false,
             body: None,
             progress_bar_mode: ProgressBarMode::Disabled,
+            url,
         };
 
         let request = match auth {
@@ -1313,11 +1317,22 @@ impl ApiRequest {
             debug!("retry number {retry_number}, max retries: {max_retries}");
             *retry_number += 1;
 
-            let mut rv = self.send_into(&mut out)?;
+            let mut rv = self.send_into(&mut out).map_err(|err| {
+                // Retry DNS failures for sentry.io, as these likely indicate
+                // a network issue. DNS failures for other domains should not
+                // be retried, to avoid masking configuration problems (e.g.
+                // if the user has mistyped their self-hosted URL).
+                if is_dns_error(&err) && self.is_sentry_io_host() {
+                    anyhow::anyhow!(RetryError::from(err))
+                } else {
+                    anyhow::anyhow!(err)
+                }
+            })?;
+
             rv.body = Some(out);
 
             if RETRY_STATUS_CODES.contains(&rv.status) {
-                anyhow::bail!(RetryError::new(rv));
+                anyhow::bail!(RetryError::Status { body: rv });
             }
 
             Ok(rv)
@@ -1336,10 +1351,41 @@ impl ApiRequest {
             })
             .call()
             .or_else(|err| match err.downcast::<RetryError>() {
-                Ok(err) => Ok(err.into_body()),
+                Ok(RetryError::Status { body }) => Ok(body),
+                Ok(RetryError::ApiError { source }) => Err(source),
                 Err(err) => Err(ApiError::with_source(ApiErrorKind::RequestFailed, err)),
             })
     }
+
+    /// Determines whether a URL has a sentry.io host (including subdomains).
+    fn is_sentry_io_host(&self) -> bool {
+        /// A regex which matches exactly "sentry.io" and hostnames ending in
+        /// ".sentry.io".
+        static SENTRY_IO_HOST_RE: LazyLock<Regex> = LazyLock::new(|| {
+            Regex::new(&format!(r"^(\S*\.)?{}$", regex::escape(DEFAULT_HOST)))
+                .expect("regex is valid")
+        });
+
+        Url::parse(&self.url)
+            .ok()
+            .map(|url| {
+                url.host_str()
+                    .is_some_and(|host| SENTRY_IO_HOST_RE.is_match(host))
+            })
+            .unwrap_or(false)
+    }
+}
+
+/// Returns true if the error source chain contains a curl DNS resolution error.
+fn is_dns_error(err: &ApiError) -> bool {
+    let mut current = err.source();
+    while let Some(error) = current {
+        if let Some(curl_err) = error.downcast_ref::<curl::Error>() {
+            return curl_err.is_couldnt_resolve_host();
+        }
+        current = error.source();
+    }
+    false
 }
 
 impl ApiResponse {

sentry_cli-3.2.2/src/commands/dart_symbol_map/mod.rs

@@ -0,0 +1,27 @@
+use anyhow::Result;
+use clap::{ArgMatches, Command};
+
+use crate::utils::args::ArgExt as _;
+
+pub mod upload;
+
+const GROUP_ABOUT: &str = "Manage Dart/Flutter symbol maps for Sentry.";
+
+pub(super) fn make_command(mut command: Command) -> Command {
+    command = command
+        .about(GROUP_ABOUT)
+        .subcommand_required(true)
+        .arg_required_else_help(true)
+        .org_arg()
+        .project_arg(false);
+
+    command = command.subcommand(upload::make_command(Command::new("upload")));
+    command
+}
+
+pub(super) fn execute(matches: &ArgMatches) -> Result<()> {
+    if let Some(sub_matches) = matches.subcommand_matches("upload") {
+        return upload::execute(sub_matches);
+    }
+    unreachable!();
+}

{sentry_cli-3.2.0 → sentry_cli-3.2.2}/src/commands/dart_symbol_map/upload.rs

@@ -4,7 +4,7 @@ use std::fmt::{Display, Formatter, Result as FmtResult};
 use std::path::Path;
 
 use anyhow::{bail, Context as _, Result};
-use clap::Args;
+use clap::{Arg, ArgMatches, Command};
 
 use crate::api::Api;
 use crate::config::Config;
@@ -42,32 +42,37 @@ impl Assemblable for DartSymbolMapObject<'_> {
     }
 }
 
-#[derive(Args, Clone)]
-pub(crate) struct DartSymbolMapUploadArgs {
-    #[arg(short = 'o', long = "org")]
-    #[arg(help = "The organization ID or slug.")]
-    pub(super) org: Option<String>,
-
-    #[arg(short = 'p', long = "project")]
-    #[arg(help = "The project ID or slug.")]
-    pub(super) project: Option<String>,
-
-    #[arg(value_name = "MAPPING")]
-    #[arg(
-        help = "Path to the dartsymbolmap JSON file (e.g. dartsymbolmap.json). Must be a JSON array of strings with an even number of entries (pairs)."
-    )]
-    pub(super) mapping: String,
-
-    #[arg(value_name = "DEBUG_FILE")]
-    #[arg(
-        help = "Path to the corresponding debug file to extract the Debug ID from. The file must contain exactly one Debug ID."
-    )]
-    pub(super) debug_file: String,
+const MAPPING_ARG: &str = "mapping";
+const DEBUG_FILE_ARG: &str = "debug_file";
+
+pub(super) fn make_command(command: Command) -> Command {
+    command
+        .about("Upload a Dart/Flutter symbol map (dartsymbolmap) for deobfuscating Dart exception types.")
+        .long_about(
+            "Upload a Dart/Flutter symbol map (dartsymbolmap) for deobfuscating Dart exception types.{n}{n}Examples:{n}  sentry-cli dart-symbol-map upload --org my-org --project my-proj path/to/dartsymbolmap.json path/to/debug/file{n}{n}The mapping must be a JSON array of strings with an even number of entries (pairs).{n}The debug file must contain exactly one Debug ID. {n}{n}\
+    This command is supported on Sentry SaaS and self-hosted versions ≥25.8.0.",
+        )
+        .arg(
+            Arg::new(MAPPING_ARG)
+                .value_name("MAPPING")
+                .required(true)
+                .help("Path to the dartsymbolmap JSON file (e.g. dartsymbolmap.json). Must be a JSON array of strings with an even number of entries (pairs)."),
+        )
+        .arg(
+            Arg::new(DEBUG_FILE_ARG)
+                .value_name("DEBUG_FILE")
+                .required(true)
+                .help("Path to the corresponding debug file to extract the Debug ID from. The file must contain exactly one Debug ID."),
+        )
 }
 
-pub(super) fn execute(args: DartSymbolMapUploadArgs) -> Result<()> {
-    let mapping_path = &args.mapping;
-    let debug_file_path = &args.debug_file;
+pub(super) fn execute(matches: &ArgMatches) -> Result<()> {
+    let mapping_path = matches
+        .get_one::<String>(MAPPING_ARG)
+        .expect("required by clap");
+    let debug_file_path = matches
+        .get_one::<String>(DEBUG_FILE_ARG)
+        .expect("required by clap");
 
     // Extract Debug ID(s) from the provided debug file
     let dif = DifFile::open_path(debug_file_path, None)?;
@@ -101,8 +106,7 @@ pub(super) fn execute(args: DartSymbolMapUploadArgs) -> Result<()> {
             let file_name = Path::new(mapping_path)
                 .file_name()
                 .and_then(OsStr::to_str)
-                .unwrap_or(mapping_path)
-                ;
+                .unwrap_or(mapping_path);
 
             let mapping_len = mapping_file_bytes.len();
             let object = DartSymbolMapObject {
@@ -113,27 +117,12 @@ pub(super) fn execute(args: DartSymbolMapUploadArgs) -> Result<()> {
 
             // Prepare chunked upload
             let api = Api::current();
-            // Resolve org and project like logs: prefer args, fallback to defaults
             let config = Config::current();
-            let (default_org, default_project) = config.get_org_and_project_defaults();
-            let org = args
-                .org
-                .as_ref()
-                .or(default_org.as_ref())
-                .ok_or_else(|| anyhow::anyhow!(
-                    "No organization specified. Please specify an organization using the --org argument."
-                ))?;
-            let project = args
-                .project
-                .as_ref()
-                .or(default_project.as_ref())
-                .ok_or_else(|| anyhow::anyhow!(
-                    "No project specified. Use --project or set a default in config."
-                ))?;
+            let org = config.get_org(matches)?;
+            let project = config.get_project(matches)?;
             let chunk_upload_options = api
                 .authenticated()?
-                .get_chunk_upload_options(org)?;
-
+                .get_chunk_upload_options(&org)?;
 
             // Early file size check against server or default limits (same as debug files)
             let effective_max_file_size = if chunk_upload_options.max_file_size > 0 {
@@ -148,7 +137,7 @@ pub(super) fn execute(args: DartSymbolMapUploadArgs) -> Result<()> {
                 );
             }
 
-            let options = ChunkOptions::new(chunk_upload_options, org, project)
+            let options = ChunkOptions::new(chunk_upload_options, &org, &project)
                 .with_max_wait(DEFAULT_MAX_WAIT);
 
             let chunked = Chunked::from(object, options.server_options().chunk_size);

{sentry_cli-3.2.0 → sentry_cli-3.2.2}/src/commands/derive_parser.rs

@@ -2,7 +2,6 @@ use crate::utils::auth_token::AuthToken;
 use crate::utils::value_parsers::{auth_token_parser, kv_parser};
 use clap::{ArgAction::SetTrue, Parser, Subcommand};
 
-use super::dart_symbol_map::DartSymbolMapArgs;
 use super::logs::LogsArgs;
 
 #[derive(Parser)]
@@ -38,5 +37,4 @@ pub(super) struct SentryCLI {
 #[derive(Subcommand)]
 pub(super) enum SentryCLICommand {
     Logs(LogsArgs),
-    DartSymbolMap(DartSymbolMapArgs),
 }

{sentry_cli-3.2.0 → sentry_cli-3.2.2}/src/commands/logs/mod.rs

@@ -39,9 +39,7 @@ pub(super) fn make_command(command: Command) -> Command {
 }
 
 pub(super) fn execute(_: &ArgMatches) -> Result<()> {
-    let SentryCLICommand::Logs(LogsArgs { subcommand }) = SentryCLI::parse().command else {
-        unreachable!("expected logs subcommand");
-    };
+    let SentryCLICommand::Logs(LogsArgs { subcommand }) = SentryCLI::parse().command;
     eprintln!("{BETA_WARNING}");
 
     match subcommand {

{sentry_cli-3.2.0 → sentry_cli-3.2.2}/src/constants.rs

@@ -8,6 +8,9 @@ pub const APP_NAME: &str = "sentrycli";
 /// The default API URL
 pub const DEFAULT_URL: &str = "https://sentry.io/";
 
+/// The default API host
+pub const DEFAULT_HOST: &str = "sentry.io";
+
 /// The version of the library
 pub const VERSION: &str = env!("CARGO_PKG_VERSION");
 

sentry_cli-3.2.0/src/commands/dart_symbol_map/mod.rs

@@ -1,47 +0,0 @@
-use anyhow::Result;
-use clap::{ArgMatches, Args, Command, Parser as _, Subcommand};
-
-pub mod upload;
-
-const GROUP_ABOUT: &str = "Manage Dart/Flutter symbol maps for Sentry.";
-const UPLOAD_ABOUT: &str =
-    "Upload a Dart/Flutter symbol map (dartsymbolmap) for deobfuscating Dart exception types.";
-const UPLOAD_LONG_ABOUT: &str =
-    "Upload a Dart/Flutter symbol map (dartsymbolmap) for deobfuscating Dart exception types.{n}{n}Examples:{n}  sentry-cli dart-symbol-map upload --org my-org --project my-proj path/to/dartsymbolmap.json path/to/debug/file{n}{n}The mapping must be a JSON array of strings with an even number of entries (pairs).{n}The debug file must contain exactly one Debug ID. {n}{n}\
-    This command is supported on Sentry SaaS and self-hosted versions ≥25.8.0.";
-
-#[derive(Args)]
-pub(super) struct DartSymbolMapArgs {
-    #[command(subcommand)]
-    pub(super) subcommand: DartSymbolMapSubcommand,
-}
-
-#[derive(Subcommand)]
-#[command(about = GROUP_ABOUT)]
-pub(super) enum DartSymbolMapSubcommand {
-    #[command(about = UPLOAD_ABOUT)]
-    #[command(long_about = UPLOAD_LONG_ABOUT)]
-    Upload(upload::DartSymbolMapUploadArgs),
-}
-
-pub(super) fn make_command(command: Command) -> Command {
-    DartSymbolMapSubcommand::augment_subcommands(
-        command
-            .about(GROUP_ABOUT)
-            .subcommand_required(true)
-            .arg_required_else_help(true),
-    )
-}
-
-pub(super) fn execute(_: &ArgMatches) -> Result<()> {
-    let subcommand = match crate::commands::derive_parser::SentryCLI::parse().command {
-        crate::commands::derive_parser::SentryCLICommand::DartSymbolMap(DartSymbolMapArgs {
-            subcommand,
-        }) => subcommand,
-        _ => unreachable!("expected dart-symbol-map subcommand"),
-    };
-
-    match subcommand {
-        DartSymbolMapSubcommand::Upload(args) => upload::execute(args),
-    }
-}