From d79b658fb314c02d305ecabc8cd5c1bfad0679b3 Mon Sep 17 00:00:00 2001 From: shiv Date: Wed, 8 Jul 2026 13:28:02 +0530 Subject: [PATCH 1/2] fix: update logs query client and test to handle new schema wrapper --- cmd/logs_query.go | 30 +++++++++++++++++++----------- cmd/logs_query_test.go | 16 ++++++++++------ 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/cmd/logs_query.go b/cmd/logs_query.go index 0fb8c3b..a2b0e53 100644 --- a/cmd/logs_query.go +++ b/cmd/logs_query.go @@ -51,10 +51,14 @@ var logsQueryCmd = &cobra.Command{ req := client.NewRequest(` query FetchLogs($request: FetchLogRequest!) { logs_list(request: $request) { - timestamp - severity - message - labels + logs { + timestamp + severity + message + labels + } + query + provider } } `) @@ -70,11 +74,15 @@ var logsQueryCmd = &cobra.Command{ req.Var("request", requestVars) var respData struct { - LogsList []struct { - Timestamp string `json:"timestamp"` - Severity string `json:"severity"` - Message string `json:"message"` - Labels json.RawMessage `json:"labels"` + LogsList struct { + Logs []struct { + Timestamp string `json:"timestamp"` + Severity string `json:"severity"` + Message string `json:"message"` + Labels json.RawMessage `json:"labels"` + } `json:"logs"` + Query string `json:"query"` + Provider string `json:"provider"` } `json:"logs_list"` } @@ -82,13 +90,13 @@ var logsQueryCmd = &cobra.Command{ return err } - if len(respData.LogsList) == 0 { + if len(respData.LogsList.Logs) == 0 { fmt.Println("No logs found.") return nil } table := format.TabularData{ - Data: respData.LogsList, + Data: respData.LogsList.Logs, Fields: []format.TableField{ {Header: "Timestamp", Field: "Timestamp"}, {Header: "Severity", Field: "Severity"}, diff --git a/cmd/logs_query_test.go b/cmd/logs_query_test.go index 2e8228a..f345acc 100644 --- a/cmd/logs_query_test.go +++ b/cmd/logs_query_test.go @@ -8,13 +8,17 @@ import ( func TestLogsQuery_Unit(t *testing.T) { mockData := map[string]any{ - "logs_list": []map[string]any{ - { - "timestamp": "2025-10-15T10:00:00Z", - "severity": "info", - "message": "Log message 1", - "labels": "{}", + "logs_list": map[string]any{ + "logs": []map[string]any{ + { + "timestamp": "2025-10-15T10:00:00Z", + "severity": "info", + "message": "Log message 1", + "labels": "{}", + }, }, + "query": "test", + "provider": "nudgebee", }, } From 922ed68796ccb6dc35e0676d9b11beb50408ac6a Mon Sep 17 00:00:00 2001 From: shiv Date: Wed, 8 Jul 2026 14:01:11 +0530 Subject: [PATCH 2/2] address review feedback: remove unused query and provider fields --- cmd/logs_query.go | 4 ---- cmd/logs_query_test.go | 2 -- 2 files changed, 6 deletions(-) diff --git a/cmd/logs_query.go b/cmd/logs_query.go index a2b0e53..d7dee58 100644 --- a/cmd/logs_query.go +++ b/cmd/logs_query.go @@ -57,8 +57,6 @@ var logsQueryCmd = &cobra.Command{ message labels } - query - provider } } `) @@ -81,8 +79,6 @@ var logsQueryCmd = &cobra.Command{ Message string `json:"message"` Labels json.RawMessage `json:"labels"` } `json:"logs"` - Query string `json:"query"` - Provider string `json:"provider"` } `json:"logs_list"` } diff --git a/cmd/logs_query_test.go b/cmd/logs_query_test.go index f345acc..cde7e53 100644 --- a/cmd/logs_query_test.go +++ b/cmd/logs_query_test.go @@ -17,8 +17,6 @@ func TestLogsQuery_Unit(t *testing.T) { "labels": "{}", }, }, - "query": "test", - "provider": "nudgebee", }, }