Skip to content

Commit dd2f601

Browse files
dependabot[bot]dragonsinth
dependabot[bot]
and
dragonsinth
authored
Bump github.com/jhump/protoreflect from 1.13.0 to 1.14.0 (#343)
* Bump github.com/jhump/protoreflect from 1.13.0 to 1.14.0 Bumps [github.com/jhump/protoreflect](https://github.com/jhump/protoreflect) from 1.13.0 to 1.14.0. - [Release notes](https://github.com/jhump/protoreflect/releases) - [Commits](jhump/protoreflect@v1.13.0...v1.14.0) --- updated-dependencies: - dependency-name: github.com/jhump/protoreflect dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * fix ci * what can we even build on? * stop testing old things Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Scott Blum <[email protected]>
1 parent 81c624c commit dd2f601

File tree

13 files changed

+47
-50
lines changed

13 files changed

+47
-50
lines changed

‎.circleci/config.yml

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
shared_configs:
22
simple_job_steps: &simple_job_steps
3-
- checkout
4-
- run:
5-
name: Run tests
6-
command: |
7-
make deps test
8-
full_job_steps: &full_job_steps
93
- checkout
104
- run:
115
name: Run tests
@@ -15,18 +9,6 @@ shared_configs:
159
# Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference
1610
version: 2.1
1711
jobs:
18-
build-1-15:
19-
working_directory: ~/repo
20-
docker:
21-
- image: cimg/go:1.15
22-
steps: *simple_job_steps
23-
24-
build-1-16:
25-
working_directory: ~/repo
26-
docker:
27-
- image: cimg/go:1.16
28-
steps: *full_job_steps
29-
3012
build-1-17:
3113
working_directory: ~/repo
3214
docker:
@@ -39,10 +21,15 @@ jobs:
3921
- image: cimg/go:1.18
4022
steps: *simple_job_steps
4123

24+
build-1-19:
25+
working_directory: ~/repo
26+
docker:
27+
- image: cimg/go:1.19
28+
steps: *simple_job_steps
29+
4230
workflows:
4331
pr-build-test:
4432
jobs:
45-
- build-1-15
46-
- build-1-16
4733
- build-1-17
4834
- build-1-18
35+
- build-1-19

‎Makefile

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,9 @@ checkgofmt:
4242
vet:
4343
go vet ./...
4444

45-
# This all works fine with Go modules, but without modules,
46-
# CI is just getting latest master for dependencies like grpc.
4745
.PHONY: staticcheck
4846
staticcheck:
49-
@go install honnef.co/go/tools/cmd/staticcheck@v0.0.1-2020.1.4
47+
@go install honnef.co/go/tools/cmd/staticcheck@v0.3.3
5048
staticcheck ./...
5149

5250
.PHONY: ineffassign
@@ -56,21 +54,19 @@ ineffassign:
5654

5755
.PHONY: predeclared
5856
predeclared:
59-
@go install github.com/nishanths/predeclared@86fad755b4d3
60-
predeclared .
57+
@go install github.com/nishanths/predeclared@5f2f810c9ae6
58+
predeclared ./...
6159

6260
# Intentionally omitted from CI, but target here for ad-hoc reports.
6361
.PHONY: golint
6462
golint:
65-
# TODO: pin version
66-
@go install golang.org/x/lint/golint@latest
63+
@go install golang.org/x/lint/[email protected]
6764
golint -min_confidence 0.9 -set_exit_status ./...
6865

6966
# Intentionally omitted from CI, but target here for ad-hoc reports.
7067
.PHONY: errcheck
7168
errcheck:
72-
# TODO: pin version
73-
@go install github.com/kisielk/errcheck@latest
69+
@go install github.com/kisielk/[email protected]
7470
errcheck ./...
7571

7672
.PHONY: test

‎cmd/grpcurl/go1_10.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build go1.10
12
// +build go1.10
23

34
package main

‎cmd/grpcurl/go1_9.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !go1.10
12
// +build !go1.10
23

34
package main

‎cmd/grpcurl/grpcurl.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ import (
3838
// the response status codes emitted use an offest of 64
3939
const statusCodeOffset = 64
4040

41-
const no_version = "dev build <no version set>"
41+
const noVersion = "dev build <no version set>"
4242

43-
var version = no_version
43+
var version = noVersion
4444

4545
var (
4646
exit = os.Exit
@@ -445,7 +445,7 @@ func main() {
445445
}
446446

447447
grpcurlUA := "grpcurl/" + version
448-
if version == no_version {
448+
if version == noVersion {
449449
grpcurlUA = "grpcurl/dev-build (no version set)"
450450
}
451451
if *userAgent != "" {
@@ -508,7 +508,7 @@ func main() {
508508
md := grpcurl.MetadataFromHeaders(append(addlHeaders, reflHeaders...))
509509
refCtx := metadata.NewOutgoingContext(ctx, md)
510510
cc = dial()
511-
refClient = grpcreflect.NewClient(refCtx, reflectpb.NewServerReflectionClient(cc))
511+
refClient = grpcreflect.NewClientV1Alpha(refCtx, reflectpb.NewServerReflectionClient(cc))
512512
reflSource := grpcurl.DescriptorSourceFromServer(ctx, refClient)
513513
if fileSource != nil {
514514
descSource = compositeSource{reflSource, fileSource}

‎cmd/grpcurl/unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows
12
// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
23

34
package main

‎format.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,20 @@ func (tf *textFormatter) format(m proto.Message) (string, error) {
197197
return str, nil
198198
}
199199

200+
// Format of request data. The allowed values are 'json' or 'text'.
200201
type Format string
201202

202203
const (
204+
// FormatJSON specifies input data in JSON format. Multiple request values
205+
// may be concatenated (messages with a JSON representation other than
206+
// object must be separated by whitespace, such as a newline)
203207
FormatJSON = Format("json")
208+
209+
// FormatText specifies input data must be in the protobuf text format.
210+
// Multiple request values must be separated by the "record separator"
211+
// ASCII character: 0x1E. The stream should not end in a record separator.
212+
// If it does, it will be interpreted as a final, blank message after the
213+
// separator.
204214
FormatText = Format("text")
205215
)
206216

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
cloud.google.com/go v0.56.0 // indirect
77
github.com/davecgh/go-spew v1.1.1 // indirect
88
github.com/golang/protobuf v1.5.2
9-
github.com/jhump/protoreflect v1.13.0
9+
github.com/jhump/protoreflect v1.14.0
1010
golang.org/x/text v0.3.7 // indirect
1111
google.golang.org/grpc v1.50.1
1212
google.golang.org/protobuf v1.28.1

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ github.com/jhump/gopoet v0.0.0-20190322174617-17282ff210b3/go.mod h1:me9yfT6IJSl
111111
github.com/jhump/gopoet v0.1.0/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI=
112112
github.com/jhump/goprotoc v0.5.0/go.mod h1:VrbvcYrQOrTi3i0Vf+m+oqQWk9l72mjkJCYo7UvLHRQ=
113113
github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E=
114-
github.com/jhump/protoreflect v1.13.0 h1:zrrZqa7JAc2YGgPSzZZkmUXJ5G6NRPdxOg/9t7ISImA=
115-
github.com/jhump/protoreflect v1.13.0/go.mod h1:JytZfP5d0r8pVNLZvai7U/MCuTWITgrI4tTg7puQFKI=
114+
github.com/jhump/protoreflect v1.14.0 h1:MBbQK392K3u8NTLbKOCIi3XdI+y+c6yt5oMq0X3xviw=
115+
github.com/jhump/protoreflect v1.14.0/go.mod h1:JytZfP5d0r8pVNLZvai7U/MCuTWITgrI4tTg7puQFKI=
116116
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
117117
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
118118
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=

‎grpcurl.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -407,9 +407,9 @@ func makeTemplate(md *desc.MessageDescriptor, path []*desc.MessageDescriptor) pr
407407
case "google.protobuf.Any":
408408
// empty type URL is not allowed by JSON representation
409409
// so we must give it a dummy type
410-
var any anypb.Any
411-
_ = anypb.MarshalFrom(&any, &emptypb.Empty{}, protov2.MarshalOptions{})
412-
return &any
410+
var anyVal anypb.Any
411+
_ = anypb.MarshalFrom(&anyVal, &emptypb.Empty{}, protov2.MarshalOptions{})
412+
return &anyVal
413413
case "google.protobuf.Value":
414414
// unset kind is not allowed by JSON representation
415415
// so we must give it something

0 commit comments

Comments
 (0)