fixes

Author: vgrozdanic

src/api/mod.rs

@@ -1225,60 +1225,14 @@ impl<'a> AuthenticatedApi<'a> {
 
         Ok(rv)
     }
-}
-
-/// Options for fetching organization events
-#[derive(Debug, Default)]
-pub struct FetchEventsOptions<'a> {
-    /// Project ID to filter events by
-    pub project_id: Option<&'a str>,
-    /// Cursor for pagination
-    pub cursor: Option<&'a str>,
-    /// Query string to filter events
-    pub query: Option<&'a str>,
-    /// Number of events per page (default: 100)
-    pub per_page: Option<usize>,
-    /// Time period for stats (default: "1h")
-    pub stats_period: Option<&'a str>,
-    /// Sort order (default: "-timestamp")
-    pub sort: Option<&'a str>,
-}
 
-impl<'a> AuthenticatedApi<'a> {
     /// Fetch organization events from the specified dataset
     pub fn fetch_organization_events(
         &self,
         org: &str,
-        dataset: &str,
-        fields: &[&str],
-        options: FetchEventsOptions,
+        options: &FetchEventsOptions,
     ) -> ApiResult<Vec<LogEntry>> {
-        let mut params = vec![format!("dataset={}", QueryArg(dataset))];
-
-        for field in fields {
-            params.push(format!("field={}", QueryArg(field)));
-        }
-
-        if let Some(cursor) = options.cursor {
-            params.push(format!("cursor={}", QueryArg(cursor)));
-        }
-
-        if let Some(project_id) = options.project_id {
-            params.push(format!("project={}", QueryArg(project_id)));
-        }
-
-        if let Some(query) = options.query {
-            params.push(format!("query={}", QueryArg(query)));
-        }
-
-        params.push(format!("per_page={}", options.per_page.unwrap_or(100)));
-        params.push(format!(
-            "statsPeriod={}",
-            options.stats_period.unwrap_or("1h")
-        ));
-        params.push("referrer=sentry-cli-tail".to_owned());
-        params.push(format!("sort={}", options.sort.unwrap_or("-timestamp")));
-
+        let params = options.to_query_params();
         let url = format!(
             "/organizations/{}/events/?{}",
             PathArg(org),
@@ -1459,6 +1413,71 @@ impl<'a> AuthenticatedApi<'a> {
     }
 }
 
+/// Available datasets for fetching organization events
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Dataset {
+    /// Our logs dataset
+    OurLogs,
+}
+
+impl Dataset {
+    /// Returns the string representation of the dataset
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            Dataset::OurLogs => "ourlogs",
+        }
+    }
+}
+/// Options for fetching organization events
+pub struct FetchEventsOptions<'a> {
+    /// Dataset to fetch events from
+    pub dataset: Dataset,
+    /// Fields to include in the response
+    pub fields: &'a [&'a str],
+    /// Project ID to filter events by
+    pub project_id: Option<&'a str>,
+    /// Cursor for pagination
+    pub cursor: Option<&'a str>,
+    /// Query string to filter events
+    pub query: Option<&'a str>,
+    /// Number of events per page (default: 100)
+    pub per_page: Option<usize>,
+    /// Time period for stats (default: "1h")
+    pub stats_period: Option<&'a str>,
+    /// Sort order (default: "-timestamp")
+    pub sort: Option<&'a str>,
+}
+
+impl<'a> FetchEventsOptions<'a> {
+    /// Generate query parameters as a vector of strings
+    pub fn to_query_params(&self) -> Vec<String> {
+        let mut params = vec![format!("dataset={}", QueryArg(self.dataset.as_str()))];
+
+        for field in self.fields {
+            params.push(format!("field={}", QueryArg(field)));
+        }
+
+        if let Some(cursor) = self.cursor {
+            params.push(format!("cursor={}", QueryArg(cursor)));
+        }
+
+        if let Some(project_id) = self.project_id {
+            params.push(format!("project={}", QueryArg(project_id)));
+        }
+
+        if let Some(query) = self.query {
+            params.push(format!("query={}", QueryArg(query)));
+        }
+
+        params.push(format!("per_page={}", self.per_page.unwrap_or(100)));
+        params.push(format!("statsPeriod={}", self.stats_period.unwrap_or("1h")));
+
+        params.push(format!("sort={}", self.sort.unwrap_or("-timestamp")));
+
+        params
+    }
+}
+
 impl RegionSpecificApi<'_> {
     fn request(&self, method: Method, url: &str) -> ApiResult<ApiRequest> {
         self.api

src/commands/logs/common_args.rs

@@ -1,45 +1,59 @@
 use anyhow::Result;
 use clap::Args;
 
-use crate::api::{Api, FetchEventsOptions};
+use crate::api::{Api, Dataset, FetchEventsOptions};
 use crate::config::Config;
 use crate::utils::formatting::Table;
 
-use super::common_args::CommonLogsArgs;
+/// Fields to fetch from the logs API
+const LOG_FIELDS: &[&str] = &[
+    "sentry.item_id",
+    "trace",
+    "severity",
+    "timestamp",
+    "message",
+];
 
 /// Arguments for listing logs
 #[derive(Args)]
 pub(super) struct ListLogsArgs {
-    #[command(flatten)]
-    pub(super) common: CommonLogsArgs,
+    #[arg(short = 'o', long = "org")]
+    #[arg(help = "The organization ID or slug.")]
+    org: Option<String>,
 
-    #[arg(long = "max-rows")]
-    #[arg(help = "Maximum number of rows to print.")]
-    pub(super) max_rows: Option<usize>,
+    #[arg(short = 'p', long = "project")]
+    #[arg(help = "The project ID (slug not supported).")]
+    project: Option<String>,
 
-    #[arg(long = "per-page", default_value = "100")]
-    #[arg(help = "Number of log entries per request (max 1000).")]
-    pub(super) per_page: usize,
+    #[arg(long = "max-rows", default_value = "100")]
+    #[arg(help = "Maximum number of log entries to fetch and display (max 1000).")]
+    max_rows: usize,
 
     #[arg(long = "query", default_value = "")]
     #[arg(help = "Query to filter logs. Example: \"level:error\"")]
-    pub(super) query: String,
-
-    #[arg(long = "live")]
-    #[arg(help = "Live-tail logs (not implemented yet).")]
-    pub(super) live: bool,
+    query: String,
 }
 
 pub(super) fn execute(args: ListLogsArgs) -> Result<()> {
     let config = Config::current();
     let (default_org, default_project) = config.get_org_and_project_defaults();
 
-    let org = args.common.org.or(default_org).ok_or_else(|| {
-        anyhow::anyhow!("No organization specified. Use --org or set a default in config.")
-    })?;
-    let project = args.common.project.or(default_project).ok_or_else(|| {
-        anyhow::anyhow!("No project specified. Use --project or set a default in config.")
-    })?;
+    let org = args
+        .org
+        .as_ref()
+        .or(default_org.as_ref())
+        .ok_or_else(|| {
+            anyhow::anyhow!("No organization specified. Use --org or set a default in config.")
+        })?
+        .to_owned();
+    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.")
+        })?
+        .to_owned();
 
     let api = Api::current();
 
@@ -48,25 +62,32 @@ pub(super) fn execute(args: ListLogsArgs) -> Result<()> {
     } else {
         Some(args.query.as_str())
     };
-    let fields = [
-        "sentry.item_id",
-        "trace",
-        "severity",
-        "timestamp",
-        "message",
-    ];
 
+    execute_single_fetch(&api, &org, &project, query, LOG_FIELDS, &args)
+}
+
+fn execute_single_fetch(
+    api: &Api,
+    org: &str,
+    project: &str,
+    query: Option<&str>,
+    fields: &[&str],
+    args: &ListLogsArgs,
+) -> Result<()> {
     let options = FetchEventsOptions {
-        project_id: Some(&project),
+        dataset: Dataset::OurLogs,
+        fields,
+        project_id: Some(project),
+        cursor: None,
         query,
-        per_page: Some(args.per_page),
+        per_page: Some(args.max_rows),
         stats_period: Some("1h"),
-        ..Default::default()
+        sort: Some("-timestamp"),
     };
 
     let logs = api
         .authenticated()?
-        .fetch_organization_events(&org, "ourlogs", &fields, options)?;
+        .fetch_organization_events(org, &options)?;
 
     let mut table = Table::new();
     table
@@ -77,9 +98,7 @@ pub(super) fn execute(args: ListLogsArgs) -> Result<()> {
         .add("Message")
         .add("Trace");
 
-    let max_rows = std::cmp::min(logs.len(), args.max_rows.unwrap_or(usize::MAX));
-
-    if let Some(logs) = logs.get(..max_rows) {
+    if let Some(logs) = logs.get(..args.max_rows) {
         for log in logs {
             let row = table.add_row();
             row.add(&log.item_id)

src/commands/logs/list.rs

@@ -1,5 +1,3 @@
-pub mod common_args;
-
 mod list;
 
 use self::list::ListLogsArgs;
@@ -19,12 +17,12 @@ pub(super) struct LogsArgs {
 #[derive(Subcommand)]
 #[command(about = "Manage logs in Sentry")]
 #[command(long_about = "Manage and query logs in Sentry. \
-This command provides access to log entries and supports live-tailing functionality.")]
+    This command provides access to log entries.")]
 enum LogsSubcommand {
     #[command(about = LIST_ABOUT)]
     #[command(long_about = format!("{LIST_ABOUT}. \
-Query and filter log entries from your Sentry projects. \
-Supports filtering by time period, log level, and custom queries."))]
+    Query and filter log entries from your Sentry projects. \
+    Supports filtering by time period, log level, and custom queries."))]
     List(ListLogsArgs),
 }
 

src/commands/logs/mod.rs

@@ -13,10 +13,7 @@ Options:
           The organization ID or slug.
 
   -p, --project <PROJECT>
-          The project ID or slug.
-
-      --live
-          Live-tail logs (not implemented yet).
+          The project ID (slug not supported).
 
       --header <KEY:VALUE>
           Custom headers that should be attached to all requests

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

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

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

@@ -6,10 +6,7 @@ Usage: sentry-cli[EXE] logs list [OPTIONS]
 
 Options:
       --max-rows <MAX_ROWS>
-          Maximum number of rows to print.
-
-      --per-page <PER_PAGE>
-          Number of log entries per request (max 1000). [default: 100]
+          Maximum number of log entries to fetch and display (max 1000). [default: 100]
 
       --query <QUERY>
           Query to filter logs. Example: "level:error" [default: ]
@@ -18,10 +15,7 @@ Options:
           The organization ID or slug.
 
   -p, --project <PROJECT>
-          The project ID or slug.
-
-      --live
-          Live-tail logs (not implemented yet).
+          The project ID (slug not supported).
 
       --header <KEY:VALUE>
           Custom headers that should be attached to all requests

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

@@ -0,0 +1,5 @@
+$ sentry-cli logs list --org wat-org --project 12345 --max-rows 50
+? success
++------------------+---------------------+----------+----------------------+---------------------+
+| Item ID          | Timestamp           | Severity | Message              | Trace               |
++------------------+---------------------+----------+----------------------+---------------------+ 

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

@@ -1,9 +1,9 @@
-$ sentry-cli logs list --org wat-org --project wat-project
+$ sentry-cli logs list --org wat-org --project 12345
 ? 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 |
++------------------+---------------------+----------+--------------------------+---------------------+
+| 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 |
-+------------------+---------------------+----------+----------------------+---------------------+ 
++------------------+---------------------+----------+--------------------------+---------------------+

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

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