From 822e71585288055ae42a2e978bc997b4e7f78743 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Thu, 15 Jun 2023 14:51:40 +0200 Subject: [PATCH] fix(hubl): revert f235aae (#16534) --- tools/hubl/internal/compat.go | 40 +++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tools/hubl/internal/compat.go b/tools/hubl/internal/compat.go index 8ef10f5524..553e72a665 100644 --- a/tools/hubl/internal/compat.go +++ b/tools/hubl/internal/compat.go @@ -9,7 +9,7 @@ import ( autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" reflectionv1beta1 "cosmossdk.io/api/cosmos/base/reflection/v1beta1" "google.golang.org/grpc" - "google.golang.org/grpc/reflection/grpc_reflection_v1" + "google.golang.org/grpc/reflection/grpc_reflection_v1alpha" "google.golang.org/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/reflect/protoregistry" @@ -35,13 +35,13 @@ func loadFileDescriptorsGRPCReflection(ctx context.Context, client *grpc.ClientC } } - reflectClient, err := grpc_reflection_v1.NewServerReflectionClient(client).ServerReflectionInfo(ctx) + reflectClient, err := grpc_reflection_v1alpha.NewServerReflectionClient(client).ServerReflectionInfo(ctx) if err != nil { return nil, err } fdMap := map[string]*descriptorpb.FileDescriptorProto{} - waitListServiceRes := make(chan *grpc_reflection_v1.ListServiceResponse) + waitListServiceRes := make(chan *grpc_reflection_v1alpha.ListServiceResponse) //nolint:staticcheck // SA1019: we want to keep using v1alpha waitc := make(chan struct{}) go func() { for { @@ -56,26 +56,26 @@ func loadFileDescriptorsGRPCReflection(ctx context.Context, client *grpc.ClientC } switch res := in.MessageResponse.(type) { - case *grpc_reflection_v1.ServerReflectionResponse_ListServicesResponse: - waitListServiceRes <- res.ListServicesResponse - case *grpc_reflection_v1.ServerReflectionResponse_FileDescriptorResponse: + case *grpc_reflection_v1alpha.ServerReflectionResponse_ListServicesResponse: + waitListServiceRes <- res.ListServicesResponse //nolint:staticcheck // SA1019: we want to keep using v1alpha + case *grpc_reflection_v1alpha.ServerReflectionResponse_FileDescriptorResponse: processFileDescriptorsResponse(res, fdMap) } } }() - if err = reflectClient.Send(&grpc_reflection_v1.ServerReflectionRequest{ - MessageRequest: &grpc_reflection_v1.ServerReflectionRequest_ListServices{}, + if err = reflectClient.Send(&grpc_reflection_v1alpha.ServerReflectionRequest{ //nolint:staticcheck // SA1019: we want to keep using v1alpha + MessageRequest: &grpc_reflection_v1alpha.ServerReflectionRequest_ListServices{}, }); err != nil { return nil, err } listServiceRes := <-waitListServiceRes - for _, response := range listServiceRes.Service { - err = reflectClient.Send(&grpc_reflection_v1.ServerReflectionRequest{ - MessageRequest: &grpc_reflection_v1.ServerReflectionRequest_FileContainingSymbol{ - FileContainingSymbol: response.Name, + for _, response := range listServiceRes.Service { //nolint:staticcheck // SA1019: we want to keep using v1alpha + err = reflectClient.Send(&grpc_reflection_v1alpha.ServerReflectionRequest{ //nolint:staticcheck // SA1019: we want to keep using v1alpha + MessageRequest: &grpc_reflection_v1alpha.ServerReflectionRequest_FileContainingSymbol{ + FileContainingSymbol: response.Name, //nolint:staticcheck // SA1019: we want to keep using v1alpha }, }) if err != nil { @@ -84,8 +84,8 @@ func loadFileDescriptorsGRPCReflection(ctx context.Context, client *grpc.ClientC } for _, msgName := range interfaceImplNames { - err = reflectClient.Send(&grpc_reflection_v1.ServerReflectionRequest{ - MessageRequest: &grpc_reflection_v1.ServerReflectionRequest_FileContainingSymbol{ + err = reflectClient.Send(&grpc_reflection_v1alpha.ServerReflectionRequest{ //nolint:staticcheck // SA1019: we want to keep using v1alpha + MessageRequest: &grpc_reflection_v1alpha.ServerReflectionRequest_FileContainingSymbol{ FileContainingSymbol: msgName, }, }) @@ -133,8 +133,8 @@ func loadFileDescriptorsGRPCReflection(ctx context.Context, client *grpc.ClientC return fdSet, nil } -func processFileDescriptorsResponse(res *grpc_reflection_v1.ServerReflectionResponse_FileDescriptorResponse, fdMap map[string]*descriptorpb.FileDescriptorProto) { - for _, bz := range res.FileDescriptorResponse.FileDescriptorProto { +func processFileDescriptorsResponse(res *grpc_reflection_v1alpha.ServerReflectionResponse_FileDescriptorResponse, fdMap map[string]*descriptorpb.FileDescriptorProto) { + for _, bz := range res.FileDescriptorResponse.FileDescriptorProto { //nolint:staticcheck // SA1019: we want to keep using v1alpha fd := &descriptorpb.FileDescriptorProto{} err := proto.Unmarshal(bz, fd) if err != nil { @@ -158,7 +158,7 @@ func missingFileDescriptors(fdMap map[string]*descriptorpb.FileDescriptorProto, } func addMissingFileDescriptors(ctx context.Context, client *grpc.ClientConn, fdMap map[string]*descriptorpb.FileDescriptorProto, missingFiles []string) error { - reflectClient, err := grpc_reflection_v1.NewServerReflectionClient(client).ServerReflectionInfo(ctx) + reflectClient, err := grpc_reflection_v1alpha.NewServerReflectionClient(client).ServerReflectionInfo(ctx) if err != nil { return err } @@ -176,15 +176,15 @@ func addMissingFileDescriptors(ctx context.Context, client *grpc.ClientConn, fdM panic(err) } - if res, ok := in.MessageResponse.(*grpc_reflection_v1.ServerReflectionResponse_FileDescriptorResponse); ok { + if res, ok := in.MessageResponse.(*grpc_reflection_v1alpha.ServerReflectionResponse_FileDescriptorResponse); ok { processFileDescriptorsResponse(res, fdMap) } } }() for _, file := range missingFiles { - err = reflectClient.Send(&grpc_reflection_v1.ServerReflectionRequest{ - MessageRequest: &grpc_reflection_v1.ServerReflectionRequest_FileByFilename{ + err = reflectClient.Send(&grpc_reflection_v1alpha.ServerReflectionRequest{ //nolint:staticcheck // SA1019: we want to keep using v1alpha + MessageRequest: &grpc_reflection_v1alpha.ServerReflectionRequest_FileByFilename{ FileByFilename: file, }, })