fixes x2

Author: vgrozdanic

src/api/mod.rs

@@ -1422,12 +1422,19 @@ pub enum Dataset {
 
 impl Dataset {
     /// Returns the string representation of the dataset
-    pub fn as_str(&self) -> &'static str {
+    fn as_str(&self) -> &'static str {
         match self {
             Dataset::OurLogs => "ourlogs",
         }
     }
 }
+
+impl fmt::Display for Dataset {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.as_str())
+    }
+}
+
 /// Options for fetching organization events
 pub struct FetchEventsOptions<'a> {
     /// Dataset to fetch events from

src/commands/logs/list.rs

@@ -5,6 +5,18 @@ use crate::api::{Api, Dataset, FetchEventsOptions};
 use crate::config::Config;
 use crate::utils::formatting::Table;
 
+/// Validate that max_rows is greater than 0
+fn validate_max_rows(s: &str) -> Result<usize, String> {
+    let value = s
+        .parse::<usize>()
+        .map_err(|_| "invalid number".to_owned())?;
+    if value == 0 {
+        Err("max-rows must be greater than 0".to_owned())
+    } else {
+        Ok(value)
+    }
+}
+
 /// Fields to fetch from the logs API
 const LOG_FIELDS: &[&str] = &[
     "sentry.item_id",
@@ -26,6 +38,7 @@ pub(super) struct ListLogsArgs {
     project: Option<String>,
 
     #[arg(long = "max-rows", default_value = "100")]
+    #[arg(value_parser = validate_max_rows)]
     #[arg(help = "Maximum number of log entries to fetch and display (max 1000).")]
     max_rows: usize,
 
@@ -43,7 +56,7 @@ pub(super) fn execute(args: ListLogsArgs) -> Result<()> {
         .as_ref()
         .or(default_org.as_ref())
         .ok_or_else(|| {
-            anyhow::anyhow!("No organization specified. Use --org or set a default in config.")
+            anyhow::anyhow!("No organization specified. Please specify an organization using the --org argument.")
         })?
         .to_owned();
     let project = args
@@ -98,15 +111,14 @@ fn execute_single_fetch(
         .add("Message")
         .add("Trace");
 
-    if let Some(logs) = logs.get(..args.max_rows) {
-        for log in logs {
-            let row = table.add_row();
-            row.add(&log.item_id)
-                .add(&log.timestamp)
-                .add(log.severity.as_deref().unwrap_or(""))
-                .add(log.message.as_deref().unwrap_or(""))
-                .add(log.trace.as_deref().unwrap_or(""));
-        }
+    let logs_to_show = &logs[..args.max_rows.min(logs.len())];
+    for log in logs_to_show {
+        let row = table.add_row();
+        row.add(&log.item_id)
+            .add(&log.timestamp)
+            .add(log.severity.as_deref().unwrap_or(""))
+            .add(log.message.as_deref().unwrap_or(""))
+            .add(log.trace.as_deref().unwrap_or(""));
     }
 
     if table.is_empty() {

tests/integration/_cases/logs/logs-help.trycmd

@@ -1,20 +1,15 @@
+```
 $ sentry-cli logs --help
 ? success
-Manage logs in Sentry.
+Manage and query logs in Sentry. This command provides access to log entries.
 
-Usage: sentry-cli[EXE] logs [OPTIONS] <COMMAND>
+Usage: sentry-cli logs [OPTIONS] [COMMAND]
 
 Commands:
-  list  List logs from your organization.
+  list  List logs from your organization
   help  Print this message or the help of the given subcommand(s)
 
 Options:
-  -o, --org <ORG>
-          The organization ID or slug.
-
-  -p, --project <PROJECT>
-          The project ID (slug not supported).
-
       --header <KEY:VALUE>
           Custom headers that should be attached to all requests
           in key:value format.
@@ -32,4 +27,6 @@ Options:
           [aliases: silent]
 
   -h, --help
-          Print help 
+          Print help (see a summary with '-h')
+
+``` 

tests/integration/_cases/logs/logs-list-basic.trycmd

@@ -1,3 +1,6 @@
-$ sentry-cli logs list --org wat-org --project 12345 --max-rows 0
+```
+$ sentry-cli logs list --org wat-org --project 12345 --max-rows 1
 ? success
-No logs found 
+No logs found
+
+``` 

tests/integration/_cases/logs/logs-list-help.trycmd

@@ -1,29 +1,35 @@
+```
 $ sentry-cli logs list --help
 ? success
-List logs from your organization.
+List logs from your organization. Query and filter log entries from your Sentry projects. Supports
+filtering by time period, log level, and custom queries.
 
 Usage: sentry-cli[EXE] logs list [OPTIONS]
 
 Options:
-      --max-rows <MAX_ROWS>
-          Maximum number of log entries to fetch and display (max 1000). [default: 100]
-
-      --query <QUERY>
-          Query to filter logs. Example: "level:error" [default: ]
-
   -o, --org <ORG>
           The organization ID or slug.
 
-  -p, --project <PROJECT>
-          The project ID (slug not supported).
-
       --header <KEY:VALUE>
           Custom headers that should be attached to all requests
           in key:value format.
 
+  -p, --project <PROJECT>
+          The project ID (slug not supported).
+
       --auth-token <AUTH_TOKEN>
           Use the given Sentry auth token.
 
+      --max-rows <MAX_ROWS>
+          Maximum number of log entries to fetch and display (max 1000).
+          
+          [default: 100]
+
+      --query <QUERY>
+          Query to filter logs. Example: "level:error"
+          
+          [default: ]
+
       --log-level <LOG_LEVEL>
           Set the log output verbosity. [possible values: trace, debug, info, warn, error]
 
@@ -34,4 +40,6 @@ Options:
           [aliases: silent]
 
   -h, --help
-          Print help 
+          Print help (see a summary with '-h')
+
+``` 

tests/integration/_cases/logs/logs-list-no-defaults.trycmd

@@ -1,9 +1,12 @@
-$ sentry-cli logs list --org wat-org --project 12345
+```
+$ sentry-cli logs list
 ? success
-+------------------+---------------------+----------+--------------------------+---------------------+
-| Item ID          | Timestamp           | Severity | Message                  | Trace               |
-+------------------+---------------------+----------+--------------------------+---------------------+
-| test-item-id-001 | 2025-01-15T10:30:00 | info     | test_log_message_001     | test-trace-id-abc123 |
-| test-item-id-002 | 2025-01-15T10:31:00 | error    | test_error_message_002   | test-trace-id-def456 |
-| test-item-id-003 | 2025-01-15T10:32:00 | warning  | test_warning_message_003 | test-trace-id-ghi789 |
-+------------------+---------------------+----------+--------------------------+---------------------+
++------------------+---------------------------+----------+--------------------------+----------------------+
+| Item ID          | Timestamp                 | Severity | Message                  | Trace                |
++------------------+---------------------------+----------+--------------------------+----------------------+
+| test-item-id-001 | 2025-01-15T10:30:00+00:00 | info     | test_log_message_001     | test-trace-id-abc123 |
+| test-item-id-002 | 2025-01-15T10:31:00+00:00 | error    | test_error_message_002   | test-trace-id-def456 |
+| test-item-id-003 | 2025-01-15T10:32:00+00:00 | warning  | test_warning_message_003 | test-trace-id-ghi789 |
++------------------+---------------------------+----------+--------------------------+----------------------+
+
+```

tests/integration/_cases/logs/logs-list-with-custom-max-rows.trycmd

@@ -1,3 +1,8 @@
+```
 $ sentry-cli logs list --org wat-org --project 12345 --max-rows 0
-? success
-No logs found 
+? failed
+error: invalid value '0' for '--max-rows <MAX_ROWS>': max-rows must be greater than 0
+
+For more information, try '--help'.
+
+``` 

tests/integration/_cases/logs/logs-list-with-data.trycmd

@@ -5,25 +5,40 @@ fn command_logs_with_api_calls() {
     TestManager::new()
         .mock_endpoint(
             MockEndpointBuilder::new(
-                "GET",
-                "/api/0/organizations/wat-org/events/?dataset=ourlogs&field=sentry.item_id&field=trace&field=severity&field=timestamp&field=message&project=12345&per_page=100&statsPeriod=1h&sort=-timestamp",
-            )
-            .with_response_file("logs/get-logs.json"),
-        )
-        .mock_endpoint(
-            MockEndpointBuilder::new(
-                "GET",
-                "/api/0/organizations/wat-org/events/?dataset=ourlogs&field=sentry.item_id&field=trace&field=severity&field=timestamp&field=message&project=12345&per_page=50&statsPeriod=1h&sort=-timestamp",
+                "GET", 
+                "/api/0/organizations/wat-org/events/?dataset=ourlogs&field=sentry.item_id&field=trace&field=severity&field=timestamp&field=message&project=wat-project&per_page=100&statsPeriod=1h&sort=-timestamp"
             )
             .with_response_file("logs/get-logs.json"),
         )
+        .register_trycmd_test("logs/logs-list-with-data.trycmd")
+        .with_default_token();
+}
+
+#[test]
+fn command_logs_basic() {
+    TestManager::new()
         .mock_endpoint(
             MockEndpointBuilder::new(
-                "GET",
-                "/api/0/organizations/wat-org/events/?dataset=ourlogs&field=sentry.item_id&field=trace&field=severity&field=timestamp&field=message&project=12345&per_page=0&statsPeriod=1h&sort=-timestamp",
+                "GET", 
+                "/api/0/organizations/wat-org/events/?dataset=ourlogs&field=sentry.item_id&field=trace&field=severity&field=timestamp&field=message&project=12345&per_page=1&statsPeriod=1h&sort=-timestamp"
             )
-            .with_response_body("{\"data\": []}"),
+            .with_response_body(r#"{"data": []}"#),
         )
-        .register_trycmd_test("logs/*.trycmd")
+        .register_trycmd_test("logs/logs-list-basic.trycmd")
         .with_default_token();
 }
+
+#[test]
+fn command_logs_zero_max_rows() {
+    TestManager::new().register_trycmd_test("logs/logs-list-with-zero-max-rows.trycmd");
+}
+
+#[test]
+fn command_logs_help() {
+    TestManager::new().register_trycmd_test("logs/logs-help.trycmd");
+}
+
+#[test]
+fn command_logs_list_help() {
+    TestManager::new().register_trycmd_test("logs/logs-list-help.trycmd");
+}