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.

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

fix: revert f235aae (part 2) #16697

Merged
merged 2 commits into from
Jun 27, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/grpc/gogoreflection/serverreflection.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
dpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
rpb "google.golang.org/grpc/reflection/grpc_reflection_v1"
rpb "google.golang.org/grpc/reflection/grpc_reflection_v1alpha"
"google.golang.org/grpc/status"
)

Expand Down Expand Up @@ -387,42 +387,42 @@
return err
}

out := &rpb.ServerReflectionResponse{

Check failure on line 390 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / golangci-lint

SA1019: rpb.ServerReflectionResponse is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)

Check failure on line 390 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / Analyze

SA1019: rpb.ServerReflectionResponse is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)
ValidHost: in.Host,

Check failure on line 391 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / golangci-lint

SA1019: in.Host is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)

Check failure on line 391 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / Analyze

SA1019: in.Host is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)
OriginalRequest: in,
}
switch req := in.MessageRequest.(type) {
case *rpb.ServerReflectionRequest_FileByFilename:
b, err := s.fileDescEncodingByFilename(req.FileByFilename, sentFileDescriptors)

Check failure on line 396 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / golangci-lint

SA1019: req.FileByFilename is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)

Check failure on line 396 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / Analyze

SA1019: req.FileByFilename is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)
if err != nil {
out.MessageResponse = &rpb.ServerReflectionResponse_ErrorResponse{
ErrorResponse: &rpb.ErrorResponse{

Check failure on line 399 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / golangci-lint

SA1019: rpb.ErrorResponse is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)

Check failure on line 399 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / Analyze

SA1019: rpb.ErrorResponse is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)
ErrorCode: int32(codes.NotFound),
ErrorMessage: err.Error(),
},
}
} else {
out.MessageResponse = &rpb.ServerReflectionResponse_FileDescriptorResponse{
FileDescriptorResponse: &rpb.FileDescriptorResponse{FileDescriptorProto: b},

Check failure on line 406 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / golangci-lint

SA1019: rpb.FileDescriptorResponse is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)

Check failure on line 406 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / Analyze

SA1019: rpb.FileDescriptorResponse is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)
}
}
case *rpb.ServerReflectionRequest_FileContainingSymbol:
b, err := s.fileDescEncodingContainingSymbol(req.FileContainingSymbol, sentFileDescriptors)

Check failure on line 410 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / golangci-lint

SA1019: req.FileContainingSymbol is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)

Check failure on line 410 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / Analyze

SA1019: req.FileContainingSymbol is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)
if err != nil {
out.MessageResponse = &rpb.ServerReflectionResponse_ErrorResponse{
ErrorResponse: &rpb.ErrorResponse{

Check failure on line 413 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / golangci-lint

SA1019: rpb.ErrorResponse is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)

Check failure on line 413 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / Analyze

SA1019: rpb.ErrorResponse is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)
ErrorCode: int32(codes.NotFound),
ErrorMessage: err.Error(),
},
}
} else {
out.MessageResponse = &rpb.ServerReflectionResponse_FileDescriptorResponse{
FileDescriptorResponse: &rpb.FileDescriptorResponse{FileDescriptorProto: b},

Check failure on line 420 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / golangci-lint

SA1019: rpb.FileDescriptorResponse is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)

Check failure on line 420 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / Analyze

SA1019: rpb.FileDescriptorResponse is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)
}
}
case *rpb.ServerReflectionRequest_FileContainingExtension:
typeName := req.FileContainingExtension.ContainingType

Check failure on line 424 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / golangci-lint

SA1019: req.FileContainingExtension.ContainingType is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)

Check failure on line 424 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / Analyze

SA1019: req.FileContainingExtension.ContainingType is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)
extNum := req.FileContainingExtension.ExtensionNumber

Check failure on line 425 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / golangci-lint

SA1019: req.FileContainingExtension.ExtensionNumber is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)

Check failure on line 425 in server/grpc/gogoreflection/serverreflection.go

View workflow job for this annotation

GitHub Actions / Analyze

SA1019: req.FileContainingExtension.ExtensionNumber is deprecated: The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated. (staticcheck)
b, err := s.fileDescEncodingContainingExtension(typeName, extNum, sentFileDescriptors)
if err != nil {
out.MessageResponse = &rpb.ServerReflectionResponse_ErrorResponse{
Expand Down