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

Fix for protoc plugin extension reparse issue #3307

Merged
merged 6 commits into from
Sep 11, 2024
Merged

Fix for protoc plugin extension reparse issue #3307

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e2bccb0
Fix for protoc plugin extension reparse issue (Fixes #3306)
jchadwick-buf Sep 9, 2024
3c6c6f1
Update protoplugin + cleaner empty resolver
jchadwick-buf Sep 10, 2024
6482b1d
Merge branch 'main' of https://github.com/bufbuild/buf into fix-proto…
jchadwick-buf Sep 10, 2024
e28a3e2
Move EmptyResolver and add comment
jchadwick-buf Sep 10, 2024
df4aaee
Merge branch 'main' into fix-protoc-plugin-reparse
bufdev Sep 10, 2024
6e064b2
Add comment explaining `EmptyResolver` usage
jchadwick-buf Sep 10, 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
3 changes: 3 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,6 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/grpc v1.66.0 // indirect
)

// temporary until something akin to https://github.com/bufbuild/protoplugin/pull/17 is merged
replace github.com/bufbuild/protoplugin => github.com/jchadwick-buf/protoplugin v0.0.0-20240909191235-edfe697940bd
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ github.com/bufbuild/bufplugin-go v0.1.0 h1:3LmgSHaSf8mPvwoFunimgm8uKJFLg+YePdi7N
github.com/bufbuild/bufplugin-go v0.1.0/go.mod h1:gIbsJlcYJRLylxxNN3FPNd91fYxJmGVQgbZ67xLVrXk=
github.com/bufbuild/protocompile v0.14.1 h1:iA73zAf/fyljNjQKwYzUHD6AD4R8KMasmwa/FBatYVw=
github.com/bufbuild/protocompile v0.14.1/go.mod h1:ppVdAIhbr2H8asPk6k4pY7t9zB1OU5DoEw9xY/FUi1c=
github.com/bufbuild/protoplugin v0.0.0-20240323223605-e2735f6c31ee h1:E6ET8YUcYJ1lAe6ctR3as7yqzW2BNItDFnaB5zQq/8M=
github.com/bufbuild/protoplugin v0.0.0-20240323223605-e2735f6c31ee/go.mod h1:HjGFxsck9RObrTJp2hXQZfWhPgZqnR6sR1U5fCA/Kus=
github.com/bufbuild/protovalidate-go v0.6.5 h1:WucDKXIbK22WjkO8A8J6Yyxxy0jl91Oe9LSMduq3YEE=
github.com/bufbuild/protovalidate-go v0.6.5/go.mod h1:LHDiGCWSM3GagZEnyEZ1sPtFwi6Ja4tVTi/DCc+iDFI=
github.com/bufbuild/protoyaml-go v0.1.12 h1:tIJrwvGxumVpNwLsw/AevT1QnkPDBuAObBSuBAdmAWY=
Expand Down Expand Up @@ -157,6 +155,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:
github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/jchadwick-buf/protoplugin v0.0.0-20240909191235-edfe697940bd h1:SzJXnUiE0hmuD+OeMIOYeePT1cPUTcoi2y9Kl4qME+k=
github.com/jchadwick-buf/protoplugin v0.0.0-20240909191235-edfe697940bd/go.mod h1:orVwXsUHOxZCBYP6hjO2KhCxyx3KB5hTHNs7nEWRrUY=
github.com/jdx/go-netrc v1.0.0 h1:QbLMLyCZGj0NA8glAhxUpf1zDg6cxnWgMBbjq40W0gQ=
github.com/jdx/go-netrc v1.0.0/go.mod h1:Gh9eFQJnoTNIRHXl2j5bJXA1u84hQWJWgGh569zF3v8=
github.com/jhump/protoreflect v1.16.0 h1:54fZg+49widqXYQ0b+usAFHbMkBGR4PpXrsHc8+TBDg=
Expand Down
9 changes: 8 additions & 1 deletion private/buf/cmd/protoc-gen-buf-breaking/breaking.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ import (
"github.com/bufbuild/buf/private/pkg/protodescriptor"
"github.com/bufbuild/buf/private/pkg/tracing"
"github.com/bufbuild/protoplugin"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/reflect/protoregistry"
)

const (
Expand All @@ -43,7 +45,12 @@ const (

// Main is the main.
func Main() {
protoplugin.Main(protoplugin.HandlerFunc(handle))
protoplugin.Main(
protoplugin.HandlerFunc(handle),
protoplugin.WithUnmarshalOptions(proto.UnmarshalOptions{
Resolver: (*protoregistry.Types)(nil),
Copy link
Member

Choose a reason for hiding this comment

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

I don't understand what this is doing and why - needs extensive code comments

Copy link
Member Author

Choose a reason for hiding this comment

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

The code has been made clearer, no more typed nil.

}),
)
}

func handle(
Expand Down
9 changes: 8 additions & 1 deletion private/buf/cmd/protoc-gen-buf-lint/lint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ import (
"github.com/bufbuild/buf/private/pkg/protodescriptor"
"github.com/bufbuild/buf/private/pkg/tracing"
"github.com/bufbuild/protoplugin"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/reflect/protoregistry"
)

const (
Expand All @@ -42,7 +44,12 @@ const (

// Main is the main.
func Main() {
protoplugin.Main(protoplugin.HandlerFunc(handle))
protoplugin.Main(
protoplugin.HandlerFunc(handle),
protoplugin.WithUnmarshalOptions(proto.UnmarshalOptions{
Resolver: (*protoregistry.Types)(nil),
}),
)
}

func handle(
Expand Down