Merge remote-tracking branch 'origin/master' into szokeasaurusrex/remove-backoff

Author: szokeasaurusrex

Cargo.lock

@@ -39,7 +39,7 @@ ignore = "0.4.20"
 # Do not update due to https://github.com/console-rs/indicatif/issues/317 and https://github.com/getsentry/sentry-cli/pull/1055
 indicatif = "0.14.0"
 itertools = "0.10.5"
-java-properties = "1.4.1"
+java-properties = "2.0.0"
 lazy_static = "1.4.0"
 libc = "0.2.139"
 log = { version = "0.4.17", features = ["std"] }

Cargo.toml

@@ -339,12 +339,12 @@ impl Api {
         };
 
         let ref_name = format!("sentry-cli-{}-{arch}{EXT}", capitalize_string(PLATFORM));
-        info!("Looking for file named: {}", ref_name);
+        info!("Looking for file named: {ref_name}");
 
         if resp.status() == 200 {
             let info: RegistryRelease = resp.convert()?;
             for (filename, _download_url) in info.file_urls {
-                info!("Found asset {}", filename);
+                info!("Found asset {filename}");
                 if filename == ref_name {
                     return Ok(Some(SentryCliRelease {
                         version: info.version,
@@ -1728,7 +1728,7 @@ impl ApiRequest {
 
         match pipeline_env {
             Some(env) => {
-                debug!("pipeline: {}", env);
+                debug!("pipeline: {env}");
                 headers
                     .append(&format!("User-Agent: sentry-cli/{VERSION} {env}"))
                     .ok();
@@ -1817,7 +1817,7 @@ impl ApiRequest {
 
     /// enables or disables redirects.  The default is off.
     pub fn follow_location(mut self, val: bool) -> ApiResult<Self> {
-        debug!("follow redirects: {}", val);
+        debug!("follow redirects: {val}");
         self.handle.follow_location(val)?;
         Ok(self)
     }
@@ -1918,7 +1918,7 @@ impl ApiResponse {
     pub fn into_result(self) -> ApiResult<Self> {
         if let Some(ref body) = self.body {
             let body = String::from_utf8_lossy(body);
-            debug!("body: {}", body);
+            debug!("body: {body}");
         }
         if self.ok() {
             return Ok(self);
@@ -2055,7 +2055,7 @@ fn log_headers(is_response: bool, data: &[u8]) {
                 };
                 format!("{}: {} {info}", &caps[1], &caps[2])
             });
-            debug!("{} {}", if is_response { ">" } else { "<" }, replaced);
+            debug!("{} {replaced}", if is_response { ">" } else { "<" });
         }
     }
 }

src/api/mod.rs

@@ -161,14 +161,11 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
                 repo_ref
                     .and_then(|r| match git_repo_head_ref(r) {
                         Ok(ref_name) => {
-                            debug!("Found current branch reference: {}", ref_name);
+                            debug!("Found current branch reference: {ref_name}");
                             Some(ref_name)
                         }
                         Err(e) => {
-                            debug!(
-                                "No valid branch reference found (likely detached HEAD): {}",
-                                e
-                            );
+                            debug!("No valid branch reference found (likely detached HEAD): {e}");
                             None
                         }
                     })
@@ -188,11 +185,11 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
                 repo_ref
                     .and_then(|r| match git_repo_base_ref(r, &cached_remote) {
                         Ok(base_ref_name) => {
-                            debug!("Found base reference: {}", base_ref_name);
+                            debug!("Found base reference: {base_ref_name}");
                             Some(base_ref_name)
                         }
                         Err(e) => {
-                            info!("Could not detect base branch reference: {}", e);
+                            info!("Could not detect base branch reference: {e}");
                             None
                         }
                     })
@@ -208,15 +205,15 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
                 repo_ref
                     .and_then(|r| match git_repo_base_repo_name_preserve_case(r) {
                         Ok(Some(base_repo_name)) => {
-                            debug!("Found base repository name: {}", base_repo_name);
+                            debug!("Found base repository name: {base_repo_name}");
                             Some(base_repo_name)
                         }
                         Ok(None) => {
                             debug!("No base repository found - not a fork");
                             None
                         }
                         Err(e) => {
-                            warn!("Could not detect base repository name: {}", e);
+                            warn!("Could not detect base repository name: {e}");
                             None
                         }
                     })
@@ -237,7 +234,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
         .map(Cow::Borrowed)
         .or_else(|| {
             vcs::find_base_sha()
-                .inspect_err(|e| debug!("Error finding base SHA: {}", e))
+                .inspect_err(|e| debug!("Error finding base SHA: {e}"))
                 .ok()
                 .flatten()
                 .map(Cow::Owned)
@@ -326,7 +323,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
                 uploaded_paths_and_urls.push((path.to_path_buf(), artifact_url));
             }
             Err(e) => {
-                debug!("Failed to upload file at path {}: {}", path.display(), e);
+                debug!("Failed to upload file at path {}: {e}", path.display());
                 errored_paths_and_reasons.push((path.to_path_buf(), e));
             }
         }
@@ -446,7 +443,7 @@ fn normalize_file(path: &Path, bytes: &[u8]) -> Result<TempFile> {
         .to_str()
         .with_context(|| format!("Failed to get relative path for {}", path.display()))?;
 
-    debug!("Adding file to zip: {}", file_name);
+    debug!("Adding file to zip: {file_name}");
 
     // Need to set the last modified time to a fixed value to ensure consistent checksums
     // This is important as an optimization to avoid re-uploading the same chunks if they're already on the server
@@ -486,11 +483,8 @@ fn upload_file(
         update to the latest version of Sentry to use the build upload command.";
 
     debug!(
-        "Uploading file to organization: {}, project: {}, build_configuration: {}, vcs_info: {:?}",
-        org,
-        project,
+        "Uploading file to organization: {org}, project: {project}, build_configuration: {}, vcs_info: {vcs_info:?}",
         build_configuration.unwrap_or("unknown"),
-        vcs_info,
     );
 
     let chunk_upload_options = api.get_chunk_upload_options(org)?.ok_or_else(|| {
@@ -569,7 +563,7 @@ fn upload_file(
         // true for ChunkedFileState::NotFound.
         if response.state == ChunkedFileState::Error {
             let message = response.detail.as_deref().unwrap_or("unknown error");
-            bail!("Failed to process uploaded files: {}", message);
+            bail!("Failed to process uploaded files: {message}");
         }
 
         if let Some(artifact_url) = response.artifact_url {

src/commands/build/upload.rs

@@ -78,8 +78,7 @@ pub(super) fn execute(args: DartSymbolMapUploadArgs) -> Result<()> {
     ids.dedup();
     match ids.len() {
         0 => bail!(
-            "No debug identifier found in the provided debug file ({}). Ensure the file contains an embedded Debug ID.",
-            debug_file_path
+            "No debug identifier found in the provided debug file ({debug_file_path}). Ensure the file contains an embedded Debug ID."
         ),
         1 => {
             let debug_id = ids.remove(0);
@@ -153,10 +152,7 @@ pub(super) fn execute(args: DartSymbolMapUploadArgs) -> Result<()> {
 
             if (mapping_len as u64) > effective_max_file_size {
                 bail!(
-                    "The dartsymbolmap '{}' exceeds the maximum allowed size ({} bytes > {} bytes).",
-                    mapping_path,
-                    mapping_len,
-                    effective_max_file_size
+                    "The dartsymbolmap '{mapping_path}' exceeds the maximum allowed size ({mapping_len} bytes > {effective_max_file_size} bytes)."
                 );
             }
 
@@ -172,8 +168,7 @@ pub(super) fn execute(args: DartSymbolMapUploadArgs) -> Result<()> {
             Ok(())
         }
         _ => bail!(
-            "Multiple debug identifiers found in the provided debug file ({}): {}. Please provide a file that contains a single Debug ID.",
-            debug_file_path,
+            "Multiple debug identifiers found in the provided debug file ({debug_file_path}): {}. Please provide a file that contains a single Debug ID.",
             ids.into_iter().map(|id| id.to_string()).collect::<Vec<_>>().join(", ")
         ),
     }

src/commands/dart_symbol_map/upload.rs

@@ -251,7 +251,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
                 upload.filter_format(DifFormat::BcSymbolMap);
                 upload.filter_format(DifFormat::PList)
             }
-            other => bail!("Unsupported type: {}", other),
+            other => bail!("Unsupported type: {other}"),
         };
     }
 

src/commands/debug_files/upload.rs

@@ -239,7 +239,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
 
         if matches.get_flag("decompress") && is_gzip_compressed(&contents) {
             contents = decompress_gzip_content(&contents).unwrap_or_else(|_| {
-                warn!("Could not decompress: {}", name);
+                warn!("Could not decompress: {name}");
                 contents
             });
         }

src/commands/files/upload.rs

@@ -288,10 +288,7 @@ pub fn execute() -> Result<()> {
         );
     }
 
-    debug!(
-        "sentry-cli version: {}, platform: \"{}\", architecture: \"{}\"",
-        VERSION, PLATFORM, ARCH
-    );
+    debug!("sentry-cli version: {VERSION}, platform: \"{PLATFORM}\", architecture: \"{ARCH}\"");
 
     info!(
         "sentry-cli was invoked with the following command line: {}",
@@ -358,7 +355,7 @@ fn setup() {
     set_logger(&Logger).unwrap();
 
     if let Err(e) = load_dotenv_result {
-        log::warn!("Failed to load .env file: {}", e);
+        log::warn!("Failed to load .env file: {e}");
     }
 }
 

src/commands/mod.rs

@@ -17,7 +17,7 @@ pub fn execute(_matches: &ArgMatches) -> Result<()> {
     let regions = authenticated_api.list_available_regions()?;
 
     let mut organizations: Vec<Organization> = vec![];
-    debug!("Available regions: {:?}", regions);
+    debug!("Available regions: {regions:?}");
 
     // Self-hosted instances won't have a region instance or prefix, so we
     // need to check before fanning out.

src/commands/organizations/list.rs

@@ -117,18 +117,15 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
 
             if commit_spec.rev.len() > MAX_COMMIT_SHA_LENGTH {
                 bail!(
-                    "Invalid commit SHA '{}'. Commit SHAs must be {} characters or less.",
-                    commit_spec.rev,
-                    MAX_COMMIT_SHA_LENGTH
+                    "Invalid commit SHA '{}'. Commit SHAs must be {MAX_COMMIT_SHA_LENGTH} characters or less.",
+                    commit_spec.rev
                 );
             }
 
             if let Some(ref prev_rev) = commit_spec.prev_rev {
                 if prev_rev.len() > MAX_COMMIT_SHA_LENGTH {
                     bail!(
-                        "Invalid previous commit SHA '{}'. Commit SHAs must be {} characters or less.",
-                        prev_rev,
-                        MAX_COMMIT_SHA_LENGTH
+                        "Invalid previous commit SHA '{prev_rev}'. Commit SHAs must be {MAX_COMMIT_SHA_LENGTH} characters or less."
                     );
                 }
             }