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

Jump to bottom

server/admin: Encode protocol buffers in accordance with the spec #6587

Merged
merged 3 commits into from
May 17, 2016
Merged

server/admin: Encode protocol buffers in accordance with the spec #6587

merged 3 commits into from
May 17, 2016

Conversation

tamird
Copy link
Contributor

@tamird tamird commented May 9, 2016 •
edited by petermattis
Loading

@mrtracy this should encode protos correctly; can you verify?

This change is Reviewable

@tamird tamird mentioned this pull request May 9, 2016
Closed
awalterschulze
awalterschulze reviewed May 17, 2016
View reviewed changes
util/protoutil/jsonpb_marshal.go
// Unmarshal unmarshals JSON "data" into "v"
func (j *JSONPb) Unmarshal(data []byte, v interface{}) error {
if pb, ok := v.(proto.Message); ok {
return proto.Unmarshal(data, pb)
Copy link

Choose a reason for hiding this comment

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

jsonpb.Unmarshal ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed, thanks

@bdarnell
Copy link
Contributor

:lgtm:

Previously, tamird (Tamir Duberstein) wrote…

server/admin: Encode protocol buffers in accordance with the spec

@mrtracy this should encode protos correctly; can you verify?

Reviewed 1 of 4 files at r2, 12 of 12 files at r5.
Review status: all files reviewed at latest revision, 3 unresolved discussions, all commit checks successful.

GLOCKFILE, line 22 [r5] (raw file):

github.com/agtorre/gocolorize f42b554bf7f006936130c9bb4f971afd2d87f671
github.com/biogo/store 913427a1d5e89604e50ea1db0f28f34966d61602
github.com/chzyer/readline 92c174e5fb5590f1ddbabd5963ffc799f2323b10

Please put mass glockfile updates in their own commit (except for changes that are required by the dep updates)

util/http_test.go, line 118 [r5] (raw file):

}

type readCloser struct {

This exists as io/ioutil.NopCloser

Comments from Reviewable

@tamird
Copy link
Contributor Author

tamird commented May 17, 2016

Review status: 1 of 13 files reviewed at latest revision, 3 unresolved discussions, some commit checks pending.

GLOCKFILE, line 22 [r5] (raw file):

Previously, bdarnell (Ben Darnell) wrote…

Please put mass glockfile updates in their own commit (except for changes that are required by the dep updates)


Done.

util/http_test.go, line 118 [r5] (raw file):

Previously, bdarnell (Ben Darnell) wrote…

This exists as io/ioutil.NopCloser


Nice, I was hoping it was so. Done.

Comments from Reviewable

@mrtracy
Copy link
Contributor

mrtracy commented May 17, 2016

:lgtm:

Previously, bdarnell (Ben Darnell) wrote…

:lgtm:

Review status: 1 of 13 files reviewed at latest revision, 3 unresolved discussions, some commit checks pending.

Comments from Reviewable

@tamird tamird merged commit 76ae1b6 into cockroachdb:master May 17, 2016
@tamird tamird deleted the grpc-gateway-types branch May 17, 2016 19:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@mrtracy mrtracy

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tamird @bdarnell @mrtracy @awalterschulze