sentry-cli 2.47.0__tar.gz → 2.48.0__tar.gz

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/Cargo.lock

@@ -2692,7 +2692,7 @@ dependencies = [
 
 [[package]]
 name = "sentry-cli"
-version = "2.47.0"
+version = "2.48.0"
 dependencies = [
  "anyhow",
  "anylog",

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Armin Ronacher <armin.ronacher@active-4.com>"]
 build = "build.rs"
 name = "sentry-cli"
-version = "2.47.0"
+version = "2.48.0"
 edition = "2021"
 rust-version = "1.86"
 
@@ -100,6 +100,8 @@ unstable-mobile-app = ["apple-catalog-parsing"]
 
 [workspace.lints.clippy]
 allow-attributes = "warn"
+str-to-string = "warn"
+string-to-string = "warn"
 unnecessary-wraps = "warn"
 unwrap-used = "warn"
 
@@ -112,7 +114,6 @@ workspace = true
 
 [target."cfg(target_os = \"macos\")".dependencies]
 mac-process-info = "0.2.0"
-apple-catalog-parsing = { path = "apple-catalog-parsing" }
 
 [target."cfg(unix)"]
 

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/PKG-INFO

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

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/apple-catalog-parsing/build.rs

@@ -2,6 +2,9 @@ use std::env;
 use std::process::Command;
 
 fn main() {
+    /// Environment variable to disable Swift sandboxing.
+    const SWIFT_DISABLE_SANDBOX: &str = "SWIFT_DISABLE_SANDBOX";
+
     let target = env::var("TARGET").expect("TARGET is set for build scripts");
     let mut target_bits = target.split('-');
 
@@ -20,21 +23,34 @@ fn main() {
 
     println!("cargo:rerun-if-changed=native/swift/AssetCatalogParser");
 
+    // Allow swift to be run with `--disable-sandbox` in case cargo has been invoked inside a
+    // sandbox already. Nested sandboxes are not allowed on Darwin.
+    println!("cargo:rerun-if-env-changed={SWIFT_DISABLE_SANDBOX}");
+
     let out_dir = env::var("OUT_DIR").expect("OUT_DIR is set for build scripts");
 
     // Compile Swift code
     let status = Command::new("swift")
-        .args([
-            "build",
-            "-c",
-            "release",
-            "--package-path",
-            "native/swift/AssetCatalogParser",
-            "--scratch-path",
-            &format!("{out_dir}/swift-scratch"),
-            "--triple",
-            &format!("{arch}-apple-macosx10.12"),
-        ])
+        .args(
+            [
+                "build",
+                "-c",
+                "release",
+                "--package-path",
+                "native/swift/AssetCatalogParser",
+                "--scratch-path",
+                &format!("{out_dir}/swift-scratch"),
+                "--triple",
+                &format!("{arch}-apple-macosx10.12"),
+            ]
+            .into_iter()
+            .chain(
+                env::var(SWIFT_DISABLE_SANDBOX)
+                    .ok()
+                    .filter(|s| s == "1")
+                    .map(|_| "--disable-sandbox"),
+            ),
+        )
         .status()
         .expect("Failed to compile SPM");
 
@@ -73,7 +89,7 @@ fn main() {
     let developer_dir_path = String::from_utf8(developer_dir.stdout)
         .expect("Failed to convert developer directory to UTF-8")
         .trim()
-        .to_string();
+        .to_owned();
 
     println!(
         "cargo:rustc-link-search={developer_dir_path}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx"

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/sentry_cli.egg-info/PKG-INFO

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

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/api/mod.rs

@@ -473,7 +473,7 @@ impl<'a> AuthenticatedApi<'a> {
         checksums: &[String],
     ) -> ApiResult<Vec<Artifact>> {
         let mut rv = vec![];
-        let mut cursor = "".to_string();
+        let mut cursor = "".to_owned();
         loop {
             let mut path = if let Some(project) = project {
                 format!(
@@ -1080,7 +1080,7 @@ impl<'a> AuthenticatedApi<'a> {
     /// we're issuing a request to a monolith deployment.
     pub fn list_organizations(&self, region: Option<&Region>) -> ApiResult<Vec<Organization>> {
         let mut rv = vec![];
-        let mut cursor = "".to_string();
+        let mut cursor = "".to_owned();
         loop {
             let current_path = &format!("/organizations/?cursor={}", QueryArg(&cursor));
             let resp = if let Some(rg) = region {
@@ -1128,7 +1128,7 @@ impl<'a> AuthenticatedApi<'a> {
     /// List all monitors associated with an organization
     pub fn list_organization_monitors(&self, org: &str) -> ApiResult<Vec<Monitor>> {
         let mut rv = vec![];
-        let mut cursor = "".to_string();
+        let mut cursor = "".to_owned();
         loop {
             let resp = self.get(&format!(
                 "/organizations/{}/monitors/?cursor={}",
@@ -1156,7 +1156,7 @@ impl<'a> AuthenticatedApi<'a> {
     /// List all projects associated with an organization
     pub fn list_organization_projects(&self, org: &str) -> ApiResult<Vec<Project>> {
         let mut rv = vec![];
-        let mut cursor = "".to_string();
+        let mut cursor = "".to_owned();
         loop {
             let resp = self.get(&format!(
                 "/organizations/{}/projects/?cursor={}",
@@ -1189,7 +1189,7 @@ impl<'a> AuthenticatedApi<'a> {
         max_pages: usize,
     ) -> ApiResult<Vec<ProcessedEvent>> {
         let mut rv = vec![];
-        let mut cursor = "".to_string();
+        let mut cursor = "".to_owned();
         let mut requests_no = 0;
 
         loop {
@@ -1236,7 +1236,7 @@ impl<'a> AuthenticatedApi<'a> {
         query: Option<String>,
     ) -> ApiResult<Vec<Issue>> {
         let mut rv = vec![];
-        let mut cursor = "".to_string();
+        let mut cursor = "".to_owned();
         let mut requests_no = 0;
 
         let url = if let Some(query) = query {
@@ -1283,7 +1283,7 @@ impl<'a> AuthenticatedApi<'a> {
     /// List all repos associated with an organization
     pub fn list_organization_repos(&self, org: &str) -> ApiResult<Vec<Repo>> {
         let mut rv = vec![];
-        let mut cursor = "".to_string();
+        let mut cursor = "".to_owned();
         loop {
             let path = format!(
                 "/organizations/{}/repos/?cursor={}",
@@ -1930,7 +1930,7 @@ fn log_headers(is_response: bool, data: &[u8]) {
 
             let replaced = AUTH_RE.replace_all(line, |caps: &Captures<'_>| {
                 let info = if &caps[1].to_lowercase() == "basic" {
-                    caps[3].split(':').next().unwrap().to_string()
+                    caps[3].split(':').next().unwrap().to_owned()
                 } else {
                     format!("{}***", &caps[3][..std::cmp::min(caps[3].len(), 8)])
                 };

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/api/pagination.rs

@@ -33,7 +33,7 @@ impl FromStr for Pagination {
 
             *target = Some(Link {
                 results: item.get("results") == Some(&"true"),
-                cursor: (*item.get("cursor").unwrap_or(&"")).to_string(),
+                cursor: (*item.get("cursor").unwrap_or(&"")).to_owned(),
             });
         }
 

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/commands/bash_hook.rs

@@ -117,7 +117,7 @@ fn send_event(
         );
     }
 
-    let mut cmd = "unknown".to_string();
+    let mut cmd = "unknown".to_owned();
     let mut exit_code = 1;
     let mut frames = vec![];
 
@@ -129,7 +129,7 @@ fn send_event(
             // meta info
             if line.starts_with('@') {
                 if let Some(rest) = line.strip_prefix("@command:") {
-                    cmd = rest.to_string();
+                    cmd = rest.to_owned();
                 } else if let Some(rest) = line.strip_prefix("@exit_code:") {
                     exit_code = rest.parse().unwrap_or(exit_code);
                 } else {
@@ -170,7 +170,7 @@ fn send_event(
                 if let Ok(f) = fs::File::open(filename) {
                     let lines: Vec<_> = BufReader::new(f)
                         .lines()
-                        .map(|x| x.unwrap_or_else(|_| "".to_string()))
+                        .map(|x| x.unwrap_or_else(|_| "".to_owned()))
                         .collect();
                     source_caches.insert(filename, lines);
                 } else {

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/commands/debug_files/bundle_jvm.rs

@@ -96,7 +96,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
             let local_path_jvm_ext = local_path.with_extension("jvm");
             let url = format!("~/{}", path_as_url(&local_path_jvm_ext));
             (
-                url.to_string(),
+                url.clone(),
                 SourceFile {
                     url,
                     path: source.path.clone(),

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/commands/files/upload.rs

@@ -143,7 +143,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
                 bail!("Invalid header. Needs to be in key:value format");
             }
             let (key, value) = header.split_once(':').unwrap();
-            headers.insert(key.trim().to_string(), value.trim().to_string());
+            headers.insert(key.trim().to_owned(), value.trim().to_owned());
         }
     };
 
@@ -205,7 +205,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
                 let url = format!("{}/{}{}", url_prefix, path_as_url(local_path), url_suffix);
 
                 (
-                    url.to_string(),
+                    url.clone(),
                     SourceFile {
                         url,
                         path: source.path.clone(),

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/commands/info.rs

@@ -70,7 +70,7 @@ fn get_config_status_json() -> Result<()> {
     let (org, project) = config.get_org_and_project_defaults();
     rv.config.org = org;
     rv.config.project = project;
-    rv.config.url = Some(config.get_base_url()?.to_string());
+    rv.config.url = Some(config.get_base_url()?.to_owned());
 
     rv.auth.auth_type = config.get_auth().map(|val| match val {
         Auth::Token(_) => "token".into(),

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/commands/login.rs

@@ -153,7 +153,7 @@ fn get_org_from_token(token: &AuthToken) -> Option<&str> {
 fn format_org_info(org: Option<&str>) -> String {
     match org {
         Some(org_name) => format!("for organization {org_name}"),
-        None => "not tied to any specific organization".to_string(),
+        None => "not tied to any specific organization".to_owned(),
     }
 }
 

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/commands/mobile_app/upload.rs

@@ -1,5 +1,9 @@
 use std::borrow::Cow;
+#[cfg(not(windows))]
+use std::fs;
 use std::io::Write;
+#[cfg(not(windows))]
+use std::os::unix::fs::PermissionsExt;
 use std::path::Path;
 
 use anyhow::{anyhow, bail, Context as _, Result};
@@ -34,7 +38,8 @@ pub fn make_command(command: Command) -> Command {
                 .value_name("PATH")
                 .help("The path to the mobile app files to upload. Supported files include Apk, Aab or XCArchive.")
                 .num_args(1..)
-                .action(ArgAction::Append),
+                .action(ArgAction::Append)
+                .required(true),
         )
         .arg(
             Arg::new("sha")
@@ -251,7 +256,14 @@ fn normalize_directory(path: &Path) -> Result<TempFile> {
         .filter(|entry| entry.path().is_file())
         .map(|entry| {
             let entry_path = entry.into_path();
-            let relative_path = entry_path.strip_prefix(path)?.to_owned();
+            let relative_path = entry_path
+                .strip_prefix(path.parent().ok_or_else(|| {
+                    anyhow!(
+                        "Cannot determine parent directory for path: {}",
+                        path.display()
+                    )
+                })?)?
+                .to_owned();
             Ok((entry_path, relative_path))
         })
         .collect::<Result<Vec<_>>>()?
@@ -268,6 +280,10 @@ fn normalize_directory(path: &Path) -> Result<TempFile> {
     for (entry_path, relative_path) in entries {
         debug!("Adding file to zip: {}", relative_path.display());
 
+        #[cfg(not(windows))]
+        // On Unix, we need to preserve the file permissions.
+        let options = options.unix_permissions(fs::metadata(&entry_path)?.permissions().mode());
+
         zip.start_file(relative_path.to_string_lossy(), options)?;
         let file_byteview = ByteView::open(&entry_path)?;
         zip.write_all(file_byteview.as_slice())?;
@@ -301,14 +317,12 @@ fn upload_file(
         build_configuration.unwrap_or("unknown")
     );
 
-    let chunk_upload_options = api
-        .get_chunk_upload_options(org)?
-        .ok_or_else(|| {
-            anyhow!(
-                "The Sentry server lacks chunked uploading support, which \
+    let chunk_upload_options = api.get_chunk_upload_options(org)?.ok_or_else(|| {
+        anyhow!(
+            "The Sentry server lacks chunked uploading support, which \
                 is required for mobile app uploads. {SELF_HOSTED_ERROR_HINT}"
-            )
-        })?;
+        )
+    })?;
 
     if !chunk_upload_options.supports(ChunkUploadCapability::PreprodArtifacts) {
         bail!(
@@ -402,3 +416,27 @@ fn poll_assemble(
 
     Ok(())
 }
+
+#[cfg(not(windows))]
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::fs;
+    use zip::ZipArchive;
+
+    #[test]
+    fn test_normalize_directory_preserves_top_level_directory_name() -> Result<()> {
+        let temp_dir = crate::utils::fs::TempDir::create()?;
+        let test_dir = temp_dir.path().join("MyApp.xcarchive");
+        fs::create_dir_all(test_dir.join("Products"))?;
+        fs::write(test_dir.join("Products").join("app.txt"), "test content")?;
+
+        let result_zip = normalize_directory(&test_dir)?;
+        let zip_file = fs::File::open(result_zip.path())?;
+        let mut archive = ZipArchive::new(zip_file)?;
+        let file = archive.by_index(0)?;
+        let file_path = file.name();
+        assert_eq!(file_path, "MyApp.xcarchive/Products/app.txt");
+        Ok(())
+    }
+}

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/commands/mod.rs

@@ -19,7 +19,33 @@ use crate::utils::system::{load_dotenv, print_error, set_panic_hook, QuietExit};
 use crate::utils::update::run_sentrycli_update_nagger;
 use crate::utils::value_parsers::auth_token_parser;
 
+mod bash_hook;
+mod debug_files;
+mod deploys;
 mod derive_parser;
+mod events;
+mod files;
+mod info;
+mod issues;
+mod login;
+mod mobile_app;
+mod monitors;
+mod organizations;
+mod projects;
+mod react_native;
+mod releases;
+mod repos;
+mod send_envelope;
+mod send_event;
+mod send_metric;
+mod sourcemaps;
+#[cfg(not(feature = "managed"))]
+mod uninstall;
+#[cfg(not(feature = "managed"))]
+mod update;
+mod upload_dif;
+mod upload_dsym;
+mod upload_proguard;
 
 macro_rules! each_subcommand {
     ($mac:ident) => {
@@ -53,14 +79,6 @@ macro_rules! each_subcommand {
     };
 }
 
-macro_rules! import_subcommand {
-    ($name:ident) => {
-        pub mod $name;
-    };
-}
-
-each_subcommand!(import_subcommand);
-
 const ABOUT: &str = "
 Command line utility for Sentry.
 
@@ -88,7 +106,7 @@ const UPDATE_NAGGER_CMDS: &[&str] = &[
 const AUTH_TOKEN_ARG: &str = "auth-token";
 
 fn print_completions<G: Generator>(gen: G, cmd: &mut Command) {
-    generate(gen, cmd, cmd.get_name().to_string(), &mut io::stdout());
+    generate(gen, cmd, cmd.get_name().to_owned(), &mut io::stdout());
 }
 
 fn preexecute_hooks() -> Result<bool> {

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/commands/monitors/run.rs

@@ -140,10 +140,10 @@ fn execute_checkin(
 
     let open_checkin = MonitorCheckIn {
         check_in_id,
-        monitor_slug: monitor_slug.to_string(),
+        monitor_slug: monitor_slug.to_owned(),
         status: MonitorCheckInStatus::InProgress,
         duration: None,
-        environment: Some(environment.to_string()),
+        environment: Some(environment.to_owned()),
         monitor_config,
     };
 
@@ -166,10 +166,10 @@ fn execute_checkin(
 
     let close_checkin = MonitorCheckIn {
         check_in_id,
-        monitor_slug: monitor_slug.to_string(),
+        monitor_slug: monitor_slug.to_owned(),
         status,
         duration,
-        environment: Some(environment.to_string()),
+        environment: Some(environment.to_owned()),
         monitor_config: None,
     };
 

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/commands/react_native/gradle.rs

@@ -119,9 +119,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
 
     if let Some(version) = version {
         for dist in matches.get_many::<String>("dist").unwrap() {
-            println!(
-                "Uploading sourcemaps for release {version} distribution {dist}"
-            );
+            println!("Uploading sourcemaps for release {version} distribution {dist}");
 
             processor.upload(&UploadContext {
                 org: &org,

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/commands/react_native/xcode.rs

@@ -145,7 +145,7 @@ fn find_hermesc() -> String {
         }
     }
 
-    let pods_root_path = env::var("PODS_ROOT").unwrap_or("".to_string());
+    let pods_root_path = env::var("PODS_ROOT").unwrap_or("".to_owned());
     format!("{pods_root_path}/hermes-engine/destroot/bin/hermesc")
 }
 
@@ -219,10 +219,10 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
         let url = url.trim_end_matches('/');
         bundle_file = TempFile::create()?;
         bundle_path = bundle_file.path().to_path_buf();
-        bundle_url = "~/index.ios.bundle".to_string();
+        bundle_url = "~/index.ios.bundle".to_owned();
         sourcemap_file = TempFile::create()?;
         sourcemap_path = sourcemap_file.path().to_path_buf();
-        sourcemap_url = "~/index.ios.map".to_string();
+        sourcemap_url = "~/index.ios.map".to_owned();
 
         // wait up to 10 seconds for the server to be up.
         if !api.wait_until_available(url, Duration::seconds(10))? {
@@ -359,7 +359,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
                 match InfoPlist::discover_from_env() {
                     Ok(Some(plist)) => {
                         // Successfully discovered and parsed Info.plist
-                        let dist_string = plist.build().to_string();
+                        let dist_string = plist.build().to_owned();
                         let release_string =
                             format!("{}@{}+{}", plist.bundle_id(), plist.version(), dist_string);
                         info!("Parse result from Info.plist: {:?}", &plist);
@@ -418,7 +418,7 @@ pub fn wrap_call() -> Result<()> {
     let mut sourcemap_path = None;
     let bundle_command = env::var("SENTRY_RN_BUNDLE_COMMAND");
     let compose_source_maps_path = env::var("COMPOSE_SOURCEMAP_PATH");
-    let no_debug_id = env::var("SENTRY_RN_NO_DEBUG_ID").unwrap_or("0".to_string()) == "1";
+    let no_debug_id = env::var("SENTRY_RN_NO_DEBUG_ID").unwrap_or("0".to_owned()) == "1";
 
     let report_file_path = env::var("SENTRY_RN_SOURCEMAP_REPORT").unwrap();
     let mut sourcemap_report: SourceMapReport = if std::path::Path::new(&report_file_path).exists()
@@ -442,11 +442,11 @@ pub fn wrap_call() -> Result<()> {
             if item == "--sourcemap-output" {
                 sourcemap_path = iter.next().cloned();
             } else if let Some(rest) = item.strip_prefix("--sourcemap-output=") {
-                sourcemap_path = Some(rest.to_string());
+                sourcemap_path = Some(rest.to_owned());
             } else if item == "--bundle-output" {
                 bundle_path = iter.next().cloned();
             } else if let Some(rest) = item.strip_prefix("--bundle-output=") {
-                bundle_path = Some(rest.to_string());
+                bundle_path = Some(rest.to_owned());
             }
         }
 
@@ -551,8 +551,8 @@ pub fn wrap_call() -> Result<()> {
                         .get("debugId")
                         .or_else(|| packager_sourcemap.get("debug_id"))
                     {
-                        hermes_sourcemap.insert("debugId".to_string(), debug_id.clone());
-                        hermes_sourcemap.insert("debug_id".to_string(), debug_id.clone());
+                        hermes_sourcemap.insert("debugId".to_owned(), debug_id.clone());
+                        hermes_sourcemap.insert("debug_id".to_owned(), debug_id.clone());
 
                         hermes_sourcemap_file = fs::File::create(hermes_sourcemap_path)?;
                         serde_json::to_writer(&mut hermes_sourcemap_file, &hermes_sourcemap)?;

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/commands/send_event.rs

@@ -316,7 +316,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
 
     if let Some(fingerprint) = matches.get_many::<String>("fingerprint") {
         event.fingerprint = fingerprint
-            .map(|x| x.to_string().into())
+            .map(|x| x.clone().into())
             .collect::<Vec<_>>()
             .into();
     }

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/commands/send_metric/common_args.rs

@@ -51,7 +51,7 @@ impl FromStr for MetricName {
             .ok_or_else(|| anyhow!("metric name cannot be empty"))?
             .is_ascii_alphabetic()
         {
-            Ok(MetricName(s.to_string()))
+            Ok(MetricName(s.to_owned()))
         } else {
             Err(anyhow!(
                 "metric name must start with an alphabetic character"

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/commands/send_metric/mod.rs

@@ -38,7 +38,7 @@ This command will validate input parameters and attempt to send a metric to \
 Sentry. Due to network errors and rate limits, the metric is not guaranteed to \
 arrive. Check the debug output for transmission errors by passing --log-level=\
 debug or setting `SENTRY_LOG_LEVEL=debug`."))]
-#[command(hide=true)]
+#[command(hide = true)]
 enum SendMetricSubcommand {
     #[command(about = format!("[DEPRECATED] {INCREMENT_ABOUT}"))]
     #[command(long_about = format!("{DEPRECATION_MESSAGE}{{n}}{{n}}{INCREMENT_ABOUT}"))]

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/commands/sourcemaps/explain.rs

@@ -333,7 +333,7 @@ fn print_mapped_frame(frame: &Frame) {
 fn extract_release(event: &ProcessedEvent) -> Result<String> {
     if let Some(release) = event.release.as_ref() {
         success(format!("Event has release name: {release}"));
-        Ok(release.to_string())
+        Ok(release.clone())
     } else {
         error("Event is missing a release name");
         tip("Configure 'release' option in the SDK.\n  \

{sentry_cli-2.47.0 → sentry_cli-2.48.0}/src/config.rs

@@ -78,7 +78,7 @@ impl Config {
             .unwrap_or_default();
 
         let url = if token_url.is_empty() {
-            manually_configured_url.unwrap_or_else(|| DEFAULT_URL.to_string())
+            manually_configured_url.unwrap_or_else(|| DEFAULT_URL.to_owned())
         } else {
             warn_about_conflicting_urls(token_url, manually_configured_url.as_deref());
             token_url.into()
@@ -184,7 +184,7 @@ impl Config {
                 self.cached_token_data = val.payload().cloned();
 
                 if let Some(token_url) = self.cached_token_data.as_ref().map(|td| td.url.as_str()) {
-                    self.cached_base_url = token_url.to_string();
+                    self.cached_base_url = token_url.to_owned();
                 }
 
                 self.ini.set_to(
@@ -194,8 +194,7 @@ impl Config {
                 );
             }
             Some(Auth::Key(ref val)) => {
-                self.ini
-                    .set_to(Some("auth"), "api_key".into(), val.to_string());
+                self.ini.set_to(Some("auth"), "api_key".into(), val.clone());
             }
             None => {}
         }
@@ -351,7 +350,7 @@ impl Config {
                     format_err!("An organization ID or slug is required (provide with --org)")
                 }),
             (None, Some(cli_org)) => Ok(cli_org),
-            (Some(token_org), None) => Ok(token_org.to_string()),
+            (Some(token_org), None) => Ok(token_org.clone()),
             (Some(token_org), Some(cli_org)) => {
                 if cli_org != *token_org {
                     log::warn!(
@@ -381,7 +380,7 @@ impl Config {
     // Backward compatibility with `releases files <VERSION>` commands.
     pub fn get_release_with_legacy_fallback(&self, matches: &ArgMatches) -> Result<String> {
         if let Some(version) = matches.get_one::<String>("version") {
-            Ok(version.to_string())
+            Ok(version.clone())
         } else {
             self.get_release(matches)
         }
@@ -656,7 +655,7 @@ fn load_cli_config() -> Result<(PathBuf, Ini)> {
         let ini = Ini::read_from(&mut f).context(format!("Failed to parse {file_desc}"))?;
         for (section, props) in ini.iter() {
             for (key, value) in props.iter() {
-                rv.set_to(section, key.to_string(), value.to_owned());
+                rv.set_to(section, key.to_owned(), value.to_owned());
             }
         }
         (project_config_path, rv)
@@ -681,7 +680,7 @@ fn load_cli_config() -> Result<(PathBuf, Ini)> {
                     let mut iter = key.rsplitn(2, '.');
                     if let Some(key) = iter.next() {
                         let section = iter.next();
-                        rv.set_to(section, key.to_string(), value);
+                        rv.set_to(section, key.to_owned(), value);
                     } else {
                         debug!("Incorrect properties file key: {}", key);
                     }
@@ -780,9 +779,9 @@ fn get_default_vcs_remote(ini: &Ini) -> String {
     if let Ok(remote) = env::var("SENTRY_VCS_REMOTE") {
         remote
     } else if let Some(remote) = ini.get_from(Some("defaults"), "vcs_remote") {
-        remote.to_string()
+        remote.to_owned()
     } else {
-        "origin".to_string()
+        "origin".to_owned()
     }
 }
 
@@ -799,7 +798,7 @@ mod tests {
             process_bound: false,
             ini: Default::default(),
             cached_auth: None,
-            cached_base_url: "https://sentry.io/".to_string(),
+            cached_base_url: "https://sentry.io/".to_owned(),
             cached_headers: None,
             cached_log_level: LevelFilter::Off,
             cached_vcs_remote: String::new(),