From 20636e76a99aed65ef8706949d2400079ba003da Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Mon, 16 Nov 2020 19:59:46 -0500 Subject: [PATCH] protobuf: update protoc to latest version (#4038) Presently, protoc 3.3.0 (released in 2017) is still being used. This commit updates the vet.sh script as well as existing generated files to use protoc 3.14.0 instead. The only concrete change this brings is updated import paths of Timestamp and Duration types. However, in practice this is a no-op, since the types themselves are already aliased to the new import path: - https://pkg.go.dev/github.com/golang/protobuf@v1.4.3/ptypes/duration#Duration - https://pkg.go.dev/github.com/golang/protobuf@v1.4.3/ptypes/timestamp#Timestamp --- .../grpclb/grpc_lb_v1/load_balancer.pb.go | 18 ++--- .../internal/proto/grpc_lookup_v1/rls.pb.go | 2 +- .../proto/grpc_lookup_v1/rls_config.pb.go | 18 ++--- benchmark/grpc_testing/control.pb.go | 2 +- benchmark/grpc_testing/messages.pb.go | 2 +- benchmark/grpc_testing/payloads.pb.go | 2 +- benchmark/grpc_testing/services.pb.go | 2 +- benchmark/grpc_testing/stats.pb.go | 2 +- binarylog/grpc_binarylog_v1/binarylog.pb.go | 40 +++++----- channelz/grpc_channelz_v1/channelz.pb.go | 78 +++++++++---------- .../internal/proto/grpc_gcp/altscontext.pb.go | 2 +- .../internal/proto/grpc_gcp/handshaker.pb.go | 2 +- .../grpc_gcp/transport_security_common.pb.go | 2 +- .../internal/meshca_experimental/config.pb.go | 14 ++-- .../meshca/internal/v1/meshca.pb.go | 10 +-- examples/features/proto/echo/echo.pb.go | 2 +- .../helloworld/helloworld/helloworld.pb.go | 2 +- .../route_guide/routeguide/route_guide.pb.go | 2 +- health/grpc_health_v1/health.pb.go | 2 +- .../grpc_service_config/service_config.pb.go | 56 ++++++------- interop/grpc_testing/test.pb.go | 2 +- profiling/proto/service.pb.go | 2 +- .../grpc_reflection_v1alpha/reflection.pb.go | 2 +- reflection/grpc_testing/proto2.pb.go | 2 +- reflection/grpc_testing/proto2_ext.pb.go | 2 +- reflection/grpc_testing/proto2_ext2.pb.go | 2 +- reflection/grpc_testing/test.pb.go | 2 +- stats/grpc_testing/test.pb.go | 2 +- stress/grpc_testing/metrics.pb.go | 2 +- test/codec_perf/perf.pb.go | 2 +- test/grpc_testing/test.pb.go | 2 +- vet.sh | 4 +- 32 files changed, 143 insertions(+), 143 deletions(-) diff --git a/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go b/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go index 4725858e79d9..c393d7ffd3b2 100644 --- a/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go +++ b/balancer/grpclb/grpc_lb_v1/load_balancer.pb.go @@ -20,17 +20,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: grpc/lb/v1/load_balancer.proto package grpc_lb_v1 import ( proto "github.com/golang/protobuf/proto" - duration "github.com/golang/protobuf/ptypes/duration" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -246,7 +246,7 @@ type ClientStats struct { unknownFields protoimpl.UnknownFields // The timestamp of generating the report. - Timestamp *timestamp.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + Timestamp *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` // The total number of RPCs that started. NumCallsStarted int64 `protobuf:"varint,2,opt,name=num_calls_started,json=numCallsStarted,proto3" json:"num_calls_started,omitempty"` // The total number of RPCs that finished. @@ -292,7 +292,7 @@ func (*ClientStats) Descriptor() ([]byte, []int) { return file_grpc_lb_v1_load_balancer_proto_rawDescGZIP(), []int{3} } -func (x *ClientStats) GetTimestamp() *timestamp.Timestamp { +func (x *ClientStats) GetTimestamp() *timestamppb.Timestamp { if x != nil { return x.Timestamp } @@ -479,7 +479,7 @@ type InitialLoadBalanceResponse struct { // This interval defines how often the client should send the client stats // to the load balancer. Stats should only be reported when the duration is // positive. - ClientStatsReportInterval *duration.Duration `protobuf:"bytes,2,opt,name=client_stats_report_interval,json=clientStatsReportInterval,proto3" json:"client_stats_report_interval,omitempty"` + ClientStatsReportInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=client_stats_report_interval,json=clientStatsReportInterval,proto3" json:"client_stats_report_interval,omitempty"` } func (x *InitialLoadBalanceResponse) Reset() { @@ -514,7 +514,7 @@ func (*InitialLoadBalanceResponse) Descriptor() ([]byte, []int) { return file_grpc_lb_v1_load_balancer_proto_rawDescGZIP(), []int{6} } -func (x *InitialLoadBalanceResponse) GetClientStatsReportInterval() *duration.Duration { +func (x *InitialLoadBalanceResponse) GetClientStatsReportInterval() *durationpb.Duration { if x != nil { return x.ClientStatsReportInterval } @@ -793,8 +793,8 @@ var file_grpc_lb_v1_load_balancer_proto_goTypes = []interface{}{ (*InitialLoadBalanceResponse)(nil), // 6: grpc.lb.v1.InitialLoadBalanceResponse (*ServerList)(nil), // 7: grpc.lb.v1.ServerList (*Server)(nil), // 8: grpc.lb.v1.Server - (*timestamp.Timestamp)(nil), // 9: google.protobuf.Timestamp - (*duration.Duration)(nil), // 10: google.protobuf.Duration + (*timestamppb.Timestamp)(nil), // 9: google.protobuf.Timestamp + (*durationpb.Duration)(nil), // 10: google.protobuf.Duration } var file_grpc_lb_v1_load_balancer_proto_depIdxs = []int32{ 1, // 0: grpc.lb.v1.LoadBalanceRequest.initial_request:type_name -> grpc.lb.v1.InitialLoadBalanceRequest diff --git a/balancer/rls/internal/proto/grpc_lookup_v1/rls.pb.go b/balancer/rls/internal/proto/grpc_lookup_v1/rls.pb.go index aad29f104b19..d48a1a6de84d 100644 --- a/balancer/rls/internal/proto/grpc_lookup_v1/rls.pb.go +++ b/balancer/rls/internal/proto/grpc_lookup_v1/rls.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: grpc/lookup/v1/rls.proto package grpc_lookup_v1 diff --git a/balancer/rls/internal/proto/grpc_lookup_v1/rls_config.pb.go b/balancer/rls/internal/proto/grpc_lookup_v1/rls_config.pb.go index e8a7a6dae544..6b0924b335fa 100644 --- a/balancer/rls/internal/proto/grpc_lookup_v1/rls_config.pb.go +++ b/balancer/rls/internal/proto/grpc_lookup_v1/rls_config.pb.go @@ -15,16 +15,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: grpc/lookup/v1/rls_config.proto package grpc_lookup_v1 import ( proto "github.com/golang/protobuf/proto" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -328,17 +328,17 @@ type RouteLookupConfig struct { LookupService string `protobuf:"bytes,3,opt,name=lookup_service,json=lookupService,proto3" json:"lookup_service,omitempty"` // Configure a timeout value for lookup service requests. // Defaults to 10 seconds if not specified. - LookupServiceTimeout *duration.Duration `protobuf:"bytes,4,opt,name=lookup_service_timeout,json=lookupServiceTimeout,proto3" json:"lookup_service_timeout,omitempty"` + LookupServiceTimeout *durationpb.Duration `protobuf:"bytes,4,opt,name=lookup_service_timeout,json=lookupServiceTimeout,proto3" json:"lookup_service_timeout,omitempty"` // How long are responses valid for (like HTTP Cache-Control). // If omitted or zero, the longest valid cache time is used. // This value is clamped to 5 minutes to avoid unflushable bad responses. - MaxAge *duration.Duration `protobuf:"bytes,5,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"` + MaxAge *durationpb.Duration `protobuf:"bytes,5,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"` // After a response has been in the client cache for this amount of time // and is re-requested, start an asynchronous RPC to re-validate it. // This value should be less than max_age by at least the length of a // typical RTT to the Route Lookup Service to fully mask the RTT latency. // If omitted, keys are only re-requested after they have expired. - StaleAge *duration.Duration `protobuf:"bytes,6,opt,name=stale_age,json=staleAge,proto3" json:"stale_age,omitempty"` + StaleAge *durationpb.Duration `protobuf:"bytes,6,opt,name=stale_age,json=staleAge,proto3" json:"stale_age,omitempty"` // Rough indicator of amount of memory to use for the client cache. Some of // the data structure overhead is not accounted for, so actual memory consumed // will be somewhat greater than this value. If this field is omitted or set @@ -409,21 +409,21 @@ func (x *RouteLookupConfig) GetLookupService() string { return "" } -func (x *RouteLookupConfig) GetLookupServiceTimeout() *duration.Duration { +func (x *RouteLookupConfig) GetLookupServiceTimeout() *durationpb.Duration { if x != nil { return x.LookupServiceTimeout } return nil } -func (x *RouteLookupConfig) GetMaxAge() *duration.Duration { +func (x *RouteLookupConfig) GetMaxAge() *durationpb.Duration { if x != nil { return x.MaxAge } return nil } -func (x *RouteLookupConfig) GetStaleAge() *duration.Duration { +func (x *RouteLookupConfig) GetStaleAge() *durationpb.Duration { if x != nil { return x.StaleAge } @@ -611,7 +611,7 @@ var file_grpc_lookup_v1_rls_config_proto_goTypes = []interface{}{ (*HttpKeyBuilder)(nil), // 2: grpc.lookup.v1.HttpKeyBuilder (*RouteLookupConfig)(nil), // 3: grpc.lookup.v1.RouteLookupConfig (*GrpcKeyBuilder_Name)(nil), // 4: grpc.lookup.v1.GrpcKeyBuilder.Name - (*duration.Duration)(nil), // 5: google.protobuf.Duration + (*durationpb.Duration)(nil), // 5: google.protobuf.Duration } var file_grpc_lookup_v1_rls_config_proto_depIdxs = []int32{ 4, // 0: grpc.lookup.v1.GrpcKeyBuilder.names:type_name -> grpc.lookup.v1.GrpcKeyBuilder.Name diff --git a/benchmark/grpc_testing/control.pb.go b/benchmark/grpc_testing/control.pb.go index 9cb9a2fcde6e..af117985dbda 100644 --- a/benchmark/grpc_testing/control.pb.go +++ b/benchmark/grpc_testing/control.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: benchmark/grpc_testing/control.proto package grpc_testing diff --git a/benchmark/grpc_testing/messages.pb.go b/benchmark/grpc_testing/messages.pb.go index 924e24e1ef9c..eb6e2975b326 100644 --- a/benchmark/grpc_testing/messages.pb.go +++ b/benchmark/grpc_testing/messages.pb.go @@ -17,7 +17,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: benchmark/grpc_testing/messages.proto package grpc_testing diff --git a/benchmark/grpc_testing/payloads.pb.go b/benchmark/grpc_testing/payloads.pb.go index 5e6313896009..f8a3edbd854f 100644 --- a/benchmark/grpc_testing/payloads.pb.go +++ b/benchmark/grpc_testing/payloads.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: benchmark/grpc_testing/payloads.proto package grpc_testing diff --git a/benchmark/grpc_testing/services.pb.go b/benchmark/grpc_testing/services.pb.go index 70f66ffca46f..17d33e05678b 100644 --- a/benchmark/grpc_testing/services.pb.go +++ b/benchmark/grpc_testing/services.pb.go @@ -18,7 +18,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: benchmark/grpc_testing/services.proto package grpc_testing diff --git a/benchmark/grpc_testing/stats.pb.go b/benchmark/grpc_testing/stats.pb.go index 9dcf37ac3abd..87fc9bf2d3bc 100644 --- a/benchmark/grpc_testing/stats.pb.go +++ b/benchmark/grpc_testing/stats.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: benchmark/grpc_testing/stats.proto package grpc_testing diff --git a/binarylog/grpc_binarylog_v1/binarylog.pb.go b/binarylog/grpc_binarylog_v1/binarylog.pb.go index da0472967615..ed75290cdf34 100644 --- a/binarylog/grpc_binarylog_v1/binarylog.pb.go +++ b/binarylog/grpc_binarylog_v1/binarylog.pb.go @@ -19,17 +19,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: grpc/binlog/v1/binarylog.proto package grpc_binarylog_v1 import ( proto "github.com/golang/protobuf/proto" - duration "github.com/golang/protobuf/ptypes/duration" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -243,7 +243,7 @@ type GrpcLogEntry struct { unknownFields protoimpl.UnknownFields // The timestamp of the binary log message - Timestamp *timestamp.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + Timestamp *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` // Uniquely identifies a call. The value must not be 0 in order to disambiguate // from an unset value. // Each call may have several log entries, they will all have the same call_id. @@ -308,7 +308,7 @@ func (*GrpcLogEntry) Descriptor() ([]byte, []int) { return file_grpc_binlog_v1_binarylog_proto_rawDescGZIP(), []int{0} } -func (x *GrpcLogEntry) GetTimestamp() *timestamp.Timestamp { +func (x *GrpcLogEntry) GetTimestamp() *timestamppb.Timestamp { if x != nil { return x.Timestamp } @@ -439,7 +439,7 @@ type ClientHeader struct { // or : . Authority string `protobuf:"bytes,3,opt,name=authority,proto3" json:"authority,omitempty"` // the RPC timeout - Timeout *duration.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (x *ClientHeader) Reset() { @@ -495,7 +495,7 @@ func (x *ClientHeader) GetAuthority() string { return "" } -func (x *ClientHeader) GetTimeout() *duration.Duration { +func (x *ClientHeader) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -1020,19 +1020,19 @@ func file_grpc_binlog_v1_binarylog_proto_rawDescGZIP() []byte { var file_grpc_binlog_v1_binarylog_proto_enumTypes = make([]protoimpl.EnumInfo, 3) var file_grpc_binlog_v1_binarylog_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_grpc_binlog_v1_binarylog_proto_goTypes = []interface{}{ - (GrpcLogEntry_EventType)(0), // 0: grpc.binarylog.v1.GrpcLogEntry.EventType - (GrpcLogEntry_Logger)(0), // 1: grpc.binarylog.v1.GrpcLogEntry.Logger - (Address_Type)(0), // 2: grpc.binarylog.v1.Address.Type - (*GrpcLogEntry)(nil), // 3: grpc.binarylog.v1.GrpcLogEntry - (*ClientHeader)(nil), // 4: grpc.binarylog.v1.ClientHeader - (*ServerHeader)(nil), // 5: grpc.binarylog.v1.ServerHeader - (*Trailer)(nil), // 6: grpc.binarylog.v1.Trailer - (*Message)(nil), // 7: grpc.binarylog.v1.Message - (*Metadata)(nil), // 8: grpc.binarylog.v1.Metadata - (*MetadataEntry)(nil), // 9: grpc.binarylog.v1.MetadataEntry - (*Address)(nil), // 10: grpc.binarylog.v1.Address - (*timestamp.Timestamp)(nil), // 11: google.protobuf.Timestamp - (*duration.Duration)(nil), // 12: google.protobuf.Duration + (GrpcLogEntry_EventType)(0), // 0: grpc.binarylog.v1.GrpcLogEntry.EventType + (GrpcLogEntry_Logger)(0), // 1: grpc.binarylog.v1.GrpcLogEntry.Logger + (Address_Type)(0), // 2: grpc.binarylog.v1.Address.Type + (*GrpcLogEntry)(nil), // 3: grpc.binarylog.v1.GrpcLogEntry + (*ClientHeader)(nil), // 4: grpc.binarylog.v1.ClientHeader + (*ServerHeader)(nil), // 5: grpc.binarylog.v1.ServerHeader + (*Trailer)(nil), // 6: grpc.binarylog.v1.Trailer + (*Message)(nil), // 7: grpc.binarylog.v1.Message + (*Metadata)(nil), // 8: grpc.binarylog.v1.Metadata + (*MetadataEntry)(nil), // 9: grpc.binarylog.v1.MetadataEntry + (*Address)(nil), // 10: grpc.binarylog.v1.Address + (*timestamppb.Timestamp)(nil), // 11: google.protobuf.Timestamp + (*durationpb.Duration)(nil), // 12: google.protobuf.Duration } var file_grpc_binlog_v1_binarylog_proto_depIdxs = []int32{ 11, // 0: grpc.binarylog.v1.GrpcLogEntry.timestamp:type_name -> google.protobuf.Timestamp diff --git a/channelz/grpc_channelz_v1/channelz.pb.go b/channelz/grpc_channelz_v1/channelz.pb.go index ca98e688b0b8..416b3528d5c6 100644 --- a/channelz/grpc_channelz_v1/channelz.pb.go +++ b/channelz/grpc_channelz_v1/channelz.pb.go @@ -22,19 +22,19 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: grpc/channelz/v1/channelz.proto package grpc_channelz_v1 import ( proto "github.com/golang/protobuf/proto" - any "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -411,7 +411,7 @@ type ChannelData struct { // The number of calls that have completed with a non-OK status CallsFailed int64 `protobuf:"varint,6,opt,name=calls_failed,json=callsFailed,proto3" json:"calls_failed,omitempty"` // The last time a call was started on the channel. - LastCallStartedTimestamp *timestamp.Timestamp `protobuf:"bytes,7,opt,name=last_call_started_timestamp,json=lastCallStartedTimestamp,proto3" json:"last_call_started_timestamp,omitempty"` + LastCallStartedTimestamp *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=last_call_started_timestamp,json=lastCallStartedTimestamp,proto3" json:"last_call_started_timestamp,omitempty"` } func (x *ChannelData) Reset() { @@ -488,7 +488,7 @@ func (x *ChannelData) GetCallsFailed() int64 { return 0 } -func (x *ChannelData) GetLastCallStartedTimestamp() *timestamp.Timestamp { +func (x *ChannelData) GetLastCallStartedTimestamp() *timestamppb.Timestamp { if x != nil { return x.LastCallStartedTimestamp } @@ -507,7 +507,7 @@ type ChannelTraceEvent struct { // the severity of the trace event Severity ChannelTraceEvent_Severity `protobuf:"varint,2,opt,name=severity,proto3,enum=grpc.channelz.v1.ChannelTraceEvent_Severity" json:"severity,omitempty"` // When this event occurred. - Timestamp *timestamp.Timestamp `protobuf:"bytes,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + Timestamp *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` // ref of referenced channel or subchannel. // Optional, only present if this event refers to a child object. For example, // this field would be filled if this trace event was for a subchannel being @@ -565,7 +565,7 @@ func (x *ChannelTraceEvent) GetSeverity() ChannelTraceEvent_Severity { return ChannelTraceEvent_CT_UNKNOWN } -func (x *ChannelTraceEvent) GetTimestamp() *timestamp.Timestamp { +func (x *ChannelTraceEvent) GetTimestamp() *timestamppb.Timestamp { if x != nil { return x.Timestamp } @@ -620,7 +620,7 @@ type ChannelTrace struct { // implementations. NumEventsLogged int64 `protobuf:"varint,1,opt,name=num_events_logged,json=numEventsLogged,proto3" json:"num_events_logged,omitempty"` // Time that this channel was created. - CreationTimestamp *timestamp.Timestamp `protobuf:"bytes,2,opt,name=creation_timestamp,json=creationTimestamp,proto3" json:"creation_timestamp,omitempty"` + CreationTimestamp *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=creation_timestamp,json=creationTimestamp,proto3" json:"creation_timestamp,omitempty"` // List of events that have occurred on this channel. Events []*ChannelTraceEvent `protobuf:"bytes,3,rep,name=events,proto3" json:"events,omitempty"` } @@ -664,7 +664,7 @@ func (x *ChannelTrace) GetNumEventsLogged() int64 { return 0 } -func (x *ChannelTrace) GetCreationTimestamp() *timestamp.Timestamp { +func (x *ChannelTrace) GetCreationTimestamp() *timestamppb.Timestamp { if x != nil { return x.CreationTimestamp } @@ -994,7 +994,7 @@ type ServerData struct { // The number of incoming calls that have a completed with a non-OK status CallsFailed int64 `protobuf:"varint,4,opt,name=calls_failed,json=callsFailed,proto3" json:"calls_failed,omitempty"` // The last time a call was started on the server. - LastCallStartedTimestamp *timestamp.Timestamp `protobuf:"bytes,5,opt,name=last_call_started_timestamp,json=lastCallStartedTimestamp,proto3" json:"last_call_started_timestamp,omitempty"` + LastCallStartedTimestamp *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=last_call_started_timestamp,json=lastCallStartedTimestamp,proto3" json:"last_call_started_timestamp,omitempty"` } func (x *ServerData) Reset() { @@ -1057,7 +1057,7 @@ func (x *ServerData) GetCallsFailed() int64 { return 0 } -func (x *ServerData) GetLastCallStartedTimestamp() *timestamp.Timestamp { +func (x *ServerData) GetLastCallStartedTimestamp() *timestamppb.Timestamp { if x != nil { return x.LastCallStartedTimestamp } @@ -1187,22 +1187,22 @@ type SocketData struct { KeepAlivesSent int64 `protobuf:"varint,6,opt,name=keep_alives_sent,json=keepAlivesSent,proto3" json:"keep_alives_sent,omitempty"` // The last time a stream was created by this endpoint. Usually unset for // servers. - LastLocalStreamCreatedTimestamp *timestamp.Timestamp `protobuf:"bytes,7,opt,name=last_local_stream_created_timestamp,json=lastLocalStreamCreatedTimestamp,proto3" json:"last_local_stream_created_timestamp,omitempty"` + LastLocalStreamCreatedTimestamp *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=last_local_stream_created_timestamp,json=lastLocalStreamCreatedTimestamp,proto3" json:"last_local_stream_created_timestamp,omitempty"` // The last time a stream was created by the remote endpoint. Usually unset // for clients. - LastRemoteStreamCreatedTimestamp *timestamp.Timestamp `protobuf:"bytes,8,opt,name=last_remote_stream_created_timestamp,json=lastRemoteStreamCreatedTimestamp,proto3" json:"last_remote_stream_created_timestamp,omitempty"` + LastRemoteStreamCreatedTimestamp *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=last_remote_stream_created_timestamp,json=lastRemoteStreamCreatedTimestamp,proto3" json:"last_remote_stream_created_timestamp,omitempty"` // The last time a message was sent by this endpoint. - LastMessageSentTimestamp *timestamp.Timestamp `protobuf:"bytes,9,opt,name=last_message_sent_timestamp,json=lastMessageSentTimestamp,proto3" json:"last_message_sent_timestamp,omitempty"` + LastMessageSentTimestamp *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=last_message_sent_timestamp,json=lastMessageSentTimestamp,proto3" json:"last_message_sent_timestamp,omitempty"` // The last time a message was received by this endpoint. - LastMessageReceivedTimestamp *timestamp.Timestamp `protobuf:"bytes,10,opt,name=last_message_received_timestamp,json=lastMessageReceivedTimestamp,proto3" json:"last_message_received_timestamp,omitempty"` + LastMessageReceivedTimestamp *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=last_message_received_timestamp,json=lastMessageReceivedTimestamp,proto3" json:"last_message_received_timestamp,omitempty"` // The amount of window, granted to the local endpoint by the remote endpoint. // This may be slightly out of date due to network latency. This does NOT // include stream level or TCP level flow control info. - LocalFlowControlWindow *wrappers.Int64Value `protobuf:"bytes,11,opt,name=local_flow_control_window,json=localFlowControlWindow,proto3" json:"local_flow_control_window,omitempty"` + LocalFlowControlWindow *wrapperspb.Int64Value `protobuf:"bytes,11,opt,name=local_flow_control_window,json=localFlowControlWindow,proto3" json:"local_flow_control_window,omitempty"` // The amount of window, granted to the remote endpoint by the local endpoint. // This may be slightly out of date due to network latency. This does NOT // include stream level or TCP level flow control info. - RemoteFlowControlWindow *wrappers.Int64Value `protobuf:"bytes,12,opt,name=remote_flow_control_window,json=remoteFlowControlWindow,proto3" json:"remote_flow_control_window,omitempty"` + RemoteFlowControlWindow *wrapperspb.Int64Value `protobuf:"bytes,12,opt,name=remote_flow_control_window,json=remoteFlowControlWindow,proto3" json:"remote_flow_control_window,omitempty"` // Socket options set on this socket. May be absent if 'summary' is set // on GetSocketRequest. Option []*SocketOption `protobuf:"bytes,13,rep,name=option,proto3" json:"option,omitempty"` @@ -1282,42 +1282,42 @@ func (x *SocketData) GetKeepAlivesSent() int64 { return 0 } -func (x *SocketData) GetLastLocalStreamCreatedTimestamp() *timestamp.Timestamp { +func (x *SocketData) GetLastLocalStreamCreatedTimestamp() *timestamppb.Timestamp { if x != nil { return x.LastLocalStreamCreatedTimestamp } return nil } -func (x *SocketData) GetLastRemoteStreamCreatedTimestamp() *timestamp.Timestamp { +func (x *SocketData) GetLastRemoteStreamCreatedTimestamp() *timestamppb.Timestamp { if x != nil { return x.LastRemoteStreamCreatedTimestamp } return nil } -func (x *SocketData) GetLastMessageSentTimestamp() *timestamp.Timestamp { +func (x *SocketData) GetLastMessageSentTimestamp() *timestamppb.Timestamp { if x != nil { return x.LastMessageSentTimestamp } return nil } -func (x *SocketData) GetLastMessageReceivedTimestamp() *timestamp.Timestamp { +func (x *SocketData) GetLastMessageReceivedTimestamp() *timestamppb.Timestamp { if x != nil { return x.LastMessageReceivedTimestamp } return nil } -func (x *SocketData) GetLocalFlowControlWindow() *wrappers.Int64Value { +func (x *SocketData) GetLocalFlowControlWindow() *wrapperspb.Int64Value { if x != nil { return x.LocalFlowControlWindow } return nil } -func (x *SocketData) GetRemoteFlowControlWindow() *wrappers.Int64Value { +func (x *SocketData) GetRemoteFlowControlWindow() *wrapperspb.Int64Value { if x != nil { return x.RemoteFlowControlWindow } @@ -1522,7 +1522,7 @@ type SocketOption struct { Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` // Additional data associated with the socket option. At least one of value // or additional will be set. - Additional *any.Any `protobuf:"bytes,3,opt,name=additional,proto3" json:"additional,omitempty"` + Additional *anypb.Any `protobuf:"bytes,3,opt,name=additional,proto3" json:"additional,omitempty"` } func (x *SocketOption) Reset() { @@ -1571,7 +1571,7 @@ func (x *SocketOption) GetValue() string { return "" } -func (x *SocketOption) GetAdditional() *any.Any { +func (x *SocketOption) GetAdditional() *anypb.Any { if x != nil { return x.Additional } @@ -1585,7 +1585,7 @@ type SocketOptionTimeout struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Duration *duration.Duration `protobuf:"bytes,1,opt,name=duration,proto3" json:"duration,omitempty"` + Duration *durationpb.Duration `protobuf:"bytes,1,opt,name=duration,proto3" json:"duration,omitempty"` } func (x *SocketOptionTimeout) Reset() { @@ -1620,7 +1620,7 @@ func (*SocketOptionTimeout) Descriptor() ([]byte, []int) { return file_grpc_channelz_v1_channelz_proto_rawDescGZIP(), []int{17} } -func (x *SocketOptionTimeout) GetDuration() *duration.Duration { +func (x *SocketOptionTimeout) GetDuration() *durationpb.Duration { if x != nil { return x.Duration } @@ -1637,7 +1637,7 @@ type SocketOptionLinger struct { // active maps to `struct linger.l_onoff` Active bool `protobuf:"varint,1,opt,name=active,proto3" json:"active,omitempty"` // duration maps to `struct linger.l_linger` - Duration *duration.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"` + Duration *durationpb.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"` } func (x *SocketOptionLinger) Reset() { @@ -1679,7 +1679,7 @@ func (x *SocketOptionLinger) GetActive() bool { return false } -func (x *SocketOptionLinger) GetDuration() *duration.Duration { +func (x *SocketOptionLinger) GetDuration() *durationpb.Duration { if x != nil { return x.Duration } @@ -2853,7 +2853,7 @@ type Address_OtherAddress struct { // The human readable version of the value. This value should be set. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // The actual address message. - Value *any.Any `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + Value *anypb.Any `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` } func (x *Address_OtherAddress) Reset() { @@ -2895,7 +2895,7 @@ func (x *Address_OtherAddress) GetName() string { return "" } -func (x *Address_OtherAddress) GetValue() *any.Any { +func (x *Address_OtherAddress) GetValue() *anypb.Any { if x != nil { return x.Value } @@ -3012,7 +3012,7 @@ type Security_OtherSecurity struct { // The human readable version of the value. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // The actual security details message. - Value *any.Any `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + Value *anypb.Any `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` } func (x *Security_OtherSecurity) Reset() { @@ -3054,7 +3054,7 @@ func (x *Security_OtherSecurity) GetName() string { return "" } -func (x *Security_OtherSecurity) GetValue() *any.Any { +func (x *Security_OtherSecurity) GetValue() *anypb.Any { if x != nil { return x.Value } @@ -3632,10 +3632,10 @@ var file_grpc_channelz_v1_channelz_proto_goTypes = []interface{}{ (*Address_OtherAddress)(nil), // 38: grpc.channelz.v1.Address.OtherAddress (*Security_Tls)(nil), // 39: grpc.channelz.v1.Security.Tls (*Security_OtherSecurity)(nil), // 40: grpc.channelz.v1.Security.OtherSecurity - (*timestamp.Timestamp)(nil), // 41: google.protobuf.Timestamp - (*wrappers.Int64Value)(nil), // 42: google.protobuf.Int64Value - (*any.Any)(nil), // 43: google.protobuf.Any - (*duration.Duration)(nil), // 44: google.protobuf.Duration + (*timestamppb.Timestamp)(nil), // 41: google.protobuf.Timestamp + (*wrapperspb.Int64Value)(nil), // 42: google.protobuf.Int64Value + (*anypb.Any)(nil), // 43: google.protobuf.Any + (*durationpb.Duration)(nil), // 44: google.protobuf.Duration } var file_grpc_channelz_v1_channelz_proto_depIdxs = []int32{ 8, // 0: grpc.channelz.v1.Channel.ref:type_name -> grpc.channelz.v1.ChannelRef diff --git a/credentials/alts/internal/proto/grpc_gcp/altscontext.pb.go b/credentials/alts/internal/proto/grpc_gcp/altscontext.pb.go index e0744eef355e..703b48da753b 100644 --- a/credentials/alts/internal/proto/grpc_gcp/altscontext.pb.go +++ b/credentials/alts/internal/proto/grpc_gcp/altscontext.pb.go @@ -18,7 +18,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: grpc/gcp/altscontext.proto package grpc_gcp diff --git a/credentials/alts/internal/proto/grpc_gcp/handshaker.pb.go b/credentials/alts/internal/proto/grpc_gcp/handshaker.pb.go index ed94ab265bbb..40570e9bf2de 100644 --- a/credentials/alts/internal/proto/grpc_gcp/handshaker.pb.go +++ b/credentials/alts/internal/proto/grpc_gcp/handshaker.pb.go @@ -18,7 +18,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: grpc/gcp/handshaker.proto package grpc_gcp diff --git a/credentials/alts/internal/proto/grpc_gcp/transport_security_common.pb.go b/credentials/alts/internal/proto/grpc_gcp/transport_security_common.pb.go index 922b531a55c2..4fc3c79d6a39 100644 --- a/credentials/alts/internal/proto/grpc_gcp/transport_security_common.pb.go +++ b/credentials/alts/internal/proto/grpc_gcp/transport_security_common.pb.go @@ -18,7 +18,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: grpc/gcp/transport_security_common.proto package grpc_gcp diff --git a/credentials/tls/certprovider/meshca/internal/meshca_experimental/config.pb.go b/credentials/tls/certprovider/meshca/internal/meshca_experimental/config.pb.go index afabe3b7b12d..846586782137 100644 --- a/credentials/tls/certprovider/meshca/internal/meshca_experimental/config.pb.go +++ b/credentials/tls/certprovider/meshca/internal/meshca_experimental/config.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: grpc/tls/provider/meshca/experimental/config.proto // NOTE: This proto will very likely move to a different namespace and a @@ -26,9 +26,9 @@ package meshca_experimental import ( v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" proto "github.com/golang/protobuf/proto" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -111,11 +111,11 @@ type GoogleMeshCaConfig struct { // Certificate lifetime to request in CSRs sent to the MeshCA. // // A default value of 24h will be used if left unspecified. - CertificateLifetime *duration.Duration `protobuf:"bytes,2,opt,name=certificate_lifetime,json=certificateLifetime,proto3" json:"certificate_lifetime,omitempty"` + CertificateLifetime *durationpb.Duration `protobuf:"bytes,2,opt,name=certificate_lifetime,json=certificateLifetime,proto3" json:"certificate_lifetime,omitempty"` // How long before certificate expiration should the certificate be renewed. // // A default value of 12h will be used if left unspecified. - RenewalGracePeriod *duration.Duration `protobuf:"bytes,3,opt,name=renewal_grace_period,json=renewalGracePeriod,proto3" json:"renewal_grace_period,omitempty"` + RenewalGracePeriod *durationpb.Duration `protobuf:"bytes,3,opt,name=renewal_grace_period,json=renewalGracePeriod,proto3" json:"renewal_grace_period,omitempty"` // Type of key. // // RSA keys will be used if left unspecified. @@ -169,14 +169,14 @@ func (x *GoogleMeshCaConfig) GetServer() *v3.ApiConfigSource { return nil } -func (x *GoogleMeshCaConfig) GetCertificateLifetime() *duration.Duration { +func (x *GoogleMeshCaConfig) GetCertificateLifetime() *durationpb.Duration { if x != nil { return x.CertificateLifetime } return nil } -func (x *GoogleMeshCaConfig) GetRenewalGracePeriod() *duration.Duration { +func (x *GoogleMeshCaConfig) GetRenewalGracePeriod() *durationpb.Duration { if x != nil { return x.RenewalGracePeriod } @@ -276,7 +276,7 @@ var file_grpc_tls_provider_meshca_experimental_config_proto_goTypes = []interfac (GoogleMeshCaConfig_KeyType)(0), // 0: grpc.tls.provider.meshca.experimental.GoogleMeshCaConfig.KeyType (*GoogleMeshCaConfig)(nil), // 1: grpc.tls.provider.meshca.experimental.GoogleMeshCaConfig (*v3.ApiConfigSource)(nil), // 2: envoy.config.core.v3.ApiConfigSource - (*duration.Duration)(nil), // 3: google.protobuf.Duration + (*durationpb.Duration)(nil), // 3: google.protobuf.Duration } var file_grpc_tls_provider_meshca_experimental_config_proto_depIdxs = []int32{ 2, // 0: grpc.tls.provider.meshca.experimental.GoogleMeshCaConfig.server:type_name -> envoy.config.core.v3.ApiConfigSource diff --git a/credentials/tls/certprovider/meshca/internal/v1/meshca.pb.go b/credentials/tls/certprovider/meshca/internal/v1/meshca.pb.go index bc0fcd452b47..387f8c55abc0 100644 --- a/credentials/tls/certprovider/meshca/internal/v1/meshca.pb.go +++ b/credentials/tls/certprovider/meshca/internal/v1/meshca.pb.go @@ -15,16 +15,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: istio/google/security/meshca/v1/meshca.proto package google_security_meshca_v1 import ( proto "github.com/golang/protobuf/proto" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -52,7 +52,7 @@ type MeshCertificateRequest struct { // PEM-encoded certificate request. Csr string `protobuf:"bytes,2,opt,name=csr,proto3" json:"csr,omitempty"` // Optional: requested certificate validity period. - Validity *duration.Duration `protobuf:"bytes,3,opt,name=validity,proto3" json:"validity,omitempty"` // Reserved 4 + Validity *durationpb.Duration `protobuf:"bytes,3,opt,name=validity,proto3" json:"validity,omitempty"` // Reserved 4 } func (x *MeshCertificateRequest) Reset() { @@ -101,7 +101,7 @@ func (x *MeshCertificateRequest) GetCsr() string { return "" } -func (x *MeshCertificateRequest) GetValidity() *duration.Duration { +func (x *MeshCertificateRequest) GetValidity() *durationpb.Duration { if x != nil { return x.Validity } @@ -211,7 +211,7 @@ var file_istio_google_security_meshca_v1_meshca_proto_msgTypes = make([]protoimp var file_istio_google_security_meshca_v1_meshca_proto_goTypes = []interface{}{ (*MeshCertificateRequest)(nil), // 0: google.security.meshca.v1.MeshCertificateRequest (*MeshCertificateResponse)(nil), // 1: google.security.meshca.v1.MeshCertificateResponse - (*duration.Duration)(nil), // 2: google.protobuf.Duration + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } var file_istio_google_security_meshca_v1_meshca_proto_depIdxs = []int32{ 2, // 0: google.security.meshca.v1.MeshCertificateRequest.validity:type_name -> google.protobuf.Duration diff --git a/examples/features/proto/echo/echo.pb.go b/examples/features/proto/echo/echo.pb.go index b096703e62ee..5af638d5280e 100644 --- a/examples/features/proto/echo/echo.pb.go +++ b/examples/features/proto/echo/echo.pb.go @@ -18,7 +18,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: examples/features/proto/echo/echo.proto package echo diff --git a/examples/helloworld/helloworld/helloworld.pb.go b/examples/helloworld/helloworld/helloworld.pb.go index 5f9912a1f5f3..2d5cbf5d7805 100644 --- a/examples/helloworld/helloworld/helloworld.pb.go +++ b/examples/helloworld/helloworld/helloworld.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: examples/helloworld/helloworld/helloworld.proto package helloworld diff --git a/examples/route_guide/routeguide/route_guide.pb.go b/examples/route_guide/routeguide/route_guide.pb.go index f99a1dacda74..85c3033c7cd2 100644 --- a/examples/route_guide/routeguide/route_guide.pb.go +++ b/examples/route_guide/routeguide/route_guide.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: examples/route_guide/routeguide/route_guide.proto package routeguide diff --git a/health/grpc_health_v1/health.pb.go b/health/grpc_health_v1/health.pb.go index 2b6803ecc72a..a66024d23e30 100644 --- a/health/grpc_health_v1/health.pb.go +++ b/health/grpc_health_v1/health.pb.go @@ -18,7 +18,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: grpc/health/v1/health.proto package grpc_health_v1 diff --git a/internal/proto/grpc_service_config/service_config.pb.go b/internal/proto/grpc_service_config/service_config.pb.go index 8130a39bcc83..b50d59d79352 100644 --- a/internal/proto/grpc_service_config/service_config.pb.go +++ b/internal/proto/grpc_service_config/service_config.pb.go @@ -25,18 +25,18 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: grpc/service_config/service_config.proto package grpc_service_config import ( proto "github.com/golang/protobuf/proto" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" code "google.golang.org/genproto/googleapis/rpc/code" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -133,7 +133,7 @@ type MethodConfig struct { // also affect transient errors encountered during name resolution, which // cannot be caught by the value here, since the service config is // obtained by the gRPC client via name resolution. - WaitForReady *wrappers.BoolValue `protobuf:"bytes,2,opt,name=wait_for_ready,json=waitForReady,proto3" json:"wait_for_ready,omitempty"` + WaitForReady *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=wait_for_ready,json=waitForReady,proto3" json:"wait_for_ready,omitempty"` // The default timeout in seconds for RPCs sent to this method. This can be // overridden in code. If no reply is received in the specified amount of // time, the request is aborted and a DEADLINE_EXCEEDED error status @@ -143,7 +143,7 @@ type MethodConfig struct { // and the value set by the application via the gRPC client API. If either // one is not set, then the other will be used. If neither is set, then the // request has no deadline. - Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` // The maximum allowed payload size for an individual request or object in a // stream (client->server) in bytes. The size which is measured is the // serialized payload after per-message compression (but before stream @@ -159,7 +159,7 @@ type MethodConfig struct { // be sent and the client will see a ClientError. // Note that 0 is a valid value, meaning that the request message // must be empty. - MaxRequestMessageBytes *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=max_request_message_bytes,json=maxRequestMessageBytes,proto3" json:"max_request_message_bytes,omitempty"` + MaxRequestMessageBytes *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=max_request_message_bytes,json=maxRequestMessageBytes,proto3" json:"max_request_message_bytes,omitempty"` // The maximum allowed payload size for an individual response or object in a // stream (server->client) in bytes. The size which is measured is the // serialized payload after per-message compression (but before stream @@ -175,7 +175,7 @@ type MethodConfig struct { // be sent, and a ServerError will be sent to the client instead. // Note that 0 is a valid value, meaning that the response message // must be empty. - MaxResponseMessageBytes *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=max_response_message_bytes,json=maxResponseMessageBytes,proto3" json:"max_response_message_bytes,omitempty"` + MaxResponseMessageBytes *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=max_response_message_bytes,json=maxResponseMessageBytes,proto3" json:"max_response_message_bytes,omitempty"` // Only one of retry_policy or hedging_policy may be set. If neither is set, // RPCs will not be retried or hedged. // @@ -224,28 +224,28 @@ func (x *MethodConfig) GetName() []*MethodConfig_Name { return nil } -func (x *MethodConfig) GetWaitForReady() *wrappers.BoolValue { +func (x *MethodConfig) GetWaitForReady() *wrapperspb.BoolValue { if x != nil { return x.WaitForReady } return nil } -func (x *MethodConfig) GetTimeout() *duration.Duration { +func (x *MethodConfig) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } return nil } -func (x *MethodConfig) GetMaxRequestMessageBytes() *wrappers.UInt32Value { +func (x *MethodConfig) GetMaxRequestMessageBytes() *wrapperspb.UInt32Value { if x != nil { return x.MaxRequestMessageBytes } return nil } -func (x *MethodConfig) GetMaxResponseMessageBytes() *wrappers.UInt32Value { +func (x *MethodConfig) GetMaxResponseMessageBytes() *wrapperspb.UInt32Value { if x != nil { return x.MaxResponseMessageBytes } @@ -612,7 +612,7 @@ type XdsConfig struct { // If not present, load reporting will be disabled. // If set to the empty string, load reporting will be sent to the same // server that we obtained CDS data from. - LrsLoadReportingServerName *wrappers.StringValue `protobuf:"bytes,5,opt,name=lrs_load_reporting_server_name,json=lrsLoadReportingServerName,proto3" json:"lrs_load_reporting_server_name,omitempty"` + LrsLoadReportingServerName *wrapperspb.StringValue `protobuf:"bytes,5,opt,name=lrs_load_reporting_server_name,json=lrsLoadReportingServerName,proto3" json:"lrs_load_reporting_server_name,omitempty"` } func (x *XdsConfig) Reset() { @@ -676,7 +676,7 @@ func (x *XdsConfig) GetEdsServiceName() string { return "" } -func (x *XdsConfig) GetLrsLoadReportingServerName() *wrappers.StringValue { +func (x *XdsConfig) GetLrsLoadReportingServerName() *wrapperspb.StringValue { if x != nil { return x.LrsLoadReportingServerName } @@ -698,7 +698,7 @@ type EdsLoadBalancingPolicyConfig struct { // If unset, no load reporting is done. // If set to empty string, load reporting will be sent to the same // server as we are getting xds data from. - LrsLoadReportingServerName *wrappers.StringValue `protobuf:"bytes,3,opt,name=lrs_load_reporting_server_name,json=lrsLoadReportingServerName,proto3" json:"lrs_load_reporting_server_name,omitempty"` + LrsLoadReportingServerName *wrapperspb.StringValue `protobuf:"bytes,3,opt,name=lrs_load_reporting_server_name,json=lrsLoadReportingServerName,proto3" json:"lrs_load_reporting_server_name,omitempty"` // Locality-picking policy. // This policy's config is expected to be in the format used // by the weighted_target policy. Note that the config should include @@ -759,7 +759,7 @@ func (x *EdsLoadBalancingPolicyConfig) GetEdsServiceName() string { return "" } -func (x *EdsLoadBalancingPolicyConfig) GetLrsLoadReportingServerName() *wrappers.StringValue { +func (x *EdsLoadBalancingPolicyConfig) GetLrsLoadReportingServerName() *wrapperspb.StringValue { if x != nil { return x.LrsLoadReportingServerName } @@ -1271,10 +1271,10 @@ type MethodConfig_RetryPolicy struct { // random(0, // min(initial_backoff*backoff_multiplier**(n-1), max_backoff)). // Required. Must be greater than zero. - InitialBackoff *duration.Duration `protobuf:"bytes,2,opt,name=initial_backoff,json=initialBackoff,proto3" json:"initial_backoff,omitempty"` + InitialBackoff *durationpb.Duration `protobuf:"bytes,2,opt,name=initial_backoff,json=initialBackoff,proto3" json:"initial_backoff,omitempty"` // Required. Must be greater than zero. - MaxBackoff *duration.Duration `protobuf:"bytes,3,opt,name=max_backoff,json=maxBackoff,proto3" json:"max_backoff,omitempty"` - BackoffMultiplier float32 `protobuf:"fixed32,4,opt,name=backoff_multiplier,json=backoffMultiplier,proto3" json:"backoff_multiplier,omitempty"` // Required. Must be greater than zero. + MaxBackoff *durationpb.Duration `protobuf:"bytes,3,opt,name=max_backoff,json=maxBackoff,proto3" json:"max_backoff,omitempty"` + BackoffMultiplier float32 `protobuf:"fixed32,4,opt,name=backoff_multiplier,json=backoffMultiplier,proto3" json:"backoff_multiplier,omitempty"` // Required. Must be greater than zero. // The set of status codes which may be retried. // // This field is required and must be non-empty. @@ -1320,14 +1320,14 @@ func (x *MethodConfig_RetryPolicy) GetMaxAttempts() uint32 { return 0 } -func (x *MethodConfig_RetryPolicy) GetInitialBackoff() *duration.Duration { +func (x *MethodConfig_RetryPolicy) GetInitialBackoff() *durationpb.Duration { if x != nil { return x.InitialBackoff } return nil } -func (x *MethodConfig_RetryPolicy) GetMaxBackoff() *duration.Duration { +func (x *MethodConfig_RetryPolicy) GetMaxBackoff() *durationpb.Duration { if x != nil { return x.MaxBackoff } @@ -1366,7 +1366,7 @@ type MethodConfig_HedgingPolicy struct { // The first RPC will be sent immediately, but the max_requests-1 subsequent // hedged RPCs will be sent at intervals of every hedging_delay. Set this // to 0 to immediately send all max_requests RPCs. - HedgingDelay *duration.Duration `protobuf:"bytes,2,opt,name=hedging_delay,json=hedgingDelay,proto3" json:"hedging_delay,omitempty"` + HedgingDelay *durationpb.Duration `protobuf:"bytes,2,opt,name=hedging_delay,json=hedgingDelay,proto3" json:"hedging_delay,omitempty"` // The set of status codes which indicate other hedged RPCs may still // succeed. If a non-fatal status code is returned by the server, hedged // RPCs will continue. Otherwise, outstanding requests will be canceled and @@ -1415,7 +1415,7 @@ func (x *MethodConfig_HedgingPolicy) GetMaxAttempts() uint32 { return 0 } -func (x *MethodConfig_HedgingPolicy) GetHedgingDelay() *duration.Duration { +func (x *MethodConfig_HedgingPolicy) GetHedgingDelay() *durationpb.Duration { if x != nil { return x.HedgingDelay } @@ -1682,7 +1682,7 @@ type ServiceConfig_HealthCheckConfig struct { unknownFields protoimpl.UnknownFields // Service name to use in the health-checking request. - ServiceName *wrappers.StringValue `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"` + ServiceName *wrapperspb.StringValue `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"` } func (x *ServiceConfig_HealthCheckConfig) Reset() { @@ -1717,7 +1717,7 @@ func (*ServiceConfig_HealthCheckConfig) Descriptor() ([]byte, []int) { return file_grpc_service_config_service_config_proto_rawDescGZIP(), []int{11, 1} } -func (x *ServiceConfig_HealthCheckConfig) GetServiceName() *wrappers.StringValue { +func (x *ServiceConfig_HealthCheckConfig) GetServiceName() *wrapperspb.StringValue { if x != nil { return x.ServiceName } @@ -2077,10 +2077,10 @@ var file_grpc_service_config_service_config_proto_goTypes = []interface{}{ (*LrsLoadBalancingPolicyConfig_Locality)(nil), // 20: grpc.service_config.LrsLoadBalancingPolicyConfig.Locality (*ServiceConfig_RetryThrottlingPolicy)(nil), // 21: grpc.service_config.ServiceConfig.RetryThrottlingPolicy (*ServiceConfig_HealthCheckConfig)(nil), // 22: grpc.service_config.ServiceConfig.HealthCheckConfig - (*wrappers.BoolValue)(nil), // 23: google.protobuf.BoolValue - (*duration.Duration)(nil), // 24: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 25: google.protobuf.UInt32Value - (*wrappers.StringValue)(nil), // 26: google.protobuf.StringValue + (*wrapperspb.BoolValue)(nil), // 23: google.protobuf.BoolValue + (*durationpb.Duration)(nil), // 24: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 25: google.protobuf.UInt32Value + (*wrapperspb.StringValue)(nil), // 26: google.protobuf.StringValue (code.Code)(0), // 27: google.rpc.Code } var file_grpc_service_config_service_config_proto_depIdxs = []int32{ diff --git a/interop/grpc_testing/test.pb.go b/interop/grpc_testing/test.pb.go index 1f3bb0b9f692..8b8178f3ce53 100644 --- a/interop/grpc_testing/test.pb.go +++ b/interop/grpc_testing/test.pb.go @@ -18,7 +18,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: interop/grpc_testing/test.proto package grpc_testing diff --git a/profiling/proto/service.pb.go b/profiling/proto/service.pb.go index 889c14eb9e89..22bc4bc47f48 100644 --- a/profiling/proto/service.pb.go +++ b/profiling/proto/service.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: profiling/proto/service.proto package proto diff --git a/reflection/grpc_reflection_v1alpha/reflection.pb.go b/reflection/grpc_reflection_v1alpha/reflection.pb.go index 6b8e0b77f067..1f859f764881 100644 --- a/reflection/grpc_reflection_v1alpha/reflection.pb.go +++ b/reflection/grpc_reflection_v1alpha/reflection.pb.go @@ -17,7 +17,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: reflection/grpc_reflection_v1alpha/reflection.proto package grpc_reflection_v1alpha diff --git a/reflection/grpc_testing/proto2.pb.go b/reflection/grpc_testing/proto2.pb.go index aa5d35f4c67e..9a8f643adb17 100644 --- a/reflection/grpc_testing/proto2.pb.go +++ b/reflection/grpc_testing/proto2.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: reflection/grpc_testing/proto2.proto package grpc_testing diff --git a/reflection/grpc_testing/proto2_ext.pb.go b/reflection/grpc_testing/proto2_ext.pb.go index 4d96fa358aea..4fe2b2a17d86 100644 --- a/reflection/grpc_testing/proto2_ext.pb.go +++ b/reflection/grpc_testing/proto2_ext.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: reflection/grpc_testing/proto2_ext.proto package grpc_testing diff --git a/reflection/grpc_testing/proto2_ext2.pb.go b/reflection/grpc_testing/proto2_ext2.pb.go index 88b96565afdb..e84c44f22c96 100644 --- a/reflection/grpc_testing/proto2_ext2.pb.go +++ b/reflection/grpc_testing/proto2_ext2.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: reflection/grpc_testing/proto2_ext2.proto package grpc_testing diff --git a/reflection/grpc_testing/test.pb.go b/reflection/grpc_testing/test.pb.go index b5e589e3155d..6740b629d767 100644 --- a/reflection/grpc_testing/test.pb.go +++ b/reflection/grpc_testing/test.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: reflection/grpc_testing/test.proto package grpc_testing diff --git a/stats/grpc_testing/test.pb.go b/stats/grpc_testing/test.pb.go index 59866b746384..7acea50d128f 100644 --- a/stats/grpc_testing/test.pb.go +++ b/stats/grpc_testing/test.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: stats/grpc_testing/test.proto package grpc_testing diff --git a/stress/grpc_testing/metrics.pb.go b/stress/grpc_testing/metrics.pb.go index 45d34c662ec2..f8e95188fec0 100644 --- a/stress/grpc_testing/metrics.pb.go +++ b/stress/grpc_testing/metrics.pb.go @@ -22,7 +22,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: stress/grpc_testing/metrics.proto package grpc_testing diff --git a/test/codec_perf/perf.pb.go b/test/codec_perf/perf.pb.go index d9c81ee855a2..d09ce726b63f 100644 --- a/test/codec_perf/perf.pb.go +++ b/test/codec_perf/perf.pb.go @@ -18,7 +18,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: test/codec_perf/perf.proto package codec_perf diff --git a/test/grpc_testing/test.pb.go b/test/grpc_testing/test.pb.go index a632338e9a6b..89ebb3420f24 100644 --- a/test/grpc_testing/test.pb.go +++ b/test/grpc_testing/test.pb.go @@ -18,7 +18,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.3.0 +// protoc v3.14.0 // source: test/grpc_testing/test.proto package grpc_testing diff --git a/vet.sh b/vet.sh index 48652f6040f2..b41df6dc8607 100755 --- a/vet.sh +++ b/vet.sh @@ -53,7 +53,7 @@ if [[ "$1" = "-install" ]]; then fi if [[ -z "${VET_SKIP_PROTO}" ]]; then if [[ "${TRAVIS}" = "true" ]]; then - PROTOBUF_VERSION=3.3.0 + PROTOBUF_VERSION=3.14.0 PROTOC_FILENAME=protoc-${PROTOBUF_VERSION}-linux-x86_64.zip pushd /home/travis wget https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/${PROTOC_FILENAME} @@ -61,7 +61,7 @@ if [[ "$1" = "-install" ]]; then bin/protoc --version popd elif [[ "${GITHUB_ACTIONS}" = "true" ]]; then - PROTOBUF_VERSION=3.3.0 + PROTOBUF_VERSION=3.14.0 PROTOC_FILENAME=protoc-${PROTOBUF_VERSION}-linux-x86_64.zip pushd /home/runner/go wget https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/${PROTOC_FILENAME}