Update to use google.golang.org/protobuf #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
erichaberkorn
added a commit
to hashicorp/consul
that referenced
this pull request
Jan 6, 2023
After hashicorp/protoc-gen-go-binary#1, the build tags were inserted twice. This resulted in errors like: `proto/pbautoconf/auto_config_ent.go:9:2: partition.pb.binary.go: multiple //go:build comments` and diffs like: ``` circleci@9356716f44df:~/project$ git diff diff --git a/proto/pbnamespace/namespace.pb.binary.go b/proto/pbnamespace/namespace.pb.binary.go index 81bfdba402..afc71613c7 100644 --- a/proto/pbnamespace/namespace.pb.binary.go +++ b/proto/pbnamespace/namespace.pb.binary.go @@ -1,6 +1,9 @@ //go:build consulent // +build consulent +//go:build consulent +// +build consulent + // Code generated by protoc-gen-go-binary. DO NOT EDIT. // source: proto/pbnamespace/namespace.proto diff --git a/proto/pbpartition/partition.pb.binary.go b/proto/pbpartition/partition.pb.binary.go index e7c74837de..71cf66c015 100644 --- a/proto/pbpartition/partition.pb.binary.go +++ b/proto/pbpartition/partition.pb.binary.go @@ -1,6 +1,9 @@ //go:build consulent // +build consulent +//go:build consulent +// +build consulent + // Code generated by protoc-gen-go-binary. DO NOT EDIT. // source: proto/pbpartition/partition.proto ``` This removes the code that manually copies the build tags.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I was needing this generated code to not use golang/protobuf anymore. While that would have been pretty trivial in and of itself I also took the time to migrate the code generator to using google.golang.org/protobuf/compiler/protogen instead of the various other packages pulled from golang/protobuf and grpc-gateway protoc generator internals.
The new protogen package allows for a big simplification in the generator overall.
Most of the removed lines are due to the vendor directory being removed.