Merge pull request #166 from mercari/add-plugin-proto

Add plugin.proto to preset for compiler
mercari · May 7, 2024 · fe287f6 · fe287f6
2 parents 712c202 + 1585f80
commit fe287f6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/compiler/compiler.go b/compiler/compiler.go
@@ -87,6 +87,7 @@ func (e *CompilerError) Error() string {
 const (
 	grpcFederationFilePath        = "grpc/federation/federation.proto"
 	grpcFederationPrivateFilePath = "grpc/federation/private.proto"
+	grpcFederationPluginFilePath  = "grpc/federation/plugin.proto"
 	googleRPCCodeFilePath         = "google/rpc/code.proto"
 	googleRPCErrorDetailsFilePath = "google/rpc/error_details.proto"
 )
@@ -130,6 +131,11 @@ func RelativePathFromImportPaths(protoPath string, importPaths []string) (string
 	return protoPath, nil
 }
 
+type dependentProtoFileSet struct {
+	path string
+	data []byte
+}
+
 // Compile compile the target Protocol Buffers file and produces all file descriptors.
 func (c *Compiler) Compile(ctx context.Context, file *source.File, opts ...Option) ([]*descriptorpb.FileDescriptorProto, error) {
 	c.importPaths = []string{}
@@ -154,17 +160,16 @@ func (c *Compiler) Compile(ctx context.Context, file *source.File, opts ...Optio
 				}
 				f, err := os.Open(p)
 				if err != nil {
-					if !c.manualImport && strings.HasSuffix(p, grpcFederationFilePath) {
-						return io.NopCloser(bytes.NewBuffer(federation.ProtoFile)), nil
-					}
-					if !c.manualImport && strings.HasSuffix(p, grpcFederationPrivateFilePath) {
-						return io.NopCloser(bytes.NewBuffer(federation.PrivateProtoFile)), nil
-					}
-					if !c.manualImport && strings.HasSuffix(p, googleRPCCodeFilePath) {
-						return io.NopCloser(bytes.NewBuffer(rpc.GoogleRPCCodeProtoFile)), nil
-					}
-					if !c.manualImport && strings.HasSuffix(p, googleRPCErrorDetailsFilePath) {
-						return io.NopCloser(bytes.NewBuffer(rpc.GoogleRPCErrorDetailsProtoFile)), nil
+					for _, set := range []*dependentProtoFileSet{
+						{path: grpcFederationFilePath, data: federation.ProtoFile},
+						{path: grpcFederationPrivateFilePath, data: federation.PrivateProtoFile},
+						{path: grpcFederationPluginFilePath, data: federation.PluginProtoFile},
+						{path: googleRPCCodeFilePath, data: rpc.GoogleRPCCodeProtoFile},
+						{path: googleRPCErrorDetailsFilePath, data: rpc.GoogleRPCErrorDetailsProtoFile},
+					} {
+						if !c.manualImport && strings.HasSuffix(p, set.path) {
+							return io.NopCloser(bytes.NewBuffer(set.data)), nil
+						}
 					}
 					return nil, err
 				}

diff --git a/proto/grpc/federation/embed.go b/proto/grpc/federation/embed.go
@@ -9,3 +9,6 @@ var ProtoFile []byte
 
 //go:embed private.proto
 var PrivateProtoFile []byte
+
+//go:embed plugin.proto
+var PluginProtoFile []byte