diff --git a/go.mod b/go.mod index 782bbb5..9b6c59e 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/stretchr/testify v1.8.4 go.uber.org/zap v1.26.0 golang.org/x/net v0.19.0 - google.golang.org/grpc v1.59.0 + google.golang.org/grpc v1.60.0 google.golang.org/protobuf v1.31.0 gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.28.4 @@ -40,7 +40,7 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.4.0 // indirect + github.com/google/uuid v1.5.0 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -76,7 +76,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/klog/v2 v2.110.1 // indirect diff --git a/go.sum b/go.sum index cc75c99..2cf4205 100644 --- a/go.sum +++ b/go.sum @@ -55,6 +55,8 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJY github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= +github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= @@ -87,6 +89,7 @@ github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNB github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -234,8 +237,12 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE= google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 h1:/jFB8jK5R3Sq3i/lmeZO0cATSzFfZaJq1J2Euan3XKU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0/go.mod h1:FUoWkonphQm3RhTS+kOEhF8h0iDpm4tdXolVCeZ9KKA= google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= +google.golang.org/grpc v1.60.0 h1:6FQAR0kM31P6MRdeluor2w2gPaS4SVNrD/DNTxrQ15k= +google.golang.org/grpc v1.60.0/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= diff --git a/internal/tunnel/tunnel.pb.go b/internal/tunnel/tunnel.pb.go index 717697a..32c2504 100644 --- a/internal/tunnel/tunnel.pb.go +++ b/internal/tunnel/tunnel.pb.go @@ -15,8 +15,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 -// protoc v4.23.4 +// protoc-gen-go v1.31.0 +// protoc v4.25.1 // source: internal/tunnel/tunnel.proto package tunnel @@ -810,6 +810,7 @@ type StreamFlow struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Event: + // // *StreamFlow_StreamId // *StreamFlow_Headers // *StreamFlow_Data diff --git a/internal/tunnel/tunnel_grpc.pb.go b/internal/tunnel/tunnel_grpc.pb.go index e6b7c70..6901cc5 100644 --- a/internal/tunnel/tunnel_grpc.pb.go +++ b/internal/tunnel/tunnel_grpc.pb.go @@ -1,4 +1,23 @@ +// +// Copyright 2021-2023 OpsMx, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License") +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + // Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.3.0 +// - protoc v4.25.1 +// source: internal/tunnel/tunnel.proto package tunnel @@ -14,6 +33,14 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + TunnelService_Hello_FullMethodName = "/tunnel.TunnelService/Hello" + TunnelService_Ping_FullMethodName = "/tunnel.TunnelService/Ping" + TunnelService_WaitForRequest_FullMethodName = "/tunnel.TunnelService/WaitForRequest" + TunnelService_DataFlowAgentToController_FullMethodName = "/tunnel.TunnelService/DataFlowAgentToController" + TunnelService_RunRequest_FullMethodName = "/tunnel.TunnelService/RunRequest" +) + // TunnelServiceClient is the client API for TunnelService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -43,7 +70,7 @@ func NewTunnelServiceClient(cc grpc.ClientConnInterface) TunnelServiceClient { func (c *tunnelServiceClient) Hello(ctx context.Context, in *HelloRequest, opts ...grpc.CallOption) (*HelloResponse, error) { out := new(HelloResponse) - err := c.cc.Invoke(ctx, "/tunnel.TunnelService/Hello", in, out, opts...) + err := c.cc.Invoke(ctx, TunnelService_Hello_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -52,7 +79,7 @@ func (c *tunnelServiceClient) Hello(ctx context.Context, in *HelloRequest, opts func (c *tunnelServiceClient) Ping(ctx context.Context, in *PingRequest, opts ...grpc.CallOption) (*PingResponse, error) { out := new(PingResponse) - err := c.cc.Invoke(ctx, "/tunnel.TunnelService/Ping", in, out, opts...) + err := c.cc.Invoke(ctx, TunnelService_Ping_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -60,7 +87,7 @@ func (c *tunnelServiceClient) Ping(ctx context.Context, in *PingRequest, opts .. } func (c *tunnelServiceClient) WaitForRequest(ctx context.Context, in *WaitForRequestArgs, opts ...grpc.CallOption) (TunnelService_WaitForRequestClient, error) { - stream, err := c.cc.NewStream(ctx, &TunnelService_ServiceDesc.Streams[0], "/tunnel.TunnelService/WaitForRequest", opts...) + stream, err := c.cc.NewStream(ctx, &TunnelService_ServiceDesc.Streams[0], TunnelService_WaitForRequest_FullMethodName, opts...) if err != nil { return nil, err } @@ -92,7 +119,7 @@ func (x *tunnelServiceWaitForRequestClient) Recv() (*TunnelRequest, error) { } func (c *tunnelServiceClient) DataFlowAgentToController(ctx context.Context, opts ...grpc.CallOption) (TunnelService_DataFlowAgentToControllerClient, error) { - stream, err := c.cc.NewStream(ctx, &TunnelService_ServiceDesc.Streams[1], "/tunnel.TunnelService/DataFlowAgentToController", opts...) + stream, err := c.cc.NewStream(ctx, &TunnelService_ServiceDesc.Streams[1], TunnelService_DataFlowAgentToController_FullMethodName, opts...) if err != nil { return nil, err } @@ -126,7 +153,7 @@ func (x *tunnelServiceDataFlowAgentToControllerClient) CloseAndRecv() (*StreamFl } func (c *tunnelServiceClient) RunRequest(ctx context.Context, in *TunnelRequest, opts ...grpc.CallOption) (TunnelService_RunRequestClient, error) { - stream, err := c.cc.NewStream(ctx, &TunnelService_ServiceDesc.Streams[2], "/tunnel.TunnelService/RunRequest", opts...) + stream, err := c.cc.NewStream(ctx, &TunnelService_ServiceDesc.Streams[2], TunnelService_RunRequest_FullMethodName, opts...) if err != nil { return nil, err } @@ -219,7 +246,7 @@ func _TunnelService_Hello_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tunnel.TunnelService/Hello", + FullMethod: TunnelService_Hello_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(TunnelServiceServer).Hello(ctx, req.(*HelloRequest)) @@ -237,7 +264,7 @@ func _TunnelService_Ping_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tunnel.TunnelService/Ping", + FullMethod: TunnelService_Ping_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(TunnelServiceServer).Ping(ctx, req.(*PingRequest))