@@ -9,18 +9,16 @@ import (
9
9
"reflect"
10
10
"strings"
11
11
12
- anypb "github.com/golang/protobuf/ptypes/any"
13
12
"github.com/grpc-ecosystem/grpc-gateway/v2/internal/descriptor"
14
13
gen "github.com/grpc-ecosystem/grpc-gateway/v2/internal/generator"
15
- openapi_options "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
14
+ openapioptions "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
16
15
statuspb "google.golang.org/genproto/googleapis/rpc/status"
17
16
"google.golang.org/grpc/grpclog"
18
17
"google.golang.org/protobuf/proto"
18
+ "google.golang.org/protobuf/reflect/protodesc"
19
19
"google.golang.org/protobuf/types/descriptorpb"
20
+ "google.golang.org/protobuf/types/known/anypb"
20
21
"google.golang.org/protobuf/types/pluginpb"
21
-
22
- //nolint:staticcheck // Known issue, will be replaced when possible
23
- legacydescriptor "github.com/golang/protobuf/descriptor"
24
22
)
25
23
26
24
var errNoTargetService = errors .New ("no target service defined in the file" )
@@ -73,6 +71,7 @@ func mergeTargetFile(targets []*wrapper, mergeFileName string) *wrapper {
73
71
return mergedTarget
74
72
}
75
73
74
+ // MarshalJSON ...
76
75
// Q: What's up with the alias types here?
77
76
// A: We don't want to completely override how these structs are marshaled into
78
77
// JSON, we only want to add fields (see below, extensionMarshalJSON).
@@ -300,7 +299,7 @@ func (g *generator) Generate(targets []*descriptor.File) ([]*descriptor.Response
300
299
var mergedTarget * descriptor.File
301
300
// try to find proto leader
302
301
for _ , f := range targets {
303
- if proto .HasExtension (f .Options , openapi_options .E_Openapiv2Swagger ) {
302
+ if proto .HasExtension (f .Options , openapioptions .E_Openapiv2Swagger ) {
304
303
mergedTarget = f
305
304
break
306
305
}
@@ -370,13 +369,8 @@ func (g *generator) Generate(targets []*descriptor.File) ([]*descriptor.Response
370
369
// to registry (used for error-related API responses)
371
370
func AddErrorDefs (reg * descriptor.Registry ) error {
372
371
// load internal protos
373
- any , _ := legacydescriptor .MessageDescriptorProto (& anypb.Any {})
374
- any .SourceCodeInfo = new (descriptorpb.SourceCodeInfo )
375
- status , _ := legacydescriptor .MessageDescriptorProto (& statuspb.Status {})
376
- status .SourceCodeInfo = new (descriptorpb.SourceCodeInfo )
377
- // TODO(johanbrandhorst): Use new conversion later when possible
378
- // any := protodesc.ToFileDescriptorProto((&anypb.Any{}).ProtoReflect().Descriptor().ParentFile())
379
- // status := protodesc.ToFileDescriptorProto((&statuspb.Status{}).ProtoReflect().Descriptor().ParentFile())
372
+ any := protodesc .ToFileDescriptorProto ((& anypb.Any {}).ProtoReflect ().Descriptor ().ParentFile ())
373
+ status := protodesc .ToFileDescriptorProto ((& statuspb.Status {}).ProtoReflect ().Descriptor ().ParentFile ())
380
374
return reg .Load (& pluginpb.CodeGeneratorRequest {
381
375
ProtoFile : []* descriptorpb.FileDescriptorProto {
382
376
any ,
0 commit comments