镜像站点 · 本页由第三方 GitHub 只读镜像提供,非 GitHub 官方站点,不接受任何登录或凭据输入。前往 github.com
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
1 change: 1 addition & 0 deletions changes/55105-fleetctl-live-query-errors
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fixed `fleetctl` printing "unknown msg type error" instead of the server's error message when a live report fails.
7 changes: 7 additions & 0 deletions server/service/client_live_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,13 @@ func (c *Client) LiveQueryWithContext(
}
resHandler.status.Store(&status)

case "error":
var errMsg string
if err := json.Unmarshal(msg.Data, &errMsg); err != nil {
errMsg = string(msg.Data)
}
resHandler.errors <- ctxerr.New(ctx, errMsg)

default:
resHandler.errors <- ctxerr.Errorf(ctx, "unknown msg type %s", msg.Type)
}
Expand Down
42 changes: 42 additions & 0 deletions server/service/client_live_query_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,45 @@ func TestLiveQueryWithContext(t *testing.T) {
<-ctx.Done()
assert.True(t, gotResults)
}

func TestLiveQueryErrorFrame(t *testing.T) {
upgrader := websocket.Upgrader{}
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
switch r.URL.Path {
case "/api/latest/fleet/reports/run_by_identifiers":
err := json.NewEncoder(w).Encode(createDistributedQueryCampaignResponse{Campaign: &fleet.DistributedQueryCampaign{ID: 99}})
assert.NoError(t, err)
case "/api/latest/fleet/results/websocket":
ws, err := upgrader.Upgrade(w, r, nil)
if !assert.NoError(t, err) {
return
}
defer ws.Close()
assert.NoError(t, ws.WriteMessage(websocket.TextMessage, []byte(`{"type":"error","data":"pubsub error: boom"}`)))
for {
if _, _, err := ws.ReadMessage(); err != nil {
return
}
}
}
}))
defer ts.Close()

baseURL, err := url.Parse(ts.URL)
require.NoError(t, err)
client := &Client{
baseClient: &baseClient{BaseURL: baseURL, HTTP: fleethttp.NewClient()},
token: "1234",
}
ctx, cancel := context.WithCancel(t.Context())
defer cancel()

res, err := client.LiveQueryWithContext(ctx, "select 1;", nil, nil, []string{"host1"})
require.NoError(t, err)
select {
case err := <-res.Errors():
require.ErrorContains(t, err, "pubsub error: boom")
case <-time.After(10 * time.Second):
t.Fatal("no error from the live query")
}
}
Loading