Fmt

Author: buenaflor

src/commands/dart_symbol_map/mod.rs

@@ -1,6 +1,6 @@
-use anyhow::Result;
-use clap::{Args, ArgMatches, Command, Parser as _, Subcommand};
 use crate::utils::args::ArgExt as _;
+use anyhow::Result;
+use clap::{ArgMatches, Args, Command, Parser as _, Subcommand};
 
 pub mod upload;
 

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, ArgMatches};
+use clap::{ArgMatches, Args};
 
 use crate::api::{Api, ChunkUploadCapability};
 use crate::config::Config;
@@ -45,11 +45,15 @@ impl<'a> Assemblable for DartSymbolMapObject<'a> {
 #[derive(Args, Clone)]
 pub(crate) struct DartSymbolMapUploadArgs {
     #[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).")]
+    #[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.")]
+    #[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,
 }
 

src/commands/derive_parser.rs

@@ -2,9 +2,9 @@ use crate::utils::auth_token::AuthToken;
 use crate::utils::value_parsers::{auth_token_parser, kv_parser};
 use clap::{command, ArgAction::SetTrue, Parser, Subcommand};
 
+use super::dart_symbol_map::DartSymbolMapArgs;
 use super::logs::LogsArgs;
 use super::send_metric::SendMetricArgs;
-use super::dart_symbol_map::DartSymbolMapArgs;
 
 #[derive(Parser)]
 pub(super) struct SentryCLI {

tests/integration/upload_dart_symbol_map.rs

@@ -0,0 +1,104 @@
+use std::sync::atomic::{AtomicU8, Ordering};
+
+use crate::integration::test_utils::AssertCommand;
+use crate::integration::{MockEndpointBuilder, TestManager};
+
+#[test]
+fn command_upload_dart_symbol_map_missing_capability() {
+    // Server does not advertise `dartsymbolmap` capability → command should bail early.
+    TestManager::new()
+        .mock_endpoint(
+            MockEndpointBuilder::new("GET", "/api/0/organizations/wat-org/chunk-upload/")
+                .with_response_file("debug_files/get-chunk-upload.json"),
+        )
+        .assert_cmd([
+            "dart-symbol-map",
+            "upload",
+            "tests/integration/_fixtures/dart_symbol_map/dartsymbolmap.json",
+            // Use a fixture with a single Debug ID
+            "tests/integration/_fixtures/Sentry.Samples.Console.Basic.pdb",
+        ])
+        .with_default_token()
+        .run_and_assert(AssertCommand::Failure);
+}
+
+#[test]
+fn command_upload_dart_symbol_map_chunk_upload_flow() {
+    // Happy path: server supports dartsymbolmap capability, file needs upload, then assembles to ok.
+    let call_count = AtomicU8::new(0);
+
+    TestManager::new()
+        // Server advertises capability including `dartsymbolmap`.
+        .mock_endpoint(
+            MockEndpointBuilder::new("GET", "/api/0/organizations/wat-org/chunk-upload/")
+                .with_response_file("dart_symbol_map/get-chunk-upload.json"),
+        )
+        // Accept chunk upload requests for the missing chunks; no validation needed here.
+        .mock_endpoint(MockEndpointBuilder::new(
+            "POST",
+            "/api/0/organizations/wat-org/chunk-upload/",
+        ))
+        // Assemble flow: 1) not_found (missingChunks), 2) created, 3) ok
+        .mock_endpoint(
+            MockEndpointBuilder::new(
+                "POST",
+                "/api/0/projects/wat-org/wat-project/files/difs/assemble/",
+            )
+            .with_header_matcher("content-type", "application/json")
+            .with_response_fn(move |request| {
+                let body = request.body().expect("body should be readable");
+                let body_json: serde_json::Value = serde_json::from_slice(body)
+                    .expect("request body should be valid JSON");
+
+                // The request map has a single entry keyed by checksum; reuse it in responses.
+                let (checksum, _obj) = body_json
+                    .as_object()
+                    .and_then(|m| m.iter().next())
+                    .map(|(k, v)| (k.clone(), v.clone()))
+                    .expect("assemble request must contain at least one object");
+
+                match call_count.fetch_add(1, Ordering::Relaxed) {
+                    0 => format!(
+                        "{{\"{checksum}\":{{\"state\":\"not_found\",\"missingChunks\":[\"{checksum}\"]}}}}"
+                    )
+                    .into(),
+                    1 => format!(
+                        "{{\"{checksum}\":{{\"state\":\"created\",\"missingChunks\":[]}}}}"
+                    )
+                    .into(),
+                    2 => format!(
+                        "{{\"{checksum}\":{{\"state\":\"ok\",\"detail\":null,\"missingChunks\":[],\"dif\":{{\"id\":\"1\",\"uuid\":\"00000000-0000-0000-0000-000000000000\",\"debugId\":\"00000000-0000-0000-0000-000000000000\",\"objectName\":\"dartsymbolmap.json\",\"cpuName\":\"any\",\"headers\":{{\"Content-Type\":\"application/octet-stream\"}},\"size\":1,\"sha1\":\"{checksum}\",\"dateCreated\":\"1776-07-04T12:00:00.000Z\",\"data\":{{}}}}}}}}"
+                    )
+                    .into(),
+                    n => panic!(
+                        "Only 3 calls to the assemble endpoint expected, but there were {}.",
+                        n + 1
+                    ),
+                }
+            })
+            .expect(3),
+        )
+        .assert_cmd([
+            "dart-symbol-map",
+            "upload",
+            "tests/integration/_fixtures/dart_symbol_map/dartsymbolmap.json",
+            // Use a fixture with a single Debug ID (embedded PDB)
+            "tests/integration/_fixtures/Sentry.Samples.Console.Basic.pdb",
+        ])
+        .with_default_token()
+        .run_and_assert(AssertCommand::Success);
+}
+
+#[test]
+fn command_upload_dart_symbol_map_invalid_mapping() {
+    // Invalid mapping (odd number of entries) should fail before any HTTP calls.
+    TestManager::new()
+        .assert_cmd([
+            "dart-symbol-map",
+            "upload",
+            "tests/integration/_fixtures/dart_symbol_map/dartsymbolmap-invalid.json",
+            "tests/integration/_fixtures/Sentry.Samples.Console.Basic.pdb",
+        ])
+        .with_default_token()
+        .run_and_assert(AssertCommand::Failure);
+}