Skip to content

Commit

Permalink
[go.mod] Update protobuf-go
Browse files Browse the repository at this point in the history
... to pull in the following commit, which fixes parsing of unknown
repeated message fields in textproto files:
protocolbuffers/protobuf-go@6352dec

Previously, if shac.textproto contained a repeated message field that
was only introduced in a later version of shac, and `min_shac_version`
was updated appropriately, `shac check` would produce an error like:

  shac: proto: syntax error (line 41:1): unexpected token: ]

Now protobuf parsing no longer fails, and we get the expected error
message:

  shac: min_shac_version specifies unsupported version "0.1.9", running 0.1.8

Generated by running:
1. go get google.golang.org/protobuf@6352deccdb59bcc074db0ab49f4d8ba8f3cdb7ee
2. go mod tidy
3. go mod vendor

Change-Id: I7a32f61967a10bc72ef0eace18aac9d1b726a945
Reviewed-on: https://fuchsia-review.googlesource.com/c/shac-project/shac/+/922812
Reviewed-by: Anthony Fandrianto <atyfto@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
Fuchsia-Auto-Submit: Oliver Newman <olivernewman@google.com>
  • Loading branch information
orn688 authored and CQ Bot committed Sep 27, 2023
1 parent e96454e commit 62acf29
Show file tree
Hide file tree
Showing 40 changed files with 2,273 additions and 934 deletions.
6 changes: 5 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ require (
golang.org/x/mod v0.11.0
golang.org/x/sync v0.3.0
golang.org/x/tools v0.7.0
google.golang.org/protobuf v1.30.0
// Pinned to a non-tagged version to get commit
// https://github.com/protocolbuffers/protobuf-go/commit/6352deccdb59bcc074db0ab49f4d8ba8f3cdb7ee
// TODO(olivernewman): Switch back to using a tagged version after the first
// release containing 6352deccdb59bcc074db0ab49f4d8ba8f3cdb7ee.
google.golang.org/protobuf v1.31.1-0.20230927161544-6352deccdb59
)

require (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.31.1-0.20230927161544-6352deccdb59 h1:VEyoIMQ5ezAWTdg2i5ZPPmEgGs1HU6krWTttP6lOLBg=
google.golang.org/protobuf v1.31.1-0.20230927161544-6352deccdb59/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
Expand Down
6 changes: 1 addition & 5 deletions internal/cli/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ func (*versionCmd) SetFlags(f *flag.FlagSet) {
}

func (*versionCmd) Execute(ctx context.Context, args []string) error {
_, err := fmt.Fprintf(os.Stdout, "shac v%d.%d.%d\n",
engine.Version[0],
engine.Version[1],
engine.Version[2],
)
_, err := fmt.Fprintf(os.Stdout, "shac v%s\n", engine.Version)
return err
}
2 changes: 1 addition & 1 deletion internal/engine/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var (
// Version is the current tool version.
//
// TODO(maruel): Add proper version, preferably from git tag.
Version = shacVersion{0, 1, 8}
Version = shacVersion{0, 1, 9}
)

func (v shacVersion) String() string {
Expand Down
2 changes: 1 addition & 1 deletion shac.textproto
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# TODO(olivernewman): Build github.com/protocolbuffers/txtpbfmt into shac and
# enforce formatting of shac.textproto files in all repos that use shac.

min_shac_version: "0.1.7"
min_shac_version: "0.1.9"
allow_network: False
ignore: "/vendor/"
# Vendored code for test data only.
Expand Down
26 changes: 17 additions & 9 deletions vendor/google.golang.org/protobuf/encoding/protojson/decode.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 44 additions & 9 deletions vendor/google.golang.org/protobuf/encoding/protojson/encode.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 12 additions & 6 deletions vendor/google.golang.org/protobuf/encoding/prototext/encode.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 62acf29

Please sign in to comment.