diff --git a/Cargo.lock b/Cargo.lock index 8f016a76c..9e251584b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,6 +28,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" version = "1.1.0" @@ -36,9 +42,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.21.5" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" @@ -144,15 +150,15 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.26" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http", "indexmap 2.2.3", "slab", @@ -181,9 +187,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "http" -version = "0.2.12" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -192,12 +198,24 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", + "futures-util", "http", + "http-body", "pin-project-lite", ] @@ -353,9 +371,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -384,9 +402,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.4" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec" dependencies = [ "bytes", "prost-derive", @@ -394,11 +412,10 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" +checksum = "d0f3e5beed80eb580c68e2c600937ac2c4eedabdfd5ef1e5b7ea4f3fba84497b" dependencies = [ - "bytes", "heck", "itertools", "log", @@ -411,14 +428,13 @@ dependencies = [ "regex", "syn 2.0.87", "tempfile", - "which", ] [[package]] name = "prost-derive" -version = "0.12.4" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3" dependencies = [ "anyhow", "itertools", @@ -429,9 +445,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.4" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" +checksum = "cc2f1e56baa61e93533aebc21af4d2134b70f66275e0fcdf3cbe43d77ff7e8fc" dependencies = [ "prost", ] @@ -603,9 +619,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.12" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -628,19 +644,19 @@ dependencies = [ [[package]] name = "tonic" -version = "0.10.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-trait", "base64", "bytes", "http", "http-body", + "http-body-util", "percent-encoding", "pin-project", "prost", - "tokio", "tokio-stream", "tower-layer", "tower-service", @@ -649,13 +665,14 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.10.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" +checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11" dependencies = [ "prettyplease", "proc-macro2", "prost-build", + "prost-types", "quote", "syn 2.0.87", ] @@ -716,17 +733,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "which" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -dependencies = [ - "either", - "libc", - "once_cell", -] - [[package]] name = "windows-sys" version = "0.42.0" diff --git a/Cargo.toml b/Cargo.toml index 8e2d3ba3e..688146b1c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,20 +49,20 @@ rustdoc-args = ["--cfg", "docsrs"] all-features = true [dependencies] -h2 = { version = "0.3", optional = true } -http = { version = "0.2", optional = true } +h2 = { version = "0.4", optional = true } +http = { version = "1", optional = true } ipnet = { version = "2", optional = true } -prost = "0.12" -prost-types = { version = "0.12", optional = true } +prost = "0.13" +prost-types = { version = "0.13", optional = true } quickcheck = { version = "1", default-features = false, optional = true } thiserror = { version = "2", optional = true } [dependencies.tonic] -version = "0.10" +version = "0.12" default-features = false features = ["prost"] [dev-dependencies.tonic-build] -version = "0.10" +version = "0.12" default-features = false features = ["prost"] diff --git a/examples/gen.rs b/examples/gen.rs index 357ac0a04..7a22f4513 100644 --- a/examples/gen.rs +++ b/examples/gen.rs @@ -21,7 +21,7 @@ fn main() -> Result<(), Box> { .build_client(true) .build_server(true) .out_dir(out_dir) - .compile(&proto_files, &[proto_dir]) + .compile_protos(&proto_files, &[proto_dir]) { eprintln!("{}", e.to_string().replace("\\n", "\n").trim_end()); std::process::exit(1); diff --git a/go/destination/destination.pb.go b/go/destination/destination.pb.go index d8bc2b0e8..5426a522c 100644 --- a/go/destination/destination.pb.go +++ b/go/destination/destination.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc v5.29.0 // source: destination.proto @@ -25,19 +25,18 @@ const ( ) type GetDestination struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Scheme string `protobuf:"bytes,1,opt,name=scheme,proto3" json:"scheme,omitempty"` - Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Scheme string `protobuf:"bytes,1,opt,name=scheme,proto3" json:"scheme,omitempty"` + Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` // An opaque value that is set at injection-time and sent with destintion // lookups. // // If, for instance, the token encodes a namespace or some locality // information, the service may alter its results to take this locality into // account. - ContextToken string `protobuf:"bytes,3,opt,name=context_token,json=contextToken,proto3" json:"context_token,omitempty"` + ContextToken string `protobuf:"bytes,3,opt,name=context_token,json=contextToken,proto3" json:"context_token,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GetDestination) Reset() { @@ -92,16 +91,15 @@ func (x *GetDestination) GetContextToken() string { } type Update struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Update: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Update: // // *Update_Add // *Update_Remove // *Update_NoEndpoints - Update isUpdate_Update `protobuf_oneof:"update"` + Update isUpdate_Update `protobuf_oneof:"update"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Update) Reset() { @@ -134,30 +132,36 @@ func (*Update) Descriptor() ([]byte, []int) { return file_destination_proto_rawDescGZIP(), []int{1} } -func (m *Update) GetUpdate() isUpdate_Update { - if m != nil { - return m.Update +func (x *Update) GetUpdate() isUpdate_Update { + if x != nil { + return x.Update } return nil } func (x *Update) GetAdd() *WeightedAddrSet { - if x, ok := x.GetUpdate().(*Update_Add); ok { - return x.Add + if x != nil { + if x, ok := x.Update.(*Update_Add); ok { + return x.Add + } } return nil } func (x *Update) GetRemove() *AddrSet { - if x, ok := x.GetUpdate().(*Update_Remove); ok { - return x.Remove + if x != nil { + if x, ok := x.Update.(*Update_Remove); ok { + return x.Remove + } } return nil } func (x *Update) GetNoEndpoints() *NoEndpoints { - if x, ok := x.GetUpdate().(*Update_NoEndpoints); ok { - return x.NoEndpoints + if x != nil { + if x, ok := x.Update.(*Update_NoEndpoints); ok { + return x.NoEndpoints + } } return nil } @@ -193,11 +197,10 @@ func (*Update_Remove) isUpdate_Update() {} func (*Update_NoEndpoints) isUpdate_Update() {} type AddrSet struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Addrs []*net.TcpAddress `protobuf:"bytes,1,rep,name=addrs,proto3" json:"addrs,omitempty"` unknownFields protoimpl.UnknownFields - - Addrs []*net.TcpAddress `protobuf:"bytes,1,rep,name=addrs,proto3" json:"addrs,omitempty"` + sizeCache protoimpl.SizeCache } func (x *AddrSet) Reset() { @@ -238,12 +241,11 @@ func (x *AddrSet) GetAddrs() []*net.TcpAddress { } type WeightedAddrSet struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Addrs []*WeightedAddr `protobuf:"bytes,1,rep,name=addrs,proto3" json:"addrs,omitempty"` + MetricLabels map[string]string `protobuf:"bytes,2,rep,name=metric_labels,json=metricLabels,proto3" json:"metric_labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` unknownFields protoimpl.UnknownFields - - Addrs []*WeightedAddr `protobuf:"bytes,1,rep,name=addrs,proto3" json:"addrs,omitempty"` - MetricLabels map[string]string `protobuf:"bytes,2,rep,name=metric_labels,json=metricLabels,proto3" json:"metric_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + sizeCache protoimpl.SizeCache } func (x *WeightedAddrSet) Reset() { @@ -291,16 +293,13 @@ func (x *WeightedAddrSet) GetMetricLabels() map[string]string { } type WeightedAddr struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Addr *net.TcpAddress `protobuf:"bytes,1,opt,name=addr,proto3" json:"addr,omitempty"` - Weight uint32 `protobuf:"varint,3,opt,name=weight,proto3" json:"weight,omitempty"` - MetricLabels map[string]string `protobuf:"bytes,4,rep,name=metric_labels,json=metricLabels,proto3" json:"metric_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - TlsIdentity *TlsIdentity `protobuf:"bytes,5,opt,name=tls_identity,json=tlsIdentity,proto3" json:"tls_identity,omitempty"` - ProtocolHint *ProtocolHint `protobuf:"bytes,6,opt,name=protocol_hint,json=protocolHint,proto3" json:"protocol_hint,omitempty"` - AuthorityOverride *AuthorityOverride `protobuf:"bytes,7,opt,name=authority_override,json=authorityOverride,proto3" json:"authority_override,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Addr *net.TcpAddress `protobuf:"bytes,1,opt,name=addr,proto3" json:"addr,omitempty"` + Weight uint32 `protobuf:"varint,3,opt,name=weight,proto3" json:"weight,omitempty"` + MetricLabels map[string]string `protobuf:"bytes,4,rep,name=metric_labels,json=metricLabels,proto3" json:"metric_labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + TlsIdentity *TlsIdentity `protobuf:"bytes,5,opt,name=tls_identity,json=tlsIdentity,proto3" json:"tls_identity,omitempty"` + ProtocolHint *ProtocolHint `protobuf:"bytes,6,opt,name=protocol_hint,json=protocolHint,proto3" json:"protocol_hint,omitempty"` + AuthorityOverride *AuthorityOverride `protobuf:"bytes,7,opt,name=authority_override,json=authorityOverride,proto3" json:"authority_override,omitempty"` // The HTTP/2 parameters to use when connecting to the destination, if HTTP/2 // is used. These parameters are used by proxies when the application traffic // is HTTP/2 or when the H2 ProtocolHint is used to transport HTTP/1 @@ -308,7 +307,9 @@ type WeightedAddr struct { Http2 *Http2ClientParams `protobuf:"bytes,8,opt,name=http2,proto3" json:"http2,omitempty"` // A reference to the metadata for this endpoint, usually a Pod. This may be // omitted when the resource type is unknown. - ResourceRef *meta.Metadata `protobuf:"bytes,9,opt,name=resource_ref,json=resourceRef,proto3" json:"resource_ref,omitempty"` + ResourceRef *meta.Metadata `protobuf:"bytes,9,opt,name=resource_ref,json=resourceRef,proto3" json:"resource_ref,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *WeightedAddr) Reset() { @@ -398,11 +399,8 @@ func (x *WeightedAddr) GetResourceRef() *meta.Metadata { } type TlsIdentity struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Strategy: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Strategy: // // *TlsIdentity_DnsLikeIdentity_ // *TlsIdentity_UriLikeIdentity_ @@ -410,7 +408,9 @@ type TlsIdentity struct { // The server name of the endpoint. This is the value that needs to be included // by clients in the ClientHello SNI extension of the TLS handshake when they // initiate TLS connections to servers. - ServerName *TlsIdentity_DnsLikeIdentity `protobuf:"bytes,4,opt,name=server_name,json=serverName,proto3" json:"server_name,omitempty"` + ServerName *TlsIdentity_DnsLikeIdentity `protobuf:"bytes,4,opt,name=server_name,json=serverName,proto3" json:"server_name,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TlsIdentity) Reset() { @@ -443,23 +443,27 @@ func (*TlsIdentity) Descriptor() ([]byte, []int) { return file_destination_proto_rawDescGZIP(), []int{5} } -func (m *TlsIdentity) GetStrategy() isTlsIdentity_Strategy { - if m != nil { - return m.Strategy +func (x *TlsIdentity) GetStrategy() isTlsIdentity_Strategy { + if x != nil { + return x.Strategy } return nil } func (x *TlsIdentity) GetDnsLikeIdentity() *TlsIdentity_DnsLikeIdentity { - if x, ok := x.GetStrategy().(*TlsIdentity_DnsLikeIdentity_); ok { - return x.DnsLikeIdentity + if x != nil { + if x, ok := x.Strategy.(*TlsIdentity_DnsLikeIdentity_); ok { + return x.DnsLikeIdentity + } } return nil } func (x *TlsIdentity) GetUriLikeIdentity() *TlsIdentity_UriLikeIdentity { - if x, ok := x.GetStrategy().(*TlsIdentity_UriLikeIdentity_); ok { - return x.UriLikeIdentity + if x != nil { + if x, ok := x.Strategy.(*TlsIdentity_UriLikeIdentity_); ok { + return x.UriLikeIdentity + } } return nil } @@ -488,11 +492,10 @@ func (*TlsIdentity_DnsLikeIdentity_) isTlsIdentity_Strategy() {} func (*TlsIdentity_UriLikeIdentity_) isTlsIdentity_Strategy() {} type AuthorityOverride struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - AuthorityOverride string `protobuf:"bytes,1,opt,name=authority_override,json=authorityOverride,proto3" json:"authority_override,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + AuthorityOverride string `protobuf:"bytes,1,opt,name=authority_override,json=authorityOverride,proto3" json:"authority_override,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *AuthorityOverride) Reset() { @@ -533,11 +536,10 @@ func (x *AuthorityOverride) GetAuthorityOverride() string { } type NoEndpoints struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Exists bool `protobuf:"varint,1,opt,name=exists,proto3" json:"exists,omitempty"` unknownFields protoimpl.UnknownFields - - Exists bool `protobuf:"varint,1,opt,name=exists,proto3" json:"exists,omitempty"` + sizeCache protoimpl.SizeCache } func (x *NoEndpoints) Reset() { @@ -580,11 +582,8 @@ func (x *NoEndpoints) GetExists() bool { // A hint of what protocol the service knows. The default value is // for the `hint` field to be not be set, essentially meaning "unknown". type ProtocolHint struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Protocol: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Protocol: // // *ProtocolHint_H2_ // *ProtocolHint_Opaque_ @@ -592,6 +591,8 @@ type ProtocolHint struct { // When set, indicates that the target supports receiving opaque traffic // wrapped with the Linkerd connection header on the specified port. OpaqueTransport *ProtocolHint_OpaqueTransport `protobuf:"bytes,2,opt,name=opaque_transport,json=opaqueTransport,proto3" json:"opaque_transport,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtocolHint) Reset() { @@ -624,23 +625,27 @@ func (*ProtocolHint) Descriptor() ([]byte, []int) { return file_destination_proto_rawDescGZIP(), []int{8} } -func (m *ProtocolHint) GetProtocol() isProtocolHint_Protocol { - if m != nil { - return m.Protocol +func (x *ProtocolHint) GetProtocol() isProtocolHint_Protocol { + if x != nil { + return x.Protocol } return nil } func (x *ProtocolHint) GetH2() *ProtocolHint_H2 { - if x, ok := x.GetProtocol().(*ProtocolHint_H2_); ok { - return x.H2 + if x != nil { + if x, ok := x.Protocol.(*ProtocolHint_H2_); ok { + return x.H2 + } } return nil } func (x *ProtocolHint) GetOpaque() *ProtocolHint_Opaque { - if x, ok := x.GetProtocol().(*ProtocolHint_Opaque_); ok { - return x.Opaque + if x != nil { + if x, ok := x.Protocol.(*ProtocolHint_Opaque_); ok { + return x.Opaque + } } return nil } @@ -675,16 +680,15 @@ func (*ProtocolHint_Opaque_) isProtocolHint_Protocol() {} // Configures the parameters used to initialize an HTTP/2 connection. type Http2ClientParams struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Overrides the default client flow control settings. FlowControl *Http2ClientParams_FlowControl `protobuf:"bytes,1,opt,name=flow_control,json=flowControl,proto3" json:"flow_control,omitempty"` // Enables keep-alive timeouts. KeepAlive *Http2ClientParams_KeepAlive `protobuf:"bytes,2,opt,name=keep_alive,json=keepAlive,proto3" json:"keep_alive,omitempty"` // Configures Hyper internals. - Internals *Http2ClientParams_Internals `protobuf:"bytes,3,opt,name=internals,proto3" json:"internals,omitempty"` + Internals *Http2ClientParams_Internals `protobuf:"bytes,3,opt,name=internals,proto3" json:"internals,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Http2ClientParams) Reset() { @@ -739,10 +743,7 @@ func (x *Http2ClientParams) GetInternals() *Http2ClientParams_Internals { } type DestinationProfile struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The fully-qualified service name, if one exists. // // When resolving (especially by IP), this field provides the fully-qualified @@ -785,7 +786,9 @@ type DestinationProfile struct { ParentRef *meta.Metadata `protobuf:"bytes,7,opt,name=parent_ref,json=parentRef,proto3" json:"parent_ref,omitempty"` // A reference to the metadata for a ServiceProfile resource. This is omitted // when no ServiceProfile resource exists. - ProfileRef *meta.Metadata `protobuf:"bytes,8,opt,name=profile_ref,json=profileRef,proto3" json:"profile_ref,omitempty"` + ProfileRef *meta.Metadata `protobuf:"bytes,8,opt,name=profile_ref,json=profileRef,proto3" json:"profile_ref,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *DestinationProfile) Reset() { @@ -875,10 +878,7 @@ func (x *DestinationProfile) GetProfileRef() *meta.Metadata { } type Route struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // This route contains requests which match this condition. Condition *RequestMatch `protobuf:"bytes,1,opt,name=condition,proto3" json:"condition,omitempty"` // A list of response classes for this route. If a response matches @@ -886,14 +886,16 @@ type Route struct { // match any ResponseClasses, it is considered to be a successful response. ResponseClasses []*ResponseClass `protobuf:"bytes,2,rep,name=response_classes,json=responseClasses,proto3" json:"response_classes,omitempty"` // Metric labels to attach to requests and responses that match this route. - MetricsLabels map[string]string `protobuf:"bytes,3,rep,name=metrics_labels,json=metricsLabels,proto3" json:"metrics_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + MetricsLabels map[string]string `protobuf:"bytes,3,rep,name=metrics_labels,json=metricsLabels,proto3" json:"metrics_labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // If a route is retryable, any failed requests on that route may be retried // by the proxy. IsRetryable bool `protobuf:"varint,4,opt,name=is_retryable,json=isRetryable,proto3" json:"is_retryable,omitempty"` // After this time has elapsed since receiving the initial request, any // outstanding request will be cancelled, a timeout error response will be // returned, and no more retries will be attempted. - Timeout *duration.Duration `protobuf:"bytes,5,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *duration.Duration `protobuf:"bytes,5,opt,name=timeout,proto3" json:"timeout,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Route) Reset() { @@ -962,10 +964,7 @@ func (x *Route) GetTimeout() *duration.Duration { } type RetryBudget struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The ratio of additional traffic that may be added by retries. A // retry_ratio of 0.1 means that 1 retry may be attempted for every 10 regular // requests. A retry_ratio of 1.0 means that 1 retry may be attempted for @@ -979,7 +978,9 @@ type RetryBudget struct { // This duration indicates for how long requests should be considered for the // purposes of enforcing the retry_ratio. A higher value considers a larger // window and therefore allows burstier retries. - Ttl *duration.Duration `protobuf:"bytes,3,opt,name=ttl,proto3" json:"ttl,omitempty"` + Ttl *duration.Duration `protobuf:"bytes,3,opt,name=ttl,proto3" json:"ttl,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *RetryBudget) Reset() { @@ -1034,15 +1035,14 @@ func (x *RetryBudget) GetTtl() *duration.Duration { } type ResponseClass struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // This class contains responses which match this condition. Condition *ResponseMatch `protobuf:"bytes,1,opt,name=condition,proto3" json:"condition,omitempty"` // If responses in this class should be considered failures. This defaults // to false (success). - IsFailure bool `protobuf:"varint,2,opt,name=is_failure,json=isFailure,proto3" json:"is_failure,omitempty"` + IsFailure bool `protobuf:"varint,2,opt,name=is_failure,json=isFailure,proto3" json:"is_failure,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ResponseClass) Reset() { @@ -1090,18 +1090,17 @@ func (x *ResponseClass) GetIsFailure() bool { } type RequestMatch struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Match: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Match: // // *RequestMatch_All // *RequestMatch_Any // *RequestMatch_Not // *RequestMatch_Path // *RequestMatch_Method - Match isRequestMatch_Match `protobuf_oneof:"match"` + Match isRequestMatch_Match `protobuf_oneof:"match"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *RequestMatch) Reset() { @@ -1134,44 +1133,54 @@ func (*RequestMatch) Descriptor() ([]byte, []int) { return file_destination_proto_rawDescGZIP(), []int{14} } -func (m *RequestMatch) GetMatch() isRequestMatch_Match { - if m != nil { - return m.Match +func (x *RequestMatch) GetMatch() isRequestMatch_Match { + if x != nil { + return x.Match } return nil } func (x *RequestMatch) GetAll() *RequestMatch_Seq { - if x, ok := x.GetMatch().(*RequestMatch_All); ok { - return x.All + if x != nil { + if x, ok := x.Match.(*RequestMatch_All); ok { + return x.All + } } return nil } func (x *RequestMatch) GetAny() *RequestMatch_Seq { - if x, ok := x.GetMatch().(*RequestMatch_Any); ok { - return x.Any + if x != nil { + if x, ok := x.Match.(*RequestMatch_Any); ok { + return x.Any + } } return nil } func (x *RequestMatch) GetNot() *RequestMatch { - if x, ok := x.GetMatch().(*RequestMatch_Not); ok { - return x.Not + if x != nil { + if x, ok := x.Match.(*RequestMatch_Not); ok { + return x.Not + } } return nil } func (x *RequestMatch) GetPath() *PathMatch { - if x, ok := x.GetMatch().(*RequestMatch_Path); ok { - return x.Path + if x != nil { + if x, ok := x.Match.(*RequestMatch_Path); ok { + return x.Path + } } return nil } func (x *RequestMatch) GetMethod() *http_types.HttpMethod { - if x, ok := x.GetMatch().(*RequestMatch_Method); ok { - return x.Method + if x != nil { + if x, ok := x.Match.(*RequestMatch_Method); ok { + return x.Method + } } return nil } @@ -1211,12 +1220,11 @@ func (*RequestMatch_Path) isRequestMatch_Match() {} func (*RequestMatch_Method) isRequestMatch_Match() {} type PathMatch struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Match if the request path matches this regex. - Regex string `protobuf:"bytes,1,opt,name=regex,proto3" json:"regex,omitempty"` + Regex string `protobuf:"bytes,1,opt,name=regex,proto3" json:"regex,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *PathMatch) Reset() { @@ -1257,17 +1265,16 @@ func (x *PathMatch) GetRegex() string { } type ResponseMatch struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Match: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Match: // // *ResponseMatch_All // *ResponseMatch_Any // *ResponseMatch_Not // *ResponseMatch_Status - Match isResponseMatch_Match `protobuf_oneof:"match"` + Match isResponseMatch_Match `protobuf_oneof:"match"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ResponseMatch) Reset() { @@ -1300,37 +1307,45 @@ func (*ResponseMatch) Descriptor() ([]byte, []int) { return file_destination_proto_rawDescGZIP(), []int{16} } -func (m *ResponseMatch) GetMatch() isResponseMatch_Match { - if m != nil { - return m.Match +func (x *ResponseMatch) GetMatch() isResponseMatch_Match { + if x != nil { + return x.Match } return nil } func (x *ResponseMatch) GetAll() *ResponseMatch_Seq { - if x, ok := x.GetMatch().(*ResponseMatch_All); ok { - return x.All + if x != nil { + if x, ok := x.Match.(*ResponseMatch_All); ok { + return x.All + } } return nil } func (x *ResponseMatch) GetAny() *ResponseMatch_Seq { - if x, ok := x.GetMatch().(*ResponseMatch_Any); ok { - return x.Any + if x != nil { + if x, ok := x.Match.(*ResponseMatch_Any); ok { + return x.Any + } } return nil } func (x *ResponseMatch) GetNot() *ResponseMatch { - if x, ok := x.GetMatch().(*ResponseMatch_Not); ok { - return x.Not + if x != nil { + if x, ok := x.Match.(*ResponseMatch_Not); ok { + return x.Not + } } return nil } func (x *ResponseMatch) GetStatus() *HttpStatusRange { - if x, ok := x.GetMatch().(*ResponseMatch_Status); ok { - return x.Status + if x != nil { + if x, ok := x.Match.(*ResponseMatch_Status); ok { + return x.Status + } } return nil } @@ -1366,14 +1381,13 @@ func (*ResponseMatch_Status) isResponseMatch_Match() {} // If either a minimum or maximum is not specified, the range is considered to // be over a discrete value. type HttpStatusRange struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Minimum matching http status code (inclusive), if specified. Min uint32 `protobuf:"varint,1,opt,name=min,proto3" json:"min,omitempty"` // Maximum matching http status code (inclusive), if specified. - Max uint32 `protobuf:"varint,2,opt,name=max,proto3" json:"max,omitempty"` + Max uint32 `protobuf:"varint,2,opt,name=max,proto3" json:"max,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpStatusRange) Reset() { @@ -1421,10 +1435,7 @@ func (x *HttpStatusRange) GetMax() uint32 { } type WeightedDst struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // This authority will be used as the `path` in a call to the Destination.Get // rpc. Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` @@ -1432,7 +1443,9 @@ type WeightedDst struct { // relative to other weights in the same dst_overrides list. Weight uint32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"` // A reference to the metadata for a Service resource. - BackendRef *meta.Metadata `protobuf:"bytes,3,opt,name=backend_ref,json=backendRef,proto3" json:"backend_ref,omitempty"` + BackendRef *meta.Metadata `protobuf:"bytes,3,opt,name=backend_ref,json=backendRef,proto3" json:"backend_ref,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *WeightedDst) Reset() { @@ -1488,16 +1501,15 @@ func (x *WeightedDst) GetBackendRef() *meta.Metadata { // Verify the certificate based on the Kubernetes pod identity. type TlsIdentity_DnsLikeIdentity struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // A DNS-like name that encodes workload coordinates. // // For example: // // {name}.{namespace}.{type}.identity.{control-namespace}.{trust-domain...} - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TlsIdentity_DnsLikeIdentity) Reset() { @@ -1539,16 +1551,15 @@ func (x *TlsIdentity_DnsLikeIdentity) GetName() string { // Verify the certificate based on an URI identity. type TlsIdentity_UriLikeIdentity struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // A URI name that encodes workload identity. // // For example: // // spiffe://trust-domain/workload-dentifier - Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"` + Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TlsIdentity_UriLikeIdentity) Reset() { @@ -1589,9 +1600,9 @@ func (x *TlsIdentity_UriLikeIdentity) GetUri() string { } type ProtocolHint_H2 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtocolHint_H2) Reset() { @@ -1625,9 +1636,9 @@ func (*ProtocolHint_H2) Descriptor() ([]byte, []int) { } type ProtocolHint_Opaque struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtocolHint_Opaque) Reset() { @@ -1661,12 +1672,11 @@ func (*ProtocolHint_Opaque) Descriptor() ([]byte, []int) { } type ProtocolHint_OpaqueTransport struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The target proxy's inbound port. - InboundPort uint32 `protobuf:"varint,1,opt,name=inbound_port,json=inboundPort,proto3" json:"inbound_port,omitempty"` + InboundPort uint32 `protobuf:"varint,1,opt,name=inbound_port,json=inboundPort,proto3" json:"inbound_port,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProtocolHint_OpaqueTransport) Reset() { @@ -1707,16 +1717,15 @@ func (x *ProtocolHint_OpaqueTransport) GetInboundPort() uint32 { } type Http2ClientParams_FlowControl struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Configures the maximum connection-level flow control window size. InitialConnectionWindowSize uint32 `protobuf:"varint,1,opt,name=initial_connection_window_size,json=initialConnectionWindowSize,proto3" json:"initial_connection_window_size,omitempty"` // Configures the maximum stream-level flow control window size. InitialStreamWindowSize uint32 `protobuf:"varint,2,opt,name=initial_stream_window_size,json=initialStreamWindowSize,proto3" json:"initial_stream_window_size,omitempty"` // Enables Hyper's adaptive flow control, ignoring other window settings. AdaptiveFlowControl bool `protobuf:"varint,3,opt,name=adaptive_flow_control,json=adaptiveFlowControl,proto3" json:"adaptive_flow_control,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Http2ClientParams_FlowControl) Reset() { @@ -1771,17 +1780,16 @@ func (x *Http2ClientParams_FlowControl) GetAdaptiveFlowControl() bool { } type Http2ClientParams_KeepAlive struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The time between pings. Interval *duration.Duration `protobuf:"bytes,1,opt,name=interval,proto3" json:"interval,omitempty"` // The time to wait for a ping response before considering the connection // dead. Timeout *duration.Duration `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"` // Whether to send pings when there is no other traffic. - WhileIdle bool `protobuf:"varint,3,opt,name=while_idle,json=whileIdle,proto3" json:"while_idle,omitempty"` + WhileIdle bool `protobuf:"varint,3,opt,name=while_idle,json=whileIdle,proto3" json:"while_idle,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Http2ClientParams_KeepAlive) Reset() { @@ -1836,13 +1844,12 @@ func (x *Http2ClientParams_KeepAlive) GetWhileIdle() bool { } type Http2ClientParams_Internals struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - MaxConcurrentResetStreams uint32 `protobuf:"varint,1,opt,name=max_concurrent_reset_streams,json=maxConcurrentResetStreams,proto3" json:"max_concurrent_reset_streams,omitempty"` - MaxFrameSize uint32 `protobuf:"varint,2,opt,name=max_frame_size,json=maxFrameSize,proto3" json:"max_frame_size,omitempty"` - MaxSendBufSize uint32 `protobuf:"varint,3,opt,name=max_send_buf_size,json=maxSendBufSize,proto3" json:"max_send_buf_size,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + MaxConcurrentResetStreams uint32 `protobuf:"varint,1,opt,name=max_concurrent_reset_streams,json=maxConcurrentResetStreams,proto3" json:"max_concurrent_reset_streams,omitempty"` + MaxFrameSize uint32 `protobuf:"varint,2,opt,name=max_frame_size,json=maxFrameSize,proto3" json:"max_frame_size,omitempty"` + MaxSendBufSize uint32 `protobuf:"varint,3,opt,name=max_send_buf_size,json=maxSendBufSize,proto3" json:"max_send_buf_size,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Http2ClientParams_Internals) Reset() { @@ -1897,11 +1904,10 @@ func (x *Http2ClientParams_Internals) GetMaxSendBufSize() uint32 { } type RequestMatch_Seq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Matches []*RequestMatch `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"` unknownFields protoimpl.UnknownFields - - Matches []*RequestMatch `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"` + sizeCache protoimpl.SizeCache } func (x *RequestMatch_Seq) Reset() { @@ -1942,11 +1948,10 @@ func (x *RequestMatch_Seq) GetMatches() []*RequestMatch { } type ResponseMatch_Seq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Matches []*ResponseMatch `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"` unknownFields protoimpl.UnknownFields - - Matches []*ResponseMatch `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ResponseMatch_Seq) Reset() { diff --git a/go/grpc_route/grpc_route.pb.go b/go/grpc_route/grpc_route.pb.go index 578f4bd67..a9dcf7ea9 100644 --- a/go/grpc_route/grpc_route.pb.go +++ b/go/grpc_route/grpc_route.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc v5.29.0 // source: grpc_route.proto @@ -22,15 +22,14 @@ const ( ) type GrpcRouteMatch struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Rpc *GrpcRpcMatch `protobuf:"bytes,1,opt,name=rpc,proto3" json:"rpc,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Rpc *GrpcRpcMatch `protobuf:"bytes,1,opt,name=rpc,proto3" json:"rpc,omitempty"` // A set of header value matches that must be satisified. This match is not // comprehensive, so requests may include headers that are not covered by this // match. - Headers []*http_route.HeaderMatch `protobuf:"bytes,2,rep,name=headers,proto3" json:"headers,omitempty"` + Headers []*http_route.HeaderMatch `protobuf:"bytes,2,rep,name=headers,proto3" json:"headers,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GrpcRouteMatch) Reset() { @@ -78,12 +77,11 @@ func (x *GrpcRouteMatch) GetHeaders() []*http_route.HeaderMatch { } type GrpcRpcMatch struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Service string `protobuf:"bytes,1,opt,name=service,proto3" json:"service,omitempty"` + Method string `protobuf:"bytes,2,opt,name=method,proto3" json:"method,omitempty"` unknownFields protoimpl.UnknownFields - - Service string `protobuf:"bytes,1,opt,name=service,proto3" json:"service,omitempty"` - Method string `protobuf:"bytes,2,opt,name=method,proto3" json:"method,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GrpcRpcMatch) Reset() { @@ -132,17 +130,16 @@ func (x *GrpcRpcMatch) GetMethod() string { // Configures a route to respond with a fixed response. type GrpcFailureInjector struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The status code to use in the `grpc-status` response. Must be specified. Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` // An error message to log and include in the `grpc-message` header. Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` // If specified, the rate of requests that should be failed. If not specified, // ALL requests are failed. - Ratio *http_route.Ratio `protobuf:"bytes,3,opt,name=ratio,proto3" json:"ratio,omitempty"` + Ratio *http_route.Ratio `protobuf:"bytes,3,opt,name=ratio,proto3" json:"ratio,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GrpcFailureInjector) Reset() { diff --git a/go/http_route/http_route.pb.go b/go/http_route/http_route.pb.go index fd5e0eae2..e86529972 100644 --- a/go/http_route/http_route.pb.go +++ b/go/http_route/http_route.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc v5.29.0 // source: http_route.proto @@ -24,15 +24,14 @@ const ( // Describes how to match an `:authority` or `host` header. type HostMatch struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Match: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Match: // // *HostMatch_Exact // *HostMatch_Suffix_ - Match isHostMatch_Match `protobuf_oneof:"match"` + Match isHostMatch_Match `protobuf_oneof:"match"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HostMatch) Reset() { @@ -65,23 +64,27 @@ func (*HostMatch) Descriptor() ([]byte, []int) { return file_http_route_proto_rawDescGZIP(), []int{0} } -func (m *HostMatch) GetMatch() isHostMatch_Match { - if m != nil { - return m.Match +func (x *HostMatch) GetMatch() isHostMatch_Match { + if x != nil { + return x.Match } return nil } func (x *HostMatch) GetExact() string { - if x, ok := x.GetMatch().(*HostMatch_Exact); ok { - return x.Exact + if x != nil { + if x, ok := x.Match.(*HostMatch_Exact); ok { + return x.Exact + } } return "" } func (x *HostMatch) GetSuffix() *HostMatch_Suffix { - if x, ok := x.GetMatch().(*HostMatch_Suffix_); ok { - return x.Suffix + if x != nil { + if x, ok := x.Match.(*HostMatch_Suffix_); ok { + return x.Suffix + } } return nil } @@ -106,10 +109,7 @@ func (*HostMatch_Suffix_) isHostMatch_Match() {} // Describes a set of matches, ALL of which must apply. type HttpRouteMatch struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Matches requests by path. Path *PathMatch `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` // A set of header value matches that must be satisified. This match is not @@ -121,7 +121,9 @@ type HttpRouteMatch struct { // covered by this match. QueryParams []*QueryParamMatch `protobuf:"bytes,3,rep,name=query_params,json=queryParams,proto3" json:"query_params,omitempty"` // If specified, restricts the match to a single HTTP method. - Method *http_types.HttpMethod `protobuf:"bytes,4,opt,name=method,proto3" json:"method,omitempty"` + Method *http_types.HttpMethod `protobuf:"bytes,4,opt,name=method,proto3" json:"method,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpRouteMatch) Reset() { @@ -184,16 +186,15 @@ func (x *HttpRouteMatch) GetMethod() *http_types.HttpMethod { // Describes how to match a path. type PathMatch struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Kind: // // *PathMatch_Exact // *PathMatch_Prefix // *PathMatch_Regex - Kind isPathMatch_Kind `protobuf_oneof:"kind"` + Kind isPathMatch_Kind `protobuf_oneof:"kind"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *PathMatch) Reset() { @@ -226,30 +227,36 @@ func (*PathMatch) Descriptor() ([]byte, []int) { return file_http_route_proto_rawDescGZIP(), []int{2} } -func (m *PathMatch) GetKind() isPathMatch_Kind { - if m != nil { - return m.Kind +func (x *PathMatch) GetKind() isPathMatch_Kind { + if x != nil { + return x.Kind } return nil } func (x *PathMatch) GetExact() string { - if x, ok := x.GetKind().(*PathMatch_Exact); ok { - return x.Exact + if x != nil { + if x, ok := x.Kind.(*PathMatch_Exact); ok { + return x.Exact + } } return "" } func (x *PathMatch) GetPrefix() string { - if x, ok := x.GetKind().(*PathMatch_Prefix); ok { - return x.Prefix + if x != nil { + if x, ok := x.Kind.(*PathMatch_Prefix); ok { + return x.Prefix + } } return "" } func (x *PathMatch) GetRegex() string { - if x, ok := x.GetKind().(*PathMatch_Regex); ok { - return x.Regex + if x != nil { + if x, ok := x.Kind.(*PathMatch_Regex); ok { + return x.Regex + } } return "" } @@ -278,16 +285,15 @@ func (*PathMatch_Regex) isPathMatch_Kind() {} // Describes how to match a header by name and value. type HeaderMatch struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - // Types that are assignable to Value: + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + // Types that are valid to be assigned to Value: // // *HeaderMatch_Exact // *HeaderMatch_Regex - Value isHeaderMatch_Value `protobuf_oneof:"value"` + Value isHeaderMatch_Value `protobuf_oneof:"value"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HeaderMatch) Reset() { @@ -327,23 +333,27 @@ func (x *HeaderMatch) GetName() string { return "" } -func (m *HeaderMatch) GetValue() isHeaderMatch_Value { - if m != nil { - return m.Value +func (x *HeaderMatch) GetValue() isHeaderMatch_Value { + if x != nil { + return x.Value } return nil } func (x *HeaderMatch) GetExact() []byte { - if x, ok := x.GetValue().(*HeaderMatch_Exact); ok { - return x.Exact + if x != nil { + if x, ok := x.Value.(*HeaderMatch_Exact); ok { + return x.Exact + } } return nil } func (x *HeaderMatch) GetRegex() string { - if x, ok := x.GetValue().(*HeaderMatch_Regex); ok { - return x.Regex + if x != nil { + if x, ok := x.Value.(*HeaderMatch_Regex); ok { + return x.Regex + } } return "" } @@ -366,16 +376,15 @@ func (*HeaderMatch_Regex) isHeaderMatch_Value() {} // Describes how to match a query parameter by name and value. type QueryParamMatch struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - // Types that are assignable to Value: + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + // Types that are valid to be assigned to Value: // // *QueryParamMatch_Exact // *QueryParamMatch_Regex - Value isQueryParamMatch_Value `protobuf_oneof:"value"` + Value isQueryParamMatch_Value `protobuf_oneof:"value"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *QueryParamMatch) Reset() { @@ -415,23 +424,27 @@ func (x *QueryParamMatch) GetName() string { return "" } -func (m *QueryParamMatch) GetValue() isQueryParamMatch_Value { - if m != nil { - return m.Value +func (x *QueryParamMatch) GetValue() isQueryParamMatch_Value { + if x != nil { + return x.Value } return nil } func (x *QueryParamMatch) GetExact() string { - if x, ok := x.GetValue().(*QueryParamMatch_Exact); ok { - return x.Exact + if x != nil { + if x, ok := x.Value.(*QueryParamMatch_Exact); ok { + return x.Exact + } } return "" } func (x *QueryParamMatch) GetRegex() string { - if x, ok := x.GetValue().(*QueryParamMatch_Regex); ok { - return x.Regex + if x != nil { + if x, ok := x.Value.(*QueryParamMatch_Regex); ok { + return x.Regex + } } return "" } @@ -457,10 +470,7 @@ func (*QueryParamMatch_Regex) isQueryParamMatch_Value() {} // Modifications are to be applied in the order they are described here: // additions apply first, then sets, and then removals. type RequestHeaderModifier struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // A list of headers name-value pairs to set on requests, augmenting any // existing values for the header. Add *http_types.Headers `protobuf:"bytes,1,opt,name=add,proto3" json:"add,omitempty"` @@ -468,7 +478,9 @@ type RequestHeaderModifier struct { // existing values for the header. Set *http_types.Headers `protobuf:"bytes,2,opt,name=set,proto3" json:"set,omitempty"` // A list of headers names to be removed from requests. - Remove []string `protobuf:"bytes,3,rep,name=remove,proto3" json:"remove,omitempty"` + Remove []string `protobuf:"bytes,3,rep,name=remove,proto3" json:"remove,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *RequestHeaderModifier) Reset() { @@ -527,10 +539,7 @@ func (x *RequestHeaderModifier) GetRemove() []string { // Modifications are to be applied in the order they are described here: // additions apply first, then sets, and then removals. type ResponseHeaderModifier struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // A list of headers name-value pairs to set on responses, augmenting any // existing values for the header. Add *http_types.Headers `protobuf:"bytes,1,opt,name=add,proto3" json:"add,omitempty"` @@ -538,7 +547,9 @@ type ResponseHeaderModifier struct { // existing values for the header. Set *http_types.Headers `protobuf:"bytes,2,opt,name=set,proto3" json:"set,omitempty"` // A list of headers names to be removed from responses. - Remove []string `protobuf:"bytes,3,rep,name=remove,proto3" json:"remove,omitempty"` + Remove []string `protobuf:"bytes,3,rep,name=remove,proto3" json:"remove,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ResponseHeaderModifier) Reset() { @@ -595,10 +606,7 @@ func (x *ResponseHeaderModifier) GetRemove() []string { // Configures a route to respond with a redirect response. The `location` header // is set with the given URL parameters. type RequestRedirect struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The scheme value to be used in the `location` header. If not specified, // the original request's scheme is used. Scheme *http_types.Scheme `protobuf:"bytes,1,opt,name=scheme,proto3" json:"scheme,omitempty"` @@ -613,7 +621,9 @@ type RequestRedirect struct { Port uint32 `protobuf:"varint,4,opt,name=port,proto3" json:"port,omitempty"` // The status code to use in the HTTP response. If not specified, 301 is // used. - Status uint32 `protobuf:"varint,5,opt,name=status,proto3" json:"status,omitempty"` + Status uint32 `protobuf:"varint,5,opt,name=status,proto3" json:"status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *RequestRedirect) Reset() { @@ -683,15 +693,14 @@ func (x *RequestRedirect) GetStatus() uint32 { // Describes how a path value may be rewritten in a route. type PathModifier struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Replace: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Replace: // // *PathModifier_Full // *PathModifier_Prefix - Replace isPathModifier_Replace `protobuf_oneof:"replace"` + Replace isPathModifier_Replace `protobuf_oneof:"replace"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *PathModifier) Reset() { @@ -724,23 +733,27 @@ func (*PathModifier) Descriptor() ([]byte, []int) { return file_http_route_proto_rawDescGZIP(), []int{8} } -func (m *PathModifier) GetReplace() isPathModifier_Replace { - if m != nil { - return m.Replace +func (x *PathModifier) GetReplace() isPathModifier_Replace { + if x != nil { + return x.Replace } return nil } func (x *PathModifier) GetFull() string { - if x, ok := x.GetReplace().(*PathModifier_Full); ok { - return x.Full + if x != nil { + if x, ok := x.Replace.(*PathModifier_Full); ok { + return x.Full + } } return "" } func (x *PathModifier) GetPrefix() string { - if x, ok := x.GetReplace().(*PathModifier_Prefix); ok { - return x.Prefix + if x != nil { + if x, ok := x.Replace.(*PathModifier_Prefix); ok { + return x.Prefix + } } return "" } @@ -770,17 +783,16 @@ func (*PathModifier_Prefix) isPathModifier_Replace() {} // Configures a route to respond with a fixed response. type HttpFailureInjector struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The status code to use in the HTTP response. Must be specified. Status uint32 `protobuf:"varint,1,opt,name=status,proto3" json:"status,omitempty"` // An error message to log and include in the `l5d-proxy-err` header. Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` // If specified, the rate of requests that should be failed. If not specified, // ALL requests are failed. - Ratio *Ratio `protobuf:"bytes,3,opt,name=ratio,proto3" json:"ratio,omitempty"` + Ratio *Ratio `protobuf:"bytes,3,opt,name=ratio,proto3" json:"ratio,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpFailureInjector) Reset() { @@ -838,13 +850,12 @@ func (x *HttpFailureInjector) GetRatio() *Ratio { // // Represents fractional values on [0, 1]. type Ratio struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Numerator uint32 `protobuf:"varint,1,opt,name=numerator,proto3" json:"numerator,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Numerator uint32 `protobuf:"varint,1,opt,name=numerator,proto3" json:"numerator,omitempty"` // MUST not be zero. - Denominator uint32 `protobuf:"varint,2,opt,name=denominator,proto3" json:"denominator,omitempty"` + Denominator uint32 `protobuf:"varint,2,opt,name=denominator,proto3" json:"denominator,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Ratio) Reset() { @@ -892,10 +903,7 @@ func (x *Ratio) GetDenominator() uint32 { } type Timeouts struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Limits the the time a stream may be active after all request frames have // been processed. Response *duration.Duration `protobuf:"bytes,1,opt,name=response,proto3" json:"response,omitempty"` @@ -904,7 +912,9 @@ type Timeouts struct { Request *duration.Duration `protobuf:"bytes,2,opt,name=request,proto3" json:"request,omitempty"` // Limits the amount of time a stream may be idle (i.e. with no frames being // processed). - Idle *duration.Duration `protobuf:"bytes,3,opt,name=idle,proto3" json:"idle,omitempty"` + Idle *duration.Duration `protobuf:"bytes,3,opt,name=idle,proto3" json:"idle,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Timeouts) Reset() { @@ -960,11 +970,10 @@ func (x *Timeouts) GetIdle() *duration.Duration { // A match like `*.example.com` is encoded as [com, example]. type HostMatch_Suffix struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ReverseLabels []string `protobuf:"bytes,1,rep,name=reverse_labels,json=reverseLabels,proto3" json:"reverse_labels,omitempty"` unknownFields protoimpl.UnknownFields - - ReverseLabels []string `protobuf:"bytes,1,rep,name=reverse_labels,json=reverseLabels,proto3" json:"reverse_labels,omitempty"` + sizeCache protoimpl.SizeCache } func (x *HostMatch_Suffix) Reset() { diff --git a/go/http_types/http_types.pb.go b/go/http_types/http_types.pb.go index 19b61de0c..a2f88c6a7 100644 --- a/go/http_types/http_types.pb.go +++ b/go/http_types/http_types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc v5.29.0 // source: http_types.proto @@ -134,15 +134,14 @@ func (Scheme_Registered) EnumDescriptor() ([]byte, []int) { } type HttpMethod struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Type: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Type: // // *HttpMethod_Registered_ // *HttpMethod_Unregistered - Type isHttpMethod_Type `protobuf_oneof:"type"` + Type isHttpMethod_Type `protobuf_oneof:"type"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpMethod) Reset() { @@ -175,23 +174,27 @@ func (*HttpMethod) Descriptor() ([]byte, []int) { return file_http_types_proto_rawDescGZIP(), []int{0} } -func (m *HttpMethod) GetType() isHttpMethod_Type { - if m != nil { - return m.Type +func (x *HttpMethod) GetType() isHttpMethod_Type { + if x != nil { + return x.Type } return nil } func (x *HttpMethod) GetRegistered() HttpMethod_Registered { - if x, ok := x.GetType().(*HttpMethod_Registered_); ok { - return x.Registered + if x != nil { + if x, ok := x.Type.(*HttpMethod_Registered_); ok { + return x.Registered + } } return HttpMethod_GET } func (x *HttpMethod) GetUnregistered() string { - if x, ok := x.GetType().(*HttpMethod_Unregistered); ok { - return x.Unregistered + if x != nil { + if x, ok := x.Type.(*HttpMethod_Unregistered); ok { + return x.Unregistered + } } return "" } @@ -213,15 +216,14 @@ func (*HttpMethod_Registered_) isHttpMethod_Type() {} func (*HttpMethod_Unregistered) isHttpMethod_Type() {} type Scheme struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Type: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Type: // // *Scheme_Registered_ // *Scheme_Unregistered - Type isScheme_Type `protobuf_oneof:"type"` + Type isScheme_Type `protobuf_oneof:"type"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Scheme) Reset() { @@ -254,23 +256,27 @@ func (*Scheme) Descriptor() ([]byte, []int) { return file_http_types_proto_rawDescGZIP(), []int{1} } -func (m *Scheme) GetType() isScheme_Type { - if m != nil { - return m.Type +func (x *Scheme) GetType() isScheme_Type { + if x != nil { + return x.Type } return nil } func (x *Scheme) GetRegistered() Scheme_Registered { - if x, ok := x.GetType().(*Scheme_Registered_); ok { - return x.Registered + if x != nil { + if x, ok := x.Type.(*Scheme_Registered_); ok { + return x.Registered + } } return Scheme_HTTP } func (x *Scheme) GetUnregistered() string { - if x, ok := x.GetType().(*Scheme_Unregistered); ok { - return x.Unregistered + if x != nil { + if x, ok := x.Type.(*Scheme_Unregistered); ok { + return x.Unregistered + } } return "" } @@ -292,11 +298,10 @@ func (*Scheme_Registered_) isScheme_Type() {} func (*Scheme_Unregistered) isScheme_Type() {} type Headers struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Headers []*Headers_Header `protobuf:"bytes,1,rep,name=headers,proto3" json:"headers,omitempty"` unknownFields protoimpl.UnknownFields - - Headers []*Headers_Header `protobuf:"bytes,1,rep,name=headers,proto3" json:"headers,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Headers) Reset() { @@ -337,12 +342,11 @@ func (x *Headers) GetHeaders() []*Headers_Header { } type Headers_Header struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Headers_Header) Reset() { diff --git a/go/identity/identity.pb.go b/go/identity/identity.pb.go index 37b0b34e8..fde66d41a 100644 --- a/go/identity/identity.pb.go +++ b/go/identity/identity.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc v5.29.0 // source: identity.proto @@ -22,11 +22,8 @@ const ( ) type CertifyRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Identity string `protobuf:"bytes,1,opt,name=identity,proto3" json:"identity,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Identity string `protobuf:"bytes,1,opt,name=identity,proto3" json:"identity,omitempty"` // Proof of the requester's identity. // // In Kubernetes, for instance, this is the contents of a service account @@ -34,6 +31,8 @@ type CertifyRequest struct { Token []byte `protobuf:"bytes,2,opt,name=token,proto3" json:"token,omitempty"` // A PEM-encoded x509 Certificate Signing Request. CertificateSigningRequest []byte `protobuf:"bytes,3,opt,name=certificate_signing_request,json=certificateSigningRequest,proto3" json:"certificate_signing_request,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *CertifyRequest) Reset() { @@ -88,16 +87,15 @@ func (x *CertifyRequest) GetCertificateSigningRequest() []byte { } type CertifyResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // A PEM-encoded x509 Certificate. LeafCertificate []byte `protobuf:"bytes,1,opt,name=leaf_certificate,json=leafCertificate,proto3" json:"leaf_certificate,omitempty"` // A list of PEM-encoded x509 Certificates that establish the trust chain // between the leaf_certificate and the well-known trust anchors. IntermediateCertificates [][]byte `protobuf:"bytes,2,rep,name=intermediate_certificates,json=intermediateCertificates,proto3" json:"intermediate_certificates,omitempty"` ValidUntil *timestamp.Timestamp `protobuf:"bytes,3,opt,name=valid_until,json=validUntil,proto3" json:"valid_until,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *CertifyResponse) Reset() { diff --git a/go/inbound/inbound.pb.go b/go/inbound/inbound.pb.go index 22c8f239b..cb95fee80 100644 --- a/go/inbound/inbound.pb.go +++ b/go/inbound/inbound.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc v5.29.0 // source: inbound.proto @@ -26,14 +26,13 @@ const ( ) type PortSpec struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Identifies a proxy workload (e.g., pod name). Workload string `protobuf:"bytes,1,opt,name=workload,proto3" json:"workload,omitempty"` // An inbound port on _workload_. - Port uint32 `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"` + Port uint32 `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *PortSpec) Reset() { @@ -81,10 +80,7 @@ func (x *PortSpec) GetPort() uint32 { } type Server struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // If set, indicates how the proxy should proxy connections on the specified // port. Protocol *ProxyProtocol `protobuf:"bytes,1,opt,name=protocol,proto3" json:"protocol,omitempty"` @@ -99,7 +95,9 @@ type Server struct { // // A control plane SHOULD return the same keys in all policies. That is, we do // NOT want to return arbitrary pod labels in this field. - Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Server) Reset() { @@ -161,11 +159,8 @@ func (x *Server) GetLabels() map[string]string { } type ProxyProtocol struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Kind: // // *ProxyProtocol_Detect_ // *ProxyProtocol_Opaque_ @@ -173,7 +168,9 @@ type ProxyProtocol struct { // *ProxyProtocol_Http1_ // *ProxyProtocol_Http2_ // *ProxyProtocol_Grpc_ - Kind isProxyProtocol_Kind `protobuf_oneof:"kind"` + Kind isProxyProtocol_Kind `protobuf_oneof:"kind"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProxyProtocol) Reset() { @@ -206,51 +203,63 @@ func (*ProxyProtocol) Descriptor() ([]byte, []int) { return file_inbound_proto_rawDescGZIP(), []int{2} } -func (m *ProxyProtocol) GetKind() isProxyProtocol_Kind { - if m != nil { - return m.Kind +func (x *ProxyProtocol) GetKind() isProxyProtocol_Kind { + if x != nil { + return x.Kind } return nil } func (x *ProxyProtocol) GetDetect() *ProxyProtocol_Detect { - if x, ok := x.GetKind().(*ProxyProtocol_Detect_); ok { - return x.Detect + if x != nil { + if x, ok := x.Kind.(*ProxyProtocol_Detect_); ok { + return x.Detect + } } return nil } func (x *ProxyProtocol) GetOpaque() *ProxyProtocol_Opaque { - if x, ok := x.GetKind().(*ProxyProtocol_Opaque_); ok { - return x.Opaque + if x != nil { + if x, ok := x.Kind.(*ProxyProtocol_Opaque_); ok { + return x.Opaque + } } return nil } func (x *ProxyProtocol) GetTls() *ProxyProtocol_Tls { - if x, ok := x.GetKind().(*ProxyProtocol_Tls_); ok { - return x.Tls + if x != nil { + if x, ok := x.Kind.(*ProxyProtocol_Tls_); ok { + return x.Tls + } } return nil } func (x *ProxyProtocol) GetHttp1() *ProxyProtocol_Http1 { - if x, ok := x.GetKind().(*ProxyProtocol_Http1_); ok { - return x.Http1 + if x != nil { + if x, ok := x.Kind.(*ProxyProtocol_Http1_); ok { + return x.Http1 + } } return nil } func (x *ProxyProtocol) GetHttp2() *ProxyProtocol_Http2 { - if x, ok := x.GetKind().(*ProxyProtocol_Http2_); ok { - return x.Http2 + if x != nil { + if x, ok := x.Kind.(*ProxyProtocol_Http2_); ok { + return x.Http2 + } } return nil } func (x *ProxyProtocol) GetGrpc() *ProxyProtocol_Grpc { - if x, ok := x.GetKind().(*ProxyProtocol_Grpc_); ok { - return x.Grpc + if x != nil { + if x, ok := x.Kind.(*ProxyProtocol_Grpc_); ok { + return x.Grpc + } } return nil } @@ -296,10 +305,7 @@ func (*ProxyProtocol_Http2_) isProxyProtocol_Kind() {} func (*ProxyProtocol_Grpc_) isProxyProtocol_Kind() {} type Authz struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Limits this authorization to client addresses in the provided networks. // // Must have at least one network, otherwise the authorization must be @@ -316,10 +322,12 @@ type Authz struct { // `labels` should be considered deprecated. `metadata` is preferred. However, // controllers should continue to set `labels` for compatibility with older // proxies. - Labels map[string]string `protobuf:"bytes,3,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Labels map[string]string `protobuf:"bytes,3,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // If set, describes an Authorization configuration. Replaces the free-from // `labels` field. - Metadata *meta.Metadata `protobuf:"bytes,4,opt,name=metadata,proto3" json:"metadata,omitempty"` + Metadata *meta.Metadata `protobuf:"bytes,4,opt,name=metadata,proto3" json:"metadata,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Authz) Reset() { @@ -382,12 +390,11 @@ func (x *Authz) GetMetadata() *meta.Metadata { // Describes a network of authorized clients. type Network struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Net *net.IPNetwork `protobuf:"bytes,1,opt,name=net,proto3" json:"net,omitempty"` + Except []*net.IPNetwork `protobuf:"bytes,2,rep,name=except,proto3" json:"except,omitempty"` unknownFields protoimpl.UnknownFields - - Net *net.IPNetwork `protobuf:"bytes,1,opt,name=net,proto3" json:"net,omitempty"` - Except []*net.IPNetwork `protobuf:"bytes,2,rep,name=except,proto3" json:"except,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Network) Reset() { @@ -435,15 +442,14 @@ func (x *Network) GetExcept() []*net.IPNetwork { } type Authn struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Permit: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Permit: // // *Authn_Unauthenticated // *Authn_MeshTLS - Permit isAuthn_Permit `protobuf_oneof:"permit"` + Permit isAuthn_Permit `protobuf_oneof:"permit"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Authn) Reset() { @@ -476,23 +482,27 @@ func (*Authn) Descriptor() ([]byte, []int) { return file_inbound_proto_rawDescGZIP(), []int{5} } -func (m *Authn) GetPermit() isAuthn_Permit { - if m != nil { - return m.Permit +func (x *Authn) GetPermit() isAuthn_Permit { + if x != nil { + return x.Permit } return nil } func (x *Authn) GetUnauthenticated() *Authn_PermitUnauthenticated { - if x, ok := x.GetPermit().(*Authn_Unauthenticated); ok { - return x.Unauthenticated + if x != nil { + if x, ok := x.Permit.(*Authn_Unauthenticated); ok { + return x.Unauthenticated + } } return nil } func (x *Authn) GetMeshTLS() *Authn_PermitMeshTLS { - if x, ok := x.GetPermit().(*Authn_MeshTLS); ok { - return x.MeshTLS + if x != nil { + if x, ok := x.Permit.(*Authn_MeshTLS); ok { + return x.MeshTLS + } } return nil } @@ -515,11 +525,10 @@ func (*Authn_Unauthenticated) isAuthn_Permit() {} func (*Authn_MeshTLS) isAuthn_Permit() {} type Identity struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Identity) Reset() { @@ -564,11 +573,10 @@ func (x *Identity) GetName() string { // An empty list is equivalent to `.` (matching all names); the list `["foo", // "bar"]` is equivalent to "foo.bar." (matching `*.foo.bar`), etc. type IdentitySuffix struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Parts []string `protobuf:"bytes,1,rep,name=parts,proto3" json:"parts,omitempty"` unknownFields protoimpl.UnknownFields - - Parts []string `protobuf:"bytes,1,rep,name=parts,proto3" json:"parts,omitempty"` + sizeCache protoimpl.SizeCache } func (x *IdentitySuffix) Reset() { @@ -611,18 +619,17 @@ func (x *IdentitySuffix) GetParts() []string { // Inbound-specific HTTP route configuration (based on the // [Gateway API](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPRoute)). type HttpRoute struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Metadata *meta.Metadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Metadata *meta.Metadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` // If empty, the host value is ignored. Hosts []*http_route.HostMatch `protobuf:"bytes,2,rep,name=hosts,proto3" json:"hosts,omitempty"` // Extends the list of authorizations on the `Server` with authorizations // specific to this route. Authorizations []*Authz `protobuf:"bytes,3,rep,name=authorizations,proto3" json:"authorizations,omitempty"` // Must have at least one rule. - Rules []*HttpRoute_Rule `protobuf:"bytes,4,rep,name=rules,proto3" json:"rules,omitempty"` + Rules []*HttpRoute_Rule `protobuf:"bytes,4,rep,name=rules,proto3" json:"rules,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpRoute) Reset() { @@ -685,18 +692,17 @@ func (x *HttpRoute) GetRules() []*HttpRoute_Rule { // Inbound-specific gRPC route configuration. type GrpcRoute struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Metadata *meta.Metadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Metadata *meta.Metadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` // If empty, the host value is ignored. Hosts []*http_route.HostMatch `protobuf:"bytes,2,rep,name=hosts,proto3" json:"hosts,omitempty"` // The server MUST return at least one authorization, otherwise all requests // to this route will fail with an unauthorized response. Authorizations []*Authz `protobuf:"bytes,3,rep,name=authorizations,proto3" json:"authorizations,omitempty"` // Must have at least one rule. - Rules []*GrpcRoute_Rule `protobuf:"bytes,4,rep,name=rules,proto3" json:"rules,omitempty"` + Rules []*GrpcRoute_Rule `protobuf:"bytes,4,rep,name=rules,proto3" json:"rules,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GrpcRoute) Reset() { @@ -758,10 +764,7 @@ func (x *GrpcRoute) GetRules() []*GrpcRoute_Rule { } type HttpLocalRateLimit struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Describes the associated HTTPLocalRateLimitPolicy resource Metadata *meta.Metadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` // Overall rate-limit, which all traffic coming to this server should abide @@ -771,7 +774,9 @@ type HttpLocalRateLimit struct { // identity, will have this rate-limit. Identity *HttpLocalRateLimit_Limit `protobuf:"bytes,3,opt,name=identity,proto3" json:"identity,omitempty"` // Limit overrides for traffic from a specific client. - Overrides []*HttpLocalRateLimit_Override `protobuf:"bytes,4,rep,name=overrides,proto3" json:"overrides,omitempty"` + Overrides []*HttpLocalRateLimit_Override `protobuf:"bytes,4,rep,name=overrides,proto3" json:"overrides,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpLocalRateLimit) Reset() { @@ -833,16 +838,15 @@ func (x *HttpLocalRateLimit) GetOverrides() []*HttpLocalRateLimit_Override { } type ProxyProtocol_Detect struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Timeout *duration.Duration `protobuf:"bytes,1,opt,name=timeout,proto3" json:"timeout,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Timeout *duration.Duration `protobuf:"bytes,1,opt,name=timeout,proto3" json:"timeout,omitempty"` // If the protocol detected as HTTP, a list of HTTP routes that should be // matched. HttpRoutes []*HttpRoute `protobuf:"bytes,3,rep,name=http_routes,json=httpRoutes,proto3" json:"http_routes,omitempty"` // If the protocol detected as HTTP, applicable rate limit. HttpLocalRateLimit *HttpLocalRateLimit `protobuf:"bytes,4,opt,name=http_local_rate_limit,json=httpLocalRateLimit,proto3" json:"http_local_rate_limit,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProxyProtocol_Detect) Reset() { @@ -897,12 +901,11 @@ func (x *ProxyProtocol_Detect) GetHttpLocalRateLimit() *HttpLocalRateLimit { } type ProxyProtocol_Http1 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Routes []*HttpRoute `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes,omitempty"` - LocalRateLimit *HttpLocalRateLimit `protobuf:"bytes,3,opt,name=local_rate_limit,json=localRateLimit,proto3" json:"local_rate_limit,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Routes []*HttpRoute `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes,omitempty"` + LocalRateLimit *HttpLocalRateLimit `protobuf:"bytes,3,opt,name=local_rate_limit,json=localRateLimit,proto3" json:"local_rate_limit,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProxyProtocol_Http1) Reset() { @@ -950,12 +953,11 @@ func (x *ProxyProtocol_Http1) GetLocalRateLimit() *HttpLocalRateLimit { } type ProxyProtocol_Http2 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Routes []*HttpRoute `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes,omitempty"` - LocalRateLimit *HttpLocalRateLimit `protobuf:"bytes,3,opt,name=local_rate_limit,json=localRateLimit,proto3" json:"local_rate_limit,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Routes []*HttpRoute `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes,omitempty"` + LocalRateLimit *HttpLocalRateLimit `protobuf:"bytes,3,opt,name=local_rate_limit,json=localRateLimit,proto3" json:"local_rate_limit,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProxyProtocol_Http2) Reset() { @@ -1003,11 +1005,10 @@ func (x *ProxyProtocol_Http2) GetLocalRateLimit() *HttpLocalRateLimit { } type ProxyProtocol_Grpc struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Routes []*GrpcRoute `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes,omitempty"` unknownFields protoimpl.UnknownFields - - Routes []*GrpcRoute `protobuf:"bytes,2,rep,name=routes,proto3" json:"routes,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProxyProtocol_Grpc) Reset() { @@ -1048,9 +1049,9 @@ func (x *ProxyProtocol_Grpc) GetRoutes() []*GrpcRoute { } type ProxyProtocol_Opaque struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProxyProtocol_Opaque) Reset() { @@ -1084,9 +1085,9 @@ func (*ProxyProtocol_Opaque) Descriptor() ([]byte, []int) { } type ProxyProtocol_Tls struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProxyProtocol_Tls) Reset() { @@ -1120,9 +1121,9 @@ func (*ProxyProtocol_Tls) Descriptor() ([]byte, []int) { } type Authn_PermitUnauthenticated struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Authn_PermitUnauthenticated) Reset() { @@ -1156,15 +1157,14 @@ func (*Authn_PermitUnauthenticated) Descriptor() ([]byte, []int) { } type Authn_PermitMeshTLS struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Clients: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Clients: // // *Authn_PermitMeshTLS_Unauthenticated // *Authn_PermitMeshTLS_Identities - Clients isAuthn_PermitMeshTLS_Clients `protobuf_oneof:"clients"` + Clients isAuthn_PermitMeshTLS_Clients `protobuf_oneof:"clients"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Authn_PermitMeshTLS) Reset() { @@ -1197,23 +1197,27 @@ func (*Authn_PermitMeshTLS) Descriptor() ([]byte, []int) { return file_inbound_proto_rawDescGZIP(), []int{5, 1} } -func (m *Authn_PermitMeshTLS) GetClients() isAuthn_PermitMeshTLS_Clients { - if m != nil { - return m.Clients +func (x *Authn_PermitMeshTLS) GetClients() isAuthn_PermitMeshTLS_Clients { + if x != nil { + return x.Clients } return nil } func (x *Authn_PermitMeshTLS) GetUnauthenticated() *Authn_PermitUnauthenticated { - if x, ok := x.GetClients().(*Authn_PermitMeshTLS_Unauthenticated); ok { - return x.Unauthenticated + if x != nil { + if x, ok := x.Clients.(*Authn_PermitMeshTLS_Unauthenticated); ok { + return x.Unauthenticated + } } return nil } func (x *Authn_PermitMeshTLS) GetIdentities() *Authn_PermitMeshTLS_PermitClientIdentities { - if x, ok := x.GetClients().(*Authn_PermitMeshTLS_Identities); ok { - return x.Identities + if x != nil { + if x, ok := x.Clients.(*Authn_PermitMeshTLS_Identities); ok { + return x.Identities + } } return nil } @@ -1238,16 +1242,15 @@ func (*Authn_PermitMeshTLS_Unauthenticated) isAuthn_PermitMeshTLS_Clients() {} func (*Authn_PermitMeshTLS_Identities) isAuthn_PermitMeshTLS_Clients() {} type Authn_PermitMeshTLS_PermitClientIdentities struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // A list of literal identities. Identities []*Identity `protobuf:"bytes,1,rep,name=identities,proto3" json:"identities,omitempty"` // A list of identity suffixes. // // If this contains an empty suffix, all identities are matched. - Suffixes []*IdentitySuffix `protobuf:"bytes,2,rep,name=suffixes,proto3" json:"suffixes,omitempty"` + Suffixes []*IdentitySuffix `protobuf:"bytes,2,rep,name=suffixes,proto3" json:"suffixes,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Authn_PermitMeshTLS_PermitClientIdentities) Reset() { @@ -1295,12 +1298,11 @@ func (x *Authn_PermitMeshTLS_PermitClientIdentities) GetSuffixes() []*IdentitySu } type HttpRoute_Rule struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Matches []*http_route.HttpRouteMatch `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"` + Filters []*HttpRoute_Filter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"` unknownFields protoimpl.UnknownFields - - Matches []*http_route.HttpRouteMatch `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"` - Filters []*HttpRoute_Filter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"` + sizeCache protoimpl.SizeCache } func (x *HttpRoute_Rule) Reset() { @@ -1348,16 +1350,15 @@ func (x *HttpRoute_Rule) GetFilters() []*HttpRoute_Filter { } type HttpRoute_Filter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Kind: // // *HttpRoute_Filter_FailureInjector // *HttpRoute_Filter_RequestHeaderModifier // *HttpRoute_Filter_Redirect - Kind isHttpRoute_Filter_Kind `protobuf_oneof:"kind"` + Kind isHttpRoute_Filter_Kind `protobuf_oneof:"kind"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpRoute_Filter) Reset() { @@ -1390,30 +1391,36 @@ func (*HttpRoute_Filter) Descriptor() ([]byte, []int) { return file_inbound_proto_rawDescGZIP(), []int{8, 1} } -func (m *HttpRoute_Filter) GetKind() isHttpRoute_Filter_Kind { - if m != nil { - return m.Kind +func (x *HttpRoute_Filter) GetKind() isHttpRoute_Filter_Kind { + if x != nil { + return x.Kind } return nil } func (x *HttpRoute_Filter) GetFailureInjector() *http_route.HttpFailureInjector { - if x, ok := x.GetKind().(*HttpRoute_Filter_FailureInjector); ok { - return x.FailureInjector + if x != nil { + if x, ok := x.Kind.(*HttpRoute_Filter_FailureInjector); ok { + return x.FailureInjector + } } return nil } func (x *HttpRoute_Filter) GetRequestHeaderModifier() *http_route.RequestHeaderModifier { - if x, ok := x.GetKind().(*HttpRoute_Filter_RequestHeaderModifier); ok { - return x.RequestHeaderModifier + if x != nil { + if x, ok := x.Kind.(*HttpRoute_Filter_RequestHeaderModifier); ok { + return x.RequestHeaderModifier + } } return nil } func (x *HttpRoute_Filter) GetRedirect() *http_route.RequestRedirect { - if x, ok := x.GetKind().(*HttpRoute_Filter_Redirect); ok { - return x.Redirect + if x != nil { + if x, ok := x.Kind.(*HttpRoute_Filter_Redirect); ok { + return x.Redirect + } } return nil } @@ -1441,12 +1448,11 @@ func (*HttpRoute_Filter_RequestHeaderModifier) isHttpRoute_Filter_Kind() {} func (*HttpRoute_Filter_Redirect) isHttpRoute_Filter_Kind() {} type GrpcRoute_Rule struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Matches []*grpc_route.GrpcRouteMatch `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"` + Filters []*GrpcRoute_Filter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"` unknownFields protoimpl.UnknownFields - - Matches []*grpc_route.GrpcRouteMatch `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"` - Filters []*GrpcRoute_Filter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GrpcRoute_Rule) Reset() { @@ -1494,15 +1500,14 @@ func (x *GrpcRoute_Rule) GetFilters() []*GrpcRoute_Filter { } type GrpcRoute_Filter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Kind: // // *GrpcRoute_Filter_FailureInjector // *GrpcRoute_Filter_RequestHeaderModifier - Kind isGrpcRoute_Filter_Kind `protobuf_oneof:"kind"` + Kind isGrpcRoute_Filter_Kind `protobuf_oneof:"kind"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GrpcRoute_Filter) Reset() { @@ -1535,23 +1540,27 @@ func (*GrpcRoute_Filter) Descriptor() ([]byte, []int) { return file_inbound_proto_rawDescGZIP(), []int{9, 1} } -func (m *GrpcRoute_Filter) GetKind() isGrpcRoute_Filter_Kind { - if m != nil { - return m.Kind +func (x *GrpcRoute_Filter) GetKind() isGrpcRoute_Filter_Kind { + if x != nil { + return x.Kind } return nil } func (x *GrpcRoute_Filter) GetFailureInjector() *grpc_route.GrpcFailureInjector { - if x, ok := x.GetKind().(*GrpcRoute_Filter_FailureInjector); ok { - return x.FailureInjector + if x != nil { + if x, ok := x.Kind.(*GrpcRoute_Filter_FailureInjector); ok { + return x.FailureInjector + } } return nil } func (x *GrpcRoute_Filter) GetRequestHeaderModifier() *http_route.RequestHeaderModifier { - if x, ok := x.GetKind().(*GrpcRoute_Filter_RequestHeaderModifier); ok { - return x.RequestHeaderModifier + if x != nil { + if x, ok := x.Kind.(*GrpcRoute_Filter_RequestHeaderModifier); ok { + return x.RequestHeaderModifier + } } return nil } @@ -1573,12 +1582,11 @@ func (*GrpcRoute_Filter_FailureInjector) isGrpcRoute_Filter_Kind() {} func (*GrpcRoute_Filter_RequestHeaderModifier) isGrpcRoute_Filter_Kind() {} type HttpLocalRateLimit_Override struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Limit *HttpLocalRateLimit_Limit `protobuf:"bytes,1,opt,name=limit,proto3" json:"limit,omitempty"` + Clients *HttpLocalRateLimit_Override_ClientIdentities `protobuf:"bytes,2,opt,name=clients,proto3" json:"clients,omitempty"` unknownFields protoimpl.UnknownFields - - Limit *HttpLocalRateLimit_Limit `protobuf:"bytes,1,opt,name=limit,proto3" json:"limit,omitempty"` - Clients *HttpLocalRateLimit_Override_ClientIdentities `protobuf:"bytes,2,opt,name=clients,proto3" json:"clients,omitempty"` + sizeCache protoimpl.SizeCache } func (x *HttpLocalRateLimit_Override) Reset() { @@ -1626,11 +1634,10 @@ func (x *HttpLocalRateLimit_Override) GetClients() *HttpLocalRateLimit_Override_ } type HttpLocalRateLimit_Limit struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RequestsPerSecond uint32 `protobuf:"varint,1,opt,name=requestsPerSecond,proto3" json:"requestsPerSecond,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + RequestsPerSecond uint32 `protobuf:"varint,1,opt,name=requestsPerSecond,proto3" json:"requestsPerSecond,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpLocalRateLimit_Limit) Reset() { @@ -1671,12 +1678,11 @@ func (x *HttpLocalRateLimit_Limit) GetRequestsPerSecond() uint32 { } type HttpLocalRateLimit_Override_ClientIdentities struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // A list of literal identities. - Identities []*Identity `protobuf:"bytes,1,rep,name=identities,proto3" json:"identities,omitempty"` + Identities []*Identity `protobuf:"bytes,1,rep,name=identities,proto3" json:"identities,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpLocalRateLimit_Override_ClientIdentities) Reset() { diff --git a/go/meta/meta.pb.go b/go/meta/meta.pb.go index cce706505..788296efe 100644 --- a/go/meta/meta.pb.go +++ b/go/meta/meta.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc v5.29.0 // source: meta.proto @@ -23,15 +23,14 @@ const ( // General metadata about a configuration object. Typically references either an // implicit default configuration or a Kubernetes resource. type Metadata struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Kind: // // *Metadata_Default // *Metadata_Resource - Kind isMetadata_Kind `protobuf_oneof:"kind"` + Kind isMetadata_Kind `protobuf_oneof:"kind"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Metadata) Reset() { @@ -64,23 +63,27 @@ func (*Metadata) Descriptor() ([]byte, []int) { return file_meta_proto_rawDescGZIP(), []int{0} } -func (m *Metadata) GetKind() isMetadata_Kind { - if m != nil { - return m.Kind +func (x *Metadata) GetKind() isMetadata_Kind { + if x != nil { + return x.Kind } return nil } func (x *Metadata) GetDefault() string { - if x, ok := x.GetKind().(*Metadata_Default); ok { - return x.Default + if x != nil { + if x, ok := x.Kind.(*Metadata_Default); ok { + return x.Default + } } return "" } func (x *Metadata) GetResource() *Resource { - if x, ok := x.GetKind().(*Metadata_Resource); ok { - return x.Resource + if x != nil { + if x, ok := x.Kind.(*Metadata_Resource); ok { + return x.Resource + } } return nil } @@ -108,16 +111,15 @@ func (*Metadata_Resource) isMetadata_Kind() {} // References a (e.g., Kubernetes) resource. type Resource struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Group string `protobuf:"bytes,1,opt,name=group,proto3" json:"group,omitempty"` + Kind string `protobuf:"bytes,2,opt,name=kind,proto3" json:"kind,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + Namespace string `protobuf:"bytes,4,opt,name=namespace,proto3" json:"namespace,omitempty"` + Section string `protobuf:"bytes,5,opt,name=section,proto3" json:"section,omitempty"` + Port uint32 `protobuf:"varint,6,opt,name=port,proto3" json:"port,omitempty"` unknownFields protoimpl.UnknownFields - - Group string `protobuf:"bytes,1,opt,name=group,proto3" json:"group,omitempty"` - Kind string `protobuf:"bytes,2,opt,name=kind,proto3" json:"kind,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` - Namespace string `protobuf:"bytes,4,opt,name=namespace,proto3" json:"namespace,omitempty"` - Section string `protobuf:"bytes,5,opt,name=section,proto3" json:"section,omitempty"` - Port uint32 `protobuf:"varint,6,opt,name=port,proto3" json:"port,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Resource) Reset() { diff --git a/go/net/net.pb.go b/go/net/net.pb.go index 45e08b668..7bb83d67b 100644 --- a/go/net/net.pb.go +++ b/go/net/net.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc v5.29.0 // source: net.proto @@ -21,15 +21,14 @@ const ( ) type IPAddress struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Ip: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Ip: // // *IPAddress_Ipv4 // *IPAddress_Ipv6 - Ip isIPAddress_Ip `protobuf_oneof:"ip"` + Ip isIPAddress_Ip `protobuf_oneof:"ip"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *IPAddress) Reset() { @@ -62,23 +61,27 @@ func (*IPAddress) Descriptor() ([]byte, []int) { return file_net_proto_rawDescGZIP(), []int{0} } -func (m *IPAddress) GetIp() isIPAddress_Ip { - if m != nil { - return m.Ip +func (x *IPAddress) GetIp() isIPAddress_Ip { + if x != nil { + return x.Ip } return nil } func (x *IPAddress) GetIpv4() uint32 { - if x, ok := x.GetIp().(*IPAddress_Ipv4); ok { - return x.Ipv4 + if x != nil { + if x, ok := x.Ip.(*IPAddress_Ipv4); ok { + return x.Ipv4 + } } return 0 } func (x *IPAddress) GetIpv6() *IPv6 { - if x, ok := x.GetIp().(*IPAddress_Ipv6); ok { - return x.Ipv6 + if x != nil { + if x, ok := x.Ip.(*IPAddress_Ipv6); ok { + return x.Ipv6 + } } return nil } @@ -100,12 +103,11 @@ func (*IPAddress_Ipv4) isIPAddress_Ip() {} func (*IPAddress_Ipv6) isIPAddress_Ip() {} type IPNetwork struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Ip *IPAddress `protobuf:"bytes,1,opt,name=ip,proto3" json:"ip,omitempty"` + PrefixLen uint32 `protobuf:"varint,2,opt,name=prefix_len,json=prefixLen,proto3" json:"prefix_len,omitempty"` unknownFields protoimpl.UnknownFields - - Ip *IPAddress `protobuf:"bytes,1,opt,name=ip,proto3" json:"ip,omitempty"` - PrefixLen uint32 `protobuf:"varint,2,opt,name=prefix_len,json=prefixLen,proto3" json:"prefix_len,omitempty"` + sizeCache protoimpl.SizeCache } func (x *IPNetwork) Reset() { @@ -153,12 +155,11 @@ func (x *IPNetwork) GetPrefixLen() uint32 { } type IPv6 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + First uint64 `protobuf:"fixed64,1,opt,name=first,proto3" json:"first,omitempty"` // hextets 1-4 + Last uint64 `protobuf:"fixed64,2,opt,name=last,proto3" json:"last,omitempty"` // hextets 5-8 unknownFields protoimpl.UnknownFields - - First uint64 `protobuf:"fixed64,1,opt,name=first,proto3" json:"first,omitempty"` // hextets 1-4 - Last uint64 `protobuf:"fixed64,2,opt,name=last,proto3" json:"last,omitempty"` // hextets 5-8 + sizeCache protoimpl.SizeCache } func (x *IPv6) Reset() { @@ -206,12 +207,11 @@ func (x *IPv6) GetLast() uint64 { } type TcpAddress struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Ip *IPAddress `protobuf:"bytes,1,opt,name=ip,proto3" json:"ip,omitempty"` + Port uint32 `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"` unknownFields protoimpl.UnknownFields - - Ip *IPAddress `protobuf:"bytes,1,opt,name=ip,proto3" json:"ip,omitempty"` - Port uint32 `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"` + sizeCache protoimpl.SizeCache } func (x *TcpAddress) Reset() { diff --git a/go/opaque_route/opaque_route.pb.go b/go/opaque_route/opaque_route.pb.go index 966e17326..d2b3bfe33 100644 --- a/go/opaque_route/opaque_route.pb.go +++ b/go/opaque_route/opaque_route.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc v5.29.0 // source: opaque_route.proto @@ -22,11 +22,10 @@ const ( // Used to indicate that the policy is invalid. type Invalid struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` unknownFields protoimpl.UnknownFields - - Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Invalid) Reset() { @@ -68,9 +67,9 @@ func (x *Invalid) GetMessage() string { // Used to indicate that traffic is forbidden. type Forbidden struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Forbidden) Reset() { diff --git a/go/outbound/outbound.pb.go b/go/outbound/outbound.pb.go index 5ec0022a7..ac153323c 100644 --- a/go/outbound/outbound.pb.go +++ b/go/outbound/outbound.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc v5.29.0 // source: outbound.proto @@ -29,20 +29,19 @@ const ( ) type TrafficSpec struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Uniquely identifies the source proxy workload (e.g., pod name) to the // control plane. SourceWorkload string `protobuf:"bytes,1,opt,name=source_workload,json=sourceWorkload,proto3" json:"source_workload,omitempty"` // Describes a target address, as observed by the proxy. // - // Types that are assignable to Target: + // Types that are valid to be assigned to Target: // // *TrafficSpec_Addr // *TrafficSpec_Authority - Target isTrafficSpec_Target `protobuf_oneof:"target"` + Target isTrafficSpec_Target `protobuf_oneof:"target"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TrafficSpec) Reset() { @@ -82,23 +81,27 @@ func (x *TrafficSpec) GetSourceWorkload() string { return "" } -func (m *TrafficSpec) GetTarget() isTrafficSpec_Target { - if m != nil { - return m.Target +func (x *TrafficSpec) GetTarget() isTrafficSpec_Target { + if x != nil { + return x.Target } return nil } func (x *TrafficSpec) GetAddr() *net.TcpAddress { - if x, ok := x.GetTarget().(*TrafficSpec_Addr); ok { - return x.Addr + if x != nil { + if x, ok := x.Target.(*TrafficSpec_Addr); ok { + return x.Addr + } } return nil } func (x *TrafficSpec) GetAuthority() string { - if x, ok := x.GetTarget().(*TrafficSpec_Authority); ok { - return x.Authority + if x != nil { + if x, ok := x.Target.(*TrafficSpec_Authority); ok { + return x.Authority + } } return "" } @@ -124,15 +127,14 @@ func (*TrafficSpec_Authority) isTrafficSpec_Target() {} // Outbound policy for a given traffic spec. type OutboundPolicy struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Indicates the protocol to use for this target. This will be set to Opaque // if the target has been marked as opaque and will be Discover otherwise. Protocol *ProxyProtocol `protobuf:"bytes,1,opt,name=protocol,proto3" json:"protocol,omitempty"` // Describes the resource for which outbound policy has been discovered. - Metadata *meta.Metadata `protobuf:"bytes,2,opt,name=metadata,proto3" json:"metadata,omitempty"` + Metadata *meta.Metadata `protobuf:"bytes,2,opt,name=metadata,proto3" json:"metadata,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *OutboundPolicy) Reset() { @@ -180,11 +182,8 @@ func (x *OutboundPolicy) GetMetadata() *meta.Metadata { } type ProxyProtocol struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Kind: // // *ProxyProtocol_Detect_ // *ProxyProtocol_Opaque_ @@ -192,7 +191,9 @@ type ProxyProtocol struct { // *ProxyProtocol_Http2_ // *ProxyProtocol_Grpc_ // *ProxyProtocol_Tls_ - Kind isProxyProtocol_Kind `protobuf_oneof:"kind"` + Kind isProxyProtocol_Kind `protobuf_oneof:"kind"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProxyProtocol) Reset() { @@ -225,51 +226,63 @@ func (*ProxyProtocol) Descriptor() ([]byte, []int) { return file_outbound_proto_rawDescGZIP(), []int{2} } -func (m *ProxyProtocol) GetKind() isProxyProtocol_Kind { - if m != nil { - return m.Kind +func (x *ProxyProtocol) GetKind() isProxyProtocol_Kind { + if x != nil { + return x.Kind } return nil } func (x *ProxyProtocol) GetDetect() *ProxyProtocol_Detect { - if x, ok := x.GetKind().(*ProxyProtocol_Detect_); ok { - return x.Detect + if x != nil { + if x, ok := x.Kind.(*ProxyProtocol_Detect_); ok { + return x.Detect + } } return nil } func (x *ProxyProtocol) GetOpaque() *ProxyProtocol_Opaque { - if x, ok := x.GetKind().(*ProxyProtocol_Opaque_); ok { - return x.Opaque + if x != nil { + if x, ok := x.Kind.(*ProxyProtocol_Opaque_); ok { + return x.Opaque + } } return nil } func (x *ProxyProtocol) GetHttp1() *ProxyProtocol_Http1 { - if x, ok := x.GetKind().(*ProxyProtocol_Http1_); ok { - return x.Http1 + if x != nil { + if x, ok := x.Kind.(*ProxyProtocol_Http1_); ok { + return x.Http1 + } } return nil } func (x *ProxyProtocol) GetHttp2() *ProxyProtocol_Http2 { - if x, ok := x.GetKind().(*ProxyProtocol_Http2_); ok { - return x.Http2 + if x != nil { + if x, ok := x.Kind.(*ProxyProtocol_Http2_); ok { + return x.Http2 + } } return nil } func (x *ProxyProtocol) GetGrpc() *ProxyProtocol_Grpc { - if x, ok := x.GetKind().(*ProxyProtocol_Grpc_); ok { - return x.Grpc + if x != nil { + if x, ok := x.Kind.(*ProxyProtocol_Grpc_); ok { + return x.Grpc + } } return nil } func (x *ProxyProtocol) GetTls() *ProxyProtocol_Tls { - if x, ok := x.GetKind().(*ProxyProtocol_Tls_); ok { - return x.Tls + if x != nil { + if x, ok := x.Kind.(*ProxyProtocol_Tls_); ok { + return x.Tls + } } return nil } @@ -321,15 +334,14 @@ func (*ProxyProtocol_Tls_) isProxyProtocol_Kind() {} // Outbound-specific HTTP route configuration (based on the // [Gateway API](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPRoute)). type HttpRoute struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Metadata *meta.Metadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Metadata *meta.Metadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` // If empty, the host value is ignored. Hosts []*http_route.HostMatch `protobuf:"bytes,2,rep,name=hosts,proto3" json:"hosts,omitempty"` // Must have at least one rule. - Rules []*HttpRoute_Rule `protobuf:"bytes,3,rep,name=rules,proto3" json:"rules,omitempty"` + Rules []*HttpRoute_Rule `protobuf:"bytes,3,rep,name=rules,proto3" json:"rules,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpRoute) Reset() { @@ -384,15 +396,14 @@ func (x *HttpRoute) GetRules() []*HttpRoute_Rule { } type GrpcRoute struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Metadata *meta.Metadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Metadata *meta.Metadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` // If empty, the host value is ignored. Hosts []*http_route.HostMatch `protobuf:"bytes,2,rep,name=hosts,proto3" json:"hosts,omitempty"` // Must have at least one rule. - Rules []*GrpcRoute_Rule `protobuf:"bytes,3,rep,name=rules,proto3" json:"rules,omitempty"` + Rules []*GrpcRoute_Rule `protobuf:"bytes,3,rep,name=rules,proto3" json:"rules,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GrpcRoute) Reset() { @@ -447,13 +458,12 @@ func (x *GrpcRoute) GetRules() []*GrpcRoute_Rule { } type OpaqueRoute struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Metadata *meta.Metadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Metadata *meta.Metadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` // Must have at least one rule. - Rules []*OpaqueRoute_Rule `protobuf:"bytes,3,rep,name=rules,proto3" json:"rules,omitempty"` + Rules []*OpaqueRoute_Rule `protobuf:"bytes,3,rep,name=rules,proto3" json:"rules,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *OpaqueRoute) Reset() { @@ -501,15 +511,14 @@ func (x *OpaqueRoute) GetRules() []*OpaqueRoute_Rule { } type TlsRoute struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Metadata *meta.Metadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Metadata *meta.Metadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` // If empty, the SNI value is ignored. Snis []*tls_route.SniMatch `protobuf:"bytes,2,rep,name=snis,proto3" json:"snis,omitempty"` // Must have at least one rule. - Rules []*TlsRoute_Rule `protobuf:"bytes,3,rep,name=rules,proto3" json:"rules,omitempty"` + Rules []*TlsRoute_Rule `protobuf:"bytes,3,rep,name=rules,proto3" json:"rules,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TlsRoute) Reset() { @@ -564,18 +573,17 @@ func (x *TlsRoute) GetRules() []*TlsRoute_Rule { } type Backend struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Metadata *meta.Metadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + Metadata *meta.Metadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` + // Types that are valid to be assigned to Kind: // // *Backend_Forward // *Backend_Balancer Kind isBackend_Kind `protobuf_oneof:"kind"` // Describes queue configuration for a backend. - Queue *Queue `protobuf:"bytes,4,opt,name=queue,proto3" json:"queue,omitempty"` + Queue *Queue `protobuf:"bytes,4,opt,name=queue,proto3" json:"queue,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Backend) Reset() { @@ -615,23 +623,27 @@ func (x *Backend) GetMetadata() *meta.Metadata { return nil } -func (m *Backend) GetKind() isBackend_Kind { - if m != nil { - return m.Kind +func (x *Backend) GetKind() isBackend_Kind { + if x != nil { + return x.Kind } return nil } func (x *Backend) GetForward() *destination.WeightedAddr { - if x, ok := x.GetKind().(*Backend_Forward); ok { - return x.Forward + if x != nil { + if x, ok := x.Kind.(*Backend_Forward); ok { + return x.Forward + } } return nil } func (x *Backend) GetBalancer() *Backend_BalanceP2C { - if x, ok := x.GetKind().(*Backend_Balancer); ok { - return x.Balancer + if x != nil { + if x, ok := x.Kind.(*Backend_Balancer); ok { + return x.Balancer + } } return nil } @@ -662,16 +674,15 @@ func (*Backend_Forward) isBackend_Kind() {} func (*Backend_Balancer) isBackend_Kind() {} type Queue struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The number of requests that may be held in a queue before backpressure is // exerted. Capacity uint32 `protobuf:"varint,1,opt,name=capacity,proto3" json:"capacity,omitempty"` // A timeout that limits how long a backend may remain unready before any // requests in its queue are failed. FailfastTimeout *duration.Duration `protobuf:"bytes,2,opt,name=failfast_timeout,json=failfastTimeout,proto3" json:"failfast_timeout,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Queue) Reset() { @@ -719,14 +730,13 @@ func (x *Queue) GetFailfastTimeout() *duration.Duration { } type FailureAccrual struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Kind: // // *FailureAccrual_ConsecutiveFailures_ - Kind isFailureAccrual_Kind `protobuf_oneof:"kind"` + Kind isFailureAccrual_Kind `protobuf_oneof:"kind"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *FailureAccrual) Reset() { @@ -759,16 +769,18 @@ func (*FailureAccrual) Descriptor() ([]byte, []int) { return file_outbound_proto_rawDescGZIP(), []int{9} } -func (m *FailureAccrual) GetKind() isFailureAccrual_Kind { - if m != nil { - return m.Kind +func (x *FailureAccrual) GetKind() isFailureAccrual_Kind { + if x != nil { + return x.Kind } return nil } func (x *FailureAccrual) GetConsecutiveFailures() *FailureAccrual_ConsecutiveFailures { - if x, ok := x.GetKind().(*FailureAccrual_ConsecutiveFailures_); ok { - return x.ConsecutiveFailures + if x != nil { + if x, ok := x.Kind.(*FailureAccrual_ConsecutiveFailures_); ok { + return x.ConsecutiveFailures + } } return nil } @@ -784,10 +796,7 @@ type FailureAccrual_ConsecutiveFailures_ struct { func (*FailureAccrual_ConsecutiveFailures_) isFailureAccrual_Kind() {} type ExponentialBackoff struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // The minimum amount of time to wait before resuming an operation. MinBackoff *duration.Duration `protobuf:"bytes,1,opt,name=min_backoff,json=minBackoff,proto3" json:"min_backoff,omitempty"` // The maximum amount of time to wait before resuming an operation. @@ -795,7 +804,9 @@ type ExponentialBackoff struct { MaxBackoff *duration.Duration `protobuf:"bytes,2,opt,name=max_backoff,json=maxBackoff,proto3" json:"max_backoff,omitempty"` // The ratio of the base timeout that may be randomly added to a backoff. // Must be greater than or equal to 0.0. - JitterRatio float32 `protobuf:"fixed32,3,opt,name=jitter_ratio,json=jitterRatio,proto3" json:"jitter_ratio,omitempty"` + JitterRatio float32 `protobuf:"fixed32,3,opt,name=jitter_ratio,json=jitterRatio,proto3" json:"jitter_ratio,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ExponentialBackoff) Reset() { @@ -850,17 +861,16 @@ func (x *ExponentialBackoff) GetJitterRatio() float32 { } type ProxyProtocol_Detect struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Protocol detection timeout. Timeout *duration.Duration `protobuf:"bytes,1,opt,name=timeout,proto3" json:"timeout,omitempty"` Opaque *ProxyProtocol_Opaque `protobuf:"bytes,2,opt,name=opaque,proto3" json:"opaque,omitempty"` // HTTP/1 policy configuration. Http1 *ProxyProtocol_Http1 `protobuf:"bytes,3,opt,name=http1,proto3" json:"http1,omitempty"` // HTTP/2 policy configuration. - Http2 *ProxyProtocol_Http2 `protobuf:"bytes,4,opt,name=http2,proto3" json:"http2,omitempty"` + Http2 *ProxyProtocol_Http2 `protobuf:"bytes,4,opt,name=http2,proto3" json:"http2,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProxyProtocol_Detect) Reset() { @@ -922,11 +932,10 @@ func (x *ProxyProtocol_Detect) GetHttp2() *ProxyProtocol_Http2 { } type ProxyProtocol_Opaque struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Routes []*OpaqueRoute `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty"` unknownFields protoimpl.UnknownFields - - Routes []*OpaqueRoute `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProxyProtocol_Opaque) Reset() { @@ -967,13 +976,12 @@ func (x *ProxyProtocol_Opaque) GetRoutes() []*OpaqueRoute { } type ProxyProtocol_Http1 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Routes []*HttpRoute `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Routes []*HttpRoute `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty"` // If empty, circuit breaking is not performed. FailureAccrual *FailureAccrual `protobuf:"bytes,2,opt,name=failure_accrual,json=failureAccrual,proto3" json:"failure_accrual,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProxyProtocol_Http1) Reset() { @@ -1021,13 +1029,12 @@ func (x *ProxyProtocol_Http1) GetFailureAccrual() *FailureAccrual { } type ProxyProtocol_Http2 struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Routes []*HttpRoute `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Routes []*HttpRoute `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty"` // If empty, circuit breaking is not performed. FailureAccrual *FailureAccrual `protobuf:"bytes,2,opt,name=failure_accrual,json=failureAccrual,proto3" json:"failure_accrual,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProxyProtocol_Http2) Reset() { @@ -1075,13 +1082,12 @@ func (x *ProxyProtocol_Http2) GetFailureAccrual() *FailureAccrual { } type ProxyProtocol_Grpc struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Routes []*GrpcRoute `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Routes []*GrpcRoute `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty"` // If empty, circuit breaking is not performed. FailureAccrual *FailureAccrual `protobuf:"bytes,2,opt,name=failure_accrual,json=failureAccrual,proto3" json:"failure_accrual,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ProxyProtocol_Grpc) Reset() { @@ -1129,11 +1135,10 @@ func (x *ProxyProtocol_Grpc) GetFailureAccrual() *FailureAccrual { } type ProxyProtocol_Tls struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Routes []*TlsRoute `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty"` unknownFields protoimpl.UnknownFields - - Routes []*TlsRoute `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProxyProtocol_Tls) Reset() { @@ -1174,10 +1179,7 @@ func (x *ProxyProtocol_Tls) GetRoutes() []*TlsRoute { } type HttpRoute_Rule struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Matches []*http_route.HttpRouteMatch `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"` Filters []*HttpRoute_Filter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"` Backends *HttpRoute_Distribution `protobuf:"bytes,3,opt,name=backends,proto3" json:"backends,omitempty"` @@ -1191,6 +1193,8 @@ type HttpRoute_Rule struct { // If true, the proxy will allow headers to control retry and timeout // behavior. AllowL5DRequestHeaders bool `protobuf:"varint,7,opt,name=allow_l5d_request_headers,json=allowL5dRequestHeaders,proto3" json:"allow_l5d_request_headers,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpRoute_Rule) Reset() { @@ -1274,17 +1278,16 @@ func (x *HttpRoute_Rule) GetAllowL5DRequestHeaders() bool { } type HttpRoute_Filter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Kind: // // *HttpRoute_Filter_FailureInjector // *HttpRoute_Filter_RequestHeaderModifier // *HttpRoute_Filter_Redirect // *HttpRoute_Filter_ResponseHeaderModifier - Kind isHttpRoute_Filter_Kind `protobuf_oneof:"kind"` + Kind isHttpRoute_Filter_Kind `protobuf_oneof:"kind"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpRoute_Filter) Reset() { @@ -1317,37 +1320,45 @@ func (*HttpRoute_Filter) Descriptor() ([]byte, []int) { return file_outbound_proto_rawDescGZIP(), []int{3, 1} } -func (m *HttpRoute_Filter) GetKind() isHttpRoute_Filter_Kind { - if m != nil { - return m.Kind +func (x *HttpRoute_Filter) GetKind() isHttpRoute_Filter_Kind { + if x != nil { + return x.Kind } return nil } func (x *HttpRoute_Filter) GetFailureInjector() *http_route.HttpFailureInjector { - if x, ok := x.GetKind().(*HttpRoute_Filter_FailureInjector); ok { - return x.FailureInjector + if x != nil { + if x, ok := x.Kind.(*HttpRoute_Filter_FailureInjector); ok { + return x.FailureInjector + } } return nil } func (x *HttpRoute_Filter) GetRequestHeaderModifier() *http_route.RequestHeaderModifier { - if x, ok := x.GetKind().(*HttpRoute_Filter_RequestHeaderModifier); ok { - return x.RequestHeaderModifier + if x != nil { + if x, ok := x.Kind.(*HttpRoute_Filter_RequestHeaderModifier); ok { + return x.RequestHeaderModifier + } } return nil } func (x *HttpRoute_Filter) GetRedirect() *http_route.RequestRedirect { - if x, ok := x.GetKind().(*HttpRoute_Filter_Redirect); ok { - return x.Redirect + if x != nil { + if x, ok := x.Kind.(*HttpRoute_Filter_Redirect); ok { + return x.Redirect + } } return nil } func (x *HttpRoute_Filter) GetResponseHeaderModifier() *http_route.ResponseHeaderModifier { - if x, ok := x.GetKind().(*HttpRoute_Filter_ResponseHeaderModifier); ok { - return x.ResponseHeaderModifier + if x != nil { + if x, ok := x.Kind.(*HttpRoute_Filter_ResponseHeaderModifier); ok { + return x.ResponseHeaderModifier + } } return nil } @@ -1381,16 +1392,15 @@ func (*HttpRoute_Filter_Redirect) isHttpRoute_Filter_Kind() {} func (*HttpRoute_Filter_ResponseHeaderModifier) isHttpRoute_Filter_Kind() {} type HttpRoute_Distribution struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Kind: // // *HttpRoute_Distribution_Empty_ // *HttpRoute_Distribution_FirstAvailable_ // *HttpRoute_Distribution_RandomAvailable_ - Kind isHttpRoute_Distribution_Kind `protobuf_oneof:"kind"` + Kind isHttpRoute_Distribution_Kind `protobuf_oneof:"kind"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpRoute_Distribution) Reset() { @@ -1423,30 +1433,36 @@ func (*HttpRoute_Distribution) Descriptor() ([]byte, []int) { return file_outbound_proto_rawDescGZIP(), []int{3, 2} } -func (m *HttpRoute_Distribution) GetKind() isHttpRoute_Distribution_Kind { - if m != nil { - return m.Kind +func (x *HttpRoute_Distribution) GetKind() isHttpRoute_Distribution_Kind { + if x != nil { + return x.Kind } return nil } func (x *HttpRoute_Distribution) GetEmpty() *HttpRoute_Distribution_Empty { - if x, ok := x.GetKind().(*HttpRoute_Distribution_Empty_); ok { - return x.Empty + if x != nil { + if x, ok := x.Kind.(*HttpRoute_Distribution_Empty_); ok { + return x.Empty + } } return nil } func (x *HttpRoute_Distribution) GetFirstAvailable() *HttpRoute_Distribution_FirstAvailable { - if x, ok := x.GetKind().(*HttpRoute_Distribution_FirstAvailable_); ok { - return x.FirstAvailable + if x != nil { + if x, ok := x.Kind.(*HttpRoute_Distribution_FirstAvailable_); ok { + return x.FirstAvailable + } } return nil } func (x *HttpRoute_Distribution) GetRandomAvailable() *HttpRoute_Distribution_RandomAvailable { - if x, ok := x.GetKind().(*HttpRoute_Distribution_RandomAvailable_); ok { - return x.RandomAvailable + if x != nil { + if x, ok := x.Kind.(*HttpRoute_Distribution_RandomAvailable_); ok { + return x.RandomAvailable + } } return nil } @@ -1475,16 +1491,15 @@ func (*HttpRoute_Distribution_FirstAvailable_) isHttpRoute_Distribution_Kind() { func (*HttpRoute_Distribution_RandomAvailable_) isHttpRoute_Distribution_Kind() {} type HttpRoute_Retry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - MaxRetries uint32 `protobuf:"varint,1,opt,name=max_retries,json=maxRetries,proto3" json:"max_retries,omitempty"` - MaxRequestBytes uint32 `protobuf:"varint,2,opt,name=max_request_bytes,json=maxRequestBytes,proto3" json:"max_request_bytes,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + MaxRetries uint32 `protobuf:"varint,1,opt,name=max_retries,json=maxRetries,proto3" json:"max_retries,omitempty"` + MaxRequestBytes uint32 `protobuf:"varint,2,opt,name=max_request_bytes,json=maxRequestBytes,proto3" json:"max_request_bytes,omitempty"` // Must be set, even if there are no internal conditions. - Conditions *HttpRoute_Retry_Conditions `protobuf:"bytes,3,opt,name=conditions,proto3" json:"conditions,omitempty"` - Timeout *duration.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` - Backoff *ExponentialBackoff `protobuf:"bytes,5,opt,name=backoff,proto3" json:"backoff,omitempty"` + Conditions *HttpRoute_Retry_Conditions `protobuf:"bytes,3,opt,name=conditions,proto3" json:"conditions,omitempty"` + Timeout *duration.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` + Backoff *ExponentialBackoff `protobuf:"bytes,5,opt,name=backoff,proto3" json:"backoff,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpRoute_Retry) Reset() { @@ -1553,16 +1568,15 @@ func (x *HttpRoute_Retry) GetBackoff() *ExponentialBackoff { } type HttpRoute_RouteBackend struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Backend *Backend `protobuf:"bytes,1,opt,name=backend,proto3" json:"backend,omitempty"` - Filters []*HttpRoute_Filter `protobuf:"bytes,3,rep,name=filters,proto3" json:"filters,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Backend *Backend `protobuf:"bytes,1,opt,name=backend,proto3" json:"backend,omitempty"` + Filters []*HttpRoute_Filter `protobuf:"bytes,3,rep,name=filters,proto3" json:"filters,omitempty"` // DEPRECATED: proxies ignore this. Use Retry timeouts instead. // // Deprecated: Marked as deprecated in outbound.proto. RequestTimeout *duration.Duration `protobuf:"bytes,4,opt,name=requestTimeout,proto3" json:"requestTimeout,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpRoute_RouteBackend) Reset() { @@ -1618,12 +1632,11 @@ func (x *HttpRoute_RouteBackend) GetRequestTimeout() *duration.Duration { } type HttpRoute_WeightedRouteBackend struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Backend *HttpRoute_RouteBackend `protobuf:"bytes,1,opt,name=backend,proto3" json:"backend,omitempty"` + Weight uint32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"` unknownFields protoimpl.UnknownFields - - Backend *HttpRoute_RouteBackend `protobuf:"bytes,1,opt,name=backend,proto3" json:"backend,omitempty"` - Weight uint32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"` + sizeCache protoimpl.SizeCache } func (x *HttpRoute_WeightedRouteBackend) Reset() { @@ -1671,9 +1684,9 @@ func (x *HttpRoute_WeightedRouteBackend) GetWeight() uint32 { } type HttpRoute_Distribution_Empty struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpRoute_Distribution_Empty) Reset() { @@ -1707,11 +1720,10 @@ func (*HttpRoute_Distribution_Empty) Descriptor() ([]byte, []int) { } type HttpRoute_Distribution_FirstAvailable struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Backends []*HttpRoute_RouteBackend `protobuf:"bytes,1,rep,name=backends,proto3" json:"backends,omitempty"` unknownFields protoimpl.UnknownFields - - Backends []*HttpRoute_RouteBackend `protobuf:"bytes,1,rep,name=backends,proto3" json:"backends,omitempty"` + sizeCache protoimpl.SizeCache } func (x *HttpRoute_Distribution_FirstAvailable) Reset() { @@ -1752,11 +1764,10 @@ func (x *HttpRoute_Distribution_FirstAvailable) GetBackends() []*HttpRoute_Route } type HttpRoute_Distribution_RandomAvailable struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Backends []*HttpRoute_WeightedRouteBackend `protobuf:"bytes,1,rep,name=backends,proto3" json:"backends,omitempty"` unknownFields protoimpl.UnknownFields - - Backends []*HttpRoute_WeightedRouteBackend `protobuf:"bytes,1,rep,name=backends,proto3" json:"backends,omitempty"` + sizeCache protoimpl.SizeCache } func (x *HttpRoute_Distribution_RandomAvailable) Reset() { @@ -1798,12 +1809,11 @@ func (x *HttpRoute_Distribution_RandomAvailable) GetBackends() []*HttpRoute_Weig // Retryable conditions. type HttpRoute_Retry_Conditions struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Specifies the status code ranges that should trigger a retry. - StatusRanges []*HttpRoute_Retry_Conditions_StatusRange `protobuf:"bytes,1,rep,name=status_ranges,json=statusRanges,proto3" json:"status_ranges,omitempty"` + StatusRanges []*HttpRoute_Retry_Conditions_StatusRange `protobuf:"bytes,1,rep,name=status_ranges,json=statusRanges,proto3" json:"status_ranges,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *HttpRoute_Retry_Conditions) Reset() { @@ -1844,12 +1854,11 @@ func (x *HttpRoute_Retry_Conditions) GetStatusRanges() []*HttpRoute_Retry_Condit } type HttpRoute_Retry_Conditions_StatusRange struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Start uint32 `protobuf:"varint,1,opt,name=start,proto3" json:"start,omitempty"` + End uint32 `protobuf:"varint,2,opt,name=end,proto3" json:"end,omitempty"` unknownFields protoimpl.UnknownFields - - Start uint32 `protobuf:"varint,1,opt,name=start,proto3" json:"start,omitempty"` - End uint32 `protobuf:"varint,2,opt,name=end,proto3" json:"end,omitempty"` + sizeCache protoimpl.SizeCache } func (x *HttpRoute_Retry_Conditions_StatusRange) Reset() { @@ -1897,10 +1906,7 @@ func (x *HttpRoute_Retry_Conditions_StatusRange) GetEnd() uint32 { } type GrpcRoute_Rule struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Matches []*grpc_route.GrpcRouteMatch `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"` Filters []*GrpcRoute_Filter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"` Backends *GrpcRoute_Distribution `protobuf:"bytes,3,opt,name=backends,proto3" json:"backends,omitempty"` @@ -1914,6 +1920,8 @@ type GrpcRoute_Rule struct { // If true, the proxy will allow headers to control retry and timeout // behavior. AllowL5DRequestHeaders bool `protobuf:"varint,7,opt,name=allow_l5d_request_headers,json=allowL5dRequestHeaders,proto3" json:"allow_l5d_request_headers,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GrpcRoute_Rule) Reset() { @@ -1997,15 +2005,14 @@ func (x *GrpcRoute_Rule) GetAllowL5DRequestHeaders() bool { } type GrpcRoute_Filter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Kind: // // *GrpcRoute_Filter_FailureInjector // *GrpcRoute_Filter_RequestHeaderModifier - Kind isGrpcRoute_Filter_Kind `protobuf_oneof:"kind"` + Kind isGrpcRoute_Filter_Kind `protobuf_oneof:"kind"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GrpcRoute_Filter) Reset() { @@ -2038,23 +2045,27 @@ func (*GrpcRoute_Filter) Descriptor() ([]byte, []int) { return file_outbound_proto_rawDescGZIP(), []int{4, 1} } -func (m *GrpcRoute_Filter) GetKind() isGrpcRoute_Filter_Kind { - if m != nil { - return m.Kind +func (x *GrpcRoute_Filter) GetKind() isGrpcRoute_Filter_Kind { + if x != nil { + return x.Kind } return nil } func (x *GrpcRoute_Filter) GetFailureInjector() *grpc_route.GrpcFailureInjector { - if x, ok := x.GetKind().(*GrpcRoute_Filter_FailureInjector); ok { - return x.FailureInjector + if x != nil { + if x, ok := x.Kind.(*GrpcRoute_Filter_FailureInjector); ok { + return x.FailureInjector + } } return nil } func (x *GrpcRoute_Filter) GetRequestHeaderModifier() *http_route.RequestHeaderModifier { - if x, ok := x.GetKind().(*GrpcRoute_Filter_RequestHeaderModifier); ok { - return x.RequestHeaderModifier + if x != nil { + if x, ok := x.Kind.(*GrpcRoute_Filter_RequestHeaderModifier); ok { + return x.RequestHeaderModifier + } } return nil } @@ -2076,16 +2087,15 @@ func (*GrpcRoute_Filter_FailureInjector) isGrpcRoute_Filter_Kind() {} func (*GrpcRoute_Filter_RequestHeaderModifier) isGrpcRoute_Filter_Kind() {} type GrpcRoute_Distribution struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Kind: // // *GrpcRoute_Distribution_Empty_ // *GrpcRoute_Distribution_FirstAvailable_ // *GrpcRoute_Distribution_RandomAvailable_ - Kind isGrpcRoute_Distribution_Kind `protobuf_oneof:"kind"` + Kind isGrpcRoute_Distribution_Kind `protobuf_oneof:"kind"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GrpcRoute_Distribution) Reset() { @@ -2118,30 +2128,36 @@ func (*GrpcRoute_Distribution) Descriptor() ([]byte, []int) { return file_outbound_proto_rawDescGZIP(), []int{4, 2} } -func (m *GrpcRoute_Distribution) GetKind() isGrpcRoute_Distribution_Kind { - if m != nil { - return m.Kind +func (x *GrpcRoute_Distribution) GetKind() isGrpcRoute_Distribution_Kind { + if x != nil { + return x.Kind } return nil } func (x *GrpcRoute_Distribution) GetEmpty() *GrpcRoute_Distribution_Empty { - if x, ok := x.GetKind().(*GrpcRoute_Distribution_Empty_); ok { - return x.Empty + if x != nil { + if x, ok := x.Kind.(*GrpcRoute_Distribution_Empty_); ok { + return x.Empty + } } return nil } func (x *GrpcRoute_Distribution) GetFirstAvailable() *GrpcRoute_Distribution_FirstAvailable { - if x, ok := x.GetKind().(*GrpcRoute_Distribution_FirstAvailable_); ok { - return x.FirstAvailable + if x != nil { + if x, ok := x.Kind.(*GrpcRoute_Distribution_FirstAvailable_); ok { + return x.FirstAvailable + } } return nil } func (x *GrpcRoute_Distribution) GetRandomAvailable() *GrpcRoute_Distribution_RandomAvailable { - if x, ok := x.GetKind().(*GrpcRoute_Distribution_RandomAvailable_); ok { - return x.RandomAvailable + if x != nil { + if x, ok := x.Kind.(*GrpcRoute_Distribution_RandomAvailable_); ok { + return x.RandomAvailable + } } return nil } @@ -2170,16 +2186,15 @@ func (*GrpcRoute_Distribution_FirstAvailable_) isGrpcRoute_Distribution_Kind() { func (*GrpcRoute_Distribution_RandomAvailable_) isGrpcRoute_Distribution_Kind() {} type GrpcRoute_Retry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - MaxRetries uint32 `protobuf:"varint,1,opt,name=max_retries,json=maxRetries,proto3" json:"max_retries,omitempty"` - MaxRequestBytes uint32 `protobuf:"varint,2,opt,name=max_request_bytes,json=maxRequestBytes,proto3" json:"max_request_bytes,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + MaxRetries uint32 `protobuf:"varint,1,opt,name=max_retries,json=maxRetries,proto3" json:"max_retries,omitempty"` + MaxRequestBytes uint32 `protobuf:"varint,2,opt,name=max_request_bytes,json=maxRequestBytes,proto3" json:"max_request_bytes,omitempty"` // Must be set, even if there are no internal conditions. - Conditions *GrpcRoute_Retry_Conditions `protobuf:"bytes,3,opt,name=conditions,proto3" json:"conditions,omitempty"` - Timeout *duration.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` - Backoff *ExponentialBackoff `protobuf:"bytes,5,opt,name=backoff,proto3" json:"backoff,omitempty"` + Conditions *GrpcRoute_Retry_Conditions `protobuf:"bytes,3,opt,name=conditions,proto3" json:"conditions,omitempty"` + Timeout *duration.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` + Backoff *ExponentialBackoff `protobuf:"bytes,5,opt,name=backoff,proto3" json:"backoff,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GrpcRoute_Retry) Reset() { @@ -2248,16 +2263,15 @@ func (x *GrpcRoute_Retry) GetBackoff() *ExponentialBackoff { } type GrpcRoute_RouteBackend struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Backend *Backend `protobuf:"bytes,1,opt,name=backend,proto3" json:"backend,omitempty"` - Filters []*GrpcRoute_Filter `protobuf:"bytes,3,rep,name=filters,proto3" json:"filters,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Backend *Backend `protobuf:"bytes,1,opt,name=backend,proto3" json:"backend,omitempty"` + Filters []*GrpcRoute_Filter `protobuf:"bytes,3,rep,name=filters,proto3" json:"filters,omitempty"` // DEPRECATED: proxies ignore this. Retry timeouts are used instead of this. // // Deprecated: Marked as deprecated in outbound.proto. RequestTimeout *duration.Duration `protobuf:"bytes,4,opt,name=requestTimeout,proto3" json:"requestTimeout,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GrpcRoute_RouteBackend) Reset() { @@ -2313,12 +2327,11 @@ func (x *GrpcRoute_RouteBackend) GetRequestTimeout() *duration.Duration { } type GrpcRoute_WeightedRouteBackend struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Backend *GrpcRoute_RouteBackend `protobuf:"bytes,1,opt,name=backend,proto3" json:"backend,omitempty"` + Weight uint32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"` unknownFields protoimpl.UnknownFields - - Backend *GrpcRoute_RouteBackend `protobuf:"bytes,1,opt,name=backend,proto3" json:"backend,omitempty"` - Weight uint32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GrpcRoute_WeightedRouteBackend) Reset() { @@ -2366,9 +2379,9 @@ func (x *GrpcRoute_WeightedRouteBackend) GetWeight() uint32 { } type GrpcRoute_Distribution_Empty struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GrpcRoute_Distribution_Empty) Reset() { @@ -2402,11 +2415,10 @@ func (*GrpcRoute_Distribution_Empty) Descriptor() ([]byte, []int) { } type GrpcRoute_Distribution_FirstAvailable struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Backends []*GrpcRoute_RouteBackend `protobuf:"bytes,1,rep,name=backends,proto3" json:"backends,omitempty"` unknownFields protoimpl.UnknownFields - - Backends []*GrpcRoute_RouteBackend `protobuf:"bytes,1,rep,name=backends,proto3" json:"backends,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GrpcRoute_Distribution_FirstAvailable) Reset() { @@ -2447,11 +2459,10 @@ func (x *GrpcRoute_Distribution_FirstAvailable) GetBackends() []*GrpcRoute_Route } type GrpcRoute_Distribution_RandomAvailable struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Backends []*GrpcRoute_WeightedRouteBackend `protobuf:"bytes,1,rep,name=backends,proto3" json:"backends,omitempty"` unknownFields protoimpl.UnknownFields - - Backends []*GrpcRoute_WeightedRouteBackend `protobuf:"bytes,1,rep,name=backends,proto3" json:"backends,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GrpcRoute_Distribution_RandomAvailable) Reset() { @@ -2493,15 +2504,14 @@ func (x *GrpcRoute_Distribution_RandomAvailable) GetBackends() []*GrpcRoute_Weig // Retryable gRPC status codes. type GrpcRoute_Retry_Conditions struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Cancelled bool `protobuf:"varint,1,opt,name=cancelled,proto3" json:"cancelled,omitempty"` - DeadineExceeded bool `protobuf:"varint,4,opt,name=deadine_exceeded,json=deadineExceeded,proto3" json:"deadine_exceeded,omitempty"` - ResourceExhausted bool `protobuf:"varint,8,opt,name=resource_exhausted,json=resourceExhausted,proto3" json:"resource_exhausted,omitempty"` - Internal bool `protobuf:"varint,13,opt,name=internal,proto3" json:"internal,omitempty"` - Unavailable bool `protobuf:"varint,14,opt,name=unavailable,proto3" json:"unavailable,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Cancelled bool `protobuf:"varint,1,opt,name=cancelled,proto3" json:"cancelled,omitempty"` + DeadineExceeded bool `protobuf:"varint,4,opt,name=deadine_exceeded,json=deadineExceeded,proto3" json:"deadine_exceeded,omitempty"` + ResourceExhausted bool `protobuf:"varint,8,opt,name=resource_exhausted,json=resourceExhausted,proto3" json:"resource_exhausted,omitempty"` + Internal bool `protobuf:"varint,13,opt,name=internal,proto3" json:"internal,omitempty"` + Unavailable bool `protobuf:"varint,14,opt,name=unavailable,proto3" json:"unavailable,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GrpcRoute_Retry_Conditions) Reset() { @@ -2570,12 +2580,11 @@ func (x *GrpcRoute_Retry_Conditions) GetUnavailable() bool { } type OpaqueRoute_Rule struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Backends *OpaqueRoute_Distribution `protobuf:"bytes,1,opt,name=backends,proto3" json:"backends,omitempty"` + Filters []*OpaqueRoute_Filter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"` unknownFields protoimpl.UnknownFields - - Backends *OpaqueRoute_Distribution `protobuf:"bytes,1,opt,name=backends,proto3" json:"backends,omitempty"` - Filters []*OpaqueRoute_Filter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"` + sizeCache protoimpl.SizeCache } func (x *OpaqueRoute_Rule) Reset() { @@ -2623,15 +2632,14 @@ func (x *OpaqueRoute_Rule) GetFilters() []*OpaqueRoute_Filter { } type OpaqueRoute_Filter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Kind: // // *OpaqueRoute_Filter_Invalid // *OpaqueRoute_Filter_Forbidden - Kind isOpaqueRoute_Filter_Kind `protobuf_oneof:"kind"` + Kind isOpaqueRoute_Filter_Kind `protobuf_oneof:"kind"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *OpaqueRoute_Filter) Reset() { @@ -2664,23 +2672,27 @@ func (*OpaqueRoute_Filter) Descriptor() ([]byte, []int) { return file_outbound_proto_rawDescGZIP(), []int{5, 1} } -func (m *OpaqueRoute_Filter) GetKind() isOpaqueRoute_Filter_Kind { - if m != nil { - return m.Kind +func (x *OpaqueRoute_Filter) GetKind() isOpaqueRoute_Filter_Kind { + if x != nil { + return x.Kind } return nil } func (x *OpaqueRoute_Filter) GetInvalid() *opaque_route.Invalid { - if x, ok := x.GetKind().(*OpaqueRoute_Filter_Invalid); ok { - return x.Invalid + if x != nil { + if x, ok := x.Kind.(*OpaqueRoute_Filter_Invalid); ok { + return x.Invalid + } } return nil } func (x *OpaqueRoute_Filter) GetForbidden() *opaque_route.Forbidden { - if x, ok := x.GetKind().(*OpaqueRoute_Filter_Forbidden); ok { - return x.Forbidden + if x != nil { + if x, ok := x.Kind.(*OpaqueRoute_Filter_Forbidden); ok { + return x.Forbidden + } } return nil } @@ -2702,16 +2714,15 @@ func (*OpaqueRoute_Filter_Invalid) isOpaqueRoute_Filter_Kind() {} func (*OpaqueRoute_Filter_Forbidden) isOpaqueRoute_Filter_Kind() {} type OpaqueRoute_Distribution struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Kind: // // *OpaqueRoute_Distribution_Empty_ // *OpaqueRoute_Distribution_FirstAvailable_ // *OpaqueRoute_Distribution_RandomAvailable_ - Kind isOpaqueRoute_Distribution_Kind `protobuf_oneof:"kind"` + Kind isOpaqueRoute_Distribution_Kind `protobuf_oneof:"kind"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *OpaqueRoute_Distribution) Reset() { @@ -2744,30 +2755,36 @@ func (*OpaqueRoute_Distribution) Descriptor() ([]byte, []int) { return file_outbound_proto_rawDescGZIP(), []int{5, 2} } -func (m *OpaqueRoute_Distribution) GetKind() isOpaqueRoute_Distribution_Kind { - if m != nil { - return m.Kind +func (x *OpaqueRoute_Distribution) GetKind() isOpaqueRoute_Distribution_Kind { + if x != nil { + return x.Kind } return nil } func (x *OpaqueRoute_Distribution) GetEmpty() *OpaqueRoute_Distribution_Empty { - if x, ok := x.GetKind().(*OpaqueRoute_Distribution_Empty_); ok { - return x.Empty + if x != nil { + if x, ok := x.Kind.(*OpaqueRoute_Distribution_Empty_); ok { + return x.Empty + } } return nil } func (x *OpaqueRoute_Distribution) GetFirstAvailable() *OpaqueRoute_Distribution_FirstAvailable { - if x, ok := x.GetKind().(*OpaqueRoute_Distribution_FirstAvailable_); ok { - return x.FirstAvailable + if x != nil { + if x, ok := x.Kind.(*OpaqueRoute_Distribution_FirstAvailable_); ok { + return x.FirstAvailable + } } return nil } func (x *OpaqueRoute_Distribution) GetRandomAvailable() *OpaqueRoute_Distribution_RandomAvailable { - if x, ok := x.GetKind().(*OpaqueRoute_Distribution_RandomAvailable_); ok { - return x.RandomAvailable + if x != nil { + if x, ok := x.Kind.(*OpaqueRoute_Distribution_RandomAvailable_); ok { + return x.RandomAvailable + } } return nil } @@ -2796,12 +2813,11 @@ func (*OpaqueRoute_Distribution_FirstAvailable_) isOpaqueRoute_Distribution_Kind func (*OpaqueRoute_Distribution_RandomAvailable_) isOpaqueRoute_Distribution_Kind() {} type OpaqueRoute_RouteBackend struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Backend *Backend `protobuf:"bytes,1,opt,name=backend,proto3" json:"backend,omitempty"` + Filters []*OpaqueRoute_Filter `protobuf:"bytes,3,rep,name=filters,proto3" json:"filters,omitempty"` unknownFields protoimpl.UnknownFields - - Backend *Backend `protobuf:"bytes,1,opt,name=backend,proto3" json:"backend,omitempty"` - Filters []*OpaqueRoute_Filter `protobuf:"bytes,3,rep,name=filters,proto3" json:"filters,omitempty"` + sizeCache protoimpl.SizeCache } func (x *OpaqueRoute_RouteBackend) Reset() { @@ -2849,12 +2865,11 @@ func (x *OpaqueRoute_RouteBackend) GetFilters() []*OpaqueRoute_Filter { } type OpaqueRoute_WeightedRouteBackend struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Backend *OpaqueRoute_RouteBackend `protobuf:"bytes,1,opt,name=backend,proto3" json:"backend,omitempty"` + Weight uint32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"` unknownFields protoimpl.UnknownFields - - Backend *OpaqueRoute_RouteBackend `protobuf:"bytes,1,opt,name=backend,proto3" json:"backend,omitempty"` - Weight uint32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"` + sizeCache protoimpl.SizeCache } func (x *OpaqueRoute_WeightedRouteBackend) Reset() { @@ -2902,9 +2917,9 @@ func (x *OpaqueRoute_WeightedRouteBackend) GetWeight() uint32 { } type OpaqueRoute_Distribution_Empty struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *OpaqueRoute_Distribution_Empty) Reset() { @@ -2938,11 +2953,10 @@ func (*OpaqueRoute_Distribution_Empty) Descriptor() ([]byte, []int) { } type OpaqueRoute_Distribution_FirstAvailable struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Backends []*OpaqueRoute_RouteBackend `protobuf:"bytes,1,rep,name=backends,proto3" json:"backends,omitempty"` unknownFields protoimpl.UnknownFields - - Backends []*OpaqueRoute_RouteBackend `protobuf:"bytes,1,rep,name=backends,proto3" json:"backends,omitempty"` + sizeCache protoimpl.SizeCache } func (x *OpaqueRoute_Distribution_FirstAvailable) Reset() { @@ -2983,11 +2997,10 @@ func (x *OpaqueRoute_Distribution_FirstAvailable) GetBackends() []*OpaqueRoute_R } type OpaqueRoute_Distribution_RandomAvailable struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Backends []*OpaqueRoute_WeightedRouteBackend `protobuf:"bytes,1,rep,name=backends,proto3" json:"backends,omitempty"` unknownFields protoimpl.UnknownFields - - Backends []*OpaqueRoute_WeightedRouteBackend `protobuf:"bytes,1,rep,name=backends,proto3" json:"backends,omitempty"` + sizeCache protoimpl.SizeCache } func (x *OpaqueRoute_Distribution_RandomAvailable) Reset() { @@ -3028,12 +3041,11 @@ func (x *OpaqueRoute_Distribution_RandomAvailable) GetBackends() []*OpaqueRoute_ } type TlsRoute_Rule struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Backends *TlsRoute_Distribution `protobuf:"bytes,1,opt,name=backends,proto3" json:"backends,omitempty"` + Filters []*TlsRoute_Filter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"` unknownFields protoimpl.UnknownFields - - Backends *TlsRoute_Distribution `protobuf:"bytes,1,opt,name=backends,proto3" json:"backends,omitempty"` - Filters []*TlsRoute_Filter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"` + sizeCache protoimpl.SizeCache } func (x *TlsRoute_Rule) Reset() { @@ -3081,15 +3093,14 @@ func (x *TlsRoute_Rule) GetFilters() []*TlsRoute_Filter { } type TlsRoute_Filter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Kind: // // *TlsRoute_Filter_Invalid // *TlsRoute_Filter_Forbidden - Kind isTlsRoute_Filter_Kind `protobuf_oneof:"kind"` + Kind isTlsRoute_Filter_Kind `protobuf_oneof:"kind"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TlsRoute_Filter) Reset() { @@ -3122,23 +3133,27 @@ func (*TlsRoute_Filter) Descriptor() ([]byte, []int) { return file_outbound_proto_rawDescGZIP(), []int{6, 1} } -func (m *TlsRoute_Filter) GetKind() isTlsRoute_Filter_Kind { - if m != nil { - return m.Kind +func (x *TlsRoute_Filter) GetKind() isTlsRoute_Filter_Kind { + if x != nil { + return x.Kind } return nil } func (x *TlsRoute_Filter) GetInvalid() *opaque_route.Invalid { - if x, ok := x.GetKind().(*TlsRoute_Filter_Invalid); ok { - return x.Invalid + if x != nil { + if x, ok := x.Kind.(*TlsRoute_Filter_Invalid); ok { + return x.Invalid + } } return nil } func (x *TlsRoute_Filter) GetForbidden() *opaque_route.Forbidden { - if x, ok := x.GetKind().(*TlsRoute_Filter_Forbidden); ok { - return x.Forbidden + if x != nil { + if x, ok := x.Kind.(*TlsRoute_Filter_Forbidden); ok { + return x.Forbidden + } } return nil } @@ -3160,16 +3175,15 @@ func (*TlsRoute_Filter_Invalid) isTlsRoute_Filter_Kind() {} func (*TlsRoute_Filter_Forbidden) isTlsRoute_Filter_Kind() {} type TlsRoute_Distribution struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Kind: // // *TlsRoute_Distribution_Empty_ // *TlsRoute_Distribution_FirstAvailable_ // *TlsRoute_Distribution_RandomAvailable_ - Kind isTlsRoute_Distribution_Kind `protobuf_oneof:"kind"` + Kind isTlsRoute_Distribution_Kind `protobuf_oneof:"kind"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TlsRoute_Distribution) Reset() { @@ -3202,30 +3216,36 @@ func (*TlsRoute_Distribution) Descriptor() ([]byte, []int) { return file_outbound_proto_rawDescGZIP(), []int{6, 2} } -func (m *TlsRoute_Distribution) GetKind() isTlsRoute_Distribution_Kind { - if m != nil { - return m.Kind +func (x *TlsRoute_Distribution) GetKind() isTlsRoute_Distribution_Kind { + if x != nil { + return x.Kind } return nil } func (x *TlsRoute_Distribution) GetEmpty() *TlsRoute_Distribution_Empty { - if x, ok := x.GetKind().(*TlsRoute_Distribution_Empty_); ok { - return x.Empty + if x != nil { + if x, ok := x.Kind.(*TlsRoute_Distribution_Empty_); ok { + return x.Empty + } } return nil } func (x *TlsRoute_Distribution) GetFirstAvailable() *TlsRoute_Distribution_FirstAvailable { - if x, ok := x.GetKind().(*TlsRoute_Distribution_FirstAvailable_); ok { - return x.FirstAvailable + if x != nil { + if x, ok := x.Kind.(*TlsRoute_Distribution_FirstAvailable_); ok { + return x.FirstAvailable + } } return nil } func (x *TlsRoute_Distribution) GetRandomAvailable() *TlsRoute_Distribution_RandomAvailable { - if x, ok := x.GetKind().(*TlsRoute_Distribution_RandomAvailable_); ok { - return x.RandomAvailable + if x != nil { + if x, ok := x.Kind.(*TlsRoute_Distribution_RandomAvailable_); ok { + return x.RandomAvailable + } } return nil } @@ -3254,12 +3274,11 @@ func (*TlsRoute_Distribution_FirstAvailable_) isTlsRoute_Distribution_Kind() {} func (*TlsRoute_Distribution_RandomAvailable_) isTlsRoute_Distribution_Kind() {} type TlsRoute_RouteBackend struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Backend *Backend `protobuf:"bytes,1,opt,name=backend,proto3" json:"backend,omitempty"` + Filters []*TlsRoute_Filter `protobuf:"bytes,3,rep,name=filters,proto3" json:"filters,omitempty"` unknownFields protoimpl.UnknownFields - - Backend *Backend `protobuf:"bytes,1,opt,name=backend,proto3" json:"backend,omitempty"` - Filters []*TlsRoute_Filter `protobuf:"bytes,3,rep,name=filters,proto3" json:"filters,omitempty"` + sizeCache protoimpl.SizeCache } func (x *TlsRoute_RouteBackend) Reset() { @@ -3307,12 +3326,11 @@ func (x *TlsRoute_RouteBackend) GetFilters() []*TlsRoute_Filter { } type TlsRoute_WeightedRouteBackend struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Backend *TlsRoute_RouteBackend `protobuf:"bytes,1,opt,name=backend,proto3" json:"backend,omitempty"` + Weight uint32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"` unknownFields protoimpl.UnknownFields - - Backend *TlsRoute_RouteBackend `protobuf:"bytes,1,opt,name=backend,proto3" json:"backend,omitempty"` - Weight uint32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"` + sizeCache protoimpl.SizeCache } func (x *TlsRoute_WeightedRouteBackend) Reset() { @@ -3360,9 +3378,9 @@ func (x *TlsRoute_WeightedRouteBackend) GetWeight() uint32 { } type TlsRoute_Distribution_Empty struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TlsRoute_Distribution_Empty) Reset() { @@ -3396,11 +3414,10 @@ func (*TlsRoute_Distribution_Empty) Descriptor() ([]byte, []int) { } type TlsRoute_Distribution_FirstAvailable struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Backends []*TlsRoute_RouteBackend `protobuf:"bytes,1,rep,name=backends,proto3" json:"backends,omitempty"` unknownFields protoimpl.UnknownFields - - Backends []*TlsRoute_RouteBackend `protobuf:"bytes,1,rep,name=backends,proto3" json:"backends,omitempty"` + sizeCache protoimpl.SizeCache } func (x *TlsRoute_Distribution_FirstAvailable) Reset() { @@ -3441,11 +3458,10 @@ func (x *TlsRoute_Distribution_FirstAvailable) GetBackends() []*TlsRoute_RouteBa } type TlsRoute_Distribution_RandomAvailable struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Backends []*TlsRoute_WeightedRouteBackend `protobuf:"bytes,1,rep,name=backends,proto3" json:"backends,omitempty"` unknownFields protoimpl.UnknownFields - - Backends []*TlsRoute_WeightedRouteBackend `protobuf:"bytes,1,rep,name=backends,proto3" json:"backends,omitempty"` + sizeCache protoimpl.SizeCache } func (x *TlsRoute_Distribution_RandomAvailable) Reset() { @@ -3487,14 +3503,13 @@ func (x *TlsRoute_Distribution_RandomAvailable) GetBackends() []*TlsRoute_Weight // A strategy for discovering endpoints for a service. type Backend_EndpointDiscovery struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Kind: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Kind: // // *Backend_EndpointDiscovery_Dst - Kind isBackend_EndpointDiscovery_Kind `protobuf_oneof:"kind"` + Kind isBackend_EndpointDiscovery_Kind `protobuf_oneof:"kind"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Backend_EndpointDiscovery) Reset() { @@ -3527,16 +3542,18 @@ func (*Backend_EndpointDiscovery) Descriptor() ([]byte, []int) { return file_outbound_proto_rawDescGZIP(), []int{7, 0} } -func (m *Backend_EndpointDiscovery) GetKind() isBackend_EndpointDiscovery_Kind { - if m != nil { - return m.Kind +func (x *Backend_EndpointDiscovery) GetKind() isBackend_EndpointDiscovery_Kind { + if x != nil { + return x.Kind } return nil } func (x *Backend_EndpointDiscovery) GetDst() *Backend_EndpointDiscovery_DestinationGet { - if x, ok := x.GetKind().(*Backend_EndpointDiscovery_Dst); ok { - return x.Dst + if x != nil { + if x, ok := x.Kind.(*Backend_EndpointDiscovery_Dst); ok { + return x.Dst + } } return nil } @@ -3555,17 +3572,16 @@ func (*Backend_EndpointDiscovery_Dst) isBackend_EndpointDiscovery_Kind() {} // Describes a power-of-two-choices (P2C) load balancer configuration for a // backend. type Backend_BalanceP2C struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Discovery *Backend_EndpointDiscovery `protobuf:"bytes,1,opt,name=discovery,proto3" json:"discovery,omitempty"` // The load estimation strategy used by this load balancer. // - // Types that are assignable to Load: + // Types that are valid to be assigned to Load: // // *Backend_BalanceP2C_PeakEwma_ - Load isBackend_BalanceP2C_Load `protobuf_oneof:"load"` + Load isBackend_BalanceP2C_Load `protobuf_oneof:"load"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Backend_BalanceP2C) Reset() { @@ -3605,16 +3621,18 @@ func (x *Backend_BalanceP2C) GetDiscovery() *Backend_EndpointDiscovery { return nil } -func (m *Backend_BalanceP2C) GetLoad() isBackend_BalanceP2C_Load { - if m != nil { - return m.Load +func (x *Backend_BalanceP2C) GetLoad() isBackend_BalanceP2C_Load { + if x != nil { + return x.Load } return nil } func (x *Backend_BalanceP2C) GetPeakEwma() *Backend_BalanceP2C_PeakEwma { - if x, ok := x.GetLoad().(*Backend_BalanceP2C_PeakEwma_); ok { - return x.PeakEwma + if x != nil { + if x, ok := x.Load.(*Backend_BalanceP2C_PeakEwma_); ok { + return x.PeakEwma + } } return nil } @@ -3632,11 +3650,10 @@ type Backend_BalanceP2C_PeakEwma_ struct { func (*Backend_BalanceP2C_PeakEwma_) isBackend_BalanceP2C_Load() {} type Backend_EndpointDiscovery_DestinationGet struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` unknownFields protoimpl.UnknownFields - - Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Backend_EndpointDiscovery_DestinationGet) Reset() { @@ -3678,15 +3695,14 @@ func (x *Backend_EndpointDiscovery_DestinationGet) GetPath() string { // Parameters configuring peak EWMA load estimation. type Backend_BalanceP2C_PeakEwma struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Initial latency value used when no latencies have been // recorded for an endpoint. DefaultRtt *duration.Duration `protobuf:"bytes,1,opt,name=default_rtt,json=defaultRtt,proto3" json:"default_rtt,omitempty"` // The duration of the moving window over which latency is observed. - Decay *duration.Duration `protobuf:"bytes,2,opt,name=decay,proto3" json:"decay,omitempty"` + Decay *duration.Duration `protobuf:"bytes,2,opt,name=decay,proto3" json:"decay,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Backend_BalanceP2C_PeakEwma) Reset() { @@ -3734,12 +3750,11 @@ func (x *Backend_BalanceP2C_PeakEwma) GetDecay() *duration.Duration { } type FailureAccrual_ConsecutiveFailures struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + MaxFailures uint32 `protobuf:"varint,1,opt,name=max_failures,json=maxFailures,proto3" json:"max_failures,omitempty"` + Backoff *ExponentialBackoff `protobuf:"bytes,2,opt,name=backoff,proto3" json:"backoff,omitempty"` unknownFields protoimpl.UnknownFields - - MaxFailures uint32 `protobuf:"varint,1,opt,name=max_failures,json=maxFailures,proto3" json:"max_failures,omitempty"` - Backoff *ExponentialBackoff `protobuf:"bytes,2,opt,name=backoff,proto3" json:"backoff,omitempty"` + sizeCache protoimpl.SizeCache } func (x *FailureAccrual_ConsecutiveFailures) Reset() { diff --git a/go/tap/tap.pb.go b/go/tap/tap.pb.go index d8bc38f23..6e8d98d59 100644 --- a/go/tap/tap.pb.go +++ b/go/tap/tap.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc v5.29.0 // source: tap.proto @@ -73,17 +73,16 @@ func (TapEvent_ProxyDirection) EnumDescriptor() ([]byte, []int) { } type ObserveRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Limits the number of event keys that will be returned by this tap. Limit uint32 `protobuf:"varint,1,opt,name=limit,proto3" json:"limit,omitempty"` // Encodes request-matching logic. Match *ObserveRequest_Match `protobuf:"bytes,2,opt,name=match,proto3" json:"match,omitempty"` // Conditionally extracts components from requests and responses to include // in tap events - Extract *ObserveRequest_Extract `protobuf:"bytes,3,opt,name=extract,proto3" json:"extract,omitempty"` + Extract *ObserveRequest_Extract `protobuf:"bytes,3,opt,name=extract,proto3" json:"extract,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ObserveRequest) Reset() { @@ -138,15 +137,14 @@ func (x *ObserveRequest) GetExtract() *ObserveRequest_Extract { } type Eos struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to End: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to End: // // *Eos_GrpcStatusCode // *Eos_ResetErrorCode - End isEos_End `protobuf_oneof:"end"` + End isEos_End `protobuf_oneof:"end"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Eos) Reset() { @@ -179,23 +177,27 @@ func (*Eos) Descriptor() ([]byte, []int) { return file_tap_proto_rawDescGZIP(), []int{1} } -func (m *Eos) GetEnd() isEos_End { - if m != nil { - return m.End +func (x *Eos) GetEnd() isEos_End { + if x != nil { + return x.End } return nil } func (x *Eos) GetGrpcStatusCode() uint32 { - if x, ok := x.GetEnd().(*Eos_GrpcStatusCode); ok { - return x.GrpcStatusCode + if x != nil { + if x, ok := x.End.(*Eos_GrpcStatusCode); ok { + return x.GrpcStatusCode + } } return 0 } func (x *Eos) GetResetErrorCode() uint32 { - if x, ok := x.GetEnd().(*Eos_ResetErrorCode); ok { - return x.ResetErrorCode + if x != nil { + if x, ok := x.End.(*Eos_ResetErrorCode); ok { + return x.ResetErrorCode + } } return 0 } @@ -217,20 +219,19 @@ func (*Eos_GrpcStatusCode) isEos_End() {} func (*Eos_ResetErrorCode) isEos_End() {} type TapEvent struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Source *net.TcpAddress `protobuf:"bytes,1,opt,name=source,proto3" json:"source,omitempty"` SourceMeta *TapEvent_EndpointMeta `protobuf:"bytes,5,opt,name=source_meta,json=sourceMeta,proto3" json:"source_meta,omitempty"` RouteMeta *TapEvent_RouteMeta `protobuf:"bytes,7,opt,name=route_meta,json=routeMeta,proto3" json:"route_meta,omitempty"` Destination *net.TcpAddress `protobuf:"bytes,2,opt,name=destination,proto3" json:"destination,omitempty"` DestinationMeta *TapEvent_EndpointMeta `protobuf:"bytes,4,opt,name=destination_meta,json=destinationMeta,proto3" json:"destination_meta,omitempty"` ProxyDirection TapEvent_ProxyDirection `protobuf:"varint,6,opt,name=proxy_direction,json=proxyDirection,proto3,enum=io.linkerd.proxy.tap.TapEvent_ProxyDirection" json:"proxy_direction,omitempty"` - // Types that are assignable to Event: + // Types that are valid to be assigned to Event: // // *TapEvent_Http_ - Event isTapEvent_Event `protobuf_oneof:"event"` + Event isTapEvent_Event `protobuf_oneof:"event"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TapEvent) Reset() { @@ -305,16 +306,18 @@ func (x *TapEvent) GetProxyDirection() TapEvent_ProxyDirection { return TapEvent_UNKNOWN } -func (m *TapEvent) GetEvent() isTapEvent_Event { - if m != nil { - return m.Event +func (x *TapEvent) GetEvent() isTapEvent_Event { + if x != nil { + return x.Event } return nil } func (x *TapEvent) GetHttp() *TapEvent_Http { - if x, ok := x.GetEvent().(*TapEvent_Http_); ok { - return x.Http + if x != nil { + if x, ok := x.Event.(*TapEvent_Http_); ok { + return x.Http + } } return nil } @@ -330,11 +333,8 @@ type TapEvent_Http_ struct { func (*TapEvent_Http_) isTapEvent_Event() {} type ObserveRequest_Match struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Match: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Match: // // *ObserveRequest_Match_All // *ObserveRequest_Match_Any @@ -344,7 +344,9 @@ type ObserveRequest_Match struct { // *ObserveRequest_Match_Http_ // *ObserveRequest_Match_DestinationLabel // *ObserveRequest_Match_RouteLabel - Match isObserveRequest_Match_Match `protobuf_oneof:"match"` + Match isObserveRequest_Match_Match `protobuf_oneof:"match"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ObserveRequest_Match) Reset() { @@ -377,65 +379,81 @@ func (*ObserveRequest_Match) Descriptor() ([]byte, []int) { return file_tap_proto_rawDescGZIP(), []int{0, 0} } -func (m *ObserveRequest_Match) GetMatch() isObserveRequest_Match_Match { - if m != nil { - return m.Match +func (x *ObserveRequest_Match) GetMatch() isObserveRequest_Match_Match { + if x != nil { + return x.Match } return nil } func (x *ObserveRequest_Match) GetAll() *ObserveRequest_Match_Seq { - if x, ok := x.GetMatch().(*ObserveRequest_Match_All); ok { - return x.All + if x != nil { + if x, ok := x.Match.(*ObserveRequest_Match_All); ok { + return x.All + } } return nil } func (x *ObserveRequest_Match) GetAny() *ObserveRequest_Match_Seq { - if x, ok := x.GetMatch().(*ObserveRequest_Match_Any); ok { - return x.Any + if x != nil { + if x, ok := x.Match.(*ObserveRequest_Match_Any); ok { + return x.Any + } } return nil } func (x *ObserveRequest_Match) GetNot() *ObserveRequest_Match { - if x, ok := x.GetMatch().(*ObserveRequest_Match_Not); ok { - return x.Not + if x != nil { + if x, ok := x.Match.(*ObserveRequest_Match_Not); ok { + return x.Not + } } return nil } func (x *ObserveRequest_Match) GetSource() *ObserveRequest_Match_Tcp { - if x, ok := x.GetMatch().(*ObserveRequest_Match_Source); ok { - return x.Source + if x != nil { + if x, ok := x.Match.(*ObserveRequest_Match_Source); ok { + return x.Source + } } return nil } func (x *ObserveRequest_Match) GetDestination() *ObserveRequest_Match_Tcp { - if x, ok := x.GetMatch().(*ObserveRequest_Match_Destination); ok { - return x.Destination + if x != nil { + if x, ok := x.Match.(*ObserveRequest_Match_Destination); ok { + return x.Destination + } } return nil } func (x *ObserveRequest_Match) GetHttp() *ObserveRequest_Match_Http { - if x, ok := x.GetMatch().(*ObserveRequest_Match_Http_); ok { - return x.Http + if x != nil { + if x, ok := x.Match.(*ObserveRequest_Match_Http_); ok { + return x.Http + } } return nil } func (x *ObserveRequest_Match) GetDestinationLabel() *ObserveRequest_Match_Label { - if x, ok := x.GetMatch().(*ObserveRequest_Match_DestinationLabel); ok { - return x.DestinationLabel + if x != nil { + if x, ok := x.Match.(*ObserveRequest_Match_DestinationLabel); ok { + return x.DestinationLabel + } } return nil } func (x *ObserveRequest_Match) GetRouteLabel() *ObserveRequest_Match_Label { - if x, ok := x.GetMatch().(*ObserveRequest_Match_RouteLabel); ok { - return x.RouteLabel + if x != nil { + if x, ok := x.Match.(*ObserveRequest_Match_RouteLabel); ok { + return x.RouteLabel + } } return nil } @@ -493,14 +511,13 @@ func (*ObserveRequest_Match_DestinationLabel) isObserveRequest_Match_Match() {} func (*ObserveRequest_Match_RouteLabel) isObserveRequest_Match_Match() {} type ObserveRequest_Extract struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Extract: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Extract: // // *ObserveRequest_Extract_Http_ - Extract isObserveRequest_Extract_Extract `protobuf_oneof:"extract"` + Extract isObserveRequest_Extract_Extract `protobuf_oneof:"extract"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ObserveRequest_Extract) Reset() { @@ -533,16 +550,18 @@ func (*ObserveRequest_Extract) Descriptor() ([]byte, []int) { return file_tap_proto_rawDescGZIP(), []int{0, 1} } -func (m *ObserveRequest_Extract) GetExtract() isObserveRequest_Extract_Extract { - if m != nil { - return m.Extract +func (x *ObserveRequest_Extract) GetExtract() isObserveRequest_Extract_Extract { + if x != nil { + return x.Extract } return nil } func (x *ObserveRequest_Extract) GetHttp() *ObserveRequest_Extract_Http { - if x, ok := x.GetExtract().(*ObserveRequest_Extract_Http_); ok { - return x.Http + if x != nil { + if x, ok := x.Extract.(*ObserveRequest_Extract_Http_); ok { + return x.Http + } } return nil } @@ -558,11 +577,10 @@ type ObserveRequest_Extract_Http_ struct { func (*ObserveRequest_Extract_Http_) isObserveRequest_Extract_Extract() {} type ObserveRequest_Match_Seq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Matches []*ObserveRequest_Match `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"` unknownFields protoimpl.UnknownFields - - Matches []*ObserveRequest_Match `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ObserveRequest_Match_Seq) Reset() { @@ -603,12 +621,11 @@ func (x *ObserveRequest_Match_Seq) GetMatches() []*ObserveRequest_Match { } type ObserveRequest_Match_Label struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` unknownFields protoimpl.UnknownFields - - Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ObserveRequest_Match_Label) Reset() { @@ -656,15 +673,14 @@ func (x *ObserveRequest_Match_Label) GetValue() string { } type ObserveRequest_Match_Tcp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Match: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Match: // // *ObserveRequest_Match_Tcp_Netmask_ // *ObserveRequest_Match_Tcp_Ports - Match isObserveRequest_Match_Tcp_Match `protobuf_oneof:"match"` + Match isObserveRequest_Match_Tcp_Match `protobuf_oneof:"match"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ObserveRequest_Match_Tcp) Reset() { @@ -697,23 +713,27 @@ func (*ObserveRequest_Match_Tcp) Descriptor() ([]byte, []int) { return file_tap_proto_rawDescGZIP(), []int{0, 0, 2} } -func (m *ObserveRequest_Match_Tcp) GetMatch() isObserveRequest_Match_Tcp_Match { - if m != nil { - return m.Match +func (x *ObserveRequest_Match_Tcp) GetMatch() isObserveRequest_Match_Tcp_Match { + if x != nil { + return x.Match } return nil } func (x *ObserveRequest_Match_Tcp) GetNetmask() *ObserveRequest_Match_Tcp_Netmask { - if x, ok := x.GetMatch().(*ObserveRequest_Match_Tcp_Netmask_); ok { - return x.Netmask + if x != nil { + if x, ok := x.Match.(*ObserveRequest_Match_Tcp_Netmask_); ok { + return x.Netmask + } } return nil } func (x *ObserveRequest_Match_Tcp) GetPorts() *ObserveRequest_Match_Tcp_PortRange { - if x, ok := x.GetMatch().(*ObserveRequest_Match_Tcp_Ports); ok { - return x.Ports + if x != nil { + if x, ok := x.Match.(*ObserveRequest_Match_Tcp_Ports); ok { + return x.Ports + } } return nil } @@ -735,17 +755,16 @@ func (*ObserveRequest_Match_Tcp_Netmask_) isObserveRequest_Match_Tcp_Match() {} func (*ObserveRequest_Match_Tcp_Ports) isObserveRequest_Match_Tcp_Match() {} type ObserveRequest_Match_Http struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Match: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Match: // // *ObserveRequest_Match_Http_Scheme // *ObserveRequest_Match_Http_Method // *ObserveRequest_Match_Http_Authority // *ObserveRequest_Match_Http_Path - Match isObserveRequest_Match_Http_Match `protobuf_oneof:"match"` + Match isObserveRequest_Match_Http_Match `protobuf_oneof:"match"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ObserveRequest_Match_Http) Reset() { @@ -778,37 +797,45 @@ func (*ObserveRequest_Match_Http) Descriptor() ([]byte, []int) { return file_tap_proto_rawDescGZIP(), []int{0, 0, 3} } -func (m *ObserveRequest_Match_Http) GetMatch() isObserveRequest_Match_Http_Match { - if m != nil { - return m.Match +func (x *ObserveRequest_Match_Http) GetMatch() isObserveRequest_Match_Http_Match { + if x != nil { + return x.Match } return nil } func (x *ObserveRequest_Match_Http) GetScheme() *http_types.Scheme { - if x, ok := x.GetMatch().(*ObserveRequest_Match_Http_Scheme); ok { - return x.Scheme + if x != nil { + if x, ok := x.Match.(*ObserveRequest_Match_Http_Scheme); ok { + return x.Scheme + } } return nil } func (x *ObserveRequest_Match_Http) GetMethod() *http_types.HttpMethod { - if x, ok := x.GetMatch().(*ObserveRequest_Match_Http_Method); ok { - return x.Method + if x != nil { + if x, ok := x.Match.(*ObserveRequest_Match_Http_Method); ok { + return x.Method + } } return nil } func (x *ObserveRequest_Match_Http) GetAuthority() *ObserveRequest_Match_Http_StringMatch { - if x, ok := x.GetMatch().(*ObserveRequest_Match_Http_Authority); ok { - return x.Authority + if x != nil { + if x, ok := x.Match.(*ObserveRequest_Match_Http_Authority); ok { + return x.Authority + } } return nil } func (x *ObserveRequest_Match_Http) GetPath() *ObserveRequest_Match_Http_StringMatch { - if x, ok := x.GetMatch().(*ObserveRequest_Match_Http_Path); ok { - return x.Path + if x != nil { + if x, ok := x.Match.(*ObserveRequest_Match_Http_Path); ok { + return x.Path + } } return nil } @@ -842,12 +869,11 @@ func (*ObserveRequest_Match_Http_Authority) isObserveRequest_Match_Http_Match() func (*ObserveRequest_Match_Http_Path) isObserveRequest_Match_Http_Match() {} type ObserveRequest_Match_Tcp_Netmask struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Ip *net.IPAddress `protobuf:"bytes,1,opt,name=ip,proto3" json:"ip,omitempty"` + Mask uint32 `protobuf:"varint,2,opt,name=mask,proto3" json:"mask,omitempty"` unknownFields protoimpl.UnknownFields - - Ip *net.IPAddress `protobuf:"bytes,1,opt,name=ip,proto3" json:"ip,omitempty"` - Mask uint32 `protobuf:"varint,2,opt,name=mask,proto3" json:"mask,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ObserveRequest_Match_Tcp_Netmask) Reset() { @@ -897,14 +923,13 @@ func (x *ObserveRequest_Match_Tcp_Netmask) GetMask() uint32 { // If either a minimum or maximum is not specified, the range is // considered to be over a discrete value. type ObserveRequest_Match_Tcp_PortRange struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Minimum matching port value (inclusive), if specified. Min uint32 `protobuf:"varint,1,opt,name=min,proto3" json:"min,omitempty"` // Maximum matching port value (inclusive), if specified. - Max uint32 `protobuf:"varint,2,opt,name=max,proto3" json:"max,omitempty"` + Max uint32 `protobuf:"varint,2,opt,name=max,proto3" json:"max,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ObserveRequest_Match_Tcp_PortRange) Reset() { @@ -952,15 +977,14 @@ func (x *ObserveRequest_Match_Tcp_PortRange) GetMax() uint32 { } type ObserveRequest_Match_Http_StringMatch struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Match: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Match: // // *ObserveRequest_Match_Http_StringMatch_Exact // *ObserveRequest_Match_Http_StringMatch_Prefix - Match isObserveRequest_Match_Http_StringMatch_Match `protobuf_oneof:"match"` + Match isObserveRequest_Match_Http_StringMatch_Match `protobuf_oneof:"match"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ObserveRequest_Match_Http_StringMatch) Reset() { @@ -993,23 +1017,27 @@ func (*ObserveRequest_Match_Http_StringMatch) Descriptor() ([]byte, []int) { return file_tap_proto_rawDescGZIP(), []int{0, 0, 3, 0} } -func (m *ObserveRequest_Match_Http_StringMatch) GetMatch() isObserveRequest_Match_Http_StringMatch_Match { - if m != nil { - return m.Match +func (x *ObserveRequest_Match_Http_StringMatch) GetMatch() isObserveRequest_Match_Http_StringMatch_Match { + if x != nil { + return x.Match } return nil } func (x *ObserveRequest_Match_Http_StringMatch) GetExact() string { - if x, ok := x.GetMatch().(*ObserveRequest_Match_Http_StringMatch_Exact); ok { - return x.Exact + if x != nil { + if x, ok := x.Match.(*ObserveRequest_Match_Http_StringMatch_Exact); ok { + return x.Exact + } } return "" } func (x *ObserveRequest_Match_Http_StringMatch) GetPrefix() string { - if x, ok := x.GetMatch().(*ObserveRequest_Match_Http_StringMatch_Prefix); ok { - return x.Prefix + if x != nil { + if x, ok := x.Match.(*ObserveRequest_Match_Http_StringMatch_Prefix); ok { + return x.Prefix + } } return "" } @@ -1032,14 +1060,13 @@ func (*ObserveRequest_Match_Http_StringMatch_Prefix) isObserveRequest_Match_Http } type ObserveRequest_Extract_Http struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Extract: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Extract: // // *ObserveRequest_Extract_Http_Headers_ - Extract isObserveRequest_Extract_Http_Extract `protobuf_oneof:"extract"` + Extract isObserveRequest_Extract_Http_Extract `protobuf_oneof:"extract"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ObserveRequest_Extract_Http) Reset() { @@ -1072,16 +1099,18 @@ func (*ObserveRequest_Extract_Http) Descriptor() ([]byte, []int) { return file_tap_proto_rawDescGZIP(), []int{0, 1, 0} } -func (m *ObserveRequest_Extract_Http) GetExtract() isObserveRequest_Extract_Http_Extract { - if m != nil { - return m.Extract +func (x *ObserveRequest_Extract_Http) GetExtract() isObserveRequest_Extract_Http_Extract { + if x != nil { + return x.Extract } return nil } func (x *ObserveRequest_Extract_Http) GetHeaders() *ObserveRequest_Extract_Http_Headers { - if x, ok := x.GetExtract().(*ObserveRequest_Extract_Http_Headers_); ok { - return x.Headers + if x != nil { + if x, ok := x.Extract.(*ObserveRequest_Extract_Http_Headers_); ok { + return x.Headers + } } return nil } @@ -1097,9 +1126,9 @@ type ObserveRequest_Extract_Http_Headers_ struct { func (*ObserveRequest_Extract_Http_Headers_) isObserveRequest_Extract_Http_Extract() {} type ObserveRequest_Extract_Http_Headers struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ObserveRequest_Extract_Http_Headers) Reset() { @@ -1133,11 +1162,10 @@ func (*ObserveRequest_Extract_Http_Headers) Descriptor() ([]byte, []int) { } type TapEvent_EndpointMeta struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Labels map[string]string `protobuf:"bytes,1,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` unknownFields protoimpl.UnknownFields - - Labels map[string]string `protobuf:"bytes,1,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + sizeCache protoimpl.SizeCache } func (x *TapEvent_EndpointMeta) Reset() { @@ -1178,11 +1206,10 @@ func (x *TapEvent_EndpointMeta) GetLabels() map[string]string { } type TapEvent_RouteMeta struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Labels map[string]string `protobuf:"bytes,1,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` unknownFields protoimpl.UnknownFields - - Labels map[string]string `protobuf:"bytes,1,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + sizeCache protoimpl.SizeCache } func (x *TapEvent_RouteMeta) Reset() { @@ -1223,16 +1250,15 @@ func (x *TapEvent_RouteMeta) GetLabels() map[string]string { } type TapEvent_Http struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Event: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Event: // // *TapEvent_Http_RequestInit_ // *TapEvent_Http_ResponseInit_ // *TapEvent_Http_ResponseEnd_ - Event isTapEvent_Http_Event `protobuf_oneof:"event"` + Event isTapEvent_Http_Event `protobuf_oneof:"event"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TapEvent_Http) Reset() { @@ -1265,30 +1291,36 @@ func (*TapEvent_Http) Descriptor() ([]byte, []int) { return file_tap_proto_rawDescGZIP(), []int{2, 2} } -func (m *TapEvent_Http) GetEvent() isTapEvent_Http_Event { - if m != nil { - return m.Event +func (x *TapEvent_Http) GetEvent() isTapEvent_Http_Event { + if x != nil { + return x.Event } return nil } func (x *TapEvent_Http) GetRequestInit() *TapEvent_Http_RequestInit { - if x, ok := x.GetEvent().(*TapEvent_Http_RequestInit_); ok { - return x.RequestInit + if x != nil { + if x, ok := x.Event.(*TapEvent_Http_RequestInit_); ok { + return x.RequestInit + } } return nil } func (x *TapEvent_Http) GetResponseInit() *TapEvent_Http_ResponseInit { - if x, ok := x.GetEvent().(*TapEvent_Http_ResponseInit_); ok { - return x.ResponseInit + if x != nil { + if x, ok := x.Event.(*TapEvent_Http_ResponseInit_); ok { + return x.ResponseInit + } } return nil } func (x *TapEvent_Http) GetResponseEnd() *TapEvent_Http_ResponseEnd { - if x, ok := x.GetEvent().(*TapEvent_Http_ResponseEnd_); ok { - return x.ResponseEnd + if x != nil { + if x, ok := x.Event.(*TapEvent_Http_ResponseEnd_); ok { + return x.ResponseEnd + } } return nil } @@ -1316,14 +1348,13 @@ func (*TapEvent_Http_ResponseInit_) isTapEvent_Http_Event() {} func (*TapEvent_Http_ResponseEnd_) isTapEvent_Http_Event() {} type TapEvent_Http_StreamId struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // A randomized base (stable across a process's runtime) Base uint32 `protobuf:"varint,1,opt,name=base,proto3" json:"base,omitempty"` // A stream id unique within the lifetime of `base`. - Stream uint64 `protobuf:"varint,2,opt,name=stream,proto3" json:"stream,omitempty"` + Stream uint64 `protobuf:"varint,2,opt,name=stream,proto3" json:"stream,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TapEvent_Http_StreamId) Reset() { @@ -1371,16 +1402,15 @@ func (x *TapEvent_Http_StreamId) GetStream() uint64 { } type TapEvent_Http_RequestInit struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id *TapEvent_Http_StreamId `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Method *http_types.HttpMethod `protobuf:"bytes,2,opt,name=method,proto3" json:"method,omitempty"` + Scheme *http_types.Scheme `protobuf:"bytes,3,opt,name=scheme,proto3" json:"scheme,omitempty"` + Authority string `protobuf:"bytes,4,opt,name=authority,proto3" json:"authority,omitempty"` + Path string `protobuf:"bytes,5,opt,name=path,proto3" json:"path,omitempty"` + Headers *http_types.Headers `protobuf:"bytes,6,opt,name=headers,proto3" json:"headers,omitempty"` unknownFields protoimpl.UnknownFields - - Id *TapEvent_Http_StreamId `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Method *http_types.HttpMethod `protobuf:"bytes,2,opt,name=method,proto3" json:"method,omitempty"` - Scheme *http_types.Scheme `protobuf:"bytes,3,opt,name=scheme,proto3" json:"scheme,omitempty"` - Authority string `protobuf:"bytes,4,opt,name=authority,proto3" json:"authority,omitempty"` - Path string `protobuf:"bytes,5,opt,name=path,proto3" json:"path,omitempty"` - Headers *http_types.Headers `protobuf:"bytes,6,opt,name=headers,proto3" json:"headers,omitempty"` + sizeCache protoimpl.SizeCache } func (x *TapEvent_Http_RequestInit) Reset() { @@ -1456,14 +1486,13 @@ func (x *TapEvent_Http_RequestInit) GetHeaders() *http_types.Headers { } type TapEvent_Http_ResponseInit struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Id *TapEvent_Http_StreamId `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` SinceRequestInit *duration.Duration `protobuf:"bytes,2,opt,name=since_request_init,json=sinceRequestInit,proto3" json:"since_request_init,omitempty"` HttpStatus uint32 `protobuf:"varint,3,opt,name=http_status,json=httpStatus,proto3" json:"http_status,omitempty"` Headers *http_types.Headers `protobuf:"bytes,4,opt,name=headers,proto3" json:"headers,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TapEvent_Http_ResponseInit) Reset() { @@ -1525,16 +1554,15 @@ func (x *TapEvent_Http_ResponseInit) GetHeaders() *http_types.Headers { } type TapEvent_Http_ResponseEnd struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` Id *TapEvent_Http_StreamId `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` SinceRequestInit *duration.Duration `protobuf:"bytes,2,opt,name=since_request_init,json=sinceRequestInit,proto3" json:"since_request_init,omitempty"` SinceResponseInit *duration.Duration `protobuf:"bytes,3,opt,name=since_response_init,json=sinceResponseInit,proto3" json:"since_response_init,omitempty"` ResponseBytes uint64 `protobuf:"varint,4,opt,name=response_bytes,json=responseBytes,proto3" json:"response_bytes,omitempty"` Eos *Eos `protobuf:"bytes,5,opt,name=eos,proto3" json:"eos,omitempty"` Trailers *http_types.Headers `protobuf:"bytes,6,opt,name=trailers,proto3" json:"trailers,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *TapEvent_Http_ResponseEnd) Reset() { diff --git a/go/tls_route/tls_route.pb.go b/go/tls_route/tls_route.pb.go index 97923f233..79e9ff962 100644 --- a/go/tls_route/tls_route.pb.go +++ b/go/tls_route/tls_route.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc v5.29.0 // source: tls_route.proto @@ -22,15 +22,14 @@ const ( // Describes how to match an `SNI` ClientHello extension. type SniMatch struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Match: + state protoimpl.MessageState `protogen:"open.v1"` + // Types that are valid to be assigned to Match: // // *SniMatch_Exact // *SniMatch_Suffix_ - Match isSniMatch_Match `protobuf_oneof:"match"` + Match isSniMatch_Match `protobuf_oneof:"match"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *SniMatch) Reset() { @@ -63,23 +62,27 @@ func (*SniMatch) Descriptor() ([]byte, []int) { return file_tls_route_proto_rawDescGZIP(), []int{0} } -func (m *SniMatch) GetMatch() isSniMatch_Match { - if m != nil { - return m.Match +func (x *SniMatch) GetMatch() isSniMatch_Match { + if x != nil { + return x.Match } return nil } func (x *SniMatch) GetExact() string { - if x, ok := x.GetMatch().(*SniMatch_Exact); ok { - return x.Exact + if x != nil { + if x, ok := x.Match.(*SniMatch_Exact); ok { + return x.Exact + } } return "" } func (x *SniMatch) GetSuffix() *SniMatch_Suffix { - if x, ok := x.GetMatch().(*SniMatch_Suffix_); ok { - return x.Suffix + if x != nil { + if x, ok := x.Match.(*SniMatch_Suffix_); ok { + return x.Suffix + } } return nil } @@ -104,11 +107,10 @@ func (*SniMatch_Suffix_) isSniMatch_Match() {} // A match like `*.example.com` is encoded as [com, example]. type SniMatch_Suffix struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ReverseLabels []string `protobuf:"bytes,1,rep,name=reverse_labels,json=reverseLabels,proto3" json:"reverse_labels,omitempty"` unknownFields protoimpl.UnknownFields - - ReverseLabels []string `protobuf:"bytes,1,rep,name=reverse_labels,json=reverseLabels,proto3" json:"reverse_labels,omitempty"` + sizeCache protoimpl.SizeCache } func (x *SniMatch_Suffix) Reset() { diff --git a/src/gen/io.linkerd.proxy.destination.rs b/src/gen/io.linkerd.proxy.destination.rs index 457285a83..4730cff0c 100644 --- a/src/gen/io.linkerd.proxy.destination.rs +++ b/src/gen/io.linkerd.proxy.destination.rs @@ -1,4 +1,4 @@ -#[allow(clippy::derive_partial_eq_without_eq)] +// This file is @generated by prost-build. #[derive(Clone, PartialEq, ::prost::Message)] pub struct GetDestination { #[prost(string, tag = "1")] @@ -14,7 +14,6 @@ pub struct GetDestination { #[prost(string, tag = "3")] pub context_token: ::prost::alloc::string::String, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Update { #[prost(oneof = "update::Update", tags = "1, 2, 3")] @@ -22,7 +21,6 @@ pub struct Update { } /// Nested message and enum types in `Update`. pub mod update { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Update { /// A new set of endpoints are available for the service. The set might be @@ -41,13 +39,11 @@ pub mod update { NoEndpoints(super::NoEndpoints), } } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct AddrSet { #[prost(message, repeated, tag = "1")] pub addrs: ::prost::alloc::vec::Vec, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct WeightedAddrSet { #[prost(message, repeated, tag = "1")] @@ -58,7 +54,6 @@ pub struct WeightedAddrSet { ::prost::alloc::string::String, >, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct WeightedAddr { #[prost(message, optional, tag = "1")] @@ -87,7 +82,6 @@ pub struct WeightedAddr { #[prost(message, optional, tag = "9")] pub resource_ref: ::core::option::Option, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct TlsIdentity { /// The server name of the endpoint. This is the value that needs to be included @@ -101,7 +95,6 @@ pub struct TlsIdentity { /// Nested message and enum types in `TlsIdentity`. pub mod tls_identity { /// Verify the certificate based on the Kubernetes pod identity. - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct DnsLikeIdentity { /// A DNS-like name that encodes workload coordinates. @@ -112,7 +105,6 @@ pub mod tls_identity { pub name: ::prost::alloc::string::String, } /// Verify the certificate based on an URI identity. - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct UriLikeIdentity { /// A URI name that encodes workload identity. @@ -122,7 +114,6 @@ pub mod tls_identity { #[prost(string, tag = "1")] pub uri: ::prost::alloc::string::String, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Strategy { #[prost(message, tag = "1")] @@ -131,22 +122,19 @@ pub mod tls_identity { UriLikeIdentity(UriLikeIdentity), } } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct AuthorityOverride { #[prost(string, tag = "1")] pub authority_override: ::prost::alloc::string::String, } -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct NoEndpoints { #[prost(bool, tag = "1")] pub exists: bool, } /// A hint of what protocol the service knows. The default value is /// for the `hint` field to be not be set, essentially meaning "unknown". -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ProtocolHint { /// When set, indicates that the target supports receiving opaque traffic /// wrapped with the Linkerd connection header on the specified port. @@ -157,21 +145,17 @@ pub struct ProtocolHint { } /// Nested message and enum types in `ProtocolHint`. pub mod protocol_hint { - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct H2 {} - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Opaque {} - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct OpaqueTransport { /// The target proxy's inbound port. #[prost(uint32, tag = "1")] pub inbound_port: u32, } - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum Protocol { /// Hints that the service understands HTTP2 and the proxy's internal /// http2-upgrade mechanism. @@ -185,8 +169,7 @@ pub mod protocol_hint { } } /// Configures the parameters used to initialize an HTTP/2 connection. -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Http2ClientParams { /// Overrides the default client flow control settings. #[prost(message, optional, tag = "1")] @@ -200,8 +183,7 @@ pub struct Http2ClientParams { } /// Nested message and enum types in `Http2ClientParams`. pub mod http2_client_params { - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct FlowControl { /// Configures the maximum connection-level flow control window size. #[prost(uint32, tag = "1")] @@ -213,8 +195,7 @@ pub mod http2_client_params { #[prost(bool, tag = "3")] pub adaptive_flow_control: bool, } - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct KeepAlive { /// The time between pings. #[prost(message, optional, tag = "1")] @@ -227,8 +208,7 @@ pub mod http2_client_params { #[prost(bool, tag = "3")] pub while_idle: bool, } - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Internals { #[prost(uint32, tag = "1")] pub max_concurrent_reset_streams: u32, @@ -238,7 +218,6 @@ pub mod http2_client_params { pub max_send_buf_size: u32, } } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct DestinationProfile { /// The fully-qualified service name, if one exists. @@ -293,7 +272,6 @@ pub struct DestinationProfile { #[prost(message, optional, tag = "8")] pub profile_ref: ::core::option::Option, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Route { /// This route contains requests which match this condition. @@ -320,8 +298,7 @@ pub struct Route { #[prost(message, optional, tag = "5")] pub timeout: ::core::option::Option<::prost_types::Duration>, } -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct RetryBudget { /// The ratio of additional traffic that may be added by retries. A /// retry_ratio of 0.1 means that 1 retry may be attempted for every 10 regular @@ -341,7 +318,6 @@ pub struct RetryBudget { #[prost(message, optional, tag = "3")] pub ttl: ::core::option::Option<::prost_types::Duration>, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct ResponseClass { /// This class contains responses which match this condition. @@ -352,7 +328,6 @@ pub struct ResponseClass { #[prost(bool, tag = "2")] pub is_failure: bool, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct RequestMatch { #[prost(oneof = "request_match::Match", tags = "1, 2, 3, 4, 5")] @@ -360,13 +335,11 @@ pub struct RequestMatch { } /// Nested message and enum types in `RequestMatch`. pub mod request_match { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Seq { #[prost(message, repeated, tag = "1")] pub matches: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Match { #[prost(message, tag = "1")] @@ -382,14 +355,12 @@ pub mod request_match { Method(super::super::http_types::HttpMethod), } } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct PathMatch { /// Match if the request path matches this regex. #[prost(string, tag = "1")] pub regex: ::prost::alloc::string::String, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct ResponseMatch { #[prost(oneof = "response_match::Match", tags = "1, 2, 3, 4")] @@ -397,13 +368,11 @@ pub struct ResponseMatch { } /// Nested message and enum types in `ResponseMatch`. pub mod response_match { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Seq { #[prost(message, repeated, tag = "1")] pub matches: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Match { #[prost(message, tag = "1")] @@ -419,8 +388,7 @@ pub mod response_match { } /// If either a minimum or maximum is not specified, the range is considered to /// be over a discrete value. -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct HttpStatusRange { /// Minimum matching http status code (inclusive), if specified. #[prost(uint32, tag = "1")] @@ -429,7 +397,6 @@ pub struct HttpStatusRange { #[prost(uint32, tag = "2")] pub max: u32, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct WeightedDst { /// This authority will be used as the `path` in a call to the Destination.Get @@ -446,7 +413,13 @@ pub struct WeightedDst { } /// Generated client implementations. pub mod destination_client { - #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] + #![allow( + unused_variables, + dead_code, + missing_docs, + clippy::wildcard_imports, + clippy::let_unit_value, + )] use tonic::codegen::*; use tonic::codegen::http::Uri; #[derive(Debug, Clone)] @@ -457,8 +430,8 @@ pub mod destination_client { where T: tonic::client::GrpcService, T::Error: Into, - T::ResponseBody: Body + Send + 'static, - ::Error: Into + Send, + T::ResponseBody: Body + std::marker::Send + 'static, + ::Error: Into + std::marker::Send, { pub fn new(inner: T) -> Self { let inner = tonic::client::Grpc::new(inner); @@ -483,7 +456,7 @@ pub mod destination_client { >, , - >>::Error: Into + Send + Sync, + >>::Error: Into + std::marker::Send + std::marker::Sync, { DestinationClient::new(InterceptedService::new(inner, interceptor)) } @@ -531,8 +504,7 @@ pub mod destination_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -560,8 +532,7 @@ pub mod destination_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -583,16 +554,22 @@ pub mod destination_client { } /// Generated server implementations. pub mod destination_server { - #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] + #![allow( + unused_variables, + dead_code, + missing_docs, + clippy::wildcard_imports, + clippy::let_unit_value, + )] use tonic::codegen::*; /// Generated trait containing gRPC methods that should be implemented for use with DestinationServer. #[async_trait] - pub trait Destination: Send + Sync + 'static { + pub trait Destination: std::marker::Send + std::marker::Sync + 'static { /// Server streaming response type for the Get method. type GetStream: tonic::codegen::tokio_stream::Stream< Item = std::result::Result, > - + Send + + std::marker::Send + 'static; /// Given a destination, return all addresses in that destination as a long- /// running stream of updates. @@ -604,7 +581,7 @@ pub mod destination_server { type GetProfileStream: tonic::codegen::tokio_stream::Stream< Item = std::result::Result, > - + Send + + std::marker::Send + 'static; /// Given a destination, return that destination's profile and send an update /// whenever it changes. @@ -614,20 +591,18 @@ pub mod destination_server { ) -> std::result::Result, tonic::Status>; } #[derive(Debug)] - pub struct DestinationServer { - inner: _Inner, + pub struct DestinationServer { + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); - impl DestinationServer { + impl DestinationServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -677,8 +652,8 @@ pub mod destination_server { impl tonic::codegen::Service> for DestinationServer where T: Destination, - B: Body + Send + 'static, - B::Error: Into + Send + 'static, + B: Body + std::marker::Send + 'static, + B::Error: Into + std::marker::Send + 'static, { type Response = http::Response; type Error = std::convert::Infallible; @@ -690,7 +665,6 @@ pub mod destination_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/io.linkerd.proxy.destination.Destination/Get" => { #[allow(non_camel_case_types)] @@ -722,7 +696,6 @@ pub mod destination_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -769,7 +742,6 @@ pub mod destination_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetProfileSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -788,20 +760,25 @@ pub mod destination_server { } _ => { Box::pin(async move { - Ok( - http::Response::builder() - .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") - .body(empty_body()) - .unwrap(), - ) + let mut response = http::Response::new(empty_body()); + let headers = response.headers_mut(); + headers + .insert( + tonic::Status::GRPC_STATUS, + (tonic::Code::Unimplemented as i32).into(), + ); + headers + .insert( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ); + Ok(response) }) } } } } - impl Clone for DestinationServer { + impl Clone for DestinationServer { fn clone(&self) -> Self { let inner = self.inner.clone(); Self { @@ -813,17 +790,9 @@ pub mod destination_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } - impl tonic::server::NamedService for DestinationServer { - const NAME: &'static str = "io.linkerd.proxy.destination.Destination"; + /// Generated gRPC service name + pub const SERVICE_NAME: &str = "io.linkerd.proxy.destination.Destination"; + impl tonic::server::NamedService for DestinationServer { + const NAME: &'static str = SERVICE_NAME; } } diff --git a/src/gen/io.linkerd.proxy.grpc_route.rs b/src/gen/io.linkerd.proxy.grpc_route.rs index 877f81ed4..fc2621164 100644 --- a/src/gen/io.linkerd.proxy.grpc_route.rs +++ b/src/gen/io.linkerd.proxy.grpc_route.rs @@ -1,4 +1,4 @@ -#[allow(clippy::derive_partial_eq_without_eq)] +// This file is @generated by prost-build. #[derive(Clone, PartialEq, ::prost::Message)] pub struct GrpcRouteMatch { #[prost(message, optional, tag = "1")] @@ -9,7 +9,6 @@ pub struct GrpcRouteMatch { #[prost(message, repeated, tag = "2")] pub headers: ::prost::alloc::vec::Vec, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct GrpcRpcMatch { #[prost(string, tag = "1")] @@ -18,7 +17,6 @@ pub struct GrpcRpcMatch { pub method: ::prost::alloc::string::String, } /// Configures a route to respond with a fixed response. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct GrpcFailureInjector { /// The status code to use in the `grpc-status` response. Must be specified. diff --git a/src/gen/io.linkerd.proxy.http_route.rs b/src/gen/io.linkerd.proxy.http_route.rs index 30165e72c..6aab04dd4 100644 --- a/src/gen/io.linkerd.proxy.http_route.rs +++ b/src/gen/io.linkerd.proxy.http_route.rs @@ -1,5 +1,5 @@ +// This file is @generated by prost-build. /// Describes how to match an `:authority` or `host` header. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct HostMatch { #[prost(oneof = "host_match::Match", tags = "1, 2")] @@ -8,13 +8,11 @@ pub struct HostMatch { /// Nested message and enum types in `HostMatch`. pub mod host_match { /// A match like `*.example.com` is encoded as \[com, example\]. - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Suffix { #[prost(string, repeated, tag = "1")] pub reverse_labels: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Match { /// Match an exact hostname, e.g. www.example.com. @@ -26,7 +24,6 @@ pub mod host_match { } } /// Describes a set of matches, ALL of which must apply. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct HttpRouteMatch { /// Matches requests by path. @@ -47,7 +44,6 @@ pub struct HttpRouteMatch { pub method: ::core::option::Option, } /// Describes how to match a path. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct PathMatch { #[prost(oneof = "path_match::Kind", tags = "1, 2, 3")] @@ -55,7 +51,6 @@ pub struct PathMatch { } /// Nested message and enum types in `PathMatch`. pub mod path_match { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Kind { #[prost(string, tag = "1")] @@ -67,7 +62,6 @@ pub mod path_match { } } /// Describes how to match a header by name and value. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct HeaderMatch { #[prost(string, tag = "1")] @@ -77,7 +71,6 @@ pub struct HeaderMatch { } /// Nested message and enum types in `HeaderMatch`. pub mod header_match { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Value { #[prost(bytes, tag = "2")] @@ -87,7 +80,6 @@ pub mod header_match { } } /// Describes how to match a query parameter by name and value. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct QueryParamMatch { #[prost(string, tag = "1")] @@ -97,7 +89,6 @@ pub struct QueryParamMatch { } /// Nested message and enum types in `QueryParamMatch`. pub mod query_param_match { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Value { #[prost(string, tag = "2")] @@ -110,7 +101,6 @@ pub mod query_param_match { /// /// Modifications are to be applied in the order they are described here: /// additions apply first, then sets, and then removals. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct RequestHeaderModifier { /// A list of headers name-value pairs to set on requests, augmenting any @@ -129,7 +119,6 @@ pub struct RequestHeaderModifier { /// /// Modifications are to be applied in the order they are described here: /// additions apply first, then sets, and then removals. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct ResponseHeaderModifier { /// A list of headers name-value pairs to set on responses, augmenting any @@ -146,7 +135,6 @@ pub struct ResponseHeaderModifier { } /// Configures a route to respond with a redirect response. The `location` header /// is set with the given URL parameters. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct RequestRedirect { /// The scheme value to be used in the `location` header. If not specified, @@ -171,7 +159,6 @@ pub struct RequestRedirect { pub status: u32, } /// Describes how a path value may be rewritten in a route. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct PathModifier { #[prost(oneof = "path_modifier::Replace", tags = "1, 2")] @@ -179,7 +166,6 @@ pub struct PathModifier { } /// Nested message and enum types in `PathModifier`. pub mod path_modifier { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Replace { /// Indicates that the path should be replaced with the given value. @@ -196,7 +182,6 @@ pub mod path_modifier { } } /// Configures a route to respond with a fixed response. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct HttpFailureInjector { /// The status code to use in the HTTP response. Must be specified. @@ -213,8 +198,7 @@ pub struct HttpFailureInjector { /// A ratio (i.e., of requests) to which an filter should be applied. /// /// Represents fractional values on \[0, 1\]. -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Ratio { #[prost(uint32, tag = "1")] pub numerator: u32, @@ -222,8 +206,7 @@ pub struct Ratio { #[prost(uint32, tag = "2")] pub denominator: u32, } -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Timeouts { /// Limits the the time a stream may be active after all request frames have /// been processed. diff --git a/src/gen/io.linkerd.proxy.http_types.rs b/src/gen/io.linkerd.proxy.http_types.rs index 306098a68..f92789ef4 100644 --- a/src/gen/io.linkerd.proxy.http_types.rs +++ b/src/gen/io.linkerd.proxy.http_types.rs @@ -1,4 +1,4 @@ -#[allow(clippy::derive_partial_eq_without_eq)] +// This file is @generated by prost-build. #[derive(Clone, PartialEq, ::prost::Message)] pub struct HttpMethod { #[prost(oneof = "http_method::Type", tags = "1, 2")] @@ -36,15 +36,15 @@ pub mod http_method { /// (if the ProtoBuf definition does not change) and safe for programmatic use. pub fn as_str_name(&self) -> &'static str { match self { - Registered::Get => "GET", - Registered::Post => "POST", - Registered::Put => "PUT", - Registered::Delete => "DELETE", - Registered::Patch => "PATCH", - Registered::Options => "OPTIONS", - Registered::Connect => "CONNECT", - Registered::Head => "HEAD", - Registered::Trace => "TRACE", + Self::Get => "GET", + Self::Post => "POST", + Self::Put => "PUT", + Self::Delete => "DELETE", + Self::Patch => "PATCH", + Self::Options => "OPTIONS", + Self::Connect => "CONNECT", + Self::Head => "HEAD", + Self::Trace => "TRACE", } } /// Creates an enum from field names used in the ProtoBuf definition. @@ -63,7 +63,6 @@ pub mod http_method { } } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Type { #[prost(enumeration = "Registered", tag = "1")] @@ -72,7 +71,6 @@ pub mod http_method { Unregistered(::prost::alloc::string::String), } } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Scheme { #[prost(oneof = "scheme::Type", tags = "1, 2")] @@ -103,8 +101,8 @@ pub mod scheme { /// (if the ProtoBuf definition does not change) and safe for programmatic use. pub fn as_str_name(&self) -> &'static str { match self { - Registered::Http => "HTTP", - Registered::Https => "HTTPS", + Self::Http => "HTTP", + Self::Https => "HTTPS", } } /// Creates an enum from field names used in the ProtoBuf definition. @@ -116,7 +114,6 @@ pub mod scheme { } } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Type { #[prost(enumeration = "Registered", tag = "1")] @@ -125,7 +122,6 @@ pub mod scheme { Unregistered(::prost::alloc::string::String), } } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Headers { #[prost(message, repeated, tag = "1")] @@ -133,7 +129,6 @@ pub struct Headers { } /// Nested message and enum types in `Headers`. pub mod headers { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Header { #[prost(string, tag = "1")] diff --git a/src/gen/io.linkerd.proxy.identity.rs b/src/gen/io.linkerd.proxy.identity.rs index 091122e39..6c5222702 100644 --- a/src/gen/io.linkerd.proxy.identity.rs +++ b/src/gen/io.linkerd.proxy.identity.rs @@ -1,4 +1,4 @@ -#[allow(clippy::derive_partial_eq_without_eq)] +// This file is @generated by prost-build. #[derive(Clone, PartialEq, ::prost::Message)] pub struct CertifyRequest { #[prost(string, tag = "1")] @@ -13,7 +13,6 @@ pub struct CertifyRequest { #[prost(bytes = "vec", tag = "3")] pub certificate_signing_request: ::prost::alloc::vec::Vec, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct CertifyResponse { /// A PEM-encoded x509 Certificate. @@ -30,7 +29,13 @@ pub struct CertifyResponse { } /// Generated client implementations. pub mod identity_client { - #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] + #![allow( + unused_variables, + dead_code, + missing_docs, + clippy::wildcard_imports, + clippy::let_unit_value, + )] use tonic::codegen::*; use tonic::codegen::http::Uri; #[derive(Debug, Clone)] @@ -41,8 +46,8 @@ pub mod identity_client { where T: tonic::client::GrpcService, T::Error: Into, - T::ResponseBody: Body + Send + 'static, - ::Error: Into + Send, + T::ResponseBody: Body + std::marker::Send + 'static, + ::Error: Into + std::marker::Send, { pub fn new(inner: T) -> Self { let inner = tonic::client::Grpc::new(inner); @@ -67,7 +72,7 @@ pub mod identity_client { >, , - >>::Error: Into + Send + Sync, + >>::Error: Into + std::marker::Send + std::marker::Sync, { IdentityClient::new(InterceptedService::new(inner, interceptor)) } @@ -120,8 +125,7 @@ pub mod identity_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -140,11 +144,17 @@ pub mod identity_client { } /// Generated server implementations. pub mod identity_server { - #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] + #![allow( + unused_variables, + dead_code, + missing_docs, + clippy::wildcard_imports, + clippy::let_unit_value, + )] use tonic::codegen::*; /// Generated trait containing gRPC methods that should be implemented for use with IdentityServer. #[async_trait] - pub trait Identity: Send + Sync + 'static { + pub trait Identity: std::marker::Send + std::marker::Sync + 'static { /// Requests that a time-bounded certificate be signed. /// /// The requester must provide a token that verifies the client's identity and @@ -158,20 +168,18 @@ pub mod identity_server { ) -> std::result::Result, tonic::Status>; } #[derive(Debug)] - pub struct IdentityServer { - inner: _Inner, + pub struct IdentityServer { + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); - impl IdentityServer { + impl IdentityServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -221,8 +229,8 @@ pub mod identity_server { impl tonic::codegen::Service> for IdentityServer where T: Identity, - B: Body + Send + 'static, - B::Error: Into + Send + 'static, + B: Body + std::marker::Send + 'static, + B::Error: Into + std::marker::Send + 'static, { type Response = http::Response; type Error = std::convert::Infallible; @@ -234,7 +242,6 @@ pub mod identity_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/io.linkerd.proxy.identity.Identity/Certify" => { #[allow(non_camel_case_types)] @@ -263,7 +270,6 @@ pub mod identity_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = CertifySvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -282,20 +288,25 @@ pub mod identity_server { } _ => { Box::pin(async move { - Ok( - http::Response::builder() - .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") - .body(empty_body()) - .unwrap(), - ) + let mut response = http::Response::new(empty_body()); + let headers = response.headers_mut(); + headers + .insert( + tonic::Status::GRPC_STATUS, + (tonic::Code::Unimplemented as i32).into(), + ); + headers + .insert( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ); + Ok(response) }) } } } } - impl Clone for IdentityServer { + impl Clone for IdentityServer { fn clone(&self) -> Self { let inner = self.inner.clone(); Self { @@ -307,17 +318,9 @@ pub mod identity_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } - impl tonic::server::NamedService for IdentityServer { - const NAME: &'static str = "io.linkerd.proxy.identity.Identity"; + /// Generated gRPC service name + pub const SERVICE_NAME: &str = "io.linkerd.proxy.identity.Identity"; + impl tonic::server::NamedService for IdentityServer { + const NAME: &'static str = SERVICE_NAME; } } diff --git a/src/gen/io.linkerd.proxy.inbound.rs b/src/gen/io.linkerd.proxy.inbound.rs index 57370a88d..1214ab824 100644 --- a/src/gen/io.linkerd.proxy.inbound.rs +++ b/src/gen/io.linkerd.proxy.inbound.rs @@ -1,4 +1,4 @@ -#[allow(clippy::derive_partial_eq_without_eq)] +// This file is @generated by prost-build. #[derive(Clone, PartialEq, ::prost::Message)] pub struct PortSpec { /// Identifies a proxy workload (e.g., pod name). @@ -8,7 +8,6 @@ pub struct PortSpec { #[prost(uint32, tag = "2")] pub port: u32, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Server { /// If set, indicates how the proxy should proxy connections on the specified @@ -34,7 +33,6 @@ pub struct Server { ::prost::alloc::string::String, >, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct ProxyProtocol { #[prost(oneof = "proxy_protocol::Kind", tags = "1, 2, 3, 4, 5, 6")] @@ -42,7 +40,6 @@ pub struct ProxyProtocol { } /// Nested message and enum types in `ProxyProtocol`. pub mod proxy_protocol { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Detect { #[prost(message, optional, tag = "1")] @@ -55,7 +52,6 @@ pub mod proxy_protocol { #[prost(message, optional, tag = "4")] pub http_local_rate_limit: ::core::option::Option, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Http1 { #[prost(message, repeated, tag = "2")] @@ -63,7 +59,6 @@ pub mod proxy_protocol { #[prost(message, optional, tag = "3")] pub local_rate_limit: ::core::option::Option, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Http2 { #[prost(message, repeated, tag = "2")] @@ -71,20 +66,16 @@ pub mod proxy_protocol { #[prost(message, optional, tag = "3")] pub local_rate_limit: ::core::option::Option, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Grpc { #[prost(message, repeated, tag = "2")] pub routes: ::prost::alloc::vec::Vec, } /// TODO: opaque TLS settings (versions, algorithms, SNI) - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Opaque {} - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Tls {} - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Kind { #[prost(message, tag = "1")] @@ -101,7 +92,6 @@ pub mod proxy_protocol { Grpc(Grpc), } } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Authz { /// Limits this authorization to client addresses in the provided networks. @@ -133,7 +123,6 @@ pub struct Authz { pub metadata: ::core::option::Option, } /// Describes a network of authorized clients. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Network { #[prost(message, optional, tag = "1")] @@ -141,7 +130,6 @@ pub struct Network { #[prost(message, repeated, tag = "2")] pub except: ::prost::alloc::vec::Vec, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Authn { #[prost(oneof = "authn::Permit", tags = "1, 2")] @@ -149,10 +137,8 @@ pub struct Authn { } /// Nested message and enum types in `Authn`. pub mod authn { - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct PermitUnauthenticated {} - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct PermitMeshTls { #[prost(oneof = "permit_mesh_tls::Clients", tags = "1, 2")] @@ -160,7 +146,6 @@ pub mod authn { } /// Nested message and enum types in `PermitMeshTLS`. pub mod permit_mesh_tls { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct PermitClientIdentities { /// A list of literal identities. @@ -172,7 +157,6 @@ pub mod authn { #[prost(message, repeated, tag = "2")] pub suffixes: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Clients { /// Indicates that client identities are not required. @@ -184,7 +168,6 @@ pub mod authn { Identities(PermitClientIdentities), } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Permit { #[prost(message, tag = "1")] @@ -194,7 +177,6 @@ pub mod authn { MeshTls(PermitMeshTls), } } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Identity { #[prost(string, tag = "1")] @@ -204,7 +186,6 @@ pub struct Identity { /// /// An empty list is equivalent to `.` (matching all names); the list `["foo", /// "bar"]` is equivalent to "foo.bar." (matching `*.foo.bar`), etc. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct IdentitySuffix { #[prost(string, repeated, tag = "1")] @@ -212,7 +193,6 @@ pub struct IdentitySuffix { } /// Inbound-specific HTTP route configuration (based on the /// [Gateway API]()). -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct HttpRoute { #[prost(message, optional, tag = "1")] @@ -230,7 +210,6 @@ pub struct HttpRoute { } /// Nested message and enum types in `HttpRoute`. pub mod http_route { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Rule { #[prost(message, repeated, tag = "1")] @@ -238,7 +217,6 @@ pub mod http_route { #[prost(message, repeated, tag = "2")] pub filters: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Filter { #[prost(oneof = "filter::Kind", tags = "1, 2, 3")] @@ -246,7 +224,6 @@ pub mod http_route { } /// Nested message and enum types in `Filter`. pub mod filter { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Kind { #[prost(message, tag = "1")] @@ -261,7 +238,6 @@ pub mod http_route { } } /// Inbound-specific gRPC route configuration. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct GrpcRoute { #[prost(message, optional, tag = "1")] @@ -279,7 +255,6 @@ pub struct GrpcRoute { } /// Nested message and enum types in `GrpcRoute`. pub mod grpc_route { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Rule { #[prost(message, repeated, tag = "1")] @@ -287,7 +262,6 @@ pub mod grpc_route { #[prost(message, repeated, tag = "2")] pub filters: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Filter { #[prost(oneof = "filter::Kind", tags = "1, 2")] @@ -295,7 +269,6 @@ pub mod grpc_route { } /// Nested message and enum types in `Filter`. pub mod filter { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Kind { #[prost(message, tag = "1")] @@ -307,7 +280,6 @@ pub mod grpc_route { } } } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct HttpLocalRateLimit { /// Describes the associated HTTPLocalRateLimitPolicy resource @@ -327,7 +299,6 @@ pub struct HttpLocalRateLimit { } /// Nested message and enum types in `HttpLocalRateLimit`. pub mod http_local_rate_limit { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Override { #[prost(message, optional, tag = "1")] @@ -337,7 +308,6 @@ pub mod http_local_rate_limit { } /// Nested message and enum types in `Override`. pub mod r#override { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct ClientIdentities { /// A list of literal identities. @@ -345,8 +315,7 @@ pub mod http_local_rate_limit { pub identities: ::prost::alloc::vec::Vec, } } - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Limit { #[prost(uint32, tag = "1")] pub requests_per_second: u32, @@ -354,7 +323,13 @@ pub mod http_local_rate_limit { } /// Generated client implementations. pub mod inbound_server_policies_client { - #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] + #![allow( + unused_variables, + dead_code, + missing_docs, + clippy::wildcard_imports, + clippy::let_unit_value, + )] use tonic::codegen::*; use tonic::codegen::http::Uri; /// / An API exposed to the linkerd2-proxy to configure the inbound proxy with per-port configuration @@ -372,8 +347,8 @@ pub mod inbound_server_policies_client { where T: tonic::client::GrpcService, T::Error: Into, - T::ResponseBody: Body + Send + 'static, - ::Error: Into + Send, + T::ResponseBody: Body + std::marker::Send + 'static, + ::Error: Into + std::marker::Send, { pub fn new(inner: T) -> Self { let inner = tonic::client::Grpc::new(inner); @@ -398,7 +373,7 @@ pub mod inbound_server_policies_client { >, , - >>::Error: Into + Send + Sync, + >>::Error: Into + std::marker::Send + std::marker::Sync, { InboundServerPoliciesClient::new(InterceptedService::new(inner, interceptor)) } @@ -442,8 +417,7 @@ pub mod inbound_server_policies_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -473,8 +447,7 @@ pub mod inbound_server_policies_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -496,11 +469,17 @@ pub mod inbound_server_policies_client { } /// Generated server implementations. pub mod inbound_server_policies_server { - #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] + #![allow( + unused_variables, + dead_code, + missing_docs, + clippy::wildcard_imports, + clippy::let_unit_value, + )] use tonic::codegen::*; /// Generated trait containing gRPC methods that should be implemented for use with InboundServerPoliciesServer. #[async_trait] - pub trait InboundServerPolicies: Send + Sync + 'static { + pub trait InboundServerPolicies: std::marker::Send + std::marker::Sync + 'static { /// / Gets the inbound server policy for a given workload port. async fn get_port( &self, @@ -510,7 +489,7 @@ pub mod inbound_server_policies_server { type WatchPortStream: tonic::codegen::tokio_stream::Stream< Item = std::result::Result, > - + Send + + std::marker::Send + 'static; /// / Watches the inbound server policy for a given workload port. async fn watch_port( @@ -526,20 +505,18 @@ pub mod inbound_server_policies_server { /// / The unary `GetPort` endpoint is exposed as a convenience for clients to query policies for /// / diagnostic purposes. #[derive(Debug)] - pub struct InboundServerPoliciesServer { - inner: _Inner, + pub struct InboundServerPoliciesServer { + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); - impl InboundServerPoliciesServer { + impl InboundServerPoliciesServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -590,8 +567,8 @@ pub mod inbound_server_policies_server { for InboundServerPoliciesServer where T: InboundServerPolicies, - B: Body + Send + 'static, - B::Error: Into + Send + 'static, + B: Body + std::marker::Send + 'static, + B::Error: Into + std::marker::Send + 'static, { type Response = http::Response; type Error = std::convert::Infallible; @@ -603,7 +580,6 @@ pub mod inbound_server_policies_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/io.linkerd.proxy.inbound.InboundServerPolicies/GetPort" => { #[allow(non_camel_case_types)] @@ -634,7 +610,6 @@ pub mod inbound_server_policies_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetPortSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -682,7 +657,6 @@ pub mod inbound_server_policies_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = WatchPortSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -701,20 +675,25 @@ pub mod inbound_server_policies_server { } _ => { Box::pin(async move { - Ok( - http::Response::builder() - .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") - .body(empty_body()) - .unwrap(), - ) + let mut response = http::Response::new(empty_body()); + let headers = response.headers_mut(); + headers + .insert( + tonic::Status::GRPC_STATUS, + (tonic::Code::Unimplemented as i32).into(), + ); + headers + .insert( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ); + Ok(response) }) } } } } - impl Clone for InboundServerPoliciesServer { + impl Clone for InboundServerPoliciesServer { fn clone(&self) -> Self { let inner = self.inner.clone(); Self { @@ -726,18 +705,9 @@ pub mod inbound_server_policies_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } - impl tonic::server::NamedService - for InboundServerPoliciesServer { - const NAME: &'static str = "io.linkerd.proxy.inbound.InboundServerPolicies"; + /// Generated gRPC service name + pub const SERVICE_NAME: &str = "io.linkerd.proxy.inbound.InboundServerPolicies"; + impl tonic::server::NamedService for InboundServerPoliciesServer { + const NAME: &'static str = SERVICE_NAME; } } diff --git a/src/gen/io.linkerd.proxy.meta.rs b/src/gen/io.linkerd.proxy.meta.rs index c38c3fecd..598715bff 100644 --- a/src/gen/io.linkerd.proxy.meta.rs +++ b/src/gen/io.linkerd.proxy.meta.rs @@ -1,6 +1,6 @@ +// This file is @generated by prost-build. /// General metadata about a configuration object. Typically references either an /// implicit default configuration or a Kubernetes resource. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Metadata { #[prost(oneof = "metadata::Kind", tags = "1, 2")] @@ -8,7 +8,6 @@ pub struct Metadata { } /// Nested message and enum types in `Metadata`. pub mod metadata { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Kind { /// A name describing a default/implicit configuration. @@ -23,7 +22,6 @@ pub mod metadata { } } /// References a (e.g., Kubernetes) resource. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Resource { #[prost(string, tag = "1")] diff --git a/src/gen/io.linkerd.proxy.net.rs b/src/gen/io.linkerd.proxy.net.rs index 829820a2e..a54c4d445 100644 --- a/src/gen/io.linkerd.proxy.net.rs +++ b/src/gen/io.linkerd.proxy.net.rs @@ -1,13 +1,12 @@ -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +// This file is @generated by prost-build. +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct IpAddress { #[prost(oneof = "ip_address::Ip", tags = "1, 2")] pub ip: ::core::option::Option, } /// Nested message and enum types in `IPAddress`. pub mod ip_address { - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum Ip { #[prost(fixed32, tag = "1")] Ipv4(u32), @@ -15,16 +14,14 @@ pub mod ip_address { Ipv6(super::IPv6), } } -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct IpNetwork { #[prost(message, optional, tag = "1")] pub ip: ::core::option::Option, #[prost(uint32, tag = "2")] pub prefix_len: u32, } -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct IPv6 { /// hextets 1-4 #[prost(fixed64, tag = "1")] @@ -33,8 +30,7 @@ pub struct IPv6 { #[prost(fixed64, tag = "2")] pub last: u64, } -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct TcpAddress { #[prost(message, optional, tag = "1")] pub ip: ::core::option::Option, diff --git a/src/gen/io.linkerd.proxy.opaque_route.rs b/src/gen/io.linkerd.proxy.opaque_route.rs index 12c4a7471..a933ad388 100644 --- a/src/gen/io.linkerd.proxy.opaque_route.rs +++ b/src/gen/io.linkerd.proxy.opaque_route.rs @@ -1,11 +1,10 @@ +// This file is @generated by prost-build. /// Used to indicate that the policy is invalid. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Invalid { #[prost(string, tag = "1")] pub message: ::prost::alloc::string::String, } /// Used to indicate that traffic is forbidden. -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Forbidden {} diff --git a/src/gen/io.linkerd.proxy.outbound.rs b/src/gen/io.linkerd.proxy.outbound.rs index 9fc9d74c3..9e2a0dd7d 100644 --- a/src/gen/io.linkerd.proxy.outbound.rs +++ b/src/gen/io.linkerd.proxy.outbound.rs @@ -1,4 +1,4 @@ -#[allow(clippy::derive_partial_eq_without_eq)] +// This file is @generated by prost-build. #[derive(Clone, PartialEq, ::prost::Message)] pub struct TrafficSpec { /// Uniquely identifies the source proxy workload (e.g., pod name) to the @@ -12,7 +12,6 @@ pub struct TrafficSpec { /// Nested message and enum types in `TrafficSpec`. pub mod traffic_spec { /// Describes a target address, as observed by the proxy. - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Target { /// Indicates the proxy is connecting to a specific IP:port. @@ -25,7 +24,6 @@ pub mod traffic_spec { } } /// Outbound policy for a given traffic spec. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct OutboundPolicy { /// Indicates the protocol to use for this target. This will be set to Opaque @@ -36,7 +34,6 @@ pub struct OutboundPolicy { #[prost(message, optional, tag = "2")] pub metadata: ::core::option::Option, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct ProxyProtocol { #[prost(oneof = "proxy_protocol::Kind", tags = "1, 2, 3, 4, 5, 6")] @@ -44,7 +41,6 @@ pub struct ProxyProtocol { } /// Nested message and enum types in `ProxyProtocol`. pub mod proxy_protocol { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Detect { /// Protocol detection timeout. @@ -59,13 +55,11 @@ pub mod proxy_protocol { #[prost(message, optional, tag = "4")] pub http2: ::core::option::Option, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Opaque { #[prost(message, repeated, tag = "1")] pub routes: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Http1 { #[prost(message, repeated, tag = "1")] @@ -74,7 +68,6 @@ pub mod proxy_protocol { #[prost(message, optional, tag = "2")] pub failure_accrual: ::core::option::Option, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Http2 { #[prost(message, repeated, tag = "1")] @@ -83,7 +76,6 @@ pub mod proxy_protocol { #[prost(message, optional, tag = "2")] pub failure_accrual: ::core::option::Option, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Grpc { #[prost(message, repeated, tag = "1")] @@ -92,13 +84,11 @@ pub mod proxy_protocol { #[prost(message, optional, tag = "2")] pub failure_accrual: ::core::option::Option, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Tls { #[prost(message, repeated, tag = "1")] pub routes: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Kind { #[prost(message, tag = "1")] @@ -121,7 +111,6 @@ pub mod proxy_protocol { } /// Outbound-specific HTTP route configuration (based on the /// [Gateway API]()). -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct HttpRoute { #[prost(message, optional, tag = "1")] @@ -135,7 +124,6 @@ pub struct HttpRoute { } /// Nested message and enum types in `HttpRoute`. pub mod http_route { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Rule { #[prost(message, repeated, tag = "1")] @@ -158,7 +146,6 @@ pub mod http_route { #[prost(bool, tag = "7")] pub allow_l5d_request_headers: bool, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Filter { #[prost(oneof = "filter::Kind", tags = "1, 2, 3, 4")] @@ -166,7 +153,6 @@ pub mod http_route { } /// Nested message and enum types in `Filter`. pub mod filter { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Kind { #[prost(message, tag = "1")] @@ -183,7 +169,6 @@ pub mod http_route { ), } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Distribution { #[prost(oneof = "distribution::Kind", tags = "1, 2, 3")] @@ -191,22 +176,18 @@ pub mod http_route { } /// Nested message and enum types in `Distribution`. pub mod distribution { - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Empty {} - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct FirstAvailable { #[prost(message, repeated, tag = "1")] pub backends: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct RandomAvailable { #[prost(message, repeated, tag = "1")] pub backends: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Kind { #[prost(message, tag = "1")] @@ -218,7 +199,6 @@ pub mod http_route { RandomAvailable(RandomAvailable), } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Retry { #[prost(uint32, tag = "1")] @@ -236,7 +216,6 @@ pub mod http_route { /// Nested message and enum types in `Retry`. pub mod retry { /// Retryable conditions. - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Conditions { /// Specifies the status code ranges that should trigger a retry. @@ -245,8 +224,7 @@ pub mod http_route { } /// Nested message and enum types in `Conditions`. pub mod conditions { - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct StatusRange { #[prost(uint32, tag = "1")] pub start: u32, @@ -255,7 +233,6 @@ pub mod http_route { } } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct RouteBackend { #[prost(message, optional, tag = "1")] @@ -267,7 +244,6 @@ pub mod http_route { #[prost(message, optional, tag = "4")] pub request_timeout: ::core::option::Option<::prost_types::Duration>, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct WeightedRouteBackend { #[prost(message, optional, tag = "1")] @@ -276,7 +252,6 @@ pub mod http_route { pub weight: u32, } } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct GrpcRoute { #[prost(message, optional, tag = "1")] @@ -290,7 +265,6 @@ pub struct GrpcRoute { } /// Nested message and enum types in `GrpcRoute`. pub mod grpc_route { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Rule { #[prost(message, repeated, tag = "1")] @@ -313,7 +287,6 @@ pub mod grpc_route { #[prost(bool, tag = "7")] pub allow_l5d_request_headers: bool, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Filter { #[prost(oneof = "filter::Kind", tags = "1, 2")] @@ -321,7 +294,6 @@ pub mod grpc_route { } /// Nested message and enum types in `Filter`. pub mod filter { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Kind { #[prost(message, tag = "1")] @@ -332,7 +304,6 @@ pub mod grpc_route { ), } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Distribution { #[prost(oneof = "distribution::Kind", tags = "1, 2, 3")] @@ -340,22 +311,18 @@ pub mod grpc_route { } /// Nested message and enum types in `Distribution`. pub mod distribution { - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Empty {} - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct FirstAvailable { #[prost(message, repeated, tag = "1")] pub backends: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct RandomAvailable { #[prost(message, repeated, tag = "1")] pub backends: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Kind { #[prost(message, tag = "1")] @@ -367,8 +334,7 @@ pub mod grpc_route { RandomAvailable(RandomAvailable), } } - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Retry { #[prost(uint32, tag = "1")] pub max_retries: u32, @@ -385,8 +351,7 @@ pub mod grpc_route { /// Nested message and enum types in `Retry`. pub mod retry { /// Retryable gRPC status codes. - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Conditions { #[prost(bool, tag = "1")] pub cancelled: bool, @@ -400,7 +365,6 @@ pub mod grpc_route { pub unavailable: bool, } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct RouteBackend { #[prost(message, optional, tag = "1")] @@ -412,7 +376,6 @@ pub mod grpc_route { #[prost(message, optional, tag = "4")] pub request_timeout: ::core::option::Option<::prost_types::Duration>, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct WeightedRouteBackend { #[prost(message, optional, tag = "1")] @@ -421,7 +384,6 @@ pub mod grpc_route { pub weight: u32, } } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct OpaqueRoute { #[prost(message, optional, tag = "1")] @@ -432,7 +394,6 @@ pub struct OpaqueRoute { } /// Nested message and enum types in `OpaqueRoute`. pub mod opaque_route { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Rule { #[prost(message, optional, tag = "1")] @@ -440,7 +401,6 @@ pub mod opaque_route { #[prost(message, repeated, tag = "2")] pub filters: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Filter { #[prost(oneof = "filter::Kind", tags = "1, 2")] @@ -448,7 +408,6 @@ pub mod opaque_route { } /// Nested message and enum types in `Filter`. pub mod filter { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Kind { #[prost(message, tag = "1")] @@ -457,7 +416,6 @@ pub mod opaque_route { Forbidden(super::super::super::opaque_route::Forbidden), } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Distribution { #[prost(oneof = "distribution::Kind", tags = "1, 2, 3")] @@ -465,22 +423,18 @@ pub mod opaque_route { } /// Nested message and enum types in `Distribution`. pub mod distribution { - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Empty {} - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct FirstAvailable { #[prost(message, repeated, tag = "1")] pub backends: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct RandomAvailable { #[prost(message, repeated, tag = "1")] pub backends: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Kind { #[prost(message, tag = "1")] @@ -492,7 +446,6 @@ pub mod opaque_route { RandomAvailable(RandomAvailable), } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct RouteBackend { #[prost(message, optional, tag = "1")] @@ -500,7 +453,6 @@ pub mod opaque_route { #[prost(message, repeated, tag = "3")] pub filters: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct WeightedRouteBackend { #[prost(message, optional, tag = "1")] @@ -509,7 +461,6 @@ pub mod opaque_route { pub weight: u32, } } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct TlsRoute { #[prost(message, optional, tag = "1")] @@ -523,7 +474,6 @@ pub struct TlsRoute { } /// Nested message and enum types in `TlsRoute`. pub mod tls_route { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Rule { #[prost(message, optional, tag = "1")] @@ -531,7 +481,6 @@ pub mod tls_route { #[prost(message, repeated, tag = "2")] pub filters: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Filter { #[prost(oneof = "filter::Kind", tags = "1, 2")] @@ -539,7 +488,6 @@ pub mod tls_route { } /// Nested message and enum types in `Filter`. pub mod filter { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Kind { #[prost(message, tag = "1")] @@ -548,7 +496,6 @@ pub mod tls_route { Forbidden(super::super::super::opaque_route::Forbidden), } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Distribution { #[prost(oneof = "distribution::Kind", tags = "1, 2, 3")] @@ -556,22 +503,18 @@ pub mod tls_route { } /// Nested message and enum types in `Distribution`. pub mod distribution { - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Empty {} - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct FirstAvailable { #[prost(message, repeated, tag = "1")] pub backends: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct RandomAvailable { #[prost(message, repeated, tag = "1")] pub backends: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Kind { #[prost(message, tag = "1")] @@ -583,7 +526,6 @@ pub mod tls_route { RandomAvailable(RandomAvailable), } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct RouteBackend { #[prost(message, optional, tag = "1")] @@ -591,7 +533,6 @@ pub mod tls_route { #[prost(message, repeated, tag = "3")] pub filters: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct WeightedRouteBackend { #[prost(message, optional, tag = "1")] @@ -600,7 +541,6 @@ pub mod tls_route { pub weight: u32, } } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Backend { #[prost(message, optional, tag = "1")] @@ -614,7 +554,6 @@ pub struct Backend { /// Nested message and enum types in `Backend`. pub mod backend { /// A strategy for discovering endpoints for a service. - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct EndpointDiscovery { #[prost(oneof = "endpoint_discovery::Kind", tags = "1")] @@ -622,13 +561,11 @@ pub mod backend { } /// Nested message and enum types in `EndpointDiscovery`. pub mod endpoint_discovery { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct DestinationGet { #[prost(string, tag = "1")] pub path: ::prost::alloc::string::String, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Kind { /// Use the `Destination` service to discover endpoints for this service. @@ -638,7 +575,6 @@ pub mod backend { } /// Describes a power-of-two-choices (P2C) load balancer configuration for a /// backend. - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct BalanceP2c { #[prost(message, optional, tag = "1")] @@ -650,8 +586,7 @@ pub mod backend { /// Nested message and enum types in `BalanceP2c`. pub mod balance_p2c { /// Parameters configuring peak EWMA load estimation. - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct PeakEwma { /// Initial latency value used when no latencies have been /// recorded for an endpoint. @@ -662,8 +597,7 @@ pub mod backend { pub decay: ::core::option::Option<::prost_types::Duration>, } /// The load estimation strategy used by this load balancer. - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum Load { /// This load balancer uses peak EWMA (exponentially weighted moving /// average) load estimates. @@ -671,7 +605,6 @@ pub mod backend { PeakEwma(PeakEwma), } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Kind { /// A backend that consists of a single endpoint. @@ -682,8 +615,7 @@ pub mod backend { Balancer(BalanceP2c), } } -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Queue { /// The number of requests that may be held in a queue before backpressure is /// exerted. @@ -694,31 +626,27 @@ pub struct Queue { #[prost(message, optional, tag = "2")] pub failfast_timeout: ::core::option::Option<::prost_types::Duration>, } -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct FailureAccrual { #[prost(oneof = "failure_accrual::Kind", tags = "1")] pub kind: ::core::option::Option, } /// Nested message and enum types in `FailureAccrual`. pub mod failure_accrual { - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ConsecutiveFailures { #[prost(uint32, tag = "1")] pub max_failures: u32, #[prost(message, optional, tag = "2")] pub backoff: ::core::option::Option, } - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum Kind { #[prost(message, tag = "1")] ConsecutiveFailures(ConsecutiveFailures), } } -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ExponentialBackoff { /// The minimum amount of time to wait before resuming an operation. #[prost(message, optional, tag = "1")] @@ -734,7 +662,13 @@ pub struct ExponentialBackoff { } /// Generated client implementations. pub mod outbound_policies_client { - #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] + #![allow( + unused_variables, + dead_code, + missing_docs, + clippy::wildcard_imports, + clippy::let_unit_value, + )] use tonic::codegen::*; use tonic::codegen::http::Uri; #[derive(Debug, Clone)] @@ -745,8 +679,8 @@ pub mod outbound_policies_client { where T: tonic::client::GrpcService, T::Error: Into, - T::ResponseBody: Body + Send + 'static, - ::Error: Into + Send, + T::ResponseBody: Body + std::marker::Send + 'static, + ::Error: Into + std::marker::Send, { pub fn new(inner: T) -> Self { let inner = tonic::client::Grpc::new(inner); @@ -771,7 +705,7 @@ pub mod outbound_policies_client { >, , - >>::Error: Into + Send + Sync, + >>::Error: Into + std::marker::Send + std::marker::Sync, { OutboundPoliciesClient::new(InterceptedService::new(inner, interceptor)) } @@ -814,8 +748,7 @@ pub mod outbound_policies_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -841,8 +774,7 @@ pub mod outbound_policies_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -864,11 +796,17 @@ pub mod outbound_policies_client { } /// Generated server implementations. pub mod outbound_policies_server { - #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] + #![allow( + unused_variables, + dead_code, + missing_docs, + clippy::wildcard_imports, + clippy::let_unit_value, + )] use tonic::codegen::*; /// Generated trait containing gRPC methods that should be implemented for use with OutboundPoliciesServer. #[async_trait] - pub trait OutboundPolicies: Send + Sync + 'static { + pub trait OutboundPolicies: std::marker::Send + std::marker::Sync + 'static { async fn get( &self, request: tonic::Request, @@ -877,7 +815,7 @@ pub mod outbound_policies_server { type WatchStream: tonic::codegen::tokio_stream::Stream< Item = std::result::Result, > - + Send + + std::marker::Send + 'static; async fn watch( &self, @@ -885,20 +823,18 @@ pub mod outbound_policies_server { ) -> std::result::Result, tonic::Status>; } #[derive(Debug)] - pub struct OutboundPoliciesServer { - inner: _Inner, + pub struct OutboundPoliciesServer { + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); - impl OutboundPoliciesServer { + impl OutboundPoliciesServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -948,8 +884,8 @@ pub mod outbound_policies_server { impl tonic::codegen::Service> for OutboundPoliciesServer where T: OutboundPolicies, - B: Body + Send + 'static, - B::Error: Into + Send + 'static, + B: Body + std::marker::Send + 'static, + B::Error: Into + std::marker::Send + 'static, { type Response = http::Response; type Error = std::convert::Infallible; @@ -961,7 +897,6 @@ pub mod outbound_policies_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/io.linkerd.proxy.outbound.OutboundPolicies/Get" => { #[allow(non_camel_case_types)] @@ -991,7 +926,6 @@ pub mod outbound_policies_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1038,7 +972,6 @@ pub mod outbound_policies_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = WatchSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1057,20 +990,25 @@ pub mod outbound_policies_server { } _ => { Box::pin(async move { - Ok( - http::Response::builder() - .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") - .body(empty_body()) - .unwrap(), - ) + let mut response = http::Response::new(empty_body()); + let headers = response.headers_mut(); + headers + .insert( + tonic::Status::GRPC_STATUS, + (tonic::Code::Unimplemented as i32).into(), + ); + headers + .insert( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ); + Ok(response) }) } } } } - impl Clone for OutboundPoliciesServer { + impl Clone for OutboundPoliciesServer { fn clone(&self) -> Self { let inner = self.inner.clone(); Self { @@ -1082,17 +1020,9 @@ pub mod outbound_policies_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } - impl tonic::server::NamedService for OutboundPoliciesServer { - const NAME: &'static str = "io.linkerd.proxy.outbound.OutboundPolicies"; + /// Generated gRPC service name + pub const SERVICE_NAME: &str = "io.linkerd.proxy.outbound.OutboundPolicies"; + impl tonic::server::NamedService for OutboundPoliciesServer { + const NAME: &'static str = SERVICE_NAME; } } diff --git a/src/gen/io.linkerd.proxy.tap.rs b/src/gen/io.linkerd.proxy.tap.rs index 3e40715d4..3141102a9 100644 --- a/src/gen/io.linkerd.proxy.tap.rs +++ b/src/gen/io.linkerd.proxy.tap.rs @@ -1,4 +1,4 @@ -#[allow(clippy::derive_partial_eq_without_eq)] +// This file is @generated by prost-build. #[derive(Clone, PartialEq, ::prost::Message)] pub struct ObserveRequest { /// Limits the number of event keys that will be returned by this tap. @@ -14,7 +14,6 @@ pub struct ObserveRequest { } /// Nested message and enum types in `ObserveRequest`. pub mod observe_request { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Match { #[prost(oneof = "r#match::Match", tags = "1, 2, 3, 4, 5, 6, 7, 8")] @@ -22,13 +21,11 @@ pub mod observe_request { } /// Nested message and enum types in `Match`. pub mod r#match { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Seq { #[prost(message, repeated, tag = "1")] pub matches: ::prost::alloc::vec::Vec, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Label { #[prost(string, tag = "1")] @@ -36,16 +33,14 @@ pub mod observe_request { #[prost(string, tag = "2")] pub value: ::prost::alloc::string::String, } - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Tcp { #[prost(oneof = "tcp::Match", tags = "1, 3")] pub r#match: ::core::option::Option, } /// Nested message and enum types in `Tcp`. pub mod tcp { - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Netmask { #[prost(message, optional, tag = "1")] pub ip: ::core::option::Option< @@ -56,8 +51,7 @@ pub mod observe_request { } /// If either a minimum or maximum is not specified, the range is /// considered to be over a discrete value. - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct PortRange { /// Minimum matching port value (inclusive), if specified. #[prost(uint32, tag = "1")] @@ -66,8 +60,7 @@ pub mod observe_request { #[prost(uint32, tag = "2")] pub max: u32, } - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum Match { #[prost(message, tag = "1")] Netmask(Netmask), @@ -75,7 +68,6 @@ pub mod observe_request { Ports(PortRange), } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Http { #[prost(oneof = "http::Match", tags = "1, 3, 2, 4")] @@ -83,7 +75,6 @@ pub mod observe_request { } /// Nested message and enum types in `Http`. pub mod http { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct StringMatch { #[prost(oneof = "string_match::Match", tags = "1, 2")] @@ -91,7 +82,6 @@ pub mod observe_request { } /// Nested message and enum types in `StringMatch`. pub mod string_match { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Match { #[prost(string, tag = "1")] @@ -100,7 +90,6 @@ pub mod observe_request { Prefix(::prost::alloc::string::String), } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Match { #[prost(message, tag = "1")] @@ -114,7 +103,6 @@ pub mod observe_request { Path(StringMatch), } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Match { #[prost(message, tag = "1")] @@ -135,50 +123,43 @@ pub mod observe_request { RouteLabel(Label), } } - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Extract { #[prost(oneof = "extract::Extract", tags = "1")] pub extract: ::core::option::Option, } /// Nested message and enum types in `Extract`. pub mod extract { - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Http { #[prost(oneof = "http::Extract", tags = "1")] pub extract: ::core::option::Option, } /// Nested message and enum types in `Http`. pub mod http { - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Headers {} - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum Extract { #[prost(message, tag = "1")] Headers(Headers), } } - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum Extract { #[prost(message, tag = "1")] Http(Http), } } } -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Eos { #[prost(oneof = "eos::End", tags = "1, 2")] pub end: ::core::option::Option, } /// Nested message and enum types in `Eos`. pub mod eos { - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum End { #[prost(uint32, tag = "1")] GrpcStatusCode(u32), @@ -186,7 +167,6 @@ pub mod eos { ResetErrorCode(u32), } } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct TapEvent { #[prost(message, optional, tag = "1")] @@ -206,7 +186,6 @@ pub struct TapEvent { } /// Nested message and enum types in `TapEvent`. pub mod tap_event { - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct EndpointMeta { #[prost(map = "string, string", tag = "1")] @@ -215,7 +194,6 @@ pub mod tap_event { ::prost::alloc::string::String, >, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct RouteMeta { #[prost(map = "string, string", tag = "1")] @@ -224,7 +202,6 @@ pub mod tap_event { ::prost::alloc::string::String, >, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Http { #[prost(oneof = "http::Event", tags = "1, 2, 3")] @@ -232,8 +209,7 @@ pub mod tap_event { } /// Nested message and enum types in `Http`. pub mod http { - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct StreamId { /// A randomized base (stable across a process's runtime) #[prost(uint32, tag = "1")] @@ -242,7 +218,6 @@ pub mod tap_event { #[prost(uint64, tag = "2")] pub stream: u64, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct RequestInit { #[prost(message, optional, tag = "1")] @@ -262,7 +237,6 @@ pub mod tap_event { super::super::super::http_types::Headers, >, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct ResponseInit { #[prost(message, optional, tag = "1")] @@ -276,7 +250,6 @@ pub mod tap_event { super::super::super::http_types::Headers, >, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct ResponseEnd { #[prost(message, optional, tag = "1")] @@ -294,7 +267,6 @@ pub mod tap_event { super::super::super::http_types::Headers, >, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Event { #[prost(message, tag = "1")] @@ -329,9 +301,9 @@ pub mod tap_event { /// (if the ProtoBuf definition does not change) and safe for programmatic use. pub fn as_str_name(&self) -> &'static str { match self { - ProxyDirection::Unknown => "UNKNOWN", - ProxyDirection::Inbound => "INBOUND", - ProxyDirection::Outbound => "OUTBOUND", + Self::Unknown => "UNKNOWN", + Self::Inbound => "INBOUND", + Self::Outbound => "OUTBOUND", } } /// Creates an enum from field names used in the ProtoBuf definition. @@ -344,7 +316,6 @@ pub mod tap_event { } } } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Event { #[prost(message, tag = "3")] @@ -353,7 +324,13 @@ pub mod tap_event { } /// Generated client implementations. pub mod tap_client { - #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] + #![allow( + unused_variables, + dead_code, + missing_docs, + clippy::wildcard_imports, + clippy::let_unit_value, + )] use tonic::codegen::*; use tonic::codegen::http::Uri; /// A service exposed by proxy instances to setup @@ -365,8 +342,8 @@ pub mod tap_client { where T: tonic::client::GrpcService, T::Error: Into, - T::ResponseBody: Body + Send + 'static, - ::Error: Into + Send, + T::ResponseBody: Body + std::marker::Send + 'static, + ::Error: Into + std::marker::Send, { pub fn new(inner: T) -> Self { let inner = tonic::client::Grpc::new(inner); @@ -391,7 +368,7 @@ pub mod tap_client { >, , - >>::Error: Into + Send + Sync, + >>::Error: Into + std::marker::Send + std::marker::Sync, { TapClient::new(InterceptedService::new(inner, interceptor)) } @@ -437,8 +414,7 @@ pub mod tap_client { .ready() .await .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, + tonic::Status::unknown( format!("Service was not ready: {}", e.into()), ) })?; @@ -455,16 +431,22 @@ pub mod tap_client { } /// Generated server implementations. pub mod tap_server { - #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] + #![allow( + unused_variables, + dead_code, + missing_docs, + clippy::wildcard_imports, + clippy::let_unit_value, + )] use tonic::codegen::*; /// Generated trait containing gRPC methods that should be implemented for use with TapServer. #[async_trait] - pub trait Tap: Send + Sync + 'static { + pub trait Tap: std::marker::Send + std::marker::Sync + 'static { /// Server streaming response type for the Observe method. type ObserveStream: tonic::codegen::tokio_stream::Stream< Item = std::result::Result, > - + Send + + std::marker::Send + 'static; async fn observe( &self, @@ -473,20 +455,18 @@ pub mod tap_server { } /// A service exposed by proxy instances to setup #[derive(Debug)] - pub struct TapServer { - inner: _Inner, + pub struct TapServer { + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); - impl TapServer { + impl TapServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -536,8 +516,8 @@ pub mod tap_server { impl tonic::codegen::Service> for TapServer where T: Tap, - B: Body + Send + 'static, - B::Error: Into + Send + 'static, + B: Body + std::marker::Send + 'static, + B::Error: Into + std::marker::Send + 'static, { type Response = http::Response; type Error = std::convert::Infallible; @@ -549,7 +529,6 @@ pub mod tap_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/io.linkerd.proxy.tap.Tap/Observe" => { #[allow(non_camel_case_types)] @@ -581,7 +560,6 @@ pub mod tap_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ObserveSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -600,20 +578,25 @@ pub mod tap_server { } _ => { Box::pin(async move { - Ok( - http::Response::builder() - .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") - .body(empty_body()) - .unwrap(), - ) + let mut response = http::Response::new(empty_body()); + let headers = response.headers_mut(); + headers + .insert( + tonic::Status::GRPC_STATUS, + (tonic::Code::Unimplemented as i32).into(), + ); + headers + .insert( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ); + Ok(response) }) } } } } - impl Clone for TapServer { + impl Clone for TapServer { fn clone(&self) -> Self { let inner = self.inner.clone(); Self { @@ -625,17 +608,9 @@ pub mod tap_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } - impl tonic::server::NamedService for TapServer { - const NAME: &'static str = "io.linkerd.proxy.tap.Tap"; + /// Generated gRPC service name + pub const SERVICE_NAME: &str = "io.linkerd.proxy.tap.Tap"; + impl tonic::server::NamedService for TapServer { + const NAME: &'static str = SERVICE_NAME; } } diff --git a/src/gen/io.linkerd.proxy.tls_route.rs b/src/gen/io.linkerd.proxy.tls_route.rs index 28e005b0d..89e72ef5c 100644 --- a/src/gen/io.linkerd.proxy.tls_route.rs +++ b/src/gen/io.linkerd.proxy.tls_route.rs @@ -1,5 +1,5 @@ +// This file is @generated by prost-build. /// Describes how to match an `SNI` ClientHello extension. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct SniMatch { #[prost(oneof = "sni_match::Match", tags = "1, 2")] @@ -8,13 +8,11 @@ pub struct SniMatch { /// Nested message and enum types in `SniMatch`. pub mod sni_match { /// A match like `*.example.com` is encoded as \[com, example\]. - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Suffix { #[prost(string, repeated, tag = "1")] pub reverse_labels: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, } - #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Match { /// Match an exact SNI, e.g. www.example.com.