Skip to content
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

Fix bug with unicode handling in proto map keys #416

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Fix bug with unicode handling in proto map keys #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89db8f8
Fix bug with unicode handling in proto map keys
jquirke Jun 19, 2024
6ffb87f
fix changes in error message strings in tests
jquirke Jun 19, 2024
055b5a2
fix more error string assertions
jquirke Jun 19, 2024
ab00ff8
Fix broken in tests
jquirke Jun 20, 2024
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 encoding/protobuf_health_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func TestProtobufHealthResponse(t *testing.T) {
{
desc: "fail",
reqBody: []byte{0x1, 0x2},
errMsg: "invalid field number",
errMsg: "cannot parse invalid wire-format data",
},
}

Expand Down
4 changes: 2 additions & 2 deletions encoding/protobuf_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func TestProtobufRequest(t *testing.T) {
method: "Bar/Baz",
desc: "invalid field in request input",
bsIn: []byte(`{"foo": "1"}`),
errMsg: "Message type Foo has no known field named foo",
errMsg: "message type Foo has no known field named foo",
},
{
method: "Bar/Baz",
Expand Down Expand Up @@ -236,7 +236,7 @@ func TestProtobufErrorDetails(t *testing.T) {
source: source,
method: "Bar/Baz",
err: yarpcerrors.FromError(fmt.Errorf("this is a test error")).WithDetails([]byte{0x8, 0x1, 0x12}),
wantErr: fmt.Errorf("could not unmarshal error details unexpected EOF"),
wantErr: fmt.Errorf("could not unmarshal error details"),
wantOutAsJSON: "null",
},
{
Expand Down
30 changes: 14 additions & 16 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,24 @@ module github.com/yarpc/yab
go 1.18

require (
github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7
github.com/cactus/go-statsd-client/v5 v5.0.0
github.com/casimir/xdg-go v0.0.0-20160329195404-372ccc2180da
github.com/ghodss/yaml v1.0.0
github.com/golang/protobuf v1.4.3
github.com/golang/protobuf v1.5.3
github.com/jessevdk/go-flags v1.5.0
github.com/jhump/protoreflect v0.0.0-20180908113807-a84568470d8a
github.com/jhump/protoreflect v1.15.6
github.com/opentracing/opentracing-go v1.2.0
github.com/stretchr/testify v1.7.1
github.com/stretchr/testify v1.8.4
github.com/uber/jaeger-client-go v2.30.0+incompatible
github.com/uber/tchannel-go v1.32.1
go.uber.org/atomic v1.9.0
go.uber.org/multierr v1.8.0
go.uber.org/thriftrw v1.29.2
go.uber.org/yarpc v1.60.0
go.uber.org/zap v1.21.0
golang.org/x/net v0.0.0-20220403103023-749bd193bc2b
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013
google.golang.org/grpc v1.40.1
golang.org/x/net v0.17.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19
google.golang.org/grpc v1.57.1
gopkg.in/yaml.v2 v2.4.0
)

Expand All @@ -30,12 +29,12 @@ require (
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/bufbuild/protocompile v0.8.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/gogo/googleapis v1.3.2 // indirect
github.com/gogo/protobuf v1.3.1 // indirect
github.com/gogo/status v1.1.0 // indirect
github.com/google/go-cmp v0.5.4 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
Expand All @@ -48,12 +47,11 @@ require (
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
go.uber.org/net/metrics v1.3.0 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/sys v0.0.0-20220403205710-6acee93ad0eb // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.10 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/protobuf v1.25.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/tools v0.6.0 // indirect
google.golang.org/protobuf v1.31.1-0.20231027082548-f4a6c1f6e5c1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
honnef.co/go/tools v0.0.1-2019.2.3 // indirect
)
Loading
Loading