Skip to content

fix: make-feed bug with multiple clusters missed comma #37142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arnej27959 merged 1 commit into from
Jun 7, 2026
+38 −21
Merged

fix: make-feed bug with multiple clusters missed comma #37142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 17 additions & 21 deletions client/go/internal/cli/cmd/visit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ type visitArgs struct {
headers []string
stream bool

cli *CLI
header http.Header
cli *CLI
header http.Header
feedStarted bool
}

func (v *visitArgs) writeBytes(b []byte) {
Expand All @@ -59,30 +60,25 @@ func (v *visitArgs) debugPrint(s string) {
}

func (v *visitArgs) dumpDocuments(documents []DocumentBlob) {
comma := false
pretty := false
if v.makeFeed {
comma = true
pretty = v.pretty
} else if !v.jsonLines {
if !v.makeFeed && !v.jsonLines {
return
}
for i, value := range documents {
if pretty {
for _, value := range documents {
blob := value.blob
if v.makeFeed && v.pretty {
var prettyJSON bytes.Buffer
parseError := json.Indent(&prettyJSON, value.blob, "", " ")
if parseError != nil {
v.writeBytes(value.blob)
} else {
v.writeBytes(prettyJSON.Bytes())
if err := json.Indent(&prettyJSON, value.blob, "", " "); err == nil {
blob = prettyJSON.Bytes()
}
} else {
v.writeBytes(value.blob)
}
var lastDocument = i == (len(documents) - 1)
if comma && !lastDocument {
v.writeString(",\n")
if v.makeFeed {
if v.feedStarted {
v.writeString(",\n")
}
v.feedStarted = true
v.writeBytes(blob)
} else {
v.writeBytes(blob)
v.writeString("\n")
}
}
Expand Down Expand Up @@ -311,7 +307,7 @@ func visitClusters(vArgs *visitArgs, service *vespa.Service) (res OperationResul
}
}
if vArgs.makeFeed {
vArgs.writeString("]\n")
vArgs.writeString("\n]\n")

@BrageHK BrageHK Jun 4, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is only relevant for tests that does not exist for visit...

}
return res
}
Expand Down
21 changes: 21 additions & 0 deletions client/go/internal/cli/cmd/visit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package cmd

import (
"bytes"
"encoding/json"
"fmt"
"net/http"
"testing"
Expand Down Expand Up @@ -319,6 +320,26 @@ func TestRemoveEntriesAreIgnored(t *testing.T) {
assert.Equal(t, 2, len(client.Requests)) // probe + 1 visit
}

func TestMakeFeedMultipleClusters(t *testing.T) {
clusterAResponse := normalpre + document1 + `],"documentCount":1}`
clusterBResponse := normalpre + document2 + `],"documentCount":1}`
client := &mock.HTTPClient{}
client.NextResponseString(200, handlersResponse)
client.NextResponseString(400, `{"pathId":"/document/v1/","message":"no content cluster '*', only 'clusterA', 'clusterB'"}`)
client.NextResponseString(200, clusterAResponse)
client.NextResponseString(200, clusterBResponse)
client.NextResponseString(200, clusterAResponse)
client.NextResponseString(200, clusterBResponse)
cli, stdout, _ := newTestCLI(t)
cli.httpClient = client
cli.sleeper = func(d time.Duration) {}
err := cli.Run("visit", "--make-feed", "-t", "http://127.0.0.1:8080")
assert.Nil(t, err)
var docs []json.RawMessage
assert.Nil(t, json.Unmarshal(stdout.Bytes(), &docs))
assert.Equal(t, 4, len(docs))
}

func inRangeMillis(v time.Duration, lo int64, hi int64) bool {
return v.Milliseconds() >= lo && v.Milliseconds() <= hi
}
Expand Down
Loading