Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v6
with:
go-version: "1.25.3"
go-version: "1.25.5"

- name: Run ui build
run: make ui-build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v6
with:
go-version: 1.25.3
go-version: 1.25.5

- name: Setup Node.js
uses: actions/setup-node@v6
Expand Down
21 changes: 18 additions & 3 deletions cmd/sql-to-logsql/api/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ type queryRequest struct {
SQL string `json:"sql"`
Endpoint string `json:"endpoint,omitempty"`
BearerToken string `json:"bearerToken,omitempty"`
Start string `json:"start,omitempty"`
End string `json:"end,omitempty"`
ExecMode string `json:"execMode,omitempty"`
}

type queryResponse struct {
Expand Down Expand Up @@ -135,6 +138,13 @@ func (s *Server) handleQuery(w http.ResponseWriter, r *http.Request) {
writeJSON(w, http.StatusBadRequest, queryResponse{Error: "sql query is required"})
return
}
execMode := strings.TrimSpace(strings.ToLower(req.ExecMode))
if execMode != "" && execMode != "translate" && execMode != "query" {
writeJSON(w, http.StatusBadRequest, queryResponse{Error: "invalid execMode: possible values are translate and query"})
return
}
start := strings.TrimSpace(req.Start)
end := strings.TrimSpace(req.End)

statement, err := processQuery(sqlText, s.sp)
if err != nil {
Expand All @@ -158,9 +168,14 @@ func (s *Server) handleQuery(w http.ResponseWriter, r *http.Request) {
}

resp := queryResponse{LogsQL: statement.LogsQL}
data, err := s.api.Execute(r.Context(), statement, vlogs.EndpointConfig{
Endpoint: req.Endpoint,
BearerToken: req.BearerToken,
data, err := s.api.Execute(r.Context(), statement, vlogs.RequestParams{
EndpointConfig: vlogs.EndpointConfig{
Endpoint: req.Endpoint,
BearerToken: req.BearerToken,
},
Start: start,
End: end,
ExecMode: execMode,
})
if err != nil {
log.Printf("ERROR: query execution failed: %v", err)
Expand Down
12 changes: 11 additions & 1 deletion cmd/sql-to-logsql/api/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ func TestHandleQuerySuccess(t *testing.T) {
if got := req.Form.Get("query"); got != "*" {
t.Fatalf("unexpected query sent: %q", got)
}
if got := req.Form.Get("start"); got != "1764770090000" {
t.Fatalf("unexpected start sent: %q", got)
}
if got := req.Form.Get("end"); got != "1764856490000" {
t.Fatalf("unexpected end sent: %q", got)
}
resp := &http.Response{
StatusCode: http.StatusOK,
Body: io.NopCloser(bytes.NewBufferString(`{"status":"ok"}`)),
Expand All @@ -41,7 +47,11 @@ func TestHandleQuerySuccess(t *testing.T) {
}),
})

reqBody := map[string]string{"sql": "SELECT * FROM logs"}
reqBody := map[string]string{
"sql": "SELECT * FROM logs",
"start": "1764770090000",
"end": "1764856490000",
}
buf, _ := json.Marshal(reqBody)
req := httptest.NewRequest(http.MethodPost, "/api/v1/sql-to-logsql", bytes.NewReader(buf))
req.Header.Set("Content-Type", "application/json")
Expand Down
Loading