aboutsummaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2023-05-04 10:15:18 +0200
committerMartin Polden <mpolden@mpolden.no>2023-05-04 10:15:18 +0200
commit6b16115f6f3b973da5c1f50215f07056f45e26fa (patch)
tree6403ab62b535cc70dbeb6b5dd3b8ccd07218573e /client
parent2361fdb7c302b124db85aaa683a3f8c07403e703 (diff)
Change JSON decoder
Diffstat (limited to 'client')
-rw-r--r--client/go/go.mod1
-rw-r--r--client/go/go.sum2
-rw-r--r--client/go/internal/vespa/document/document.go3
-rw-r--r--client/go/internal/vespa/document/document_test.go2
4 files changed, 6 insertions, 2 deletions
diff --git a/client/go/go.mod b/client/go/go.mod
index 94f69c8286a..61c8366edd5 100644
--- a/client/go/go.mod
+++ b/client/go/go.mod
@@ -5,6 +5,7 @@ go 1.18
require (
github.com/briandowns/spinner v1.16.0
github.com/fatih/color v1.10.0
+ github.com/goccy/go-json v0.10.2
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/mattn/go-colorable v0.1.8
github.com/mattn/go-isatty v0.0.13
diff --git a/client/go/go.sum b/client/go/go.sum
index ac662c9fd43..c5b8b910fb7 100644
--- a/client/go/go.sum
+++ b/client/go/go.sum
@@ -10,6 +10,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
diff --git a/client/go/internal/vespa/document/document.go b/client/go/internal/vespa/document/document.go
index 214d1dc4797..15cd8c43de5 100644
--- a/client/go/internal/vespa/document/document.go
+++ b/client/go/internal/vespa/document/document.go
@@ -2,11 +2,12 @@ package document
import (
"bufio"
- "encoding/json"
"fmt"
"io"
"strconv"
"strings"
+
+ "github.com/goccy/go-json"
)
var asciiSpace = [256]uint8{'\t': 1, '\n': 1, '\v': 1, '\f': 1, '\r': 1, ' ': 1}
diff --git a/client/go/internal/vespa/document/document_test.go b/client/go/internal/vespa/document/document_test.go
index ebae5ca523a..bdf18586753 100644
--- a/client/go/internal/vespa/document/document_test.go
+++ b/client/go/internal/vespa/document/document_test.go
@@ -174,7 +174,7 @@ func TestDocumentDecoder(t *testing.T) {
t.Errorf("unexpected error: %s", err)
}
_, err = r.Decode()
- wantErr := "invalid json at byte offset 60: invalid character '\\n' in string literal"
+ wantErr := "invalid json at byte offset 122: json: string of object unexpected end of JSON input"
if err.Error() != wantErr {
t.Errorf("want error %q, got %q", wantErr, err.Error())
}