diff --git a/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go b/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go index f64716df2..a72b014e7 100644 --- a/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go +++ b/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go @@ -66,12 +66,14 @@ type isLoadBalanceRequest_LoadBalanceRequestType interface { type LoadBalanceRequest_InitialRequest struct { InitialRequest *InitialLoadBalanceRequest `protobuf:"bytes,1,opt,name=initial_request,json=initialRequest,proto3,oneof"` } + type LoadBalanceRequest_ClientStats struct { ClientStats *ClientStats `protobuf:"bytes,2,opt,name=client_stats,json=clientStats,proto3,oneof"` } func (*LoadBalanceRequest_InitialRequest) isLoadBalanceRequest_LoadBalanceRequestType() {} -func (*LoadBalanceRequest_ClientStats) isLoadBalanceRequest_LoadBalanceRequestType() {} + +func (*LoadBalanceRequest_ClientStats) isLoadBalanceRequest_LoadBalanceRequestType() {} func (m *LoadBalanceRequest) GetLoadBalanceRequestType() isLoadBalanceRequest_LoadBalanceRequestType { if m != nil { @@ -387,12 +389,14 @@ type isLoadBalanceResponse_LoadBalanceResponseType interface { type LoadBalanceResponse_InitialResponse struct { InitialResponse *InitialLoadBalanceResponse `protobuf:"bytes,1,opt,name=initial_response,json=initialResponse,proto3,oneof"` } + type LoadBalanceResponse_ServerList struct { ServerList *ServerList `protobuf:"bytes,2,opt,name=server_list,json=serverList,proto3,oneof"` } func (*LoadBalanceResponse_InitialResponse) isLoadBalanceResponse_LoadBalanceResponseType() {} -func (*LoadBalanceResponse_ServerList) isLoadBalanceResponse_LoadBalanceResponseType() {} + +func (*LoadBalanceResponse_ServerList) isLoadBalanceResponse_LoadBalanceResponseType() {} func (m *LoadBalanceResponse) GetLoadBalanceResponseType() isLoadBalanceResponse_LoadBalanceResponseType { if m != nil { diff --git a/benchmark/grpc_testing/control.pb.go b/benchmark/grpc_testing/control.pb.go index 22134427a..3d125b31f 100644 --- a/benchmark/grpc_testing/control.pb.go +++ b/benchmark/grpc_testing/control.pb.go @@ -337,24 +337,32 @@ type isLoadParams_Load interface { type LoadParams_ClosedLoop struct { ClosedLoop *ClosedLoopParams `protobuf:"bytes,1,opt,name=closed_loop,json=closedLoop,proto3,oneof"` } + type LoadParams_Poisson struct { Poisson *PoissonParams `protobuf:"bytes,2,opt,name=poisson,proto3,oneof"` } + type LoadParams_Uniform struct { Uniform *UniformParams `protobuf:"bytes,3,opt,name=uniform,proto3,oneof"` } + type LoadParams_Determ struct { Determ *DeterministicParams `protobuf:"bytes,4,opt,name=determ,proto3,oneof"` } + type LoadParams_Pareto struct { Pareto *ParetoParams `protobuf:"bytes,5,opt,name=pareto,proto3,oneof"` } func (*LoadParams_ClosedLoop) isLoadParams_Load() {} -func (*LoadParams_Poisson) isLoadParams_Load() {} -func (*LoadParams_Uniform) isLoadParams_Load() {} -func (*LoadParams_Determ) isLoadParams_Load() {} -func (*LoadParams_Pareto) isLoadParams_Load() {} + +func (*LoadParams_Poisson) isLoadParams_Load() {} + +func (*LoadParams_Uniform) isLoadParams_Load() {} + +func (*LoadParams_Determ) isLoadParams_Load() {} + +func (*LoadParams_Pareto) isLoadParams_Load() {} func (m *LoadParams) GetLoad() isLoadParams_Load { if m != nil { @@ -829,12 +837,14 @@ type isClientArgs_Argtype interface { type ClientArgs_Setup struct { Setup *ClientConfig `protobuf:"bytes,1,opt,name=setup,proto3,oneof"` } + type ClientArgs_Mark struct { Mark *Mark `protobuf:"bytes,2,opt,name=mark,proto3,oneof"` } func (*ClientArgs_Setup) isClientArgs_Argtype() {} -func (*ClientArgs_Mark) isClientArgs_Argtype() {} + +func (*ClientArgs_Mark) isClientArgs_Argtype() {} func (m *ClientArgs) GetArgtype() isClientArgs_Argtype { if m != nil { @@ -1063,12 +1073,14 @@ type isServerArgs_Argtype interface { type ServerArgs_Setup struct { Setup *ServerConfig `protobuf:"bytes,1,opt,name=setup,proto3,oneof"` } + type ServerArgs_Mark struct { Mark *Mark `protobuf:"bytes,2,opt,name=mark,proto3,oneof"` } func (*ServerArgs_Setup) isServerArgs_Argtype() {} -func (*ServerArgs_Mark) isServerArgs_Argtype() {} + +func (*ServerArgs_Mark) isServerArgs_Argtype() {} func (m *ServerArgs) GetArgtype() isServerArgs_Argtype { if m != nil { diff --git a/benchmark/grpc_testing/payloads.pb.go b/benchmark/grpc_testing/payloads.pb.go index 1882fe7e2..f7f9cf8eb 100644 --- a/benchmark/grpc_testing/payloads.pb.go +++ b/benchmark/grpc_testing/payloads.pb.go @@ -182,15 +182,19 @@ type isPayloadConfig_Payload interface { type PayloadConfig_BytebufParams struct { BytebufParams *ByteBufferParams `protobuf:"bytes,1,opt,name=bytebuf_params,json=bytebufParams,proto3,oneof"` } + type PayloadConfig_SimpleParams struct { SimpleParams *SimpleProtoParams `protobuf:"bytes,2,opt,name=simple_params,json=simpleParams,proto3,oneof"` } + type PayloadConfig_ComplexParams struct { ComplexParams *ComplexProtoParams `protobuf:"bytes,3,opt,name=complex_params,json=complexParams,proto3,oneof"` } func (*PayloadConfig_BytebufParams) isPayloadConfig_Payload() {} -func (*PayloadConfig_SimpleParams) isPayloadConfig_Payload() {} + +func (*PayloadConfig_SimpleParams) isPayloadConfig_Payload() {} + func (*PayloadConfig_ComplexParams) isPayloadConfig_Payload() {} func (m *PayloadConfig) GetPayload() isPayloadConfig_Payload { diff --git a/channelz/grpc_channelz_v1/channelz.pb.go b/channelz/grpc_channelz_v1/channelz.pb.go index 747b8f833..72558c901 100644 --- a/channelz/grpc_channelz_v1/channelz.pb.go +++ b/channelz/grpc_channelz_v1/channelz.pb.go @@ -437,27 +437,6 @@ func (m *ChannelTraceEvent) XXX_DiscardUnknown() { var xxx_messageInfo_ChannelTraceEvent proto.InternalMessageInfo -type isChannelTraceEvent_ChildRef interface { - isChannelTraceEvent_ChildRef() -} - -type ChannelTraceEvent_ChannelRef struct { - ChannelRef *ChannelRef `protobuf:"bytes,4,opt,name=channel_ref,json=channelRef,proto3,oneof"` -} -type ChannelTraceEvent_SubchannelRef struct { - SubchannelRef *SubchannelRef `protobuf:"bytes,5,opt,name=subchannel_ref,json=subchannelRef,proto3,oneof"` -} - -func (*ChannelTraceEvent_ChannelRef) isChannelTraceEvent_ChildRef() {} -func (*ChannelTraceEvent_SubchannelRef) isChannelTraceEvent_ChildRef() {} - -func (m *ChannelTraceEvent) GetChildRef() isChannelTraceEvent_ChildRef { - if m != nil { - return m.ChildRef - } - return nil -} - func (m *ChannelTraceEvent) GetDescription() string { if m != nil { return m.Description @@ -479,6 +458,29 @@ func (m *ChannelTraceEvent) GetTimestamp() *timestamp.Timestamp { return nil } +type isChannelTraceEvent_ChildRef interface { + isChannelTraceEvent_ChildRef() +} + +type ChannelTraceEvent_ChannelRef struct { + ChannelRef *ChannelRef `protobuf:"bytes,4,opt,name=channel_ref,json=channelRef,proto3,oneof"` +} + +type ChannelTraceEvent_SubchannelRef struct { + SubchannelRef *SubchannelRef `protobuf:"bytes,5,opt,name=subchannel_ref,json=subchannelRef,proto3,oneof"` +} + +func (*ChannelTraceEvent_ChannelRef) isChannelTraceEvent_ChildRef() {} + +func (*ChannelTraceEvent_SubchannelRef) isChannelTraceEvent_ChildRef() {} + +func (m *ChannelTraceEvent) GetChildRef() isChannelTraceEvent_ChildRef { + if m != nil { + return m.ChildRef + } + return nil +} + func (m *ChannelTraceEvent) GetChannelRef() *ChannelRef { if x, ok := m.GetChildRef().(*ChannelTraceEvent_ChannelRef); ok { return x.ChannelRef @@ -1249,15 +1251,19 @@ type isAddress_Address interface { type Address_TcpipAddress struct { TcpipAddress *Address_TcpIpAddress `protobuf:"bytes,1,opt,name=tcpip_address,json=tcpipAddress,proto3,oneof"` } + type Address_UdsAddress_ struct { UdsAddress *Address_UdsAddress `protobuf:"bytes,2,opt,name=uds_address,json=udsAddress,proto3,oneof"` } + type Address_OtherAddress_ struct { OtherAddress *Address_OtherAddress `protobuf:"bytes,3,opt,name=other_address,json=otherAddress,proto3,oneof"` } -func (*Address_TcpipAddress) isAddress_Address() {} -func (*Address_UdsAddress_) isAddress_Address() {} +func (*Address_TcpipAddress) isAddress_Address() {} + +func (*Address_UdsAddress_) isAddress_Address() {} + func (*Address_OtherAddress_) isAddress_Address() {} func (m *Address) GetAddress() isAddress_Address { @@ -1560,11 +1566,13 @@ type isSecurity_Model interface { type Security_Tls_ struct { Tls *Security_Tls `protobuf:"bytes,1,opt,name=tls,proto3,oneof"` } + type Security_Other struct { Other *Security_OtherSecurity `protobuf:"bytes,2,opt,name=other,proto3,oneof"` } -func (*Security_Tls_) isSecurity_Model() {} +func (*Security_Tls_) isSecurity_Model() {} + func (*Security_Other) isSecurity_Model() {} func (m *Security) GetModel() isSecurity_Model { @@ -1707,12 +1715,14 @@ type isSecurity_Tls_CipherSuite interface { type Security_Tls_StandardName struct { StandardName string `protobuf:"bytes,1,opt,name=standard_name,json=standardName,proto3,oneof"` } + type Security_Tls_OtherName struct { OtherName string `protobuf:"bytes,2,opt,name=other_name,json=otherName,proto3,oneof"` } func (*Security_Tls_StandardName) isSecurity_Tls_CipherSuite() {} -func (*Security_Tls_OtherName) isSecurity_Tls_CipherSuite() {} + +func (*Security_Tls_OtherName) isSecurity_Tls_CipherSuite() {} func (m *Security_Tls) GetCipherSuite() isSecurity_Tls_CipherSuite { if m != nil { diff --git a/credentials/alts/core/proto/grpc_gcp/handshaker.pb.go b/credentials/alts/core/proto/grpc_gcp/handshaker.pb.go index 01e87194b..99a1cc426 100644 --- a/credentials/alts/core/proto/grpc_gcp/handshaker.pb.go +++ b/credentials/alts/core/proto/grpc_gcp/handshaker.pb.go @@ -177,12 +177,14 @@ type isIdentity_IdentityOneof interface { type Identity_ServiceAccount struct { ServiceAccount string `protobuf:"bytes,1,opt,name=service_account,json=serviceAccount,proto3,oneof"` } + type Identity_Hostname struct { Hostname string `protobuf:"bytes,2,opt,name=hostname,proto3,oneof"` } func (*Identity_ServiceAccount) isIdentity_IdentityOneof() {} -func (*Identity_Hostname) isIdentity_IdentityOneof() {} + +func (*Identity_Hostname) isIdentity_IdentityOneof() {} func (m *Identity) GetIdentityOneof() isIdentity_IdentityOneof { if m != nil { @@ -616,16 +618,20 @@ type isHandshakerReq_ReqOneof interface { type HandshakerReq_ClientStart struct { ClientStart *StartClientHandshakeReq `protobuf:"bytes,1,opt,name=client_start,json=clientStart,proto3,oneof"` } + type HandshakerReq_ServerStart struct { ServerStart *StartServerHandshakeReq `protobuf:"bytes,2,opt,name=server_start,json=serverStart,proto3,oneof"` } + type HandshakerReq_Next struct { Next *NextHandshakeMessageReq `protobuf:"bytes,3,opt,name=next,proto3,oneof"` } func (*HandshakerReq_ClientStart) isHandshakerReq_ReqOneof() {} + func (*HandshakerReq_ServerStart) isHandshakerReq_ReqOneof() {} -func (*HandshakerReq_Next) isHandshakerReq_ReqOneof() {} + +func (*HandshakerReq_Next) isHandshakerReq_ReqOneof() {} func (m *HandshakerReq) GetReqOneof() isHandshakerReq_ReqOneof { if m != nil { diff --git a/reflection/grpc_reflection_v1alpha/reflection.pb.go b/reflection/grpc_reflection_v1alpha/reflection.pb.go index 4bc5404ae..ae5aa7dbe 100644 --- a/reflection/grpc_reflection_v1alpha/reflection.pb.go +++ b/reflection/grpc_reflection_v1alpha/reflection.pb.go @@ -66,6 +66,13 @@ func (m *ServerReflectionRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ServerReflectionRequest proto.InternalMessageInfo +func (m *ServerReflectionRequest) GetHost() string { + if m != nil { + return m.Host + } + return "" +} + type isServerReflectionRequest_MessageRequest interface { isServerReflectionRequest_MessageRequest() } @@ -73,24 +80,32 @@ type isServerReflectionRequest_MessageRequest interface { type ServerReflectionRequest_FileByFilename struct { FileByFilename string `protobuf:"bytes,3,opt,name=file_by_filename,json=fileByFilename,proto3,oneof"` } + type ServerReflectionRequest_FileContainingSymbol struct { FileContainingSymbol string `protobuf:"bytes,4,opt,name=file_containing_symbol,json=fileContainingSymbol,proto3,oneof"` } + type ServerReflectionRequest_FileContainingExtension struct { FileContainingExtension *ExtensionRequest `protobuf:"bytes,5,opt,name=file_containing_extension,json=fileContainingExtension,proto3,oneof"` } + type ServerReflectionRequest_AllExtensionNumbersOfType struct { AllExtensionNumbersOfType string `protobuf:"bytes,6,opt,name=all_extension_numbers_of_type,json=allExtensionNumbersOfType,proto3,oneof"` } + type ServerReflectionRequest_ListServices struct { ListServices string `protobuf:"bytes,7,opt,name=list_services,json=listServices,proto3,oneof"` } -func (*ServerReflectionRequest_FileByFilename) isServerReflectionRequest_MessageRequest() {} -func (*ServerReflectionRequest_FileContainingSymbol) isServerReflectionRequest_MessageRequest() {} -func (*ServerReflectionRequest_FileContainingExtension) isServerReflectionRequest_MessageRequest() {} +func (*ServerReflectionRequest_FileByFilename) isServerReflectionRequest_MessageRequest() {} + +func (*ServerReflectionRequest_FileContainingSymbol) isServerReflectionRequest_MessageRequest() {} + +func (*ServerReflectionRequest_FileContainingExtension) isServerReflectionRequest_MessageRequest() {} + func (*ServerReflectionRequest_AllExtensionNumbersOfType) isServerReflectionRequest_MessageRequest() {} -func (*ServerReflectionRequest_ListServices) isServerReflectionRequest_MessageRequest() {} + +func (*ServerReflectionRequest_ListServices) isServerReflectionRequest_MessageRequest() {} func (m *ServerReflectionRequest) GetMessageRequest() isServerReflectionRequest_MessageRequest { if m != nil { @@ -99,13 +114,6 @@ func (m *ServerReflectionRequest) GetMessageRequest() isServerReflectionRequest_ return nil } -func (m *ServerReflectionRequest) GetHost() string { - if m != nil { - return m.Host - } - return "" -} - func (m *ServerReflectionRequest) GetFileByFilename() string { if x, ok := m.GetMessageRequest().(*ServerReflectionRequest_FileByFilename); ok { return x.FileByFilename @@ -347,36 +355,6 @@ func (m *ServerReflectionResponse) XXX_DiscardUnknown() { var xxx_messageInfo_ServerReflectionResponse proto.InternalMessageInfo -type isServerReflectionResponse_MessageResponse interface { - isServerReflectionResponse_MessageResponse() -} - -type ServerReflectionResponse_FileDescriptorResponse struct { - FileDescriptorResponse *FileDescriptorResponse `protobuf:"bytes,4,opt,name=file_descriptor_response,json=fileDescriptorResponse,proto3,oneof"` -} -type ServerReflectionResponse_AllExtensionNumbersResponse struct { - AllExtensionNumbersResponse *ExtensionNumberResponse `protobuf:"bytes,5,opt,name=all_extension_numbers_response,json=allExtensionNumbersResponse,proto3,oneof"` -} -type ServerReflectionResponse_ListServicesResponse struct { - ListServicesResponse *ListServiceResponse `protobuf:"bytes,6,opt,name=list_services_response,json=listServicesResponse,proto3,oneof"` -} -type ServerReflectionResponse_ErrorResponse struct { - ErrorResponse *ErrorResponse `protobuf:"bytes,7,opt,name=error_response,json=errorResponse,proto3,oneof"` -} - -func (*ServerReflectionResponse_FileDescriptorResponse) isServerReflectionResponse_MessageResponse() {} -func (*ServerReflectionResponse_AllExtensionNumbersResponse) isServerReflectionResponse_MessageResponse() { -} -func (*ServerReflectionResponse_ListServicesResponse) isServerReflectionResponse_MessageResponse() {} -func (*ServerReflectionResponse_ErrorResponse) isServerReflectionResponse_MessageResponse() {} - -func (m *ServerReflectionResponse) GetMessageResponse() isServerReflectionResponse_MessageResponse { - if m != nil { - return m.MessageResponse - } - return nil -} - func (m *ServerReflectionResponse) GetValidHost() string { if m != nil { return m.ValidHost @@ -391,6 +369,42 @@ func (m *ServerReflectionResponse) GetOriginalRequest() *ServerReflectionRequest return nil } +type isServerReflectionResponse_MessageResponse interface { + isServerReflectionResponse_MessageResponse() +} + +type ServerReflectionResponse_FileDescriptorResponse struct { + FileDescriptorResponse *FileDescriptorResponse `protobuf:"bytes,4,opt,name=file_descriptor_response,json=fileDescriptorResponse,proto3,oneof"` +} + +type ServerReflectionResponse_AllExtensionNumbersResponse struct { + AllExtensionNumbersResponse *ExtensionNumberResponse `protobuf:"bytes,5,opt,name=all_extension_numbers_response,json=allExtensionNumbersResponse,proto3,oneof"` +} + +type ServerReflectionResponse_ListServicesResponse struct { + ListServicesResponse *ListServiceResponse `protobuf:"bytes,6,opt,name=list_services_response,json=listServicesResponse,proto3,oneof"` +} + +type ServerReflectionResponse_ErrorResponse struct { + ErrorResponse *ErrorResponse `protobuf:"bytes,7,opt,name=error_response,json=errorResponse,proto3,oneof"` +} + +func (*ServerReflectionResponse_FileDescriptorResponse) isServerReflectionResponse_MessageResponse() {} + +func (*ServerReflectionResponse_AllExtensionNumbersResponse) isServerReflectionResponse_MessageResponse() { +} + +func (*ServerReflectionResponse_ListServicesResponse) isServerReflectionResponse_MessageResponse() {} + +func (*ServerReflectionResponse_ErrorResponse) isServerReflectionResponse_MessageResponse() {} + +func (m *ServerReflectionResponse) GetMessageResponse() isServerReflectionResponse_MessageResponse { + if m != nil { + return m.MessageResponse + } + return nil +} + func (m *ServerReflectionResponse) GetFileDescriptorResponse() *FileDescriptorResponse { if x, ok := m.GetMessageResponse().(*ServerReflectionResponse_FileDescriptorResponse); ok { return x.FileDescriptorResponse diff --git a/stress/grpc_testing/metrics.pb.go b/stress/grpc_testing/metrics.pb.go index 31e95d2b8..0a8ad44f0 100644 --- a/stress/grpc_testing/metrics.pb.go +++ b/stress/grpc_testing/metrics.pb.go @@ -60,6 +60,13 @@ func (m *GaugeResponse) XXX_DiscardUnknown() { var xxx_messageInfo_GaugeResponse proto.InternalMessageInfo +func (m *GaugeResponse) GetName() string { + if m != nil { + return m.Name + } + return "" +} + type isGaugeResponse_Value interface { isGaugeResponse_Value() } @@ -67,15 +74,19 @@ type isGaugeResponse_Value interface { type GaugeResponse_LongValue struct { LongValue int64 `protobuf:"varint,2,opt,name=long_value,json=longValue,proto3,oneof"` } + type GaugeResponse_DoubleValue struct { DoubleValue float64 `protobuf:"fixed64,3,opt,name=double_value,json=doubleValue,proto3,oneof"` } + type GaugeResponse_StringValue struct { StringValue string `protobuf:"bytes,4,opt,name=string_value,json=stringValue,proto3,oneof"` } -func (*GaugeResponse_LongValue) isGaugeResponse_Value() {} +func (*GaugeResponse_LongValue) isGaugeResponse_Value() {} + func (*GaugeResponse_DoubleValue) isGaugeResponse_Value() {} + func (*GaugeResponse_StringValue) isGaugeResponse_Value() {} func (m *GaugeResponse) GetValue() isGaugeResponse_Value { @@ -85,13 +96,6 @@ func (m *GaugeResponse) GetValue() isGaugeResponse_Value { return nil } -func (m *GaugeResponse) GetName() string { - if m != nil { - return m.Name - } - return "" -} - func (m *GaugeResponse) GetLongValue() int64 { if x, ok := m.GetValue().(*GaugeResponse_LongValue); ok { return x.LongValue