From 333365d23433ceb9da306b6373d5ab3a57f2e31e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 16:27:23 +0000 Subject: [PATCH] fix(deps): update module github.com/cilium/cilium to v1.17.0-rc.2 Signed-off-by: renovate[bot] --- go.mod | 6 +- go.sum | 16 +- vendor/github.com/cilium/cilium/AUTHORS | 12 +- .../cilium/cilium/api/v1/flow/flow.pb.go | 4 +- .../api/v1/models/bgp_graceful_restart.go | 2 + .../cilium/api/v1/models/bgp_peer_families.go | 2 + .../cilium/api/v1/models/c_id_r_policy.go | 2 + .../api/v1/models/c_n_i_chaining_status.go | 2 + .../cilium/api/v1/models/clock_source.go | 2 + .../cilium/api/v1/models/endpoint_policy.go | 2 + .../cilium/api/v1/models/identity_range.go | 2 + .../cilium/api/v1/models/ip_v4_big_tcp.go | 2 + .../cilium/api/v1/models/ip_v6_big_tcp.go | 2 + .../api/v1/models/kube_proxy_replacement.go | 32 +- .../cilium/cilium/api/v1/models/l4_policy.go | 2 + .../cilium/api/v1/models/policy_rule.go | 2 + .../cilium/cilium/api/v1/models/routing.go | 2 + .../cilium/cilium/api/v1/models/srv6.go | 2 + .../api/v1/models/zz_generated.deepcopy.go | 442 +++++++ .../cilium/api/v1/observer/observer.pb.go | 4 +- .../api/v1/observer/observer_grpc.pb.go | 2 +- .../cilium/cilium/api/v1/relay/relay.pb.go | 4 +- .../cilium/cilium-cli/cli/connectivity.go | 1 - .../connectivity/builder/builder.go | 4 +- ...ient_egress_l7_tls_deny_without_headers.go | 2 +- .../builder/client_egress_l7_tls_headers.go | 4 +- .../connectivity/builder/to_fqdns.go | 11 +- .../cilium-cli/connectivity/check/check.go | 1 - .../connectivity/check/deployment.go | 6 - .../cilium-cli/connectivity/check/test.go | 19 - .../cilium-cli/connectivity/tests/errors.go | 32 +- .../cilium-cli/connectivity/tests/service.go | 8 - .../cilium-cli/connectivity/tests/world.go | 7 +- .../cilium/cilium-cli/defaults/defaults.go | 2 +- .../cilium/cilium/cilium-cli/install/aws.go | 70 ++ .../cilium/cilium/cilium-cli/install/helm.go | 10 +- .../cilium/cilium-cli/install/install.go | 10 + .../cilium/pkg/bgpv1/agent/controller.go | 3 - .../cilium/cilium/pkg/bgpv1/types/bgp.go | 14 - .../cilium/pkg/bgpv1/types/fake_router.go | 14 +- .../cilium/pkg/clustermesh/types/option.go | 23 + .../cilium/pkg/container/bitlpm/cidr.go | 52 +- .../cilium/pkg/container/bitlpm/trie.go | 219 ++-- .../cilium/pkg/container/bitlpm/unsigned.go | 135 +-- .../cilium/pkg/container/versioned/value.go | 14 +- .../certificatemanager/certificate_manager.go | 54 +- .../pkg/datapath/linux/probes/probes.go | 2 + .../cilium/cilium/pkg/defaults/defaults.go | 7 +- .../cilium/cilium/pkg/envoy/resource/envoy.go | 10 - .../cilium/cilium/pkg/identity/identity.go | 2 +- .../cilium/cilium/pkg/ipcache/types/types.go | 8 +- .../cilium/pkg/k8s/apis/cilium.io/register.go | 2 +- .../v2alpha1/bgp_node_override_types.go | 7 - .../v2alpha1/zz_generated.deepcopy.go | 5 - .../v2alpha1/zz_generated.deepequal.go | 8 - .../cilium/cilium/pkg/labels/arraylist.go | 4 - .../cilium/cilium/pkg/metrics/cmd.go | 103 +- .../cilium/cilium/pkg/metrics/metrics.go | 16 - .../cilium/cilium/pkg/option/config.go | 48 +- .../cilium/cilium/pkg/policy/api/rule.go | 14 +- .../cilium/pkg/policy/api/rule_validation.go | 5 +- .../github.com/cilium/cilium/pkg/policy/l4.go | 4 +- .../cilium/cilium/pkg/policy/mapstate.go | 188 ++- .../cilium/cilium/pkg/policy/repository.go | 16 +- .../cilium/cilium/pkg/policy/resolve.go | 28 +- .../cilium/cilium/pkg/policy/selectorcache.go | 19 +- .../cilium/cilium/pkg/policy/types/types.go | 6 - .../github.com/cilium/hive/script/engine.go | 7 +- .../proto_message_extraction/v3/config.pb.go | 526 --------- .../v3/config.pb.validate.go | 349 ------ .../generic_proxy/action/v3/action.pb.go | 334 ------ .../action/v3/action.pb.validate.go | 341 ------ .../generic_proxy/codecs/dubbo/v3/dubbo.pb.go | 163 --- .../codecs/dubbo/v3/dubbo.pb.validate.go | 136 --- .../generic_proxy/codecs/http1/v3/http1.pb.go | 221 ---- .../codecs/http1/v3/http1.pb.validate.go | 194 ---- .../generic_proxy/matcher/v3/matcher.pb.go | 653 ----------- .../matcher/v3/matcher.pb.validate.go | 1027 ----------------- .../generic_proxy/router/v3/router.pb.go | 196 ---- .../router/v3/router.pb.validate.go | 136 --- .../generic_proxy/v3/generic_proxy.pb.go | 415 ------- .../v3/generic_proxy.pb.validate.go | 533 --------- .../network/generic_proxy/v3/route.pb.go | 362 ------ .../generic_proxy/v3/route.pb.validate.go | 373 ------ .../input_matchers/metadata/v3/metadata.pb.go | 190 --- .../metadata/v3/metadata.pb.validate.go | 177 --- .../cpu_utilization/v3/cpu_utilization.pb.go | 161 --- .../v3/cpu_utilization.pb.validate.go | 138 --- .../redis_auth/v3/redis_external_auth.pb.go | 377 ------ .../v3/redis_external_auth.pb.validate.go | 306 ----- vendor/modules.txt | 18 +- .../pkg/apis/v1alpha1/serviceimport.go | 2 +- 92 files changed, 1094 insertions(+), 8006 deletions(-) delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/filters/http/proto_message_extraction/v3/config.pb.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/filters/http/proto_message_extraction/v3/config.pb.validate.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/action/v3/action.pb.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/action/v3/action.pb.validate.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.pb.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.pb.validate.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.pb.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.pb.validate.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.pb.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.pb.validate.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/router/v3/router.pb.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/router/v3/router.pb.validate.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.pb.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.pb.validate.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3/route.pb.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3/route.pb.validate.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/matching/input_matchers/metadata/v3/metadata.pb.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/matching/input_matchers/metadata/v3/metadata.pb.validate.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/resource_monitors/cpu_utilization/v3/cpu_utilization.pb.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/extensions/resource_monitors/cpu_utilization/v3/cpu_utilization.pb.validate.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/service/redis_auth/v3/redis_external_auth.pb.go delete mode 100644 vendor/github.com/cilium/proxy/go/envoy/service/redis_auth/v3/redis_external_auth.pb.validate.go diff --git a/go.mod b/go.mod index 1b5c5aa0d1..7584a3384d 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ go 1.23.0 // as to why we are using a private fork. replace sigs.k8s.io/controller-tools => github.com/cilium/controller-tools v0.16.5-1 -require github.com/cilium/cilium v1.17.0-pre.3.0.20250108154004-47bb433883b2 +require github.com/cilium/cilium v1.17.0-rc.2 require ( cel.dev/expr v0.18.0 // indirect @@ -30,7 +30,7 @@ require ( github.com/chai2010/gettext-go v1.0.2 // indirect github.com/cilium/charts v0.0.0-20241218153829-9518b30a2027 // indirect github.com/cilium/ebpf v0.17.1 // indirect - github.com/cilium/hive v0.0.0-20241213121623-605c1412b9b3 // indirect + github.com/cilium/hive v0.0.0-20250121145729-e67f66eb0375 // indirect github.com/cilium/proxy v0.0.0-20241219105110-b2e1bb5839df // indirect github.com/cilium/statedb v0.3.5 // indirect github.com/cilium/stream v0.0.0-20241203114243-53c3e5d79744 // indirect @@ -213,7 +213,7 @@ require ( sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect sigs.k8s.io/kustomize/api v0.18.0 // indirect sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect - sigs.k8s.io/mcs-api v0.1.1-0.20241217092652-fede3192824f // indirect + sigs.k8s.io/mcs-api v0.1.1-0.20250116162235-62ede9a032dc // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/go.sum b/go.sum index 84a4374c58..a2474dc336 100644 --- a/go.sum +++ b/go.sum @@ -56,12 +56,12 @@ github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNS github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA= github.com/cilium/charts v0.0.0-20241218153829-9518b30a2027 h1:DffBrEg57RLbc1jzajDDRYgTqWw1gr02+sMnzQp8yks= github.com/cilium/charts v0.0.0-20241218153829-9518b30a2027/go.mod h1:M3C9VOlFvRzuV+a01t07Tw4uFLSfkCH3L542IWjf6BU= -github.com/cilium/cilium v1.17.0-pre.3.0.20250108154004-47bb433883b2 h1:OchA13nVom6cJbv3JKt2R1Qmg0CY3uw5e4llxDusxYA= -github.com/cilium/cilium v1.17.0-pre.3.0.20250108154004-47bb433883b2/go.mod h1:UTaLU297951gY5wxCGShvANCLv31z3U9Tm62creoYpo= +github.com/cilium/cilium v1.17.0-rc.2 h1:8uVzF/+vR+KYVTyvF2Gbvult2PA7r8KCccRcwAKAFxI= +github.com/cilium/cilium v1.17.0-rc.2/go.mod h1:VbjC8wgo1PJaosN65JnPCkFhaOO3Tct4DP3iDF5xQOs= github.com/cilium/ebpf v0.17.1 h1:G8mzU81R2JA1nE5/8SRubzqvBMmAmri2VL8BIZPWvV0= github.com/cilium/ebpf v0.17.1/go.mod h1:vay2FaYSmIlv3r8dNACd4mW/OCaZLJKJOo+IHBvCIO8= -github.com/cilium/hive v0.0.0-20241213121623-605c1412b9b3 h1:RfmUH1ouzj0LzORYJRhp43e1rlGpx6GNv4NIRUakU2w= -github.com/cilium/hive v0.0.0-20241213121623-605c1412b9b3/go.mod h1:pI2GJ1n3SLKIQVFrKF7W6A6gb6BQkZ+3Hp4PAEo5SuI= +github.com/cilium/hive v0.0.0-20250121145729-e67f66eb0375 h1:EhoCO0AI3qJavnhfAls4w7VpVVpAr12wIh293sNA0hQ= +github.com/cilium/hive v0.0.0-20250121145729-e67f66eb0375/go.mod h1:pI2GJ1n3SLKIQVFrKF7W6A6gb6BQkZ+3Hp4PAEo5SuI= github.com/cilium/proxy v0.0.0-20241219105110-b2e1bb5839df h1:wrv1jOKhBnFOhHb9jpE/C6Fm2kaXUDvT0HrdoeETLnQ= github.com/cilium/proxy v0.0.0-20241219105110-b2e1bb5839df/go.mod h1:BsqJTwrsaSy5DsyH+y5zATYYCsg8/fc/K0qnsNM+43A= github.com/cilium/statedb v0.3.5 h1:/lN7noYjC+JP6+fII7dhUNRS2FuLrlE0CtNOtuBtI9c= @@ -312,8 +312,8 @@ github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxU github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g= github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw= -github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos= -github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ= +github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U= +github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA= github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ= github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= @@ -705,8 +705,8 @@ sigs.k8s.io/kustomize/api v0.18.0 h1:hTzp67k+3NEVInwz5BHyzc9rGxIauoXferXyjv5lWPo sigs.k8s.io/kustomize/api v0.18.0/go.mod h1:f8isXnX+8b+SGLHQ6yO4JG1rdkZlvhaCf/uZbLVMb0U= sigs.k8s.io/kustomize/kyaml v0.18.1 h1:WvBo56Wzw3fjS+7vBjN6TeivvpbW9GmRaWZ9CIVmt4E= sigs.k8s.io/kustomize/kyaml v0.18.1/go.mod h1:C3L2BFVU1jgcddNBE1TxuVLgS46TjObMwW5FT9FcjYo= -sigs.k8s.io/mcs-api v0.1.1-0.20241217092652-fede3192824f h1:nNsLiQPASpDDB5dNq96rmVCvQ3p5B5ChEAsh0Nq0VC0= -sigs.k8s.io/mcs-api v0.1.1-0.20241217092652-fede3192824f/go.mod h1:x0rgWQwGd3FJzrb94BNn3Nu7YxUwBWcgjVRbkrkVy2A= +sigs.k8s.io/mcs-api v0.1.1-0.20250116162235-62ede9a032dc h1:oQrn1nrTacXiaXEYg+0TozPznSDIHFl2U/KZ5UFiYT8= +sigs.k8s.io/mcs-api v0.1.1-0.20250116162235-62ede9a032dc/go.mod h1:Uicqc5FnWP4dco2y7+AEg2mzNN20mVX1TDB3aDfmvhc= sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA= sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= diff --git a/vendor/github.com/cilium/cilium/AUTHORS b/vendor/github.com/cilium/cilium/AUTHORS index e60872bc03..fa6af14b97 100644 --- a/vendor/github.com/cilium/cilium/AUTHORS +++ b/vendor/github.com/cilium/cilium/AUTHORS @@ -30,6 +30,7 @@ Alexandre Barone abalexandrebarone@gmail.com Alexandre Perrin alex@isovalent.com Alexei Starovoitov alexei.starovoitov@gmail.com Alexey Grevtsev alexey.grevtcev@gmail.com +Alexis La Goutte alexis.lagoutte@gmail.com Alex Katsman alexkats@google.com Alex Romanov alex@romanov.ws Alex Szakaly alex.szakaly@gmail.com @@ -52,6 +53,7 @@ Andree Klattenhoff mail@andr.ee Andrei Kvapil kvapss@gmail.com André Martins andre@cilium.io Andrew Bulford andrew.bulford@form3.tech +Andrew E. Timmes atimmes@seatgeek.com Andrew Holt andrew.holt@utmost.co Andrew Li hui0787411@163.com Andrew Sauber 2046750+asauber@users.noreply.github.com @@ -335,6 +337,7 @@ guangwu guoguangwug@gmail.com Guilherme Oki guilherme.oki@wildlifestudios.com Guilherme Souza 101073+guilhermef@users.noreply.github.com Gunju Kim gjkim042@gmail.com +Gyutae Bae gyu.8ae@gmail.com hacktivist123 akintayoshedrack@gmail.com Hadrien Patte hadrien.patte@datadoghq.com Haitao Li lihaitao@gmail.com @@ -376,7 +379,7 @@ Ivan Makarychev i.makarychev@tinkoff.ru Ivar Lazzaro ivarlazzaro@gmail.com JabJ sajjadjafaribojd@gmail.com Jack-R-lantern tjdfkr2421@gmail.com -Jacob Henner henner@arcesium.com +Jacob Henner code@ventricle.us Jacopo Nardiello jnardiello@users.noreply.github.com Jaff Cheng jaff.cheng.sh@gmail.com Jaime Caamaño Ruiz jcaamano@suse.com @@ -485,6 +488,7 @@ Koichiro Den den@klaipeden.com Konstantin Aksenov konstantin.aksenov@flant.com Kornilios Kourtis kornilios@isovalent.com kwakubiney kebiney@hotmail.com +l1b0k libokang.lbk@alibaba-inc.com Laurent Bernaille laurent.bernaille@datadoghq.com Lawrence Gadban lawrence.gadban@solo.io ldelossa louis.delos@gmail.com @@ -586,7 +590,7 @@ Maxime Visonneau maxime.visonneau@gmail.com Maximilian Bischoff maximilian.bischoff@inovex.de Maximilian Mack max@mack.io Maxim Krasilnikov m.krasilnikov@space307.com -Maxim Mikityanskiy maxim@isovalent.com +Maxim Mikityanskiy maxtram95@gmail.com Max Körbächer 16919345+mkorbi@users.noreply.github.com MeherRushi sudharushi0@gmail.com Melissa Peiffer mbp83@nau.edu @@ -751,7 +755,7 @@ Richard Tweed RichardoC@users.noreply.github.com Ricky Ho horicky78@gmail.com Rio Kierkels riokierkels@gmail.com Robin Elfrink robin@15augustus.nl -Robin Gögge r.goegge@isovalent.com +Robin Gögge r.goegge@gmail.com Robin Hahling robin.hahling@gw-computing.net Rob Scott robertjscott@google.com Rocky Chen 40374064+rockc2020@users.noreply.github.com @@ -764,6 +768,7 @@ Ronald van Zantvoort the.loeki@gmail.com Ross Guarino rssguar@gmail.com roykharman roykharman@gmail.com Rudrakh Panigrahi rudrakh97@gmail.com +Rui Cao caorui.io@bytedance.com Rui Chen rui@chenrui.dev Rui Gu rui@covalent.io Rushikesh Butley rushikeshbutley@gmail.com @@ -903,6 +908,7 @@ Valas Valancius valas@google.com Vance Li vanceli@tencent.com Vanilla osu_Vanilla@126.com Vasu Dasari vasudasari@google.com +verysonglaa 39988258+verysonglaa@users.noreply.github.com Vigneshwaren Sunder vickymailed@gmail.com Viktor Kurchenko viktor.kurchenko@isovalent.com Viktor Kuzmin kvaster@gmail.com diff --git a/vendor/github.com/cilium/cilium/api/v1/flow/flow.pb.go b/vendor/github.com/cilium/cilium/api/v1/flow/flow.pb.go index 199c59e375..8038657a7f 100644 --- a/vendor/github.com/cilium/cilium/api/v1/flow/flow.pb.go +++ b/vendor/github.com/cilium/cilium/api/v1/flow/flow.pb.go @@ -3,8 +3,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 -// protoc v5.29.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: flow/flow.proto package flow diff --git a/vendor/github.com/cilium/cilium/api/v1/models/bgp_graceful_restart.go b/vendor/github.com/cilium/cilium/api/v1/models/bgp_graceful_restart.go index dd2cee83c5..d24845f9f1 100644 --- a/vendor/github.com/cilium/cilium/api/v1/models/bgp_graceful_restart.go +++ b/vendor/github.com/cilium/cilium/api/v1/models/bgp_graceful_restart.go @@ -17,6 +17,8 @@ import ( // BgpGracefulRestart BGP graceful restart parameters negotiated with the peer. // +// +k8s:deepcopy-gen=true +// // swagger:model BgpGracefulRestart type BgpGracefulRestart struct { diff --git a/vendor/github.com/cilium/cilium/api/v1/models/bgp_peer_families.go b/vendor/github.com/cilium/cilium/api/v1/models/bgp_peer_families.go index bcf11b9aee..aac6013add 100644 --- a/vendor/github.com/cilium/cilium/api/v1/models/bgp_peer_families.go +++ b/vendor/github.com/cilium/cilium/api/v1/models/bgp_peer_families.go @@ -17,6 +17,8 @@ import ( // BgpPeerFamilies BGP AFI SAFI state of the peer // +// +k8s:deepcopy-gen=true +// // swagger:model BgpPeerFamilies type BgpPeerFamilies struct { diff --git a/vendor/github.com/cilium/cilium/api/v1/models/c_id_r_policy.go b/vendor/github.com/cilium/cilium/api/v1/models/c_id_r_policy.go index 2678070b19..b98e611a6a 100644 --- a/vendor/github.com/cilium/cilium/api/v1/models/c_id_r_policy.go +++ b/vendor/github.com/cilium/cilium/api/v1/models/c_id_r_policy.go @@ -19,6 +19,8 @@ import ( // CIDRPolicy CIDR endpoint policy // +// +k8s:deepcopy-gen=true +// // swagger:model CIDRPolicy type CIDRPolicy struct { diff --git a/vendor/github.com/cilium/cilium/api/v1/models/c_n_i_chaining_status.go b/vendor/github.com/cilium/cilium/api/v1/models/c_n_i_chaining_status.go index 70b7a6c30a..26e8a7236c 100644 --- a/vendor/github.com/cilium/cilium/api/v1/models/c_n_i_chaining_status.go +++ b/vendor/github.com/cilium/cilium/api/v1/models/c_n_i_chaining_status.go @@ -20,6 +20,8 @@ import ( // CNIChainingStatus Status of CNI chaining // +// +k8s:deepcopy-gen=true +// // swagger:model CNIChainingStatus type CNIChainingStatus struct { diff --git a/vendor/github.com/cilium/cilium/api/v1/models/clock_source.go b/vendor/github.com/cilium/cilium/api/v1/models/clock_source.go index 07df2b3dce..c5106d8661 100644 --- a/vendor/github.com/cilium/cilium/api/v1/models/clock_source.go +++ b/vendor/github.com/cilium/cilium/api/v1/models/clock_source.go @@ -20,6 +20,8 @@ import ( // ClockSource Status of BPF clock source // +// +k8s:deepcopy-gen=true +// // swagger:model ClockSource type ClockSource struct { diff --git a/vendor/github.com/cilium/cilium/api/v1/models/endpoint_policy.go b/vendor/github.com/cilium/cilium/api/v1/models/endpoint_policy.go index 1cf376fcdd..5f6150600a 100644 --- a/vendor/github.com/cilium/cilium/api/v1/models/endpoint_policy.go +++ b/vendor/github.com/cilium/cilium/api/v1/models/endpoint_policy.go @@ -18,6 +18,8 @@ import ( // EndpointPolicy Policy information of an endpoint // +// +k8s:deepcopy-gen=true +// // swagger:model EndpointPolicy type EndpointPolicy struct { diff --git a/vendor/github.com/cilium/cilium/api/v1/models/identity_range.go b/vendor/github.com/cilium/cilium/api/v1/models/identity_range.go index 548fe6ccc7..f05ed337b7 100644 --- a/vendor/github.com/cilium/cilium/api/v1/models/identity_range.go +++ b/vendor/github.com/cilium/cilium/api/v1/models/identity_range.go @@ -17,6 +17,8 @@ import ( // IdentityRange Status of identity range of the cluster // +// +k8s:deepcopy-gen=true +// // swagger:model IdentityRange type IdentityRange struct { diff --git a/vendor/github.com/cilium/cilium/api/v1/models/ip_v4_big_tcp.go b/vendor/github.com/cilium/cilium/api/v1/models/ip_v4_big_tcp.go index 87032000f0..41dedc1cdb 100644 --- a/vendor/github.com/cilium/cilium/api/v1/models/ip_v4_big_tcp.go +++ b/vendor/github.com/cilium/cilium/api/v1/models/ip_v4_big_tcp.go @@ -17,6 +17,8 @@ import ( // IPV4BigTCP Status of IPv4 BIG TCP // +// +k8s:deepcopy-gen=true +// // swagger:model IPV4BigTCP type IPV4BigTCP struct { diff --git a/vendor/github.com/cilium/cilium/api/v1/models/ip_v6_big_tcp.go b/vendor/github.com/cilium/cilium/api/v1/models/ip_v6_big_tcp.go index e600f624b0..ed6a0f8676 100644 --- a/vendor/github.com/cilium/cilium/api/v1/models/ip_v6_big_tcp.go +++ b/vendor/github.com/cilium/cilium/api/v1/models/ip_v6_big_tcp.go @@ -17,6 +17,8 @@ import ( // IPV6BigTCP Status of IPv6 BIG TCP // +// +k8s:deepcopy-gen=true +// // swagger:model IPV6BigTCP type IPV6BigTCP struct { diff --git a/vendor/github.com/cilium/cilium/api/v1/models/kube_proxy_replacement.go b/vendor/github.com/cilium/cilium/api/v1/models/kube_proxy_replacement.go index 3c9e3e48a9..6477cb154b 100644 --- a/vendor/github.com/cilium/cilium/api/v1/models/kube_proxy_replacement.go +++ b/vendor/github.com/cilium/cilium/api/v1/models/kube_proxy_replacement.go @@ -791,7 +791,9 @@ func (m *KubeProxyReplacementFeatures) UnmarshalBinary(b []byte) error { return nil } -// KubeProxyReplacementFeaturesExternalIPs kube proxy replacement features external i ps +// KubeProxyReplacementFeaturesExternalIPs +// +// +k8s:deepcopy-gen=true // // swagger:model KubeProxyReplacementFeaturesExternalIPs type KubeProxyReplacementFeaturesExternalIPs struct { @@ -828,7 +830,9 @@ func (m *KubeProxyReplacementFeaturesExternalIPs) UnmarshalBinary(b []byte) erro return nil } -// KubeProxyReplacementFeaturesGracefulTermination kube proxy replacement features graceful termination +// KubeProxyReplacementFeaturesGracefulTermination +// +// +k8s:deepcopy-gen=true // // swagger:model KubeProxyReplacementFeaturesGracefulTermination type KubeProxyReplacementFeaturesGracefulTermination struct { @@ -865,7 +869,9 @@ func (m *KubeProxyReplacementFeaturesGracefulTermination) UnmarshalBinary(b []by return nil } -// KubeProxyReplacementFeaturesHostPort kube proxy replacement features host port +// KubeProxyReplacementFeaturesHostPort +// +// +k8s:deepcopy-gen=true // // swagger:model KubeProxyReplacementFeaturesHostPort type KubeProxyReplacementFeaturesHostPort struct { @@ -1137,7 +1143,9 @@ func (m *KubeProxyReplacementFeaturesNat46X64Gateway) UnmarshalBinary(b []byte) return nil } -// KubeProxyReplacementFeaturesNat46X64Service kube proxy replacement features nat46 x64 service +// KubeProxyReplacementFeaturesNat46X64Service +// +// +k8s:deepcopy-gen=true // // swagger:model KubeProxyReplacementFeaturesNat46X64Service type KubeProxyReplacementFeaturesNat46X64Service struct { @@ -1174,7 +1182,9 @@ func (m *KubeProxyReplacementFeaturesNat46X64Service) UnmarshalBinary(b []byte) return nil } -// KubeProxyReplacementFeaturesNodePort kube proxy replacement features node port +// KubeProxyReplacementFeaturesNodePort +// +// +k8s:deepcopy-gen=true // // swagger:model KubeProxyReplacementFeaturesNodePort type KubeProxyReplacementFeaturesNodePort struct { @@ -1437,7 +1447,9 @@ func (m *KubeProxyReplacementFeaturesNodePort) UnmarshalBinary(b []byte) error { return nil } -// KubeProxyReplacementFeaturesSessionAffinity kube proxy replacement features session affinity +// KubeProxyReplacementFeaturesSessionAffinity +// +// +k8s:deepcopy-gen=true // // swagger:model KubeProxyReplacementFeaturesSessionAffinity type KubeProxyReplacementFeaturesSessionAffinity struct { @@ -1474,7 +1486,9 @@ func (m *KubeProxyReplacementFeaturesSessionAffinity) UnmarshalBinary(b []byte) return nil } -// KubeProxyReplacementFeaturesSocketLB kube proxy replacement features socket l b +// KubeProxyReplacementFeaturesSocketLB +// +// +k8s:deepcopy-gen=true // // swagger:model KubeProxyReplacementFeaturesSocketLB type KubeProxyReplacementFeaturesSocketLB struct { @@ -1511,7 +1525,9 @@ func (m *KubeProxyReplacementFeaturesSocketLB) UnmarshalBinary(b []byte) error { return nil } -// KubeProxyReplacementFeaturesSocketLBTracing kube proxy replacement features socket l b tracing +// KubeProxyReplacementFeaturesSocketLBTracing +// +// +k8s:deepcopy-gen=true // // swagger:model KubeProxyReplacementFeaturesSocketLBTracing type KubeProxyReplacementFeaturesSocketLBTracing struct { diff --git a/vendor/github.com/cilium/cilium/api/v1/models/l4_policy.go b/vendor/github.com/cilium/cilium/api/v1/models/l4_policy.go index 142c38bdad..b6c4c198b1 100644 --- a/vendor/github.com/cilium/cilium/api/v1/models/l4_policy.go +++ b/vendor/github.com/cilium/cilium/api/v1/models/l4_policy.go @@ -19,6 +19,8 @@ import ( // L4Policy L4 endpoint policy // +// +k8s:deepcopy-gen=true +// // swagger:model L4Policy type L4Policy struct { diff --git a/vendor/github.com/cilium/cilium/api/v1/models/policy_rule.go b/vendor/github.com/cilium/cilium/api/v1/models/policy_rule.go index 900a559161..cf24453f2a 100644 --- a/vendor/github.com/cilium/cilium/api/v1/models/policy_rule.go +++ b/vendor/github.com/cilium/cilium/api/v1/models/policy_rule.go @@ -17,6 +17,8 @@ import ( // PolicyRule A policy rule including the rule labels it derives from // +// +k8s:deepcopy-gen=true +// // swagger:model PolicyRule type PolicyRule struct { diff --git a/vendor/github.com/cilium/cilium/api/v1/models/routing.go b/vendor/github.com/cilium/cilium/api/v1/models/routing.go index fdf8b0a930..fe028cf6d7 100644 --- a/vendor/github.com/cilium/cilium/api/v1/models/routing.go +++ b/vendor/github.com/cilium/cilium/api/v1/models/routing.go @@ -20,6 +20,8 @@ import ( // Routing Status of routing // +// +k8s:deepcopy-gen=true +// // swagger:model Routing type Routing struct { diff --git a/vendor/github.com/cilium/cilium/api/v1/models/srv6.go b/vendor/github.com/cilium/cilium/api/v1/models/srv6.go index 005b38889a..1b3182a487 100644 --- a/vendor/github.com/cilium/cilium/api/v1/models/srv6.go +++ b/vendor/github.com/cilium/cilium/api/v1/models/srv6.go @@ -20,6 +20,8 @@ import ( // Srv6 Status of the SRv6 // +// +k8s:deepcopy-gen=true +// // swagger:model Srv6 type Srv6 struct { diff --git a/vendor/github.com/cilium/cilium/api/v1/models/zz_generated.deepcopy.go b/vendor/github.com/cilium/cilium/api/v1/models/zz_generated.deepcopy.go index bb5487c2e2..d93fea4d1b 100644 --- a/vendor/github.com/cilium/cilium/api/v1/models/zz_generated.deepcopy.go +++ b/vendor/github.com/cilium/cilium/api/v1/models/zz_generated.deepcopy.go @@ -60,6 +60,22 @@ func (in *BandwidthManager) DeepCopy() *BandwidthManager { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *BgpGracefulRestart) DeepCopyInto(out *BgpGracefulRestart) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BgpGracefulRestart. +func (in *BgpGracefulRestart) DeepCopy() *BgpGracefulRestart { + if in == nil { + return nil + } + out := new(BgpGracefulRestart) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *BgpPeer) DeepCopyInto(out *BgpPeer) { *out = *in @@ -92,6 +108,92 @@ func (in *BgpPeer) DeepCopy() *BgpPeer { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *BgpPeerFamilies) DeepCopyInto(out *BgpPeerFamilies) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BgpPeerFamilies. +func (in *BgpPeerFamilies) DeepCopy() *BgpPeerFamilies { + if in == nil { + return nil + } + out := new(BgpPeerFamilies) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CIDRPolicy) DeepCopyInto(out *CIDRPolicy) { + *out = *in + if in.Egress != nil { + in, out := &in.Egress, &out.Egress + *out = make([]*PolicyRule, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(PolicyRule) + (*in).DeepCopyInto(*out) + } + } + } + if in.Ingress != nil { + in, out := &in.Ingress, &out.Ingress + *out = make([]*PolicyRule, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(PolicyRule) + (*in).DeepCopyInto(*out) + } + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CIDRPolicy. +func (in *CIDRPolicy) DeepCopy() *CIDRPolicy { + if in == nil { + return nil + } + out := new(CIDRPolicy) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CNIChainingStatus) DeepCopyInto(out *CNIChainingStatus) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CNIChainingStatus. +func (in *CNIChainingStatus) DeepCopy() *CNIChainingStatus { + if in == nil { + return nil + } + out := new(CNIChainingStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ClockSource) DeepCopyInto(out *ClockSource) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClockSource. +func (in *ClockSource) DeepCopy() *ClockSource { + if in == nil { + return nil + } + out := new(ClockSource) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClusterMeshStatus) DeepCopyInto(out *ClusterMeshStatus) { *out = *in @@ -240,6 +342,52 @@ func (in *EncryptionStatus) DeepCopy() *EncryptionStatus { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *EndpointPolicy) DeepCopyInto(out *EndpointPolicy) { + *out = *in + if in.AllowedEgressIdentities != nil { + in, out := &in.AllowedEgressIdentities, &out.AllowedEgressIdentities + *out = make([]int64, len(*in)) + copy(*out, *in) + } + if in.AllowedIngressIdentities != nil { + in, out := &in.AllowedIngressIdentities, &out.AllowedIngressIdentities + *out = make([]int64, len(*in)) + copy(*out, *in) + } + if in.CidrPolicy != nil { + in, out := &in.CidrPolicy, &out.CidrPolicy + *out = new(CIDRPolicy) + (*in).DeepCopyInto(*out) + } + if in.DeniedEgressIdentities != nil { + in, out := &in.DeniedEgressIdentities, &out.DeniedEgressIdentities + *out = make([]int64, len(*in)) + copy(*out, *in) + } + if in.DeniedIngressIdentities != nil { + in, out := &in.DeniedIngressIdentities, &out.DeniedIngressIdentities + *out = make([]int64, len(*in)) + copy(*out, *in) + } + if in.L4 != nil { + in, out := &in.L4, &out.L4 + *out = new(L4Policy) + (*in).DeepCopyInto(*out) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EndpointPolicy. +func (in *EndpointPolicy) DeepCopy() *EndpointPolicy { + if in == nil { + return nil + } + out := new(EndpointPolicy) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *HostFirewall) DeepCopyInto(out *HostFirewall) { *out = *in @@ -337,6 +485,38 @@ func (in *IPAMStatus) DeepCopy() *IPAMStatus { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *IPV4BigTCP) DeepCopyInto(out *IPV4BigTCP) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IPV4BigTCP. +func (in *IPV4BigTCP) DeepCopy() *IPV4BigTCP { + if in == nil { + return nil + } + out := new(IPV4BigTCP) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *IPV6BigTCP) DeepCopyInto(out *IPV6BigTCP) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IPV6BigTCP. +func (in *IPV6BigTCP) DeepCopy() *IPV6BigTCP { + if in == nil { + return nil + } + out := new(IPV6BigTCP) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *IPsecStatus) DeepCopyInto(out *IPsecStatus) { *out = *in @@ -365,6 +545,22 @@ func (in *IPsecStatus) DeepCopy() *IPsecStatus { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *IdentityRange) DeepCopyInto(out *IdentityRange) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IdentityRange. +func (in *IdentityRange) DeepCopy() *IdentityRange { + if in == nil { + return nil + } + out := new(IdentityRange) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *K8sStatus) DeepCopyInto(out *K8sStatus) { *out = *in @@ -510,6 +706,54 @@ func (in *KubeProxyReplacementFeatures) DeepCopy() *KubeProxyReplacementFeatures return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *KubeProxyReplacementFeaturesExternalIPs) DeepCopyInto(out *KubeProxyReplacementFeaturesExternalIPs) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubeProxyReplacementFeaturesExternalIPs. +func (in *KubeProxyReplacementFeaturesExternalIPs) DeepCopy() *KubeProxyReplacementFeaturesExternalIPs { + if in == nil { + return nil + } + out := new(KubeProxyReplacementFeaturesExternalIPs) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *KubeProxyReplacementFeaturesGracefulTermination) DeepCopyInto(out *KubeProxyReplacementFeaturesGracefulTermination) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubeProxyReplacementFeaturesGracefulTermination. +func (in *KubeProxyReplacementFeaturesGracefulTermination) DeepCopy() *KubeProxyReplacementFeaturesGracefulTermination { + if in == nil { + return nil + } + out := new(KubeProxyReplacementFeaturesGracefulTermination) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *KubeProxyReplacementFeaturesHostPort) DeepCopyInto(out *KubeProxyReplacementFeaturesHostPort) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubeProxyReplacementFeaturesHostPort. +func (in *KubeProxyReplacementFeaturesHostPort) DeepCopy() *KubeProxyReplacementFeaturesHostPort { + if in == nil { + return nil + } + out := new(KubeProxyReplacementFeaturesHostPort) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *KubeProxyReplacementFeaturesHostReachableServices) DeepCopyInto(out *KubeProxyReplacementFeaturesHostReachableServices) { *out = *in @@ -578,6 +822,124 @@ func (in *KubeProxyReplacementFeaturesNat46X64Gateway) DeepCopy() *KubeProxyRepl return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *KubeProxyReplacementFeaturesNat46X64Service) DeepCopyInto(out *KubeProxyReplacementFeaturesNat46X64Service) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubeProxyReplacementFeaturesNat46X64Service. +func (in *KubeProxyReplacementFeaturesNat46X64Service) DeepCopy() *KubeProxyReplacementFeaturesNat46X64Service { + if in == nil { + return nil + } + out := new(KubeProxyReplacementFeaturesNat46X64Service) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *KubeProxyReplacementFeaturesNodePort) DeepCopyInto(out *KubeProxyReplacementFeaturesNodePort) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubeProxyReplacementFeaturesNodePort. +func (in *KubeProxyReplacementFeaturesNodePort) DeepCopy() *KubeProxyReplacementFeaturesNodePort { + if in == nil { + return nil + } + out := new(KubeProxyReplacementFeaturesNodePort) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *KubeProxyReplacementFeaturesSessionAffinity) DeepCopyInto(out *KubeProxyReplacementFeaturesSessionAffinity) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubeProxyReplacementFeaturesSessionAffinity. +func (in *KubeProxyReplacementFeaturesSessionAffinity) DeepCopy() *KubeProxyReplacementFeaturesSessionAffinity { + if in == nil { + return nil + } + out := new(KubeProxyReplacementFeaturesSessionAffinity) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *KubeProxyReplacementFeaturesSocketLB) DeepCopyInto(out *KubeProxyReplacementFeaturesSocketLB) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubeProxyReplacementFeaturesSocketLB. +func (in *KubeProxyReplacementFeaturesSocketLB) DeepCopy() *KubeProxyReplacementFeaturesSocketLB { + if in == nil { + return nil + } + out := new(KubeProxyReplacementFeaturesSocketLB) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *KubeProxyReplacementFeaturesSocketLBTracing) DeepCopyInto(out *KubeProxyReplacementFeaturesSocketLBTracing) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubeProxyReplacementFeaturesSocketLBTracing. +func (in *KubeProxyReplacementFeaturesSocketLBTracing) DeepCopy() *KubeProxyReplacementFeaturesSocketLBTracing { + if in == nil { + return nil + } + out := new(KubeProxyReplacementFeaturesSocketLBTracing) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *L4Policy) DeepCopyInto(out *L4Policy) { + *out = *in + if in.Egress != nil { + in, out := &in.Egress, &out.Egress + *out = make([]*PolicyRule, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(PolicyRule) + (*in).DeepCopyInto(*out) + } + } + } + if in.Ingress != nil { + in, out := &in.Ingress, &out.Ingress + *out = make([]*PolicyRule, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(PolicyRule) + (*in).DeepCopyInto(*out) + } + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new L4Policy. +func (in *L4Policy) DeepCopy() *L4Policy { + if in == nil { + return nil + } + out := new(L4Policy) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Masquerading) DeepCopyInto(out *Masquerading) { *out = *in @@ -693,6 +1055,54 @@ func (in *NodeElement) DeepCopy() *NodeElement { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *PolicyRule) DeepCopyInto(out *PolicyRule) { + *out = *in + if in.DerivedFromRules != nil { + in, out := &in.DerivedFromRules, &out.DerivedFromRules + *out = make([][]string, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = make([]string, len(*in)) + copy(*out, *in) + } + } + } + if in.RulesBySelector != nil { + in, out := &in.RulesBySelector, &out.RulesBySelector + *out = make(map[string][][]string, len(*in)) + for key, val := range *in { + var outVal [][]string + if val == nil { + (*out)[key] = nil + } else { + in, out := &val, &outVal + *out = make([][]string, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = make([]string, len(*in)) + copy(*out, *in) + } + } + } + (*out)[key] = outVal + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PolicyRule. +func (in *PolicyRule) DeepCopy() *PolicyRule { + if in == nil { + return nil + } + out := new(PolicyRule) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ProxyStatistics) DeepCopyInto(out *ProxyStatistics) { *out = *in @@ -836,6 +1246,38 @@ func (in *RequestResponseStatistics) DeepCopy() *RequestResponseStatistics { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Routing) DeepCopyInto(out *Routing) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Routing. +func (in *Routing) DeepCopy() *Routing { + if in == nil { + return nil + } + out := new(Routing) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Srv6) DeepCopyInto(out *Srv6) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Srv6. +func (in *Srv6) DeepCopy() *Srv6 { + if in == nil { + return nil + } + out := new(Srv6) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *StatusResponse) DeepCopyInto(out *StatusResponse) { *out = *in diff --git a/vendor/github.com/cilium/cilium/api/v1/observer/observer.pb.go b/vendor/github.com/cilium/cilium/api/v1/observer/observer.pb.go index 7654042313..d2bd54a84e 100644 --- a/vendor/github.com/cilium/cilium/api/v1/observer/observer.pb.go +++ b/vendor/github.com/cilium/cilium/api/v1/observer/observer.pb.go @@ -3,8 +3,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 -// protoc v5.29.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: observer/observer.proto package observer diff --git a/vendor/github.com/cilium/cilium/api/v1/observer/observer_grpc.pb.go b/vendor/github.com/cilium/cilium/api/v1/observer/observer_grpc.pb.go index 362fb5b170..f9e149cf81 100644 --- a/vendor/github.com/cilium/cilium/api/v1/observer/observer_grpc.pb.go +++ b/vendor/github.com/cilium/cilium/api/v1/observer/observer_grpc.pb.go @@ -4,7 +4,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.5.1 -// - protoc v5.29.2 +// - protoc v5.29.3 // source: observer/observer.proto package observer diff --git a/vendor/github.com/cilium/cilium/api/v1/relay/relay.pb.go b/vendor/github.com/cilium/cilium/api/v1/relay/relay.pb.go index cb38575371..abf656c07b 100644 --- a/vendor/github.com/cilium/cilium/api/v1/relay/relay.pb.go +++ b/vendor/github.com/cilium/cilium/api/v1/relay/relay.pb.go @@ -3,8 +3,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 -// protoc v5.29.2 +// protoc-gen-go v1.36.3 +// protoc v5.29.3 // source: relay/relay.proto package relay diff --git a/vendor/github.com/cilium/cilium/cilium-cli/cli/connectivity.go b/vendor/github.com/cilium/cilium/cilium-cli/cli/connectivity.go index 117420aa09..1c1dd8abc4 100644 --- a/vendor/github.com/cilium/cilium/cilium-cli/cli/connectivity.go +++ b/vendor/github.com/cilium/cilium/cilium-cli/cli/connectivity.go @@ -129,7 +129,6 @@ func newCmdConnectivityTest(hooks api.Hooks) *cobra.Command { cmd.Flags().BoolVarP(¶ms.Timestamp, "timestamp", "t", false, "Show timestamp in messages") cmd.Flags().BoolVarP(¶ms.PauseOnFail, "pause-on-fail", "p", false, "Pause execution on test failure") cmd.Flags().StringVar(¶ms.ExternalTarget, "external-target", "one.one.one.one.", "Domain name to use as external target in connectivity tests") - cmd.Flags().StringVar(¶ms.ExternalOtherTarget, "external-other-target", "cilium.io.", "Domain name to use as a second external target in connectivity tests") cmd.Flags().StringVar(¶ms.ExternalTargetCANamespace, "external-target-ca-namespace", "", "Namespace of the CA secret for the external target. Used by client-egress-l7-tls test cases.") cmd.Flags().StringVar(¶ms.ExternalTargetCAName, "external-target-ca-name", "cabundle", "Name of the CA secret for the external target. Used by client-egress-l7-tls test cases.") cmd.Flags().StringVar(¶ms.ExternalCIDR, "external-cidr", "1.0.0.0/8", "CIDR to use as external target in connectivity tests") diff --git a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/builder/builder.go b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/builder/builder.go index caeb75dc7c..25451c4b77 100644 --- a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/builder/builder.go +++ b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/builder/builder.go @@ -253,6 +253,8 @@ func concurrentTests(connTests []*check.ConnectivityTest) error { clientEgressL7Method{}, clientEgressL7{}, clientEgressL7NamedPort{}, + clientEgressL7TlsDenyWithoutHeaders{}, + clientEgressL7TlsHeaders{}, clientEgressTlsSni{}, clientEgressL7SetHeader{}, echoIngressAuthAlwaysFail{}, @@ -287,8 +289,6 @@ func sequentialTests(ct *check.ConnectivityTest) error { tests := []testBuilder{ hostFirewallIngress{}, hostFirewallEgress{}, - clientEgressL7TlsDenyWithoutHeaders{}, - clientEgressL7TlsHeaders{}, } return injectTests(tests, ct) } diff --git a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/builder/client_egress_l7_tls_deny_without_headers.go b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/builder/client_egress_l7_tls_deny_without_headers.go index 8e183c010a..3b58772808 100644 --- a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/builder/client_egress_l7_tls_deny_without_headers.go +++ b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/builder/client_egress_l7_tls_deny_without_headers.go @@ -14,7 +14,7 @@ type clientEgressL7TlsDenyWithoutHeaders struct{} func (t clientEgressL7TlsDenyWithoutHeaders) build(ct *check.ConnectivityTest, templates map[string]string) { // Test L7 HTTPS interception using an egress policy on the clients. // Fail to load site due to missing headers. - newTest("seq-client-egress-l7-tls-deny-without-headers", ct). + newTest("client-egress-l7-tls-deny-without-headers", ct). WithFeatureRequirements(features.RequireEnabled(features.L7Proxy)). WithFeatureRequirements(features.RequireEnabled(features.PolicySecretBackendK8s)). WithCABundleSecret(). diff --git a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/builder/client_egress_l7_tls_headers.go b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/builder/client_egress_l7_tls_headers.go index ea551b0738..9ecc334fab 100644 --- a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/builder/client_egress_l7_tls_headers.go +++ b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/builder/client_egress_l7_tls_headers.go @@ -19,10 +19,10 @@ func (t clientEgressL7TlsHeaders) build(ct *check.ConnectivityTest, templates ma } func clientEgressL7TlsHeadersTest(ct *check.ConnectivityTest, templates map[string]string, portRanges bool) { - testName := "seq-client-egress-l7-tls-headers" + testName := "client-egress-l7-tls-headers" yamlFile := templates["clientEgressL7TLSPolicyYAML"] if portRanges { - testName = "seq-client-egress-l7-tls-headers-port-range" + testName = "client-egress-l7-tls-headers-port-range" yamlFile = templates["clientEgressL7TLSPolicyPortRangeYAML"] } // Test L7 HTTPS interception using an egress policy on the clients. diff --git a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/builder/to_fqdns.go b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/builder/to_fqdns.go index 0fd37b7cbe..b45e59207a 100644 --- a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/builder/to_fqdns.go +++ b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/builder/to_fqdns.go @@ -22,12 +22,17 @@ func (t toFqdns) build(ct *check.ConnectivityTest, templates map[string]string) WithFeatureRequirements(features.RequireEnabled(features.L7Proxy)). WithScenarios( tests.PodToWorld(tests.WithRetryDestPort(80)), - tests.PodToWorld2(), // resolves to ExternalOtherTarget + tests.PodToWorld2(), // resolves cilium.io. ). WithExpectations(func(a *check.Action) (egress, ingress check.Result) { - if a.Destination().Address(features.IPFamilyAny) == ct.Params().ExternalOtherTarget { + if a.Destination().Address(features.IPFamilyAny) == "cilium.io." { if a.Destination().Path() == "/" || a.Destination().Path() == "" { - // Expect packets to other external target to be dropped. + egress = check.ResultDNSOK + egress.HTTP = check.HTTP{ + Method: "GET", + URL: "https://cilium.io", + } + // Expect packets for cilium.io / 104.198.14.52 to be dropped. return check.ResultDropCurlTimeout, check.ResultNone } // Else expect HTTP drop by proxy diff --git a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/check/check.go b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/check/check.go index 0cf0549be5..3d64362796 100644 --- a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/check/check.go +++ b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/check/check.go @@ -74,7 +74,6 @@ type Parameters struct { DeploymentAnnotations annotationsMap NamespaceAnnotations annotations ExternalTarget string - ExternalOtherTarget string ExternalCIDR string ExternalIP string ExternalDeploymentPort int diff --git a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/check/deployment.go b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/check/deployment.go index afe2e449cf..5eb0d2a95b 100644 --- a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/check/deployment.go +++ b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/check/deployment.go @@ -28,7 +28,6 @@ import ( ciliumv2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2" slimmetav1 "github.com/cilium/cilium/pkg/k8s/slim/k8s/apis/meta/v1" policyapi "github.com/cilium/cilium/pkg/policy/api" - "github.com/cilium/cilium/pkg/versioncheck" ) const ( @@ -575,11 +574,6 @@ func (ct *ConnectivityTest) deploy(ctx context.Context) error { } if enabled, _ := ct.Features.MatchRequirements(features.RequireEnabled(features.CNP)); enabled { - ipsec, _ := ct.Features.MatchRequirements(features.RequireMode(features.EncryptionPod, "ipsec")) - if ipsec && versioncheck.MustCompile(">=1.14.0 <1.16.0")(ct.CiliumVersion) { - // https://github.com/cilium/cilium/issues/36681 - continue - } for _, client := range ct.Clients() { ct.Logf("✨ [%s] Deploying %s CiliumNetworkPolicy...", client.ClusterName(), testConnDisruptCNPName) _, err = client.ApplyGeneric(ctx, newConnDisruptCNP(ct.params.TestNamespace)) diff --git a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/check/test.go b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/check/test.go index ec6d9b1782..c6a5f54961 100644 --- a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/check/test.go +++ b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/check/test.go @@ -833,16 +833,6 @@ func (t *Test) collectSysdump() { func (t *Test) ForEachIPFamily(do func(features.IPFamily)) { ipFams := []features.IPFamily{features.IPFamilyV4, features.IPFamilyV6} - // The per-endpoint routes feature is broken with IPv6 on < v1.14 when there - // are any netpols installed (https://github.com/cilium/cilium/issues/23852 - // and https://github.com/cilium/cilium/issues/23910). - if f, ok := t.Context().Feature(features.EndpointRoutes); ok && - f.Enabled && t.HasNetworkPolicies() && - versioncheck.MustCompile("<1.14.0")(t.Context().CiliumVersion) { - - ipFams = []features.IPFamily{features.IPFamilyV4} - } - for _, ipFam := range ipFams { switch ipFam { case features.IPFamilyV4: @@ -866,12 +856,3 @@ func (t *Test) CertificateCAs() map[string][]byte { func (t *Test) CiliumLocalRedirectPolicies() map[string]*ciliumv2.CiliumLocalRedirectPolicy { return t.clrps } - -func (t *Test) HasNetworkPolicies() bool { - for _, obj := range t.resources { - if isPolicy(obj) { - return true - } - } - return false -} diff --git a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/tests/errors.go b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/tests/errors.go index 0ca5f8fa99..f9a553c99b 100644 --- a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/tests/errors.go +++ b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/tests/errors.go @@ -64,21 +64,19 @@ func NoErrorsInLogs(ciliumVersion semver.Version, checkLevels []string) check.Sc failedCreategRPCClient, unableReallocateIngressIP, fqdnMaxIPPerHostname, failedGetMetricsAPI} // The list is adopted from cilium/cilium/test/helper/utils.go var errorMsgsWithExceptions = map[string][]logMatcher{ - panicMessage: nil, - deadLockHeader: nil, - RunInitFailed: nil, - emptyBPFInitArg: nil, - RemovingMapMsg: {stringMatcher("globals/cilium_policy")}, - symbolSubstitution: nil, - uninitializedRegen: nil, - unstableStat: nil, - missingIptablesWait: nil, - localIDRestoreFail: nil, - routerIPMismatch: nil, - emptyIPNodeIDAlloc: nil, - "DATA RACE": nil, - envoyErrorMessage: nil, - envoyCriticalMessage: nil, + panicMessage: nil, + deadLockHeader: nil, + RunInitFailed: nil, + emptyBPFInitArg: nil, + RemovingMapMsg: {stringMatcher("globals/cilium_policy")}, + symbolSubstitution: nil, + uninitializedRegen: nil, + unstableStat: nil, + missingIptablesWait: nil, + localIDRestoreFail: nil, + routerIPMismatch: nil, + emptyIPNodeIDAlloc: nil, + "DATA RACE": nil, } if slices.Contains(checkLevels, defaults.LogLevelError) { errorMsgsWithExceptions["level=error"] = errorLogExceptions @@ -311,10 +309,6 @@ const ( unableReallocateIngressIP stringMatcher = "unable to re-allocate ingress IPv6" // cf. https://github.com/cilium/cilium/issues/36072 fqdnMaxIPPerHostname stringMatcher = "Raise tofqdns-endpoint-max-ip-per-hostname to mitigate this" // cf. https://github.com/cilium/cilium/issues/36073 failedGetMetricsAPI stringMatcher = "retrieve the complete list of server APIs: metrics.k8s.io/v1beta1" // cf. https://github.com/cilium/cilium/issues/36085 - - // Logs messages that should not be in the cilium-envoy DS logs - envoyErrorMessage = "[error]" - envoyCriticalMessage = "[critical]" ) var ( diff --git a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/tests/service.go b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/tests/service.go index 9bc3d67b8e..74ffa2fd8f 100644 --- a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/tests/service.go +++ b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/tests/service.go @@ -12,7 +12,6 @@ import ( "github.com/cilium/cilium/cilium-cli/connectivity/check" "github.com/cilium/cilium/cilium-cli/utils/features" - "github.com/cilium/cilium/pkg/versioncheck" ) // PodToService sends an HTTP request from all client Pods @@ -228,13 +227,6 @@ func curlNodePort(ctx context.Context, s check.Scenario, t *check.Test, } } - // Skip IPv6 requests when running on <1.14.0 Cilium with CNPs - if features.GetIPFamily(addr.Address) == features.IPFamilyV6 && - versioncheck.MustCompile("<1.14.0")(t.Context().CiliumVersion) && - t.HasNetworkPolicies() { - continue - } - // Manually construct an HTTP endpoint to override the destination IP // and port of the request. ep := check.HTTPEndpoint(name, fmt.Sprintf("%s://%s:%d%s", svc.Scheme(), addr.Address, np, svc.Path())) diff --git a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/tests/world.go b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/tests/world.go index e90221f615..6c46bc81fb 100644 --- a/vendor/github.com/cilium/cilium/cilium-cli/connectivity/tests/world.go +++ b/vendor/github.com/cilium/cilium/cilium-cli/connectivity/tests/world.go @@ -70,7 +70,7 @@ func (s *podToWorld) Run(ctx context.Context, t *check.Test) { } } -// PodToWorld2 sends an HTTPS request to ExternalOtherTarget from random client +// PodToWorld2 sends an HTTPS request to cilium.io from from random client // Pods. func PodToWorld2() check.Scenario { return &podToWorld2{} @@ -84,8 +84,7 @@ func (s *podToWorld2) Name() string { } func (s *podToWorld2) Run(ctx context.Context, t *check.Test) { - extTarget := t.Context().Params().ExternalOtherTarget - https := check.HTTPEndpoint(extTarget+"-https", "https://"+extTarget) + https := check.HTTPEndpoint("cilium-io-https", "https://cilium.io.") fp := check.FlowParameters{ DNSRequired: true, @@ -97,7 +96,7 @@ func (s *podToWorld2) Run(ctx context.Context, t *check.Test) { for _, client := range ct.ClientPods() { // With https, over port 443. - t.NewAction(s, fmt.Sprintf("https-%s-%d", extTarget, i), &client, https, features.IPFamilyAny).Run(func(a *check.Action) { + t.NewAction(s, fmt.Sprintf("https-cilium-io-%d", i), &client, https, features.IPFamilyAny).Run(func(a *check.Action) { a.ExecInPod(ctx, ct.CurlCommand(https, features.IPFamilyAny)) a.ValidateFlows(ctx, client, a.GetEgressRequirements(fp)) a.ValidateMetrics(ctx, client, a.GetEgressMetricsRequirements()) diff --git a/vendor/github.com/cilium/cilium/cilium-cli/defaults/defaults.go b/vendor/github.com/cilium/cilium/cilium-cli/defaults/defaults.go index 91bd6a43ce..fbedf99a36 100644 --- a/vendor/github.com/cilium/cilium/cilium-cli/defaults/defaults.go +++ b/vendor/github.com/cilium/cilium/cilium-cli/defaults/defaults.go @@ -78,7 +78,7 @@ const ( // renovate: datasource=docker ConnectivityTestFRRImage = "quay.io/frrouting/frr:10.2.1@sha256:c8543d3e0a1348cc0f2b19154fd8b0300e237773dbec65d9d6d6570c1d088deb" // renovate: datasource=docker - ConnectivityTestSocatImage = "docker.io/alpine/socat:1.8.0.0@sha256:a6be4c0262b339c53ddad723cdd178a1a13271e1137c65e27f90a08c16de02b8" + ConnectivityTestSocatImage = "docker.io/alpine/socat:1.8.0.1@sha256:d95d6a210a87164533d444e8d7ebd586231b3387a27ee7c0732ade3d6c3b0f4d" ConfigMapName = "cilium-config" diff --git a/vendor/github.com/cilium/cilium/cilium-cli/install/aws.go b/vendor/github.com/cilium/cilium/cilium-cli/install/aws.go index 91e371d2c9..6e7893410a 100644 --- a/vendor/github.com/cilium/cilium/cilium-cli/install/aws.go +++ b/vendor/github.com/cilium/cilium/cilium-cli/install/aws.go @@ -5,8 +5,11 @@ package install import ( "context" + "errors" "fmt" + "strings" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/types" @@ -19,6 +22,37 @@ const ( AwsNodeDaemonSetNodeSelectorValue = "true" ) +const ( + AwsNodeImageFamilyAmazonLinux2 = "AmazonLinux2" + AwsNodeImageFamilyAmazonLinux2023 = "AmazonLinux2023" + AwsNodeImageFamilyBottlerocket = "Bottlerocket" + AwsNodeImageFamilyCustom = "Custom" + AwsNodeImageFamilyUbuntu = "Ubuntu" + AwsNodeImageFamilyWindows = "Windows" +) + +func (k *K8sInstaller) awsRetrieveNodeImageFamily() error { + // setting default fallback value + k.params.AWS.AwsNodeImageFamily = AwsNodeImageFamilyCustom + + nodes, err := k.client.ListNodes(context.Background(), metav1.ListOptions{}) + if err != nil { + k.Log("❌ Could not list cluster nodes, defaulted to fallback node image family value: %s", k.params.AWS.AwsNodeImageFamily) + return err + } + + ami, err := getNodeImage(nodes.Items) + if err != nil { + k.Log("❌ Could not detect AWS node image family, defaulted to fallback value: %s", k.params.AWS.AwsNodeImageFamily) + return err + } + + k.params.AWS.AwsNodeImageFamily = ami + k.Log("✅ Detected AWS node image family: %s", k.params.AWS.AwsNodeImageFamily) + + return nil +} + func getChainingMode(values map[string]interface{}) string { chainingMode, _, _ := unstructured.NestedString(values, "cni", "chainingMode") return chainingMode @@ -42,3 +76,39 @@ func (k *K8sInstaller) awsSetupChainingMode(ctx context.Context, values map[stri return nil } + +func getNodeImage(nodes []corev1.Node) (string, error) { + if len(nodes) == 0 { + return "", errors.New("unable to detect node OS, cluster has no nodes") + } + + amiFn := func(ami string) string { + ami = strings.ToUpper(ami) + switch { + case strings.Contains(ami, "AMAZON LINUX 2023"): + return AwsNodeImageFamilyAmazonLinux2023 + case strings.Contains(ami, "AMAZON LINUX 2"): + return AwsNodeImageFamilyAmazonLinux2 + case strings.Contains(ami, "BOTTLEROCKET"): + return AwsNodeImageFamilyBottlerocket + case strings.Contains(ami, "UBUNTU"): + return AwsNodeImageFamilyUbuntu + case strings.Contains(ami, "WINDOWS"): + return AwsNodeImageFamilyWindows + default: + return AwsNodeImageFamilyCustom + } + } + + ami := amiFn(nodes[0].Status.NodeInfo.OSImage) + // verify that all cluster nodes use the same OS image + // because currently mixed nodes setup is not supported + for i := 1; i < len(nodes); i++ { + nodeAmi := amiFn(nodes[i].Status.NodeInfo.OSImage) + if ami != nodeAmi { + return "", fmt.Errorf("cluster has nodes with different OS images: '%s' and '%s'", ami, nodeAmi) + } + } + + return ami, nil +} diff --git a/vendor/github.com/cilium/cilium/cilium-cli/install/helm.go b/vendor/github.com/cilium/cilium/cilium-cli/install/helm.go index 997365f06d..26fdcd0114 100644 --- a/vendor/github.com/cilium/cilium/cilium-cli/install/helm.go +++ b/vendor/github.com/cilium/cilium/cilium-cli/install/helm.go @@ -64,13 +64,9 @@ func (k *K8sInstaller) getHelmValues() (map[string]interface{}, error) { // Can be removed once we drop support for <1.14.0 helmMapOpts["tunnel"] = tunnelDisabled } - if versioncheck.MustCompile(">=1.17.0")(k.chartVersion) { - // AL2023 uses ens interfaces, but we default to eth interfaces for everything else for backwards compatibility, - // since the CLI was assuming eth interfaces before support for AL2023 was introduced - helmMapOpts["egressMasqueradeInterfaces"] = "eth+ ens+" - } else { - helmMapOpts["egressMasqueradeInterfaces"] = "eth+" - } + // AL2023 uses ens interfaces, but we default to eth interfaces for everything else for backwards compatibility, + // since the CLI was assuming eth interfaces before support for AL2023 was introduced + helmMapOpts["egressMasqueradeInterfaces"] = "eth+ ens+" case DatapathGKE: helmMapOpts["ipam.mode"] = ipamKubernetes diff --git a/vendor/github.com/cilium/cilium/cilium-cli/install/install.go b/vendor/github.com/cilium/cilium/cilium-cli/install/install.go index 9f8a750175..a9a832dba3 100644 --- a/vendor/github.com/cilium/cilium/cilium-cli/install/install.go +++ b/vendor/github.com/cilium/cilium/cilium-cli/install/install.go @@ -92,6 +92,10 @@ type AzureParameters struct { IsBYOCNI bool } +type AWSParameters struct { + AwsNodeImageFamily string +} + type Parameters struct { Namespace string Writer io.Writer @@ -102,6 +106,7 @@ type Parameters struct { DatapathMode string IPv4NativeRoutingCIDR string Azure AzureParameters + AWS AWSParameters // HelmChartDirectory points to the location of a helm chart directory. // Useful to test from upstream where a helm release is not available yet. @@ -224,6 +229,11 @@ func (k *K8sInstaller) preinstall(ctx context.Context) error { } } case k8s.KindEKS: + // detect AWS AMI type + if err := k.awsRetrieveNodeImageFamily(); err != nil { + return err + } + // setup chaining mode if err := k.awsSetupChainingMode(ctx, helmValues); err != nil { return err diff --git a/vendor/github.com/cilium/cilium/pkg/bgpv1/agent/controller.go b/vendor/github.com/cilium/cilium/pkg/bgpv1/agent/controller.go index dfa9c9102d..3754e88aed 100644 --- a/vendor/github.com/cilium/cilium/pkg/bgpv1/agent/controller.go +++ b/vendor/github.com/cilium/cilium/pkg/bgpv1/agent/controller.go @@ -270,9 +270,6 @@ func (c *Controller) Reconcile(ctx context.Context) error { log.WithError(err).Error("failed to get BGPNodeConfig") return err } - if bgpncExists { - bgpnc = bgpnc.DeepCopy() // reconcilers can mutate the NodeConfig, make a copy to not mutate the version in store - } switch c.ConfigMode.Get() { case mode.Disabled: diff --git a/vendor/github.com/cilium/cilium/pkg/bgpv1/types/bgp.go b/vendor/github.com/cilium/cilium/pkg/bgpv1/types/bgp.go index 1541ccd930..42aa85b311 100644 --- a/vendor/github.com/cilium/cilium/pkg/bgpv1/types/bgp.go +++ b/vendor/github.com/cilium/cilium/pkg/bgpv1/types/bgp.go @@ -6,7 +6,6 @@ package types import ( "context" "net/netip" - "strings" "github.com/osrg/gobgp/v3/pkg/packet/bgp" @@ -127,19 +126,6 @@ type RoutePolicyConditions struct { MatchFamilies []Family } -// String() constructs a string identifier -func (r RoutePolicyConditions) String() string { - values := []string{} - values = append(values, r.MatchNeighbors...) - for _, family := range r.MatchFamilies { - values = append(values, family.String()) - } - for _, prefix := range r.MatchPrefixes { - values = append(values, prefix.CIDR.String()) - } - return strings.Join(values, "-") -} - // RoutePolicyAction defines the action taken on a route matched by a routing policy. type RoutePolicyAction int diff --git a/vendor/github.com/cilium/cilium/pkg/bgpv1/types/fake_router.go b/vendor/github.com/cilium/cilium/pkg/bgpv1/types/fake_router.go index 3c67c35606..f1bf0dc4ef 100644 --- a/vendor/github.com/cilium/cilium/pkg/bgpv1/types/fake_router.go +++ b/vendor/github.com/cilium/cilium/pkg/bgpv1/types/fake_router.go @@ -6,14 +6,12 @@ package types import "context" type FakeRouter struct { - paths map[string]*Path - policies map[string]*RoutePolicy + paths map[string]*Path } func NewFakeRouter() Router { return &FakeRouter{ - paths: make(map[string]*Path), - policies: make(map[string]*RoutePolicy), + paths: make(map[string]*Path), } } @@ -48,12 +46,10 @@ func (f *FakeRouter) WithdrawPath(ctx context.Context, p PathRequest) error { } func (f *FakeRouter) AddRoutePolicy(ctx context.Context, p RoutePolicyRequest) error { - f.policies[p.Policy.Name] = p.Policy return nil } func (f *FakeRouter) RemoveRoutePolicy(ctx context.Context, p RoutePolicyRequest) error { - delete(f.policies, p.Policy.Name) return nil } @@ -73,11 +69,7 @@ func (f *FakeRouter) GetRoutes(ctx context.Context, r *GetRoutesRequest) (*GetRo } func (f *FakeRouter) GetRoutePolicies(ctx context.Context) (*GetRoutePoliciesResponse, error) { - var policies []*RoutePolicy - for _, policy := range f.policies { - policies = append(policies, policy) - } - return &GetRoutePoliciesResponse{Policies: policies}, nil + return nil, nil } func (f *FakeRouter) GetBGP(ctx context.Context) (GetBGPResponse, error) { diff --git a/vendor/github.com/cilium/cilium/pkg/clustermesh/types/option.go b/vendor/github.com/cilium/cilium/pkg/clustermesh/types/option.go index b00ee5c92e..fe746e82b8 100644 --- a/vendor/github.com/cilium/cilium/pkg/clustermesh/types/option.go +++ b/vendor/github.com/cilium/cilium/pkg/clustermesh/types/option.go @@ -112,3 +112,26 @@ func (c ClusterInfo) ValidateRemoteConfig(config CiliumClusterConfig) error { return nil } + +// QuirksConfig allows the user to configure how Cilium behaves when a set +// of incompatible options are configured together into the agent. +type QuirksConfig struct { + // AllowUnsafePolicySKBUsage determines whether to hard-fail startup + // due to detection of a configuration combination that may trigger + // connection impact in the dataplane due to clustermesh IDs + // conflicting with other usage of skb->mark field. See GH-21330. + AllowUnsafePolicySKBUsage bool +} + +var DefaultQuirks = QuirksConfig{ + AllowUnsafePolicySKBUsage: false, +} + +func (_ QuirksConfig) Flags(flags *pflag.FlagSet) { + flags.Bool("allow-unsafe-policy-skb-usage", false, + "Allow the daemon to continue to operate even if conflicting "+ + "clustermesh ID configuration is detected which may "+ + "impact the ability for Cilium to enforce network "+ + "policy both within and across clusters") + flags.MarkHidden("allow-unsafe-policy-skb-usage") +} diff --git a/vendor/github.com/cilium/cilium/pkg/container/bitlpm/cidr.go b/vendor/github.com/cilium/cilium/pkg/container/bitlpm/cidr.go index ee14422af0..b904fb8136 100644 --- a/vendor/github.com/cilium/cilium/pkg/container/bitlpm/cidr.go +++ b/vendor/github.com/cilium/cilium/pkg/container/bitlpm/cidr.go @@ -12,15 +12,15 @@ import ( // CIDRTrie can hold both IPv4 and IPv6 prefixes // at the same time. type CIDRTrie[T any] struct { - v4 Trie[Key[netip.Prefix], T] - v6 Trie[Key[netip.Prefix], T] + v4 Trie[cidrKey, T] + v6 Trie[cidrKey, T] } // NewCIDRTrie creates a new CIDRTrie[T any]. func NewCIDRTrie[T any]() *CIDRTrie[T] { return &CIDRTrie[T]{ - v4: NewTrie[netip.Prefix, T](32), - v6: NewTrie[netip.Prefix, T](128), + v4: NewTrie[cidrKey, T](32), + v6: NewTrie[cidrKey, T](128), } } @@ -41,7 +41,7 @@ func (c *CIDRTrie[T]) LongestPrefixMatch(addr netip.Addr) (netip.Prefix, T, bool prefix := netip.PrefixFrom(addr, bits) k, v, ok := c.treeForFamily(prefix).LongestPrefixMatch(cidrKey(prefix)) if ok { - return k.Value(), v, ok + return netip.Prefix(k), v, ok } var p netip.Prefix return p, v, ok @@ -49,46 +49,46 @@ func (c *CIDRTrie[T]) LongestPrefixMatch(addr netip.Addr) (netip.Prefix, T, bool // Ancestors iterates over every CIDR pair that contains the CIDR argument. func (c *CIDRTrie[T]) Ancestors(cidr netip.Prefix, fn func(k netip.Prefix, v T) bool) { - c.treeForFamily(cidr).Ancestors(uint(cidr.Bits()), cidrKey(cidr), func(prefix uint, k Key[netip.Prefix], v T) bool { - return fn(k.Value(), v) + c.treeForFamily(cidr).Ancestors(uint(cidr.Bits()), cidrKey(cidr), func(prefix uint, k cidrKey, v T) bool { + return fn(netip.Prefix(k), v) }) } -func (c *CIDRTrie[T]) AncestorIterator(cidr netip.Prefix) Iterator[Key[netip.Prefix], T] { +func (c *CIDRTrie[T]) AncestorIterator(cidr netip.Prefix) ancestorIterator[cidrKey, T] { return c.treeForFamily(cidr).AncestorIterator(uint(cidr.Bits()), cidrKey(cidr)) } // AncestorsLongestPrefixFirst iterates over every CIDR pair that contains the CIDR argument, // longest matching prefix first, then iterating towards the root of the trie. func (c *CIDRTrie[T]) AncestorsLongestPrefixFirst(cidr netip.Prefix, fn func(k netip.Prefix, v T) bool) { - c.treeForFamily(cidr).AncestorsLongestPrefixFirst(uint(cidr.Bits()), cidrKey(cidr), func(prefix uint, k Key[netip.Prefix], v T) bool { - return fn(k.Value(), v) + c.treeForFamily(cidr).AncestorsLongestPrefixFirst(uint(cidr.Bits()), cidrKey(cidr), func(prefix uint, k cidrKey, v T) bool { + return fn(netip.Prefix(k), v) }) } -func (c *CIDRTrie[T]) AncestorLongestPrefixFirstIterator(cidr netip.Prefix) Iterator[Key[netip.Prefix], T] { +func (c *CIDRTrie[T]) AncestorLongestPrefixFirstIterator(cidr netip.Prefix) ancestorLPFIterator[cidrKey, T] { return c.treeForFamily(cidr).AncestorLongestPrefixFirstIterator(uint(cidr.Bits()), cidrKey(cidr)) } // Descendants iterates over every CIDR that is contained by the CIDR argument. func (c *CIDRTrie[T]) Descendants(cidr netip.Prefix, fn func(k netip.Prefix, v T) bool) { - c.treeForFamily(cidr).Descendants(uint(cidr.Bits()), cidrKey(cidr), func(prefix uint, k Key[netip.Prefix], v T) bool { - return fn(k.Value(), v) + c.treeForFamily(cidr).Descendants(uint(cidr.Bits()), cidrKey(cidr), func(prefix uint, k cidrKey, v T) bool { + return fn(netip.Prefix(k), v) }) } -func (c *CIDRTrie[T]) DescendantIterator(cidr netip.Prefix) Iterator[Key[netip.Prefix], T] { +func (c *CIDRTrie[T]) DescendantIterator(cidr netip.Prefix) descendantIterator[cidrKey, T] { return c.treeForFamily(cidr).DescendantIterator(uint(cidr.Bits()), cidrKey(cidr)) } // DescendantsShortestPrefixFirst iterates over every CIDR that is contained by the CIDR argument. func (c *CIDRTrie[T]) DescendantsShortestPrefixFirst(cidr netip.Prefix, fn func(k netip.Prefix, v T) bool) { - c.treeForFamily(cidr).DescendantsShortestPrefixFirst(uint(cidr.Bits()), cidrKey(cidr), func(prefix uint, k Key[netip.Prefix], v T) bool { - return fn(k.Value(), v) + c.treeForFamily(cidr).DescendantsShortestPrefixFirst(uint(cidr.Bits()), cidrKey(cidr), func(prefix uint, k cidrKey, v T) bool { + return fn(netip.Prefix(k), v) }) } -func (c *CIDRTrie[T]) DescendantShortestPrefixFirstIterator(cidr netip.Prefix) Iterator[Key[netip.Prefix], T] { +func (c *CIDRTrie[T]) DescendantShortestPrefixFirstIterator(cidr netip.Prefix) descendantSPFIterator[cidrKey, T] { return c.treeForFamily(cidr).DescendantShortestPrefixFirstIterator(uint(cidr.Bits()), cidrKey(cidr)) } @@ -111,22 +111,22 @@ func (c *CIDRTrie[T]) Len() uint { // keys first. func (c *CIDRTrie[T]) ForEach(fn func(k netip.Prefix, v T) bool) { var v4Break bool - c.v4.ForEach(func(prefix uint, k Key[netip.Prefix], v T) bool { - if !fn(k.Value(), v) { + c.v4.ForEach(func(prefix uint, k cidrKey, v T) bool { + if !fn(netip.Prefix(k), v) { v4Break = true return false } return true }) if !v4Break { - c.v6.ForEach(func(prefix uint, k Key[netip.Prefix], v T) bool { - return fn(k.Value(), v) + c.v6.ForEach(func(prefix uint, k cidrKey, v T) bool { + return fn(netip.Prefix(k), v) }) } } -func (c *CIDRTrie[T]) treeForFamily(cidr netip.Prefix) Trie[Key[netip.Prefix], T] { +func (c *CIDRTrie[T]) treeForFamily(cidr netip.Prefix) Trie[cidrKey, T] { if cidr.Addr().Is6() { return c.v6 } @@ -135,10 +135,6 @@ func (c *CIDRTrie[T]) treeForFamily(cidr netip.Prefix) Trie[Key[netip.Prefix], T type cidrKey netip.Prefix -func (k cidrKey) Value() netip.Prefix { - return netip.Prefix(k) -} - func (k cidrKey) BitValueAt(idx uint) uint8 { addr := netip.Prefix(k).Addr() if addr.Is4() { @@ -154,9 +150,9 @@ func (k cidrKey) BitValueAt(idx uint) uint8 { } } -func (k cidrKey) CommonPrefix(k2 netip.Prefix) uint { +func (k cidrKey) CommonPrefix(k2 cidrKey) uint { addr1 := netip.Prefix(k).Addr() - addr2 := k2.Addr() + addr2 := netip.Prefix(k2).Addr() words1 := (*[2]uint64)(unsafe.Pointer(&addr1)) words2 := (*[2]uint64)(unsafe.Pointer(&addr2)) if addr1.Is4() { diff --git a/vendor/github.com/cilium/cilium/pkg/container/bitlpm/trie.go b/vendor/github.com/cilium/cilium/pkg/container/bitlpm/trie.go index d64c7f0e3b..eb46d8db44 100644 --- a/vendor/github.com/cilium/cilium/pkg/container/bitlpm/trie.go +++ b/vendor/github.com/cilium/cilium/pkg/container/bitlpm/trie.go @@ -16,6 +16,9 @@ import ( // minimum number of bits (from MSB to LSB) that another comparable key // must match. // +// 'K' must implement the Key[K] interface, and should be passed by value for optimum +// performance. If 'K' is a pointer type, its Key[K] methods must accept nil receivers. +// // Each method's comments describes the mechanism of how the method // works. // @@ -25,7 +28,7 @@ import ( // [most significant bit]: https://en.wikipedia.org/wiki/Bit_numbering#Most_significant_bit // [least significant bit]: https://en.wikipedia.org/wiki/Bit_numbering#Least_significant_bit // [longest prefix match algorithm]: https://en.wikipedia.org/wiki/Longest_prefix_match -type Trie[K, T any] interface { +type Trie[K Key[K], T any] interface { // ExactLookup returns a value only if the prefix and key // match an entry in the Trie exactly. // @@ -46,7 +49,7 @@ type Trie[K, T any] interface { Ancestors(prefix uint, key K, fn func(uint, K, T) bool) // AncestorIterator returns an iterator for ancestors that // can be used to produce the 'Next' key/value pair in sequence. - AncestorIterator(prefix uint, key K) Iterator[K, T] + AncestorIterator(prefix uint, key K) ancestorIterator[K, T] // AncestorsLongestPrefixFirst iterates over every prefix-key pair that // contains the prefix-key argument pair. If the function argument // returns false the iteration will stop. AncestorsLongestPrefixFirst @@ -56,7 +59,7 @@ type Trie[K, T any] interface { // AncestorLongestPrefixFirstIterator returns an iterator for ancestors // that can be used to produce the 'Next' key/value pair in sequence, // starting from the key with the longest common prefix with 'key'. - AncestorLongestPrefixFirstIterator(prefix uint, key K) Iterator[K, T] + AncestorLongestPrefixFirstIterator(prefix uint, key K) ancestorLPFIterator[K, T] // Descendants iterates over every prefix-key pair that is contained // by the prefix-key argument pair. If the function argument // returns false the iteration will stop. Descendants does **not** iterate @@ -67,7 +70,7 @@ type Trie[K, T any] interface { Descendants(prefix uint, key K, fn func(uint, K, T) bool) // DescendantIterator returns an iterator for descendants // that can be used to produce the 'Next' key/value pair in sequence. - DescendantIterator(prefix uint, key K) Iterator[K, T] + DescendantIterator(prefix uint, key K) descendantIterator[K, T] // DescendantsShortestPrefixFirst iterates over every prefix-key pair that is contained by // the prefix-key argument pair. If the function argument returns false the iteration will // stop. DescendantsShortestPrefixFirst iterates keys starting from shortest prefix, and @@ -77,7 +80,7 @@ type Trie[K, T any] interface { // DescendantShortestPrefixFirstIterator returns an iterator for descendants // that can be used to produce the 'Next' key/value pair in sequence, // starting from the key with the shortest common prefix with 'key'. - DescendantShortestPrefixFirstIterator(prefix uint, key K) Iterator[K, T] + DescendantShortestPrefixFirstIterator(prefix uint, key K) descendantSPFIterator[K, T] // Upsert updates or inserts the trie with a a prefix, key, // and value. The method returns true if the key is new, and // false if the key already existed. @@ -98,16 +101,6 @@ type Trie[K, T any] interface { ForEach(fn func(uint, K, T) bool) } -// Iterator is an interface that can be used to produce the next key/value pair in iteration -// sequence. 'ok' is 'false' when the sequence ends; 'key' and 'value' are returned with empty -// values in that case. -// Iteration state is held in the implementation explicitly, rather than in Go stack/closures. -// Policy mapstate generation benchmark BenchmarkRegenerateCIDRDenyPolicyRules reports 25% less allocations -// with Iterator, even in combination with Go 1.23 Iterators on the caller side. -type Iterator[K, T any] interface { - Next() (ok bool, key K, value T) -} - // Key is an interface that implements all the necessary // methods to index and retrieve keys. type Key[K any] interface { @@ -118,13 +111,11 @@ type Key[K any] interface { // BitValueAt returns the value of the bit at an argument // index. MSB is 0 and LSB is n-1. BitValueAt(uint) uint8 - // Value returns the underlying value of the Key. - Value() K } // trie is the generic implementation of a bit-trie that can -// accept arbitrary keys conforming to the Key[K] interface. -type trie[K, T any] struct { +// accept arbitrary keys conforming to the Key interface. +type trie[K Key[K], T any] struct { root *node[K, T] maxPrefix uint entries uint @@ -133,17 +124,17 @@ type trie[K, T any] struct { // NewTrie returns a Trie that accepts the Key[K any] interface // as its key argument. This enables the user of this Trie to // define their own bit-key. -func NewTrie[K, T any](maxPrefix uint) Trie[Key[K], T] { +func NewTrie[K Key[K], T any](maxPrefix uint) Trie[K, T] { return &trie[K, T]{ maxPrefix: maxPrefix, } } // node represents a specific key and prefix in the trie -type node[K, T any] struct { +type node[K Key[K], T any] struct { children [2]*node[K, T] prefixLen uint - key Key[K] + key K intermediate bool value T } @@ -153,7 +144,7 @@ type node[K, T any] struct { // // Note: If the prefix argument exceeds the Trie's maximum // prefix, it will be set to the Trie's maximum prefix. -func (t *trie[K, T]) ExactLookup(prefixLen uint, k Key[K]) (ret T, found bool) { +func (t *trie[K, T]) ExactLookup(prefixLen uint, k K) (ret T, found bool) { prefixLen = min(prefixLen, t.maxPrefix) t.traverse(prefixLen, k, func(currentNode *node[K, T]) bool { // Only copy node value if exact prefix length is found @@ -169,7 +160,7 @@ func (t *trie[K, T]) ExactLookup(prefixLen uint, k Key[K]) (ret T, found bool) { // LongestPrefixMatch returns the value for the key with the // longest prefix match of the argument key. -func (t *trie[K, T]) LongestPrefixMatch(k Key[K]) (key Key[K], value T, ok bool) { +func (t *trie[K, T]) LongestPrefixMatch(k K) (key K, value T, ok bool) { var lpmNode *node[K, T] t.traverse(t.maxPrefix, k, func(currentNode *node[K, T]) bool { lpmNode = currentNode @@ -188,7 +179,7 @@ func (t *trie[K, T]) LongestPrefixMatch(k Key[K]) (key Key[K], value T, ok bool) // Note: Ancestors sets any prefixLen argument that exceeds the maximum // prefix allowed by the trie to the maximum prefix allowed by the // trie. -func (t *trie[K, T]) Ancestors(prefixLen uint, k Key[K], fn func(prefix uint, key Key[K], value T) bool) { +func (t *trie[K, T]) Ancestors(prefixLen uint, k K, fn func(prefix uint, key K, value T) bool) { prefixLen = min(prefixLen, t.maxPrefix) t.traverse(prefixLen, k, func(currentNode *node[K, T]) bool { return fn(currentNode.prefixLen, currentNode.key, currentNode.value) @@ -196,29 +187,26 @@ func (t *trie[K, T]) Ancestors(prefixLen uint, k Key[K], fn func(prefix uint, ke } // ancestorIterator implements Iteraror for ancestor iteration -type ancestorIterator[K, T any] struct { - key Key[K] +type ancestorIterator[K Key[K], T any] struct { + key K prefixLen uint maxPrefix uint currentNode *node[K, T] } // AncestorIterator returns an iterator for ancestors. -func (t *trie[K, T]) AncestorIterator(prefixLen uint, k Key[K]) Iterator[Key[K], T] { - if k != nil { - return &ancestorIterator[K, T]{ - prefixLen: min(prefixLen, t.maxPrefix), - key: k, - maxPrefix: t.maxPrefix, - currentNode: t.root, - } +func (t *trie[K, T]) AncestorIterator(prefixLen uint, k K) ancestorIterator[K, T] { + return ancestorIterator[K, T]{ + prefixLen: min(prefixLen, t.maxPrefix), + key: k, + maxPrefix: t.maxPrefix, + currentNode: t.root, } - return &ancestorIterator[K, T]{} } // Next produces the 'Next' key/value pair in the iteration sequence maintained by 'iter'. 'ok' is // 'false' when the sequence ends; 'key' and 'value' are returned with empty values in that case. -func (i *ancestorIterator[K, T]) Next() (ok bool, key Key[K], value T) { +func (i *ancestorIterator[K, T]) Next() (ok bool, key K, value T) { for i.currentNode != nil { k := i.key prefixLen := i.prefixLen @@ -246,30 +234,28 @@ func (i *ancestorIterator[K, T]) Next() (ok bool, key Key[K], value T) { // ancestorLPFIterator implements Iteraror for ancestor iteration for longest-prefix-first iteration // order. -type ancestorLPFIterator[K, T any] struct { +type ancestorLPFIterator[K Key[K], T any] struct { stack nodes[K, T] } // AncestorLongestPrefixFirstIterator returns an iterator for ancestors // that can be used to produce the 'Next' key/value pair in sequence, // starting from the key with the longest common prefix with 'key'. -func (t *trie[K, T]) AncestorLongestPrefixFirstIterator(prefixLen uint, k Key[K]) Iterator[Key[K], T] { - iter := &ancestorLPFIterator[K, T]{} - if k != nil { - for currentNode := t.root; currentNode != nil; currentNode = currentNode.children[k.BitValueAt(currentNode.prefixLen)] { - matchLen := currentNode.prefixMatch(prefixLen, k) - // The current-node does not match. - if matchLen < currentNode.prefixLen { - break - } - // Skip over intermediate nodes - if currentNode.intermediate { - continue - } - iter.stack.push(currentNode) - if matchLen == t.maxPrefix { - break - } +func (t *trie[K, T]) AncestorLongestPrefixFirstIterator(prefixLen uint, k K) ancestorLPFIterator[K, T] { + iter := ancestorLPFIterator[K, T]{} + for currentNode := t.root; currentNode != nil; currentNode = currentNode.children[k.BitValueAt(currentNode.prefixLen)] { + matchLen := currentNode.prefixMatch(prefixLen, k) + // The current-node does not match. + if matchLen < currentNode.prefixLen { + break + } + // Skip over intermediate nodes + if currentNode.intermediate { + continue + } + iter.stack.push(currentNode) + if matchLen == t.maxPrefix { + break } } return iter @@ -277,7 +263,7 @@ func (t *trie[K, T]) AncestorLongestPrefixFirstIterator(prefixLen uint, k Key[K] // Next produces the 'Next' key/value pair in the iteration sequence maintained by 'iter'. 'ok' is // 'false' when the sequence ends; 'key' and 'value' are returned with empty values in that case. -func (i *ancestorLPFIterator[K, T]) Next() (ok bool, key Key[K], value T) { +func (i *ancestorLPFIterator[K, T]) Next() (ok bool, key K, value T) { if len(i.stack) > 0 { n := i.stack.pop() return true, n.key, n.value @@ -286,38 +272,36 @@ func (i *ancestorLPFIterator[K, T]) Next() (ok bool, key Key[K], value T) { } // descendantIterator implements Iteraror for descendants iteration -type descendantIterator[K, T any] struct { +type descendantIterator[K Key[K], T any] struct { nodes nodes[K, T] } // DescendantIterator returns an iterator for descendants // that can be used to produce the 'Next' key/value pair in sequence. -func (t *trie[K, T]) DescendantIterator(prefixLen uint, k Key[K]) Iterator[Key[K], T] { - iter := &descendantIterator[K, T]{} - if k != nil { - prefixLen = min(prefixLen, t.maxPrefix) - currentNode := t.root - for currentNode != nil { - matchLen := currentNode.prefixMatch(prefixLen, k) - // CurrentNode matches the prefix-key argument - if matchLen >= prefixLen { - iter.nodes.push(currentNode) - break - } - // currentNode is a leaf and has no children. Calling k.BitValueAt may - // overrun the key storage. - if currentNode.prefixLen >= t.maxPrefix { - break - } - currentNode = currentNode.children[k.BitValueAt(currentNode.prefixLen)] +func (t *trie[K, T]) DescendantIterator(prefixLen uint, k K) descendantIterator[K, T] { + iter := descendantIterator[K, T]{} + prefixLen = min(prefixLen, t.maxPrefix) + currentNode := t.root + for currentNode != nil { + matchLen := currentNode.prefixMatch(prefixLen, k) + // CurrentNode matches the prefix-key argument + if matchLen >= prefixLen { + iter.nodes.push(currentNode) + break + } + // currentNode is a leaf and has no children. Calling k.BitValueAt may + // overrun the key storage. + if currentNode.prefixLen >= t.maxPrefix { + break } + currentNode = currentNode.children[k.BitValueAt(currentNode.prefixLen)] } return iter } // Next produces the 'Next' key/value pair in the iteration sequence maintained by 'iter'. 'ok' is // 'false' when the sequence ends; 'key' and 'value' are returned with empty values in that case. -func (i *descendantIterator[K, T]) Next() (ok bool, key Key[K], value T) { +func (i *descendantIterator[K, T]) Next() (ok bool, key K, value T) { for len(i.nodes) > 0 { // pop the latest node n := i.nodes.pop() @@ -339,7 +323,7 @@ func (i *descendantIterator[K, T]) Next() (ok bool, key Key[K], value T) { // descendantSPFIterator implements Iteraror for descendants iteration for shortest-prefix-first // iteration order. -type descendantSPFIterator[K, T any] struct { +type descendantSPFIterator[K Key[K], T any] struct { heap nodes[K, T] } @@ -348,32 +332,30 @@ type descendantSPFIterator[K, T any] struct { // stop. DescendantsShortestPrefixFirst iterates keys starting from shortest prefix, and // progressing towards keys with longer prefixes. Keys with equal prefix lengths are not // iterated in any particular order. -func (t *trie[K, T]) DescendantShortestPrefixFirstIterator(prefixLen uint, k Key[K]) Iterator[Key[K], T] { - iter := &descendantSPFIterator[K, T]{} - if k != nil { - prefixLen = min(prefixLen, t.maxPrefix) - currentNode := t.root - for currentNode != nil { - matchLen := currentNode.prefixMatch(prefixLen, k) - // CurrentNode matches the prefix-key argument - if matchLen >= prefixLen { - iter.heap.push(currentNode) - break - } - // currentNode is a leaf and has no children. Calling k.BitValueAt may - // overrun the key storage. - if currentNode.prefixLen >= t.maxPrefix { - break - } - currentNode = currentNode.children[k.BitValueAt(currentNode.prefixLen)] +func (t *trie[K, T]) DescendantShortestPrefixFirstIterator(prefixLen uint, k K) descendantSPFIterator[K, T] { + iter := descendantSPFIterator[K, T]{} + prefixLen = min(prefixLen, t.maxPrefix) + currentNode := t.root + for currentNode != nil { + matchLen := currentNode.prefixMatch(prefixLen, k) + // CurrentNode matches the prefix-key argument + if matchLen >= prefixLen { + iter.heap.push(currentNode) + break } + // currentNode is a leaf and has no children. Calling k.BitValueAt may + // overrun the key storage. + if currentNode.prefixLen >= t.maxPrefix { + break + } + currentNode = currentNode.children[k.BitValueAt(currentNode.prefixLen)] } return iter } // Next produces the 'Next' key/value pair in the iteration sequence maintained by 'iter'. 'ok' is // 'false' when the sequence ends; 'key' and 'value' are returned with empty values in that case. -func (i *descendantSPFIterator[K, T]) Next() (ok bool, key Key[K], value T) { +func (i *descendantSPFIterator[K, T]) Next() (ok bool, key K, value T) { for i.heap.Len() > 0 { // pop the node with the lowest prefix length from the heap n := i.heap.popHeap() @@ -393,7 +375,7 @@ func (i *descendantSPFIterator[K, T]) Next() (ok bool, key Key[K], value T) { return false, key, value } -func (t *trie[K, T]) AncestorsLongestPrefixFirst(prefixLen uint, k Key[K], fn func(prefix uint, key Key[K], value T) bool) { +func (t *trie[K, T]) AncestorsLongestPrefixFirst(prefixLen uint, k K, fn func(prefix uint, key K, value T) bool) { prefixLen = min(prefixLen, t.maxPrefix) t.treverse(prefixLen, k, func(currentNode *node[K, T]) bool { return fn(currentNode.prefixLen, currentNode.key, currentNode.value) @@ -408,10 +390,7 @@ func (t *trie[K, T]) AncestorsLongestPrefixFirst(prefixLen uint, k Key[K], fn fu // Note: Descendants sets any prefixLen argument that exceeds the maximum // prefix allowed by the trie to the maximum prefix allowed by the // trie. -func (t *trie[K, T]) Descendants(prefixLen uint, k Key[K], fn func(prefix uint, key Key[K], value T) bool) { - if k == nil { - return - } +func (t *trie[K, T]) Descendants(prefixLen uint, k K, fn func(prefix uint, key K, value T) bool) { prefixLen = min(prefixLen, t.maxPrefix) currentNode := t.root for currentNode != nil { @@ -439,10 +418,7 @@ func (t *trie[K, T]) Descendants(prefixLen uint, k Key[K], fn func(prefix uint, // Note: Descendants sets any prefixLen argument that exceeds the maximum // prefix allowed by the trie to the maximum prefix allowed by the // trie. -func (t *trie[K, T]) DescendantsShortestPrefixFirst(prefixLen uint, k Key[K], fn func(prefix uint, key Key[K], value T) bool) { - if k == nil { - return - } +func (t *trie[K, T]) DescendantsShortestPrefixFirst(prefixLen uint, k K, fn func(prefix uint, key K, value T) bool) { prefixLen = min(prefixLen, t.maxPrefix) currentNode := t.root for currentNode != nil { @@ -483,10 +459,7 @@ func (t *trie[K, T]) DescendantsShortestPrefixFirst(prefixLen uint, k Key[K], fn // determine which children of the current node to traverse (to // check if there is a more specific match). If there is no child then // traversal ends. Otherwise traversal continues. -func (t *trie[K, T]) traverse(prefixLen uint, k Key[K], fn func(currentNode *node[K, T]) bool) { - if k == nil { - return - } +func (t *trie[K, T]) traverse(prefixLen uint, k K, fn func(currentNode *node[K, T]) bool) { for currentNode := t.root; currentNode != nil; currentNode = currentNode.children[k.BitValueAt(currentNode.prefixLen)] { matchLen := currentNode.prefixMatch(prefixLen, k) // The current-node does not match. @@ -509,11 +482,7 @@ func (t *trie[K, T]) traverse(prefixLen uint, k Key[K], fn func(currentNode *nod const nPointersOnCacheline = 8 // treverse is like traverse, but it calls 'fn' in reverse order, starting from the most specific match -func (t *trie[K, T]) treverse(prefixLen uint, k Key[K], fn func(currentNode *node[K, T]) bool) { - if k == nil { - return - } - +func (t *trie[K, T]) treverse(prefixLen uint, k K, fn func(currentNode *node[K, T]) bool) { // stack is used to reverse the order in which nodes are visited. // Preallocate space for some pointers to reduce allocations and copies. stack := make([]*node[K, T], 0, nPointersOnCacheline) @@ -602,10 +571,7 @@ func (t *trie[K, T]) treverse(prefixLen uint, k Key[K], fn func(currentNode *nod // Note: Upsert sets any "prefixLen" argument that exceeds the maximum // prefix allowed by the trie to the maximum prefix allowed by the // trie. -func (t *trie[K, T]) Upsert(prefixLen uint, k Key[K], value T) bool { - if k == nil { - return false - } +func (t *trie[K, T]) Upsert(prefixLen uint, k K, value T) bool { prefixLen = min(prefixLen, t.maxPrefix) upsertNode := &node[K, T]{ prefixLen: prefixLen, @@ -738,10 +704,7 @@ func (t *trie[K, T]) Upsert(prefixLen uint, k Key[K], value T) bool { // Note: Delete sets any prefixLen argument that exceeds the maximum // prefix allowed by the trie to the maximum prefix allowed by the // trie. -func (t *trie[K, T]) Delete(prefixLen uint, k Key[K]) bool { - if k == nil { - return false - } +func (t *trie[K, T]) Delete(prefixLen uint, k K) bool { prefixLen = min(prefixLen, t.maxPrefix) var ( @@ -836,7 +799,7 @@ func (t *trie[K, T]) Len() uint { return t.entries } -func (t *trie[K, T]) ForEach(fn func(prefix uint, key Key[K], value T) bool) { +func (t *trie[K, T]) ForEach(fn func(prefix uint, key K, value T) bool) { if t.root != nil { t.root.forEach(fn) } @@ -845,9 +808,9 @@ func (t *trie[K, T]) ForEach(fn func(prefix uint, key Key[K], value T) bool) { // prefixMatch returns the length that the node key and // the argument key match, with the limit of the match being // the lesser of the node-key prefix or the argument-key prefix. -func (n *node[K, T]) prefixMatch(prefix uint, k Key[K]) uint { +func (n *node[K, T]) prefixMatch(prefix uint, k K) uint { limit := min(n.prefixLen, prefix) - prefixLen := n.key.CommonPrefix(k.Value()) + prefixLen := n.key.CommonPrefix(k) if prefixLen >= limit { return limit } @@ -856,7 +819,7 @@ func (n *node[K, T]) prefixMatch(prefix uint, k Key[K]) uint { // forEach calls the argument function for each key and value in // the subtree rooted at the current node, iterating recursively in depth-first manner. -func (n *node[K, T]) forEach(fn func(prefix uint, key Key[K], value T) bool) { +func (n *node[K, T]) forEach(fn func(prefix uint, key K, value T) bool) { if !n.intermediate { if !fn(n.prefixLen, n.key, n.value) { return @@ -871,7 +834,7 @@ func (n *node[K, T]) forEach(fn func(prefix uint, key Key[K], value T) bool) { } // nodes implements container/heap for trie nodes -type nodes[K, T any] []*node[K, T] +type nodes[K Key[K], T any] []*node[K, T] // container/heap interface functions func (nodes nodes[K, T]) Len() int { return len(nodes) } @@ -924,7 +887,7 @@ func (nodes *nodes[K, T]) popHeap() *node[K, T] { // the node with the shortest prefix of the subtree it represents. To iterate in the order // of increasing prefix lengths, on each round we pop the node with the shortest prefix from the // heap, visit it, and push its children into the heap. -func (n *node[K, T]) forEachShortestPrefixFirst(fn func(prefix uint, key Key[K], value T) bool) { +func (n *node[K, T]) forEachShortestPrefixFirst(fn func(prefix uint, key K, value T) bool) { // nodes is a heap used to track the heads of each unvisited subtree. Each node in the heap // has the shortest prefix length of any node in the subtree it represents. // Preallocate space for some pointers to reduce allocations and copies. diff --git a/vendor/github.com/cilium/cilium/pkg/container/bitlpm/unsigned.go b/vendor/github.com/cilium/cilium/pkg/container/bitlpm/unsigned.go index 37795cc8e0..2d771b09e8 100644 --- a/vendor/github.com/cilium/cilium/pkg/container/bitlpm/unsigned.go +++ b/vendor/github.com/cilium/cilium/pkg/container/bitlpm/unsigned.go @@ -4,7 +4,6 @@ package bitlpm import ( - "fmt" "math/bits" "unsafe" ) @@ -18,7 +17,7 @@ type Unsigned interface { // UintTrie uses all unsigned integer types // except for uintptr and uint. type UintTrie[K Unsigned, V any] struct { - trie Trie[Key[K], V] + trie Trie[unsignedKey[K], V] keySize uint } @@ -28,55 +27,41 @@ func NewUintTrie[K Unsigned, T any]() *UintTrie[K, T] { var k K size := uint(unsafe.Sizeof(k)) return &UintTrie[K, T]{ - trie: NewTrie[K, T](size * 8), + trie: NewTrie[unsignedKey[K], T](size * 8), keySize: size, } } -func (tu *UintTrie[K, T]) getKey(k K) Key[K] { - switch tu.keySize { - case 1: - return unsignedKey8[K](k) - case 2: - return unsignedKey16[K](k) - case 4: - return unsignedKey32[K](k) - case 8: - return unsignedKey64[K](k) - } - panic(fmt.Sprintf("unexpected key size of %d", unsafe.Sizeof(k))) -} - func (ut *UintTrie[K, T]) Upsert(prefix uint, k K, value T) bool { - return ut.trie.Upsert(prefix, ut.getKey(k), value) + return ut.trie.Upsert(prefix, unsignedKey[K]{value: k}, value) } func (ut *UintTrie[K, T]) Delete(prefix uint, k K) bool { - return ut.trie.Delete(prefix, ut.getKey(k)) + return ut.trie.Delete(prefix, unsignedKey[K]{value: k}) } func (ut *UintTrie[K, T]) ExactLookup(prefix uint, k K) (T, bool) { - return ut.trie.ExactLookup(prefix, ut.getKey(k)) + return ut.trie.ExactLookup(prefix, unsignedKey[K]{value: k}) } func (ut *UintTrie[K, T]) LongestPrefixMatch(k K) (K, T, bool) { - k2, v, ok := ut.trie.LongestPrefixMatch(ut.getKey(k)) + k2, v, ok := ut.trie.LongestPrefixMatch(unsignedKey[K]{value: k}) if ok { - return k2.Value(), v, ok + return k2.value, v, ok } var empty K return empty, v, ok } func (ut *UintTrie[K, T]) Ancestors(prefix uint, k K, fn func(prefix uint, key K, value T) bool) { - ut.trie.Ancestors(prefix, ut.getKey(k), func(prefix uint, k Key[K], v T) bool { - return fn(prefix, k.Value(), v) + ut.trie.Ancestors(prefix, unsignedKey[K]{value: k}, func(prefix uint, k unsignedKey[K], v T) bool { + return fn(prefix, k.value, v) }) } func (ut *UintTrie[K, T]) Descendants(prefix uint, k K, fn func(prefix uint, key K, value T) bool) { - ut.trie.Descendants(prefix, ut.getKey(k), func(prefix uint, k Key[K], v T) bool { - return fn(prefix, k.Value(), v) + ut.trie.Descendants(prefix, unsignedKey[K]{value: k}, func(prefix uint, k unsignedKey[K], v T) bool { + return fn(prefix, k.value, v) }) } @@ -85,75 +70,47 @@ func (ut *UintTrie[K, T]) Len() uint { } func (ut *UintTrie[K, T]) ForEach(fn func(prefix uint, key K, value T) bool) { - ut.trie.ForEach(func(prefix uint, k Key[K], v T) bool { - return fn(prefix, k.Value(), v) + ut.trie.ForEach(func(prefix uint, k unsignedKey[K], v T) bool { + return fn(prefix, k.value, v) }) } -type unsignedKey8[U Unsigned] uint8 - -func (u unsignedKey8[U]) CommonPrefix(v U) uint { - return uint(bits.LeadingZeros8(uint8(U(u) ^ v))) -} - -func (u unsignedKey8[U]) BitValueAt(i uint) uint8 { - if u&(1<<(7-i)) == 0 { - return 0 - } - return 1 -} - -func (u unsignedKey8[U]) Value() U { - return U(u) -} - -type unsignedKey16[U Unsigned] uint16 - -func (u unsignedKey16[U]) CommonPrefix(v U) uint { - return uint(bits.LeadingZeros16(uint16(u) ^ uint16(v))) -} - -func (u unsignedKey16[U]) BitValueAt(i uint) uint8 { - if u&(1<<(15-i)) == 0 { - return 0 - } - return 1 -} - -func (u unsignedKey16[U]) Value() U { - return U(u) -} - -type unsignedKey32[U Unsigned] uint32 - -func (u unsignedKey32[U]) CommonPrefix(v U) uint { - return uint(bits.LeadingZeros32(uint32(u) ^ uint32(v))) +type unsignedKey[U Unsigned] struct { + value U } -func (u unsignedKey32[U]) BitValueAt(i uint) uint8 { - if u&(1<<(31-i)) == 0 { - return 0 +func (u unsignedKey[U]) CommonPrefix(v unsignedKey[U]) uint { + switch any(u.value).(type) { + case uint8: + return uint(bits.LeadingZeros8(uint8(u.value ^ v.value))) + case uint16: + return uint(bits.LeadingZeros16(uint16(u.value ^ v.value))) + case uint32: + return uint(bits.LeadingZeros32(uint32(u.value ^ v.value))) + case uint64: + return uint(bits.LeadingZeros64(uint64(u.value ^ v.value))) } - return 1 -} - -func (u unsignedKey32[U]) Value() U { - return U(u) -} - -type unsignedKey64[U Unsigned] uint64 - -func (u unsignedKey64[U]) CommonPrefix(v U) uint { - return uint(bits.LeadingZeros64(uint64(u) ^ uint64(v))) -} - -func (u unsignedKey64[U]) BitValueAt(i uint) uint8 { - if u&(1<<(63-i)) == 0 { - return 0 + return 0 +} + +func (u unsignedKey[U]) BitValueAt(i uint) uint8 { + switch any(u.value).(type) { + case uint8: + if u.value&(1<<(7-i)) == 0 { + return 0 + } + case uint16: + if u.value&(1<<(15-i)) == 0 { + return 0 + } + case uint32: + if u.value&(1<<(31-i)) == 0 { + return 0 + } + case uint64: + if u.value&(1<<(63-i)) == 0 { + return 0 + } } return 1 } - -func (u unsignedKey64[U]) Value() U { - return U(u) -} diff --git a/vendor/github.com/cilium/cilium/pkg/container/versioned/value.go b/vendor/github.com/cilium/cilium/pkg/container/versioned/value.go index 29c4bfe9e9..79aa63e3f3 100644 --- a/vendor/github.com/cilium/cilium/pkg/container/versioned/value.go +++ b/vendor/github.com/cilium/cilium/pkg/container/versioned/value.go @@ -18,6 +18,7 @@ import ( "github.com/cilium/cilium/pkg/lock" "github.com/cilium/cilium/pkg/logging/logfields" + "github.com/cilium/cilium/pkg/option" ) type version uint64 @@ -53,6 +54,8 @@ type VersionHandle struct { // Coordinator of this versionHandle, if any. Used for closing if non-nil. // Atomic due to nilling and for copy prevention. coordinator atomic.Pointer[Coordinator] + // Optional stack trace of the caller for debugging purposes + stacktrace hclog.CapturedStacktrace } func (h *VersionHandle) IsValid() bool { @@ -98,7 +101,11 @@ func (h *VersionHandle) Close() error { func versionHandleFinalizer(h *VersionHandle) { coordinator := h.coordinator.Load() if coordinator != nil && coordinator.Logger != nil { - coordinator.Logger.WithField(logfields.Version, h.version).Error("Handle for version not closed.") + logger := coordinator.Logger + if h.stacktrace != "" { + logger = logger.WithField(logfields.Stacktrace, h.stacktrace) + } + logger.WithField(logfields.Version, h.version).Error("Handle for version not closed.") } h.Close() } @@ -114,6 +121,11 @@ func newVersionHandle(version version, coordinator *Coordinator) *VersionHandle // Set a finalizer to catch unclosed handles. The finalizer function complains // loudly, so that we do not rely the finalizer for closing. runtime.SetFinalizer(h, versionHandleFinalizer) + + if option.Config.Debug { + // capture a stacktrace for debugging + h.stacktrace = hclog.Stacktrace() + } } return h } diff --git a/vendor/github.com/cilium/cilium/pkg/crypto/certificatemanager/certificate_manager.go b/vendor/github.com/cilium/cilium/pkg/crypto/certificatemanager/certificate_manager.go index 3750dc9f11..779b1e2312 100644 --- a/vendor/github.com/cilium/cilium/pkg/crypto/certificatemanager/certificate_manager.go +++ b/vendor/github.com/cilium/cilium/pkg/crypto/certificatemanager/certificate_manager.go @@ -33,6 +33,7 @@ type CertificateManager interface { type SecretManager interface { GetSecretString(ctx context.Context, secret *api.Secret, ns string) (string, error) PolicySecretSyncEnabled() bool + SecretsOnlyFromSecretsNamespace() bool GetSecretSyncNamespace() string } @@ -47,34 +48,39 @@ type managerConfig struct { EnablePolicySecretsSync bool PolicySecretsNamespace string + + PolicySecretsOnlyFromSecretsNamespace bool } func (mc managerConfig) Flags(flags *pflag.FlagSet) { flags.String("certificates-directory", mc.CertificatesDirectory, "Root directory to find certificates specified in L7 TLS policy enforcement") flags.Bool("enable-policy-secrets-sync", mc.EnablePolicySecretsSync, "Enables Envoy secret sync for Secrets used in CiliumNetworkPolicy and CiliumClusterwideNetworkPolicy") + flags.Bool("policy-secrets-only-from-secrets-namespace", mc.PolicySecretsOnlyFromSecretsNamespace, "Configures the agent to only read policy Secrets from the policy-secrets-namespace") flags.String("policy-secrets-namespace", mc.PolicySecretsNamespace, "PolicySecretsNamesapce is the namespace having secrets used in CNP and CCNP") } // Manager will manage the way certificates are retrieved based in the given // k8sClient and rootPath. type manager struct { - rootPath string - k8sClient k8sClient.Clientset - secretSyncNamespace string - secretSyncEnabled bool - Logger logrus.FieldLogger + rootPath string + k8sClient k8sClient.Clientset + secretSyncNamespace string + secretSyncEnabled bool + secretsFromSecretSyncNamespace bool + Logger logrus.FieldLogger } // NewManager returns a new manager. func NewManager(cfg managerConfig, clientset k8sClient.Clientset, logger logrus.FieldLogger) (CertificateManager, SecretManager) { m := &manager{ - rootPath: cfg.CertificatesDirectory, - k8sClient: clientset, - Logger: logger, - secretSyncEnabled: cfg.EnablePolicySecretsSync, + rootPath: cfg.CertificatesDirectory, + k8sClient: clientset, + Logger: logger, + secretSyncEnabled: cfg.EnablePolicySecretsSync, + secretsFromSecretSyncNamespace: cfg.PolicySecretsOnlyFromSecretsNamespace, } - if cfg.EnablePolicySecretsSync { + if cfg.PolicySecretsOnlyFromSecretsNamespace { m.secretSyncNamespace = cfg.PolicySecretsNamespace } @@ -95,6 +101,10 @@ func (m *manager) PolicySecretSyncEnabled() bool { return m.secretSyncEnabled } +func (m *manager) SecretsOnlyFromSecretsNamespace() bool { + return m.secretsFromSecretSyncNamespace +} + // getSecrets returns either local or k8s secrets, giving precedence for local secrets if configured. // It also returns a boolean indicating if the values were read from disk or not. // The 'ns' parameter is used as the secret namespace if 'secret.Namespace' is an empty string, and is @@ -137,23 +147,25 @@ func (m *manager) getSecrets(ctx context.Context, secret *api.Secret, ns string) return nsName, secrets, true, nil } - // If there's no secret synchronization namespace configured, then we need to read values + if m.secretSyncEnabled && m.secretSyncNamespace != "" { + // If we get here, then the secret is _not_ being read from the filesystem, + // and secret sync is enabled, so we are sending via SDS, + // and then we don't want to inspect the Secret at all, because + // that will require the agent to have more access than it needs. So we return an empty `secrets` map. + // TODO(youngnick): Deprecate and remove reading from file for secrets. + emptySecrets := make(map[string][]byte) + return nsName, emptySecrets, false, nil + } + + // If secret synchronization is disabled, then we need to read values // directly from Kubernetes. Not a good idea, for security or performance reasons, but included // for backwards compatibility. // TODO(youngnick): Once we are comfortable with SDS stability, remove this and pass the // reference to the original secret instead. (This will require changes to the secretsync // package so that it can register specific secrets from anywhere.) - if m.secretSyncNamespace == "" { - secrets, err := m.k8sClient.GetSecrets(ctx, ns, secret.Name) - return nsName, secrets, true, err - } - // If the secret is _not_ being read from the filesystem, then we don't want to inspect it at all, because - // that will require the agent to have more access than it needs. So we return an empty `secrets` map. - // The plan here is to deprecate reading from file entirely, at which all this code will be removed. - // TODO(youngnick): Deprecate and remove reading from file for secrets. - emptySecrets := make(map[string][]byte) - return nsName, emptySecrets, false, nil + secrets, err := m.k8sClient.GetSecrets(ctx, ns, secret.Name) + return nsName, secrets, true, err } const ( diff --git a/vendor/github.com/cilium/cilium/pkg/datapath/linux/probes/probes.go b/vendor/github.com/cilium/cilium/pkg/datapath/linux/probes/probes.go index 05d91502dd..dcf0950dcd 100644 --- a/vendor/github.com/cilium/cilium/pkg/datapath/linux/probes/probes.go +++ b/vendor/github.com/cilium/cilium/pkg/datapath/linux/probes/probes.go @@ -745,6 +745,7 @@ func ExecuteHeaderProbes() *FeatureProbes { // common probes {ebpf.CGroupSock, asm.FnGetNetnsCookie}, {ebpf.CGroupSockAddr, asm.FnGetNetnsCookie}, + {ebpf.CGroupSockAddr, asm.FnGetSocketCookie}, {ebpf.CGroupSock, asm.FnJiffies64}, {ebpf.CGroupSockAddr, asm.FnJiffies64}, {ebpf.SchedCLS, asm.FnJiffies64}, @@ -777,6 +778,7 @@ func writeCommonHeader(writer io.Writer, probes *FeatureProbes) error { features := map[string]bool{ "HAVE_NETNS_COOKIE": probes.ProgramHelpers[ProgramHelper{ebpf.CGroupSock, asm.FnGetNetnsCookie}] && probes.ProgramHelpers[ProgramHelper{ebpf.CGroupSockAddr, asm.FnGetNetnsCookie}], + "HAVE_SOCKET_COOKIE": probes.ProgramHelpers[ProgramHelper{ebpf.CGroupSockAddr, asm.FnGetSocketCookie}], "HAVE_JIFFIES": probes.ProgramHelpers[ProgramHelper{ebpf.CGroupSock, asm.FnJiffies64}] && probes.ProgramHelpers[ProgramHelper{ebpf.CGroupSockAddr, asm.FnJiffies64}] && probes.ProgramHelpers[ProgramHelper{ebpf.SchedCLS, asm.FnJiffies64}] && diff --git a/vendor/github.com/cilium/cilium/pkg/defaults/defaults.go b/vendor/github.com/cilium/cilium/pkg/defaults/defaults.go index 06b0fab602..e8032c231f 100644 --- a/vendor/github.com/cilium/cilium/pkg/defaults/defaults.go +++ b/vendor/github.com/cilium/cilium/pkg/defaults/defaults.go @@ -370,6 +370,10 @@ const ( // kvstore consecutive quorum errors before the agent assumes permanent failure KVstoreMaxConsecutiveQuorumErrors = 2 + // KVstoreKeepAliveIntervalFactor is the factor to calculate the interval + // from KVstoreLeaseTTL in which KVstore lease is being renewed. + KVstoreKeepAliveIntervalFactor = 3 + // LockLeaseTTL is the time-to-live of the lease dedicated for locks of Kvstore. LockLeaseTTL = 25 * time.Second @@ -581,9 +585,6 @@ const ( // EnableSourceIPVerification is the default value for source ip validation EnableSourceIPVerification = true - - // BGPRouterIDAllocationMode is default BGP router-id allocation mode - BGPRouterIDAllocationMode = "default" ) var ( diff --git a/vendor/github.com/cilium/cilium/pkg/envoy/resource/envoy.go b/vendor/github.com/cilium/cilium/pkg/envoy/resource/envoy.go index 1a1c1ed275..25b1eaefe8 100644 --- a/vendor/github.com/cilium/cilium/pkg/envoy/resource/envoy.go +++ b/vendor/github.com/cilium/cilium/pkg/envoy/resource/envoy.go @@ -106,7 +106,6 @@ import ( _ "github.com/cilium/proxy/go/envoy/extensions/filters/http/oauth2/v3" _ "github.com/cilium/proxy/go/envoy/extensions/filters/http/on_demand/v3" _ "github.com/cilium/proxy/go/envoy/extensions/filters/http/original_src/v3" - _ "github.com/cilium/proxy/go/envoy/extensions/filters/http/proto_message_extraction/v3" _ "github.com/cilium/proxy/go/envoy/extensions/filters/http/proto_message_logging/v3" _ "github.com/cilium/proxy/go/envoy/extensions/filters/http/rate_limit_quota/v3" _ "github.com/cilium/proxy/go/envoy/extensions/filters/http/ratelimit/v3" @@ -131,12 +130,6 @@ import ( _ "github.com/cilium/proxy/go/envoy/extensions/filters/network/dubbo_proxy/v3" _ "github.com/cilium/proxy/go/envoy/extensions/filters/network/echo/v3" _ "github.com/cilium/proxy/go/envoy/extensions/filters/network/ext_authz/v3" - _ "github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/action/v3" - _ "github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3" - _ "github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3" - _ "github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/matcher/v3" - _ "github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/router/v3" - _ "github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3" _ "github.com/cilium/proxy/go/envoy/extensions/filters/network/http_connection_manager/v3" _ "github.com/cilium/proxy/go/envoy/extensions/filters/network/local_ratelimit/v3" _ "github.com/cilium/proxy/go/envoy/extensions/filters/network/mongo_proxy/v3" @@ -199,7 +192,6 @@ import ( _ "github.com/cilium/proxy/go/envoy/extensions/matching/common_inputs/ssl/v3" _ "github.com/cilium/proxy/go/envoy/extensions/matching/input_matchers/consistent_hashing/v3" _ "github.com/cilium/proxy/go/envoy/extensions/matching/input_matchers/ip/v3" - _ "github.com/cilium/proxy/go/envoy/extensions/matching/input_matchers/metadata/v3" _ "github.com/cilium/proxy/go/envoy/extensions/matching/input_matchers/runtime_fraction/v3" _ "github.com/cilium/proxy/go/envoy/extensions/network/dns_resolver/apple/v3" _ "github.com/cilium/proxy/go/envoy/extensions/network/dns_resolver/cares/v3" @@ -219,7 +211,6 @@ import ( _ "github.com/cilium/proxy/go/envoy/extensions/rbac/matchers/upstream_ip_port/v3" _ "github.com/cilium/proxy/go/envoy/extensions/regex_engines/v3" _ "github.com/cilium/proxy/go/envoy/extensions/request_id/uuid/v3" - _ "github.com/cilium/proxy/go/envoy/extensions/resource_monitors/cpu_utilization/v3" _ "github.com/cilium/proxy/go/envoy/extensions/resource_monitors/downstream_connections/v3" _ "github.com/cilium/proxy/go/envoy/extensions/resource_monitors/fixed_heap/v3" _ "github.com/cilium/proxy/go/envoy/extensions/resource_monitors/injected_resource/v3" @@ -269,7 +260,6 @@ import ( _ "github.com/cilium/proxy/go/envoy/service/metrics/v3" _ "github.com/cilium/proxy/go/envoy/service/rate_limit_quota/v3" _ "github.com/cilium/proxy/go/envoy/service/ratelimit/v3" - _ "github.com/cilium/proxy/go/envoy/service/redis_auth/v3" _ "github.com/cilium/proxy/go/envoy/service/route/v3" _ "github.com/cilium/proxy/go/envoy/service/runtime/v3" _ "github.com/cilium/proxy/go/envoy/service/secret/v3" diff --git a/vendor/github.com/cilium/cilium/pkg/identity/identity.go b/vendor/github.com/cilium/cilium/pkg/identity/identity.go index d55de2cac2..39e0375fd9 100644 --- a/vendor/github.com/cilium/cilium/pkg/identity/identity.go +++ b/vendor/github.com/cilium/cilium/pkg/identity/identity.go @@ -326,5 +326,5 @@ func IdentityAllocationIsLocal(lbls labels.Labels) bool { // UpdateIdentities is an interface to be called when identities change type UpdateIdentities interface { - UpdateIdentities(added, deleted IdentityMap, wg *sync.WaitGroup) + UpdateIdentities(added, deleted IdentityMap, wg *sync.WaitGroup) (mutated bool) } diff --git a/vendor/github.com/cilium/cilium/pkg/ipcache/types/types.go b/vendor/github.com/cilium/cilium/pkg/ipcache/types/types.go index ee19ffb904..988dcf662a 100644 --- a/vendor/github.com/cilium/cilium/pkg/ipcache/types/types.go +++ b/vendor/github.com/cilium/cilium/pkg/ipcache/types/types.go @@ -17,7 +17,13 @@ import ( // PolicyHandler is responsible for handling identity updates into the core // policy engine. See SelectorCache.UpdateIdentities() for more details. type PolicyHandler interface { - UpdateIdentities(added, deleted identity.IdentityMap, wg *sync.WaitGroup) + UpdateIdentities(added, deleted identity.IdentityMap, wg *sync.WaitGroup) (mutated bool) +} + +// PolicyUpdater is responsible for triggering regeneration of all endpoints. +// See pkg/policy/trigger.go for more details. +type PolicyUpdater interface { + TriggerPolicyUpdates(reason string) } // DatapathHandler is responsible for ensuring that policy updates in the diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/register.go b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/register.go index 963cab1e9c..ccbba7cdbe 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/register.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/register.go @@ -15,5 +15,5 @@ const ( // // Maintainers: Run ./Documentation/check-crd-compat-table.sh for each release // Developers: Bump patch for each change in the CRD schema. - CustomResourceDefinitionSchemaVersion = "1.31.0" + CustomResourceDefinitionSchemaVersion = "1.30.7" ) diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/bgp_node_override_types.go b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/bgp_node_override_types.go index 72f714df08..f14bdb419e 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/bgp_node_override_types.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/bgp_node_override_types.go @@ -77,13 +77,6 @@ type CiliumBGPNodeConfigInstanceOverride struct { // +listType=map // +listMapKey=name Peers []CiliumBGPNodeConfigPeerOverride `json:"peers,omitempty"` - - // LocalASN is the ASN to use for this BGP instance. - // - // +kubebuilder:validation:Optional - // +kubebuilder:validation:Minimum=1 - // +kubebuilder:validation:Maximum=4294967295 - LocalASN *int64 `json:"localASN,omitempty"` } // CiliumBGPNodeConfigPeerOverride defines configuration options which can be overridden for a specific peer. diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/zz_generated.deepcopy.go b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/zz_generated.deepcopy.go index 6a0a23bd17..ad712afe26 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/zz_generated.deepcopy.go @@ -545,11 +545,6 @@ func (in *CiliumBGPNodeConfigInstanceOverride) DeepCopyInto(out *CiliumBGPNodeCo (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.LocalASN != nil { - in, out := &in.LocalASN, &out.LocalASN - *out = new(int64) - **out = **in - } return } diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/zz_generated.deepequal.go b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/zz_generated.deepequal.go index 5e5d0bee96..cca99d9aea 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/zz_generated.deepequal.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/zz_generated.deepequal.go @@ -560,14 +560,6 @@ func (in *CiliumBGPNodeConfigInstanceOverride) DeepEqual(other *CiliumBGPNodeCon } } - if (in.LocalASN == nil) != (other.LocalASN == nil) { - return false - } else if in.LocalASN != nil { - if *in.LocalASN != *other.LocalASN { - return false - } - } - return true } diff --git a/vendor/github.com/cilium/cilium/pkg/labels/arraylist.go b/vendor/github.com/cilium/cilium/pkg/labels/arraylist.go index 80d1b2ae3b..a96810ea1a 100644 --- a/vendor/github.com/cilium/cilium/pkg/labels/arraylist.go +++ b/vendor/github.com/cilium/cilium/pkg/labels/arraylist.go @@ -4,7 +4,6 @@ package labels import ( - "fmt" "sort" ) @@ -38,13 +37,10 @@ func (ls LabelArrayList) GetModel() [][]string { // Equals returns true if the label arrays lists have the same label arrays in the same order. func (ls LabelArrayList) Equals(b LabelArrayList) bool { if len(ls) != len(b) { - fmt.Printf("LEN DIFFERS: obtained %v, expected %v\n", ls, b) return false } for l := range ls { if !ls[l].Equals(b[l]) { - fmt.Printf("LABEL ARRAY %d DIFFERS: obtained %v, expected %v\n", - l, ls[l], b[l]) return false } } diff --git a/vendor/github.com/cilium/cilium/pkg/metrics/cmd.go b/vendor/github.com/cilium/cilium/pkg/metrics/cmd.go index fe4b81612e..d9b9ffca15 100644 --- a/vendor/github.com/cilium/cilium/pkg/metrics/cmd.go +++ b/vendor/github.com/cilium/cilium/pkg/metrics/cmd.go @@ -7,8 +7,6 @@ import ( "cmp" _ "embed" "encoding/json" - "errors" - "flag" "fmt" "html/template" "io" @@ -25,6 +23,7 @@ import ( "github.com/cilium/hive/script" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" + "github.com/spf13/pflag" "gopkg.in/yaml.v3" "github.com/cilium/cilium/api/v1/models" @@ -44,7 +43,12 @@ func metricsCommand(r *Registry, dc *sampler) script.Cmd { return script.Command( script.CmdUsage{ Summary: "List registered metrics", - Args: "[-o=file] [-format={table,yaml,json}] [-s] [-e] [match regex]", + Args: "[match regex]", + Flags: func(fs *pflag.FlagSet) { + fs.StringP("out", "o", "", "Output file") + fs.BoolP("sampled", "s", false, "Show sampled metrics") + fs.StringP("format", "f", "table", "Output format, one of: table, json or yaml") + }, RegexpArgs: func(rawArgs ...string) []int { for i, arg := range rawArgs { if !strings.HasPrefix(arg, "-") { @@ -57,10 +61,9 @@ func metricsCommand(r *Registry, dc *sampler) script.Cmd { return nil }, Detail: []string{ - "To write the metrics to a file: 'metrics -o=/path/to/file'", + "To write the metrics to a file: 'metrics --out=/path/to/file'", "To show metrics matching a regex: 'metrics foo.*'", - "To show only the enabled metrics: 'metrics -e'", - "To show samples from last 60 minutes: 'metrics -s'", + "To show samples from last 60 minutes: 'metrics --sampled'", "", "The metric samples can be plotted with 'metrics/plot' command.", "", @@ -76,19 +79,18 @@ func metricsCommand(r *Registry, dc *sampler) script.Cmd { }, }, func(s *script.State, args ...string) (script.WaitFunc, error) { - flags := flag.NewFlagSet("metrics", flag.ContinueOnError) - flags.SetOutput(s.LogWriter()) - file := flags.String("o", "", "Output file") - samples := flags.Bool("s", false, "Show sampled metrics") - format := flags.String("format", "table", "Output format, one of: table, json or yaml") - if err := flags.Parse(args); err != nil { - if errors.Is(err, flag.ErrHelp) { - return nil, nil - } + file, err := s.Flags.GetString("out") + if err != nil { + return nil, err + } + sampled, err := s.Flags.GetBool("sampled") + if err != nil { + return nil, err + } + format, err := s.Flags.GetString("format") + if err != nil { return nil, err } - args = flags.Args() - var re *regexp.Regexp if len(args) > 0 { var err error @@ -99,8 +101,8 @@ func metricsCommand(r *Registry, dc *sampler) script.Cmd { } var w io.Writer - if *file != "" { - f, err := os.OpenFile(s.Path(*file), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644) + if file != "" { + f, err := os.OpenFile(s.Path(file), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644) if err != nil { return nil, err } @@ -110,11 +112,11 @@ func metricsCommand(r *Registry, dc *sampler) script.Cmd { w = s.LogWriter() } - if *samples { - return nil, writeMetricsFromSamples(w, *format, re, dc) + if sampled { + return nil, writeMetricsFromSamples(w, format, re, dc) } - return nil, writeMetricsFromRegistry(w, *format, re, r.inner) + return nil, writeMetricsFromRegistry(w, format, re, r.inner) }, ) } @@ -125,7 +127,11 @@ func plotCommand(dc *sampler) script.Cmd { return script.Command( script.CmdUsage{ Summary: "Plot sampled metrics as a line graph", - Args: "[-o=file] [-rate] [match regex]", + Args: "[match regex]", + Flags: func(fs *pflag.FlagSet) { + fs.StringP("out", "o", "", "Output file") + fs.Bool("rate", false, "Plot the rate of change") + }, RegexpArgs: func(rawArgs ...string) []int { for i, arg := range rawArgs { if !strings.HasPrefix(arg, "-") { @@ -157,18 +163,16 @@ func plotCommand(dc *sampler) script.Cmd { }, }, func(s *script.State, args ...string) (script.WaitFunc, error) { - flags := flag.NewFlagSet("metrics/plot", flag.ContinueOnError) - flags.SetOutput(s.LogWriter()) - file := flags.String("o", "", "Output file") - rate := flags.Bool("rate", false, "Plot the rate of change") - if err := flags.Parse(args); err != nil { - if errors.Is(err, flag.ErrHelp) { - return nil, nil - } + s.Logf("args: %v\n", args) + + file, err := s.Flags.GetString("out") + if err != nil { + return nil, err + } + rate, err := s.Flags.GetBool("rate") + if err != nil { return nil, err } - args = flags.Args() - var re *regexp.Regexp if len(args) > 0 { var err error @@ -179,8 +183,8 @@ func plotCommand(dc *sampler) script.Cmd { } var w io.Writer - if *file != "" { - f, err := os.OpenFile(s.Path(*file), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644) + if file != "" { + f, err := os.OpenFile(s.Path(file), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644) if err != nil { return nil, err } @@ -221,13 +225,13 @@ func plotCommand(dc *sampler) script.Cmd { switch ds := ds.(type) { case *gaugeOrCounterSamples: - PlotSamples(w, *rate, ds.getName(), ds.getLabels(), samplingTimeSpan, ds.samples.grab(), ds.bits) + PlotSamples(w, rate, ds.getName(), ds.getLabels(), samplingTimeSpan, ds.samples.grab(), ds.bits) case *histogramSamples: - PlotSamples(w, *rate, ds.getName()+" (p50)", ds.getLabels(), samplingTimeSpan, ds.p50.grab(), ds.bits) + PlotSamples(w, rate, ds.getName()+" (p50)", ds.getLabels(), samplingTimeSpan, ds.p50.grab(), ds.bits) fmt.Fprintln(w) - PlotSamples(w, *rate, ds.getName()+" (p90)", ds.getLabels(), samplingTimeSpan, ds.p90.grab(), ds.bits) + PlotSamples(w, rate, ds.getName()+" (p90)", ds.getLabels(), samplingTimeSpan, ds.p90.grab(), ds.bits) fmt.Fprintln(w) - PlotSamples(w, *rate, ds.getName()+" (p99)", ds.getLabels(), samplingTimeSpan, ds.p99.grab(), ds.bits) + PlotSamples(w, rate, ds.getName()+" (p99)", ds.getLabels(), samplingTimeSpan, ds.p99.grab(), ds.bits) } return nil, nil @@ -242,23 +246,20 @@ func htmlCommand(dc *sampler) script.Cmd { return script.Command( script.CmdUsage{ Summary: "Produce a HTML file from the sampled metrics", - Args: "[-o=file]", - Detail: []string{}, + Args: "", + Flags: func(fs *pflag.FlagSet) { + fs.StringP("out", "o", "", "Output file") + }, + Detail: []string{}, }, func(s *script.State, args ...string) (script.WaitFunc, error) { - flags := flag.NewFlagSet("metrics/html", flag.ContinueOnError) - flags.SetOutput(s.LogWriter()) - file := flags.String("o", "", "Output file") - if err := flags.Parse(args); err != nil { - if errors.Is(err, flag.ErrHelp) { - return nil, nil - } + file, err := s.Flags.GetString("out") + if err != nil { return nil, err } - var w io.Writer - if *file != "" { - f, err := os.OpenFile(s.Path(*file), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644) + if file != "" { + f, err := os.OpenFile(s.Path(file), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644) if err != nil { return nil, err } diff --git a/vendor/github.com/cilium/cilium/pkg/metrics/metrics.go b/vendor/github.com/cilium/cilium/pkg/metrics/metrics.go index 08ea50f93d..ac6a77f132 100644 --- a/vendor/github.com/cilium/cilium/pkg/metrics/metrics.go +++ b/vendor/github.com/cilium/cilium/pkg/metrics/metrics.go @@ -353,11 +353,6 @@ var ( // time taken to fully deploy an endpoint. PolicyImplementationDelay = NoOpObserverVec - // PolicyIncrementalUpdateDuration is the time it takes to apply an incremental update - // to the policy engine. An incremental update is a newly-learned identity that can be - // directly added to policy maps without a full policy recalculation. - PolicyIncrementalUpdateDuration = NoOpObserverVec - // CIDRGroup // CIDRGroupsReferenced is the number of CNPs and CCNPs referencing at least one CiliumCIDRGroup. @@ -674,7 +669,6 @@ type LegacyMetrics struct { PolicyChangeTotal metric.Vec[metric.Counter] PolicyEndpointStatus metric.Vec[metric.Gauge] PolicyImplementationDelay metric.Vec[metric.Observer] - PolicyIncrementalUpdateDuration metric.Vec[metric.Observer] CIDRGroupsReferenced metric.Gauge Identity metric.Vec[metric.Gauge] IdentityLabelSources metric.Vec[metric.Gauge] @@ -848,15 +842,6 @@ func NewLegacyMetrics() *LegacyMetrics { }, }), - PolicyIncrementalUpdateDuration: metric.NewHistogramVec(metric.HistogramOpts{ - ConfigName: Namespace + "_policy_incremental_update_duration", - - Namespace: Namespace, - Name: "policy_incremental_update_duration", - Help: "Time between learning about a new identity and it being fully added to all policies.", - Buckets: prometheus.ExponentialBuckets(10e-6, 10, 8), - }, []string{"scope"}), - CIDRGroupsReferenced: metric.NewGauge(metric.GaugeOpts{ ConfigName: Namespace + "cidrgroups_referenced", @@ -1396,7 +1381,6 @@ func NewLegacyMetrics() *LegacyMetrics { PolicyChangeTotal = lm.PolicyChangeTotal PolicyEndpointStatus = lm.PolicyEndpointStatus PolicyImplementationDelay = lm.PolicyImplementationDelay - PolicyIncrementalUpdateDuration = lm.PolicyIncrementalUpdateDuration CIDRGroupsReferenced = lm.CIDRGroupsReferenced Identity = lm.Identity IdentityLabelSources = lm.IdentityLabelSources diff --git a/vendor/github.com/cilium/cilium/pkg/option/config.go b/vendor/github.com/cilium/cilium/pkg/option/config.go index 9215cd7566..d9f4aa5ea8 100644 --- a/vendor/github.com/cilium/cilium/pkg/option/config.go +++ b/vendor/github.com/cilium/cilium/pkg/option/config.go @@ -1097,9 +1097,6 @@ const ( // EnableBGPControlPlaneStatusReport enables BGP Control Plane CRD status reporting EnableBGPControlPlaneStatusReport = "enable-bgp-control-plane-status-report" - // BGP router-id allocation mode in ipv6 standalone environment - BGPRouterIDAllocationMode = "bgp-router-id-allocation-mode" - // EnableRuntimeDeviceDetection is the name of the option to enable detection // of new and removed datapath devices during the agent runtime. EnableRuntimeDeviceDetection = "enable-runtime-device-detection" @@ -1793,6 +1790,11 @@ type DaemonConfig struct { // is marked as healthy. HealthCheckICMPFailureThreshold int + // KVstoreKeepAliveInterval is the interval in which the lease is being + // renewed. This must be set to a value lesser than the LeaseTTL ideally + // by a factor of 3. + KVstoreKeepAliveInterval time.Duration + // KVstoreLeaseTTL is the time-to-live for kvstore lease. KVstoreLeaseTTL time.Duration @@ -2188,9 +2190,6 @@ type DaemonConfig struct { // Enables BGP control plane status reporting. EnableBGPControlPlaneStatusReport bool - // BGPRouterIDAllocationMode is the mode to allocate the BGP router-id in ipv6 standalone environment. - BGPRouterIDAllocationMode string - // BPFMapEventBuffers has configuration on what BPF map event buffers to enabled // and configuration options for those. BPFMapEventBuffers map[string]string @@ -2393,14 +2392,33 @@ func (c *DaemonConfig) AreDevicesRequired() bool { c.EnableIPSecEncryptedOverlay } -// When WG & encrypt-node are on, a NodePort BPF to-be forwarded request -// to a remote node running a selected service endpoint must be encrypted. -// To make the NodePort's rev-{S,D}NAT translations to happen for a reply -// from the remote node, we need to attach bpf_host to the Cilium's WG -// netdev (otherwise, the WG netdev after decrypting the reply will pass -// it to the stack which drops the packet). +// NeedBPFHostOnWireGuardDevice returns true if the agent needs to attach +// a BPF program on the Ingress of Cilium's WireGuard device func (c *DaemonConfig) NeedBPFHostOnWireGuardDevice() bool { - return c.EnableNodePort && c.EnableWireguard && c.EncryptNode + if !c.EnableWireguard { + return false + } + + // In native routing mode we want to deliver packets to local endpoints + // straight from BPF, without passing through the stack. + // This matches overlay mode (where bpf_overlay would handle the delivery) + // and native routing mode without encryption (where bpf_host at the native + // device would handle the delivery). + if !c.TunnelingEnabled() { + return true + } + + // When WG & encrypt-node are on, a NodePort BPF to-be forwarded request + // to a remote node running a selected service endpoint must be encrypted. + // To make the NodePort's rev-{S,D}NAT translations to happen for a reply + // from the remote node, we need to attach bpf_host to the Cilium's WG + // netdev (otherwise, the WG netdev after decrypting the reply will pass + // it to the stack which drops the packet). + if c.EnableNodePort && c.EncryptNode { + return true + } + + return false } // MasqueradingEnabled returns true if either IPv4 or IPv6 masquerading is enabled. @@ -2906,6 +2924,7 @@ func (c *DaemonConfig) Populate(vp *viper.Viper) { c.KeepConfig = vp.GetBool(KeepConfig) c.KVStore = vp.GetString(KVStore) c.KVstoreLeaseTTL = vp.GetDuration(KVstoreLeaseTTL) + c.KVstoreKeepAliveInterval = c.KVstoreLeaseTTL / defaults.KVstoreKeepAliveIntervalFactor c.KVstorePeriodicSync = vp.GetDuration(KVstorePeriodicSync) c.KVstoreConnectivityTimeout = vp.GetDuration(KVstoreConnectivityTimeout) c.KVstorePodNetworkSupport = vp.GetBool(KVstorePodNetworkSupport) @@ -3300,9 +3319,6 @@ func (c *DaemonConfig) Populate(vp *viper.Viper) { // Enable BGP control plane status reporting c.EnableBGPControlPlaneStatusReport = vp.GetBool(EnableBGPControlPlaneStatusReport) - // BGP router-id allocation mode in IPv6 standalone environment - c.BGPRouterIDAllocationMode = vp.GetString(BGPRouterIDAllocationMode) - // Support failure-mode for policy map overflow c.EnableEndpointLockdownOnPolicyOverflow = vp.GetBool(EnableEndpointLockdownOnPolicyOverflow) diff --git a/vendor/github.com/cilium/cilium/pkg/policy/api/rule.go b/vendor/github.com/cilium/cilium/pkg/policy/api/rule.go index 000354854d..c77b131f15 100644 --- a/vendor/github.com/cilium/cilium/pkg/policy/api/rule.go +++ b/vendor/github.com/cilium/cilium/pkg/policy/api/rule.go @@ -76,7 +76,7 @@ type Rule struct { // Ingress is a list of IngressRule which are enforced at ingress. // If omitted or empty, this rule does not apply at ingress. // - // +kubebuilder:validation:Optional + // +kubebuilder:validation:AnyOf Ingress []IngressRule `json:"ingress,omitempty"` // IngressDeny is a list of IngressDenyRule which are enforced at ingress. @@ -84,13 +84,13 @@ type Rule struct { // rules in the 'ingress' field. // If omitted or empty, this rule does not apply at ingress. // - // +kubebuilder:validation:Optional + // +kubebuilder:validation:AnyOf IngressDeny []IngressDenyRule `json:"ingressDeny,omitempty"` // Egress is a list of EgressRule which are enforced at egress. // If omitted or empty, this rule does not apply at egress. // - // +kubebuilder:validation:Optional + // +kubebuilder:validation:AnyOf Egress []EgressRule `json:"egress,omitempty"` // EgressDeny is a list of EgressDenyRule which are enforced at egress. @@ -98,7 +98,7 @@ type Rule struct { // rules in the 'egress' field. // If omitted or empty, this rule does not apply at egress. // - // +kubebuilder:validation:Optional + // +kubebuilder:validation:AnyOf EgressDeny []EgressDenyRule `json:"egressDeny,omitempty"` // Labels is a list of optional strings which can be used to @@ -232,6 +232,12 @@ func (r *Rule) WithEgressDenyRules(rules []EgressDenyRule) *Rule { return r } +// WithEnableDefaultDeny configures the Rule to enable default deny. +func (r *Rule) WithEnableDefaultDeny(ingress, egress bool) *Rule { + r.EnableDefaultDeny = DefaultDenyConfig{&ingress, &egress} + return r +} + // WithLabels configures the Rule with the specified labels metadata. func (r *Rule) WithLabels(labels labels.LabelArray) *Rule { r.Labels = labels diff --git a/vendor/github.com/cilium/cilium/pkg/policy/api/rule_validation.go b/vendor/github.com/cilium/cilium/pkg/policy/api/rule_validation.go index 126fd1c98d..57f61f279b 100644 --- a/vendor/github.com/cilium/cilium/pkg/policy/api/rule_validation.go +++ b/vendor/github.com/cilium/cilium/pkg/policy/api/rule_validation.go @@ -36,6 +36,10 @@ var ( // Note: this function is called from both the operator and the agent; // make sure any configuration flags are bound in **both** binaries. func (r *Rule) Sanitize() error { + if len(r.Ingress) == 0 && len(r.IngressDeny) == 0 && len(r.Egress) == 0 && len(r.EgressDeny) == 0 { + return fmt.Errorf("rule must have at least one of Ingress, IngressDeny, Egress, EgressDeny") + } + if option.Config.EnableNonDefaultDenyPolicies { // Fill in the default traffic posture of this Rule. // Default posture is per-direction (ingress or egress), @@ -53,7 +57,6 @@ func (r *Rule) Sanitize() error { // Since Non Default Deny Policies is disabled by flag, set EnableDefaultDeny to true r.EnableDefaultDeny.Egress = &enableDefaultDenyDefault r.EnableDefaultDeny.Ingress = &enableDefaultDenyDefault - } if r.EndpointSelector.LabelSelector == nil && r.NodeSelector.LabelSelector == nil { diff --git a/vendor/github.com/cilium/cilium/pkg/policy/l4.go b/vendor/github.com/cilium/cilium/pkg/policy/l4.go index 5e72934c05..748a45804c 100644 --- a/vendor/github.com/cilium/cilium/pkg/policy/l4.go +++ b/vendor/github.com/cilium/cilium/pkg/policy/l4.go @@ -624,7 +624,7 @@ func (l4 *L4Filter) toMapState(p *EndpointPolicy, features policyFeatures, chang continue } } - entry := newMapStateEntry(cs, l4.RuleOrigin[cs], proxyPort, priority, isDenyRule, authReq) + entry := newMapStateEntry(l4.RuleOrigin[cs], proxyPort, priority, isDenyRule, authReq) if cs.IsWildcard() { for _, keyToAdd := range keysToAdd { @@ -1655,7 +1655,7 @@ func (l4Policy *L4Policy) AccumulateMapChanges(l4 *L4Filter, cs CachedSelector, keysToAdd = append(keysToAdd, KeyForDirection(direction).WithPortProtoPrefix(proto, mp.port, uint8(bits.LeadingZeros16(^mp.mask)))) } - value := newMapStateEntry(cs, derivedFrom, proxyPort, priority, isDeny, authReq) + value := newMapStateEntry(derivedFrom, proxyPort, priority, isDeny, authReq) if option.Config.Debug { authString := "default" diff --git a/vendor/github.com/cilium/cilium/pkg/policy/mapstate.go b/vendor/github.com/cilium/cilium/pkg/policy/mapstate.go index a2283a4b1e..427244a7ef 100644 --- a/vendor/github.com/cilium/cilium/pkg/policy/mapstate.go +++ b/vendor/github.com/cilium/cilium/pkg/policy/mapstate.go @@ -12,7 +12,6 @@ import ( "github.com/sirupsen/logrus" "github.com/cilium/cilium/pkg/container/bitlpm" - "github.com/cilium/cilium/pkg/container/set" "github.com/cilium/cilium/pkg/container/versioned" "github.com/cilium/cilium/pkg/identity" "github.com/cilium/cilium/pkg/labels" @@ -32,11 +31,10 @@ import ( type Key = types.Key type Keys = types.Keys type MapStateEntry = types.MapStateEntry -type MapStateOwner = types.CachedSelector const NoAuthRequirement = types.NoAuthRequirement -// Map type for external use. Internally we have more detail in private 'mapSteteEntry' type, +// Map type for external use. Internally we have more detail in private 'mapStateEntry' type, // as well as more extensive indexing via tries. type MapStateMap map[Key]MapStateEntry @@ -102,7 +100,7 @@ type mapState struct { entries mapStateMap // trie is a Trie that indexes policy Keys without their identity // and stores the identities in an associated builtin map. - trie bitlpm.Trie[bitlpm.Key[types.LPMKey], IDSet] + trie bitlpm.Trie[types.LPMKey, IDSet] } type IDSet map[identity.NumericIdentity]struct{} @@ -125,14 +123,11 @@ func (ms *mapState) upsert(k Key, e mapStateEntry) { // Update indices if 'k' is a new key if !exists { // Update trie - idSet, ok := ms.trie.ExactLookup(k.PrefixLength(), k) + idSet, ok := ms.trie.ExactLookup(k.PrefixLength(), k.LPMKey) if !ok { idSet = make(IDSet) - kCpy := k - kCpy.Identity = 0 - ms.trie.Upsert(kCpy.PrefixLength(), kCpy, idSet) + ms.trie.Upsert(k.PrefixLength(), k.LPMKey, idSet) } - idSet[k.Identity] = struct{}{} } } @@ -142,12 +137,11 @@ func (ms *mapState) delete(k Key) { if exists { delete(ms.entries, k) - id := k.Identity - idSet, ok := ms.trie.ExactLookup(k.PrefixLength(), k) + idSet, ok := ms.trie.ExactLookup(k.PrefixLength(), k.LPMKey) if ok { - delete(idSet, id) + delete(idSet, k.Identity) if len(idSet) == 0 { - ms.trie.Delete(k.PrefixLength(), k) + ms.trie.Delete(k.PrefixLength(), k.LPMKey) } } } @@ -208,9 +202,9 @@ func (ms *mapState) forID(k Key, idSet IDSet, f func(Key, mapStateEntry) bool) b // or wildcard ID) in the trie. func (ms *mapState) BroaderOrEqualKeys(key Key) iter.Seq2[Key, mapStateEntry] { return func(yield func(Key, mapStateEntry) bool) { - iter := ms.trie.AncestorIterator(key.PrefixLength(), key) + iter := ms.trie.AncestorIterator(key.PrefixLength(), key.LPMKey) for ok, lpmKey, idSet := iter.Next(); ok; ok, lpmKey, idSet = iter.Next() { - k := Key{LPMKey: lpmKey.Value()} + k := Key{LPMKey: lpmKey} // ANY identity is broader or equal to all identities, visit it first if it exists if !ms.forID(k.WithIdentity(0), idSet, yield) { @@ -231,9 +225,9 @@ func (ms *mapState) BroaderOrEqualKeys(key Key) iter.Seq2[Key, mapStateEntry] { // state that allows iteration to be continued even if the current trie node is removed. func (ms *mapState) NarrowerOrEqualKeys(key Key) iter.Seq2[Key, mapStateEntry] { return func(yield func(Key, mapStateEntry) bool) { - iter := ms.trie.DescendantIterator(key.PrefixLength(), key) + iter := ms.trie.DescendantIterator(key.PrefixLength(), key.LPMKey) for ok, lpmKey, idSet := iter.Next(); ok; ok, lpmKey, idSet = iter.Next() { - k := Key{LPMKey: lpmKey.Value()} + k := Key{LPMKey: lpmKey} // All identities are narrower or equal to ANY identity. if key.Identity == 0 { @@ -254,9 +248,9 @@ func (ms *mapState) NarrowerOrEqualKeys(key Key) iter.Seq2[Key, mapStateEntry] { // with most specific match with the same ID as in 'key' being returned first. func (ms *mapState) CoveringKeysWithSameID(key Key) iter.Seq2[Key, mapStateEntry] { return func(yield func(Key, mapStateEntry) bool) { - iter := ms.trie.AncestorLongestPrefixFirstIterator(key.PrefixLength(), key) + iter := ms.trie.AncestorLongestPrefixFirstIterator(key.PrefixLength(), key.LPMKey) for ok, lpmKey, idSet := iter.Next(); ok; ok, lpmKey, idSet = iter.Next() { - k := Key{LPMKey: lpmKey.Value()} + k := Key{LPMKey: lpmKey} // Visit key with the same identity, if port/proto is different. if !k.PortProtoIsEqual(key) && !ms.forID(k.WithIdentity(key.Identity), idSet, yield) { @@ -270,9 +264,9 @@ func (ms *mapState) CoveringKeysWithSameID(key Key) iter.Seq2[Key, mapStateEntry // order (least specific match first). func (ms *mapState) SubsetKeysWithSameID(key Key) iter.Seq2[Key, mapStateEntry] { return func(yield func(Key, mapStateEntry) bool) { - iter := ms.trie.DescendantShortestPrefixFirstIterator(key.PrefixLength(), key) + iter := ms.trie.DescendantShortestPrefixFirstIterator(key.PrefixLength(), key.LPMKey) for ok, lpmKey, idSet := iter.Next(); ok; ok, lpmKey, idSet = iter.Next() { - k := Key{LPMKey: lpmKey.Value()} + k := Key{LPMKey: lpmKey} // Visit key with the same identity, if port/proto is different. if !k.PortProtoIsEqual(key) && !ms.forID(k.WithIdentity(key.Identity), idSet, yield) { @@ -286,16 +280,16 @@ func (ms *mapState) SubsetKeysWithSameID(key Key) iter.Seq2[Key, mapStateEntry] // with most specific match with the same ID as in 'key' being returned first. func (ms *mapState) LPMAncestors(key Key) iter.Seq2[Key, mapStateEntry] { return func(yield func(Key, mapStateEntry) bool) { - iter := ms.trie.AncestorLongestPrefixFirstIterator(key.PrefixLength(), key) + iter := ms.trie.AncestorLongestPrefixFirstIterator(key.PrefixLength(), key.LPMKey) for ok, lpmKey, idSet := iter.Next(); ok; ok, lpmKey, idSet = iter.Next() { - k := Key{LPMKey: lpmKey.Value()} + k := Key{LPMKey: lpmKey} - // Visit key with the same identity, if port/proto is different. + // Visit key with the same identity, if one exists. if !ms.forID(k.WithIdentity(key.Identity), idSet, yield) { return } // Then visit key with zero identity if not already done above and one - // exists + // exists. if key.Identity != 0 && !ms.forID(k.WithIdentity(0), idSet, yield) { return } @@ -303,26 +297,26 @@ func (ms *mapState) LPMAncestors(key Key) iter.Seq2[Key, mapStateEntry] { } } -// lookup finds the policy verdict applicable to the given 'key' using the same precedence logic +// Lookup finds the policy verdict applicable to the given 'key' using the same precedence logic // between L3 and L4-only policies as the bpf datapath when both match the given 'key'. // To be used in testing in place of the bpf datapath when full integration testing is not desired. // Returns the closest matching covering policy entry and 'true' if found. // 'key' must not have a wildcard identity or port. -func (ms *mapState) lookup(key Key) (mapStateEntry, bool) { +func (ms *mapState) Lookup(key Key) (MapStateEntry, bool) { // Validate that the search key has no wildcards if key.Identity == 0 || key.Nexthdr == 0 || key.DestPort == 0 || key.EndPort() != key.DestPort { panic("invalid key for Lookup") } var l3key, l4key Key - var l3entry, l4entry mapStateEntry + var l3entry, l4entry MapStateEntry var haveL3, haveL4 bool for k, v := range ms.LPMAncestors(key) { if !haveL3 && k.Identity != 0 { - l3key, l3entry = k, v + l3key, l3entry = k, v.MapStateEntry haveL3 = true } if !haveL4 && k.Identity == 0 { - l4key, l4entry = k, v + l4key, l4entry = k, v.MapStateEntry haveL4 = true } if haveL3 && haveL4 { @@ -330,7 +324,7 @@ func (ms *mapState) lookup(key Key) (mapStateEntry, bool) { } } - authOverride := func(entry, other mapStateEntry) mapStateEntry { + authOverride := func(entry, other MapStateEntry) MapStateEntry { // This logic needs to be the same as in authPreferredInsert() where the newEntry's // auth type may be overridden by a covering key. // This also needs to reflect the logic in bpf/lib/policy.h __account_and_check(). @@ -391,14 +385,14 @@ func (ms *mapState) lookup(key Key) (mapStateEntry, bool) { } // Deny by default if no matches are found - return mapStateEntry{MapStateEntry: types.DenyEntry()}, false + return types.DenyEntry(), false } func (ms *mapState) Len() int { return len(ms.entries) } -// mapSteteEntry is the entry type with additional internal bookkeping of the relation between +// mapStateEntry is the entry type with additional internal bookkeping of the relation between // explicitly and implicitly added entries. type mapStateEntry struct { MapStateEntry @@ -406,10 +400,6 @@ type mapStateEntry struct { // derivedFromRules tracks the policy rules this entry derives from. // In sorted order. derivedFromRules labels.LabelArrayList - - // owners collects the keys in the map and selectors in the policy that require this key to be present. - // TODO: keep track which selector needed the entry to be deny, redirect, or just allow. - owners set.Set[MapStateOwner] } // newMapStateEntry creates a map state entry. If redirect is true, the @@ -418,21 +408,20 @@ type mapStateEntry struct { // 'cs' is used to keep track of which policy selectors need this entry. If it is 'nil' this entry // will become sticky and cannot be completely removed via incremental updates. Even in this case // the entry may be overridden or removed by a deny entry. -func newMapStateEntry(cs MapStateOwner, derivedFrom labels.LabelArrayList, proxyPort uint16, priority uint8, deny bool, authReq AuthRequirement) mapStateEntry { - return NewMapStateEntry(types.NewMapStateEntry(deny, proxyPort, priority, authReq), derivedFrom, cs) +func newMapStateEntry(derivedFrom labels.LabelArrayList, proxyPort uint16, priority uint8, deny bool, authReq AuthRequirement) mapStateEntry { + return NewMapStateEntry(types.NewMapStateEntry(deny, proxyPort, priority, authReq), derivedFrom) } -// newAllowEntryWithLabels creates an allow entry with the specified labels and a 'nil' owner. +// newAllowEntryWithLabels creates an allow entry with the specified labels. // Used for adding allow-all entries when policy enforcement is not wanted. func newAllowEntryWithLabels(lbls labels.LabelArray) mapStateEntry { - return newMapStateEntry(nil, labels.LabelArrayList{lbls}, 0, 0, false, NoAuthRequirement) + return newMapStateEntry(labels.LabelArrayList{lbls}, 0, 0, false, NoAuthRequirement) } -func NewMapStateEntry(e MapStateEntry, derivedFrom labels.LabelArrayList, owners ...MapStateOwner) mapStateEntry { +func NewMapStateEntry(e MapStateEntry, derivedFrom labels.LabelArrayList) mapStateEntry { return mapStateEntry{ MapStateEntry: e, derivedFromRules: derivedFrom, - owners: set.NewSet(owners...), } } @@ -440,9 +429,13 @@ func (e *mapStateEntry) GetRuleLabels() labels.LabelArrayList { return e.derivedFromRules } -func newMapState() mapState { +func emptyMapState() mapState { + return newMapState(0) +} + +func newMapState(size int) mapState { return mapState{ - entries: make(mapStateMap), + entries: make(mapStateMap, size), trie: bitlpm.NewTrie[types.LPMKey, IDSet](types.MapStatePrefixLen), } } @@ -486,19 +479,6 @@ func (ms *mapState) updateExisting(k Key, v mapStateEntry) { ms.entries[k] = v } -// equalsWithLabels determines if this mapState is equal to the -// argument MapState. Only compares the exported MapStateEntry and derivedFromLabels. -// Only used for testing. -func (msA *mapState) equalsWithLabels(msB *mapState) bool { - if msA.Len() != msB.Len() { - return false - } - return msA.forEach(func(kA Key, vA mapStateEntry) bool { - vB, ok := msB.get(kA) - return ok && (&vB).DatapathAndDerivedFromEqual(&vA) - }) -} - // Equals determines if this MapState is equal to the // argument (exported) MapStateMap // Only used for testing from other packages. @@ -520,10 +500,33 @@ func (msA *mapState) Equal(msB *mapState) bool { } return msA.forEach(func(kA Key, vA mapStateEntry) bool { vB, ok := msB.get(kA) - return ok && (&vB).deepEqual(&vA) + return ok && (&vB).Equal(&vA) }) } +// Diff returns the string of differences between 'obtained' and 'expected' prefixed with +// '+ ' or '- ' for obtaining something unexpected, or not obtaining the expected, respectively. +// For use in debugging from other packages. +func (obtained MapStateMap) Diff(expected MapStateMap) (res string) { + res += "Missing (-), Unexpected (+):\n" + for kE, vE := range expected { + if vO, ok := obtained[kE]; ok { + if vO != vE { + res += "- " + kE.String() + ": " + vE.String() + "\n" + res += "+ " + kE.String() + ": " + vO.String() + "\n" + } + } else { + res += "- " + kE.String() + ": " + vE.String() + "\n" + } + } + for kO, vO := range obtained { + if _, ok := expected[kO]; !ok { + res += "+ " + kO.String() + ": " + vO.String() + "\n" + } + } + return res +} + // Diff returns the string of differences between 'obtained' and 'expected' prefixed with // '+ ' or '- ' for obtaining something unexpected, or not obtaining the expected, respectively. // For use in debugging from other packages. @@ -555,7 +558,7 @@ func (obtained *mapState) diff(expected *mapState) (res string) { res += "Missing (-), Unexpected (+):\n" expected.forEach(func(kE Key, vE mapStateEntry) bool { if vO, ok := obtained.get(kE); ok { - if !(&vO).deepEqual(&vE) { + if !(&vO).Equal(&vE) { res += "- " + kE.String() + ": " + vE.String() + "\n" res += "+ " + kE.String() + ": " + vO.String() + "\n" } @@ -581,11 +584,9 @@ func (ms mapState) String() (res string) { return res } -// DatapathAndDerivedFromEqual returns true of two entries are equal in the datapath's PoV, -// i.e., IsDeny, ProxyPort and AuthType are the same for both entries, and the DerivedFromRules -// fields are also equal. +// Equal returns true of two entries are equal. // This is used for testing only via mapState.Equal and mapState.Diff. -func (e *mapStateEntry) DatapathAndDerivedFromEqual(o *mapStateEntry) bool { +func (e *mapStateEntry) Equal(o *mapStateEntry) bool { if e == nil || o == nil { return e == o } @@ -593,37 +594,20 @@ func (e *mapStateEntry) DatapathAndDerivedFromEqual(o *mapStateEntry) bool { return e.MapStateEntry == o.MapStateEntry && e.derivedFromRules.DeepEqual(&o.derivedFromRules) } -// DeepEqual is a manually generated deepequal function, deeply comparing the -// receiver with other. in must be non-nil. -// Defined manually due to deepequal-gen not supporting interface types. -func (e *mapStateEntry) deepEqual(o *mapStateEntry) bool { - if !e.DatapathAndDerivedFromEqual(o) { - return false - } - - if !e.owners.Equal(o.owners) { - return false - } - - return true -} - // String returns a string representation of the MapStateEntry func (e mapStateEntry) String() string { return e.MapStateEntry.String() + - ",derivedFromRules=" + fmt.Sprintf("%v", e.derivedFromRules) + - ",owners=" + e.owners.String() + ",derivedFromRules=" + fmt.Sprintf("%v", e.derivedFromRules) } // addKeyWithChanges adds a 'key' with value 'entry' to 'keys' keeping track of incremental changes in 'adds' and 'deletes', and any changed or removed old values in 'old', if not nil. func (ms *mapState) addKeyWithChanges(key Key, entry mapStateEntry, changes ChangeState) bool { - // Keep all owners that need this entry so that it is deleted only if all the owners delete their contribution var datapathEqual bool oldEntry, exists := ms.get(key) // Only merge if both old and new are allows or denies if exists && oldEntry.IsDeny() == entry.IsDeny() { // Do nothing if entries are equal - if entry.deepEqual(&oldEntry) { + if entry.Equal(&oldEntry) { return false // nothing to do } @@ -635,7 +619,6 @@ func (ms *mapState) addKeyWithChanges(key Key, entry mapStateEntry, changes Chan datapathEqual = oldEntry.MapStateEntry == entry.MapStateEntry oldEntry.MapStateEntry.Merge(entry.MapStateEntry) - oldEntry.owners.Merge(entry.owners) if len(entry.derivedFromRules) > 0 { oldEntry.derivedFromRules.MergeSorted(entry.derivedFromRules) } @@ -669,34 +652,11 @@ func (ms *mapState) addKeyWithChanges(key Key, entry mapStateEntry, changes Chan return true } -// deleteKeyWithChanges deletes a 'key' from 'keys' keeping track of incremental changes in 'adds' -// and 'deletes'. -// The key is unconditionally deleted if 'owner' is nil, otherwise only the contribution of this -// 'owner' is removed. -func (ms *mapState) deleteKeyWithChanges(owner MapStateOwner, key Key, changes ChangeState) { +// deleteKeyWithChanges deletes a 'key' from 'ms' keeping track of incremental changes in 'changes' +func (ms *mapState) deleteKeyWithChanges(key Key, changes ChangeState) { if entry, exists := ms.get(key); exists { // Save old value before any changes, if desired - oldAdded := changes.insertOldIfNotExists(key, entry) - if owner != nil { - if entry.owners.Has(owner) { - // remove this owner from entry's owners - changed := entry.owners.Remove(owner) - // key is not deleted if other owners still need it - if entry.owners.Len() > 0 { - if changed { - // re-insert entry due to owner change - ms.updateExisting(key, entry) - } - return - } - } else { - // 'owner' was not found, do not change anything - if oldAdded { - delete(changes.old, key) - } - return - } - } + changes.insertOldIfNotExists(key, entry) if changes.Deletes != nil { changes.Deletes[key] = struct{}{} @@ -770,7 +730,7 @@ func (ms *mapState) insertWithChanges(newKey Key, newEntry mapStateEntry, featur // Delete covered allows and denies with a different key for k, v := range ms.NarrowerOrEqualKeys(newKey) { if !v.IsDeny() || k != newKey { - ms.deleteKeyWithChanges(nil, k, changes) + ms.deleteKeyWithChanges(k, changes) } } } else { @@ -791,7 +751,7 @@ func (ms *mapState) insertWithChanges(newKey Key, newEntry mapStateEntry, featur if features.contains(redirectRules) { for k, v := range ms.NarrowerOrEqualKeys(newKey) { if !v.IsDeny() && v.ProxyPortPriority < newEntry.ProxyPortPriority { - ms.deleteKeyWithChanges(nil, k, changes) + ms.deleteKeyWithChanges(k, changes) } } } @@ -873,7 +833,6 @@ func (changes *ChangeState) insertOldIfNotExists(key Key, entry mapStateEntry) b if _, added := changes.Adds[key]; !added { // Clone to keep this entry separate from the one that may remain in 'keys' entry.derivedFromRules = slices.Clone(entry.derivedFromRules) - entry.owners = entry.owners.Clone() changes.old[key] = entry return true @@ -1011,8 +970,7 @@ func (mc *MapChanges) consumeMapChanges(p *EndpointPolicy, features policyFeatur } else { // Delete the contribution of this cs to the key and collect incremental // changes - cs, _ := entry.owners.Get() // get the sole selector - p.policyMapState.deleteKeyWithChanges(cs, key, changes) + p.policyMapState.deleteKeyWithChanges(key, changes) } } diff --git a/vendor/github.com/cilium/cilium/pkg/policy/repository.go b/vendor/github.com/cilium/cilium/pkg/policy/repository.go index eca9a31c25..5f867c91f4 100644 --- a/vendor/github.com/cilium/cilium/pkg/policy/repository.go +++ b/vendor/github.com/cilium/cilium/pkg/policy/repository.go @@ -119,7 +119,7 @@ type PolicyRepository interface { // This is used to skip policy calculation when a certain revision delta is // known to not affect the given identity. Pass a skipRevision of 0 to force // calculation. - GetSelectorPolicy(id *identity.Identity, skipRevision uint64, stats GetPolicyStatistics) (SelectorPolicy, uint64) + GetSelectorPolicy(id *identity.Identity, skipRevision uint64, stats GetPolicyStatistics) (SelectorPolicy, uint64, error) GetRevision() uint64 GetRulesList() *models.Policy @@ -133,7 +133,7 @@ type PolicyRepository interface { type GetPolicyStatistics interface { WaitingForPolicyRepository() *spanstat.SpanStat - SelectorPolicyCalculation() *spanstat.SpanStat + PolicyCalculation() *spanstat.SpanStat } // Repository is a list of policy rules which in combination form the security @@ -826,7 +826,7 @@ func wildcardRule(lbls labels.LabelArray, ingress bool) *rule { // This is used to skip policy calculation when a certain revision delta is // known to not affect the given identity. Pass a skipRevision of 0 to force // calculation. -func (r *Repository) GetSelectorPolicy(id *identity.Identity, skipRevision uint64, stats GetPolicyStatistics) (SelectorPolicy, uint64) { +func (r *Repository) GetSelectorPolicy(id *identity.Identity, skipRevision uint64, stats GetPolicyStatistics) (SelectorPolicy, uint64, error) { stats.WaitingForPolicyRepository().Start() r.RLock() defer r.RUnlock() @@ -837,21 +837,21 @@ func (r *Repository) GetSelectorPolicy(id *identity.Identity, skipRevision uint6 // Do we already have a given revision? // If so, skip calculation. if skipRevision >= rev { - return nil, rev + return nil, rev, nil } - stats.SelectorPolicyCalculation().Start() + stats.PolicyCalculation().Start() // This may call back in to the (locked) repository to generate the // selector policy sp, updated, err := r.policyCache.updateSelectorPolicy(id) - stats.SelectorPolicyCalculation().EndError(err) + stats.PolicyCalculation().EndError(err) // If we hit cache, reset the statistics. if !updated { - stats.SelectorPolicyCalculation().Reset() + stats.PolicyCalculation().Reset() } - return sp, rev + return sp, rev, nil } // ReplaceByResource replaces all rules by resource, returning the complete set of affected endpoints. diff --git a/vendor/github.com/cilium/cilium/pkg/policy/resolve.go b/vendor/github.com/cilium/cilium/pkg/policy/resolve.go index f6ad13059c..818f58e992 100644 --- a/vendor/github.com/cilium/cilium/pkg/policy/resolve.go +++ b/vendor/github.com/cilium/cilium/pkg/policy/resolve.go @@ -7,6 +7,7 @@ import ( "errors" "fmt" "iter" + "runtime" "github.com/sirupsen/logrus" @@ -103,24 +104,13 @@ func (p *EndpointPolicy) LookupRedirectPort(ingress bool, protocol string, port return 0, fmt.Errorf("Proxy port for redirect %q not found", proxyID) } -// Lookup finds the policy verdict applicable to the given 'key' using the same precedence logic -// between L3 and L4-only policies like the bpf datapath when both match the given 'key'. -// To be used in testing in place of the bpf datapath when full integration testing is not desired. -// Returns the closest matching covering policy entry, the labels of the rules that contributed to -// that verdict, and 'true' if found. -// Returns a deny entry when a match is not found, mirroring the datapath default deny behavior. -// 'key' must not have a wildcard identity or port. -func (p *EndpointPolicy) Lookup(key Key) (MapStateEntry, labels.LabelArrayList, bool) { - entry, found := p.policyMapState.lookup(key) - return entry.MapStateEntry, entry.derivedFromRules, found -} - // PolicyOwner is anything which consumes a EndpointPolicy. type PolicyOwner interface { GetID() uint64 GetNamedPort(ingress bool, name string, proto u8proto.U8proto) uint16 PolicyDebug(fields logrus.Fields, msg string) IsHost() bool + MapStateSize() int } // newSelectorPolicy returns an empty selectorPolicy stub. @@ -177,7 +167,7 @@ func (p *selectorPolicy) DistillPolicy(policyOwner PolicyOwner, redirects map[st calculatedPolicy = &EndpointPolicy{ selectorPolicy: p, VersionHandle: version, - policyMapState: newMapState(), + policyMapState: newMapState(policyOwner.MapStateSize()), policyMapChanges: MapChanges{ firstVersion: version.Version(), }, @@ -222,7 +212,8 @@ func (p *EndpointPolicy) Detach() { // in case the call was missed previouly if p.Ready() == nil { // succeeded, so it was missed previously - log.Warningf("Detach: EndpointPolicy was not marked as Ready") + _, file, line, _ := runtime.Caller(1) + log.Warningf("Detach: EndpointPolicy was not marked as Ready (%s:%d)", file, line) } // Also release the version handle held for incremental updates, if any. // This must be done after the removeUser() call above, so that we do not get a new version @@ -389,12 +380,7 @@ func (l4policy L4DirectionPolicy) forEachRedirectFilter(yield func(*L4Filter, *P return ok } -// ConsumeMapChanges transfers the changes from MapChanges to the caller. -// SelectorCache used as Identities interface which only has GetPrefix() that needs no lock. -// Endpoints explicitly wait for a WaitGroup signaling completion of AccumulatePolicyMapChanges -// calls before calling ConsumeMapChanges so that if we see any partial changes here, there will be -// another call after to cover for the rest. -// PolicyOwner (aka Endpoint) is locked during this call. +// ConsumeMapChanges applies accumulated MapChanges to EndpointPolicy 'p' and returns a symmary of changes. // Caller is responsible for calling the returned 'closer' to release resources held for the new version! // 'closer' may not be called while selector cache is locked! func (p *EndpointPolicy) ConsumeMapChanges() (closer func(), changes ChangeState) { @@ -431,6 +417,6 @@ func (p *EndpointPolicy) ConsumeMapChanges() (closer func(), changes ChangeState func NewEndpointPolicy(repo PolicyRepository) *EndpointPolicy { return &EndpointPolicy{ selectorPolicy: newSelectorPolicy(repo.GetSelectorCache()), - policyMapState: newMapState(), + policyMapState: emptyMapState(), } } diff --git a/vendor/github.com/cilium/cilium/pkg/policy/selectorcache.go b/vendor/github.com/cilium/cilium/pkg/policy/selectorcache.go index 5e792c2f43..83e00072b5 100644 --- a/vendor/github.com/cilium/cilium/pkg/policy/selectorcache.go +++ b/vendor/github.com/cilium/cilium/pkg/policy/selectorcache.go @@ -498,7 +498,14 @@ func (sc *SelectorCache) CanSkipUpdate(added, deleted identity.IdentityMap) bool // Caller should Wait() on the returned sync.WaitGroup before triggering any // policy updates. Policy updates may need Endpoint locks, so this Wait() can // deadlock if the caller is holding any endpoint locks. -func (sc *SelectorCache) UpdateIdentities(added, deleted identity.IdentityMap, wg *sync.WaitGroup) { +// +// Incremental deletes of mutated identities are not sent to the users, as that could +// lead to deletion of policy map entries while other selectors may still select the mutated +// identity. +// In this case the return value is 'true' and the caller should trigger policy updates on all +// endpoints to remove the affected identity only from selectors that no longer select the mutated +// identity. +func (sc *SelectorCache) UpdateIdentities(added, deleted identity.IdentityMap, wg *sync.WaitGroup) (mutated bool) { sc.mutex.Lock() defer sc.mutex.Unlock() @@ -581,8 +588,13 @@ func (sc *SelectorCache) UpdateIdentities(added, deleted identity.IdentityMap, w adds = append(adds, numericID) idSel.cachedSelections[numericID] = struct{}{} } else if !matches && exists { - // identity was mutated and no longer matches - dels = append(dels, numericID) + // Identity was mutated and no longer matches, the identity + // is deleted from the cached selections, but is not sent to + // users as a deletion. Instead, we return 'mutated = true' + // telling the caller to trigger forced policy updates on + // all endpoints to recompute the policy as if the mutated + // identity was never selected by the affected selector. + mutated = true delete(idSel.cachedSelections, numericID) } } @@ -609,4 +621,5 @@ func (sc *SelectorCache) UpdateIdentities(added, deleted identity.IdentityMap, w txn.Commit() } + return mutated } diff --git a/vendor/github.com/cilium/cilium/pkg/policy/types/types.go b/vendor/github.com/cilium/cilium/pkg/policy/types/types.go index 426c4799d6..9847694025 100644 --- a/vendor/github.com/cilium/cilium/pkg/policy/types/types.go +++ b/vendor/github.com/cilium/cilium/pkg/policy/types/types.go @@ -246,10 +246,4 @@ func (k LPMKey) BitValueAt(i uint) uint8 { } } -// Value implements the Value method for the -// bitlpm.Key interface. -func (k LPMKey) Value() LPMKey { - return k -} - type Keys map[Key]struct{} diff --git a/vendor/github.com/cilium/hive/script/engine.go b/vendor/github.com/cilium/hive/script/engine.go index 84208aab19..ed4fa6fdf3 100644 --- a/vendor/github.com/cilium/hive/script/engine.go +++ b/vendor/github.com/cilium/hive/script/engine.go @@ -320,7 +320,8 @@ func (e *Engine) Execute(s *State, file string, script *bufio.Reader, log io.Wri regexpArgs = usage.RegexpArgs(rawArgs...) } } - cmd.args = expandArgs(s, cmd.rawArgs, regexpArgs) + cmd.origArgs = expandArgs(s, cmd.rawArgs, regexpArgs) + cmd.args = cmd.origArgs // Run the command. err = e.runCommand(s, cmd, impl) @@ -411,6 +412,7 @@ func (e *Engine) ExecuteLine(s *State, line string, log io.Writer) (err error) { } } cmd.args = expandArgs(s, cmd.rawArgs, regexpArgs) + cmd.origArgs = cmd.args // Run the command. err = e.runCommand(s, cmd, impl) @@ -436,6 +438,7 @@ type command struct { conds []condition // all must be satisfied name string // the name of the command; must be non-empty rawArgs [][]argFragment + origArgs []string // original arguments before pflag parsing args []string // shell-expanded arguments following name background bool // command should run in background (ends with a trailing &) } @@ -695,7 +698,7 @@ func (e *Engine) runCommand(s *State, cmd *command, impl Cmd) error { if usage.Flags != nil { usage.Flags(fs) } - if err := fs.Parse(cmd.args); err != nil { + if err := fs.Parse(cmd.origArgs); err != nil { if errors.Is(err, pflag.ErrHelp) { out := new(strings.Builder) err = e.ListCmds(out, true, "^"+cmd.name+"$") diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/http/proto_message_extraction/v3/config.pb.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/http/proto_message_extraction/v3/config.pb.go deleted file mode 100644 index c1e2f93bf8..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/http/proto_message_extraction/v3/config.pb.go +++ /dev/null @@ -1,526 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.23.0 -// protoc v5.26.1 -// source: envoy/extensions/filters/http/proto_message_extraction/v3/config.proto - -package proto_message_extractionv3 - -import ( - v3 "github.com/cilium/proxy/go/envoy/config/core/v3" - _ "github.com/cncf/xds/go/udpa/annotations" - _ "github.com/cncf/xds/go/xds/annotations/v3" - proto "github.com/golang/protobuf/proto" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - -type ProtoMessageExtractionConfig_ExtractMode int32 - -const ( - ProtoMessageExtractionConfig_ExtractMode_UNSPECIFIED ProtoMessageExtractionConfig_ExtractMode = 0 - // The filter will extract the first and the last message for - // for streaming cases, containing - // client-side streaming, server-side streaming or bi-directional streaming. - ProtoMessageExtractionConfig_FIRST_AND_LAST ProtoMessageExtractionConfig_ExtractMode = 1 -) - -// Enum value maps for ProtoMessageExtractionConfig_ExtractMode. -var ( - ProtoMessageExtractionConfig_ExtractMode_name = map[int32]string{ - 0: "ExtractMode_UNSPECIFIED", - 1: "FIRST_AND_LAST", - } - ProtoMessageExtractionConfig_ExtractMode_value = map[string]int32{ - "ExtractMode_UNSPECIFIED": 0, - "FIRST_AND_LAST": 1, - } -) - -func (x ProtoMessageExtractionConfig_ExtractMode) Enum() *ProtoMessageExtractionConfig_ExtractMode { - p := new(ProtoMessageExtractionConfig_ExtractMode) - *p = x - return p -} - -func (x ProtoMessageExtractionConfig_ExtractMode) String() string { - return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) -} - -func (ProtoMessageExtractionConfig_ExtractMode) Descriptor() protoreflect.EnumDescriptor { - return file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_enumTypes[0].Descriptor() -} - -func (ProtoMessageExtractionConfig_ExtractMode) Type() protoreflect.EnumType { - return &file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_enumTypes[0] -} - -func (x ProtoMessageExtractionConfig_ExtractMode) Number() protoreflect.EnumNumber { - return protoreflect.EnumNumber(x) -} - -// Deprecated: Use ProtoMessageExtractionConfig_ExtractMode.Descriptor instead. -func (ProtoMessageExtractionConfig_ExtractMode) EnumDescriptor() ([]byte, []int) { - return file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_rawDescGZIP(), []int{0, 0} -} - -type MethodExtraction_ExtractDirective int32 - -const ( - MethodExtraction_ExtractDirective_UNSPECIFIED MethodExtraction_ExtractDirective = 0 - // The value of this field will be extracted. - MethodExtraction_EXTRACT MethodExtraction_ExtractDirective = 1 - // It should be only annotated on Message type fields so if the field isn't - // empty, an empty Struct will be extracted. - MethodExtraction_EXTRACT_REDACT MethodExtraction_ExtractDirective = 2 -) - -// Enum value maps for MethodExtraction_ExtractDirective. -var ( - MethodExtraction_ExtractDirective_name = map[int32]string{ - 0: "ExtractDirective_UNSPECIFIED", - 1: "EXTRACT", - 2: "EXTRACT_REDACT", - } - MethodExtraction_ExtractDirective_value = map[string]int32{ - "ExtractDirective_UNSPECIFIED": 0, - "EXTRACT": 1, - "EXTRACT_REDACT": 2, - } -) - -func (x MethodExtraction_ExtractDirective) Enum() *MethodExtraction_ExtractDirective { - p := new(MethodExtraction_ExtractDirective) - *p = x - return p -} - -func (x MethodExtraction_ExtractDirective) String() string { - return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) -} - -func (MethodExtraction_ExtractDirective) Descriptor() protoreflect.EnumDescriptor { - return file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_enumTypes[1].Descriptor() -} - -func (MethodExtraction_ExtractDirective) Type() protoreflect.EnumType { - return &file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_enumTypes[1] -} - -func (x MethodExtraction_ExtractDirective) Number() protoreflect.EnumNumber { - return protoreflect.EnumNumber(x) -} - -// Deprecated: Use MethodExtraction_ExtractDirective.Descriptor instead. -func (MethodExtraction_ExtractDirective) EnumDescriptor() ([]byte, []int) { - return file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_rawDescGZIP(), []int{1, 0} -} - -type ProtoMessageExtractionConfig struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // The proto descriptor set binary for the gRPC services. - // - // Types that are assignable to DescriptorSet: - // - // *ProtoMessageExtractionConfig_DataSource - // *ProtoMessageExtractionConfig_ProtoDescriptorTypedMetadata - DescriptorSet isProtoMessageExtractionConfig_DescriptorSet `protobuf_oneof:"descriptor_set"` - Mode ProtoMessageExtractionConfig_ExtractMode `protobuf:"varint,3,opt,name=mode,proto3,enum=envoy.extensions.filters.http.proto_message_extraction.v3.ProtoMessageExtractionConfig_ExtractMode" json:"mode,omitempty"` - // Specify the message extraction info. - // The key is the fully qualified gRPC method name. - // “${package}.${Service}.${Method}“, like - // “endpoints.examples.bookstore.BookStore.GetShelf“ - // - // The value is the message extraction information for individual gRPC - // methods. - ExtractionByMethod map[string]*MethodExtraction `protobuf:"bytes,4,rep,name=extraction_by_method,json=extractionByMethod,proto3" json:"extraction_by_method,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` -} - -func (x *ProtoMessageExtractionConfig) Reset() { - *x = ProtoMessageExtractionConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ProtoMessageExtractionConfig) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ProtoMessageExtractionConfig) ProtoMessage() {} - -func (x *ProtoMessageExtractionConfig) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ProtoMessageExtractionConfig.ProtoReflect.Descriptor instead. -func (*ProtoMessageExtractionConfig) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_rawDescGZIP(), []int{0} -} - -func (m *ProtoMessageExtractionConfig) GetDescriptorSet() isProtoMessageExtractionConfig_DescriptorSet { - if m != nil { - return m.DescriptorSet - } - return nil -} - -func (x *ProtoMessageExtractionConfig) GetDataSource() *v3.DataSource { - if x, ok := x.GetDescriptorSet().(*ProtoMessageExtractionConfig_DataSource); ok { - return x.DataSource - } - return nil -} - -func (x *ProtoMessageExtractionConfig) GetProtoDescriptorTypedMetadata() string { - if x, ok := x.GetDescriptorSet().(*ProtoMessageExtractionConfig_ProtoDescriptorTypedMetadata); ok { - return x.ProtoDescriptorTypedMetadata - } - return "" -} - -func (x *ProtoMessageExtractionConfig) GetMode() ProtoMessageExtractionConfig_ExtractMode { - if x != nil { - return x.Mode - } - return ProtoMessageExtractionConfig_ExtractMode_UNSPECIFIED -} - -func (x *ProtoMessageExtractionConfig) GetExtractionByMethod() map[string]*MethodExtraction { - if x != nil { - return x.ExtractionByMethod - } - return nil -} - -type isProtoMessageExtractionConfig_DescriptorSet interface { - isProtoMessageExtractionConfig_DescriptorSet() -} - -type ProtoMessageExtractionConfig_DataSource struct { - // It could be passed by a local file through “Datasource.filename“ or - // embedded in the “Datasource.inline_bytes“. - DataSource *v3.DataSource `protobuf:"bytes,1,opt,name=data_source,json=dataSource,proto3,oneof"` -} - -type ProtoMessageExtractionConfig_ProtoDescriptorTypedMetadata struct { - // Unimplemented, the key of proto descriptor TypedMetadata. - // Among filters depending on the proto descriptor, we can have a - // TypedMetadata for proto descriptors, so that these filters can share one - // copy of proto descriptor in memory. - ProtoDescriptorTypedMetadata string `protobuf:"bytes,2,opt,name=proto_descriptor_typed_metadata,json=protoDescriptorTypedMetadata,proto3,oneof"` -} - -func (*ProtoMessageExtractionConfig_DataSource) isProtoMessageExtractionConfig_DescriptorSet() {} - -func (*ProtoMessageExtractionConfig_ProtoDescriptorTypedMetadata) isProtoMessageExtractionConfig_DescriptorSet() { -} - -// This message can be used to support per route config approach later even -// though the Istio doesn't support that so far. -type MethodExtraction struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // The mapping of field path to its ExtractDirective for request messages - RequestExtractionByField map[string]MethodExtraction_ExtractDirective `protobuf:"bytes,2,rep,name=request_extraction_by_field,json=requestExtractionByField,proto3" json:"request_extraction_by_field,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=envoy.extensions.filters.http.proto_message_extraction.v3.MethodExtraction_ExtractDirective"` - // The mapping of field path to its ExtractDirective for response messages - ResponseExtractionByField map[string]MethodExtraction_ExtractDirective `protobuf:"bytes,3,rep,name=response_extraction_by_field,json=responseExtractionByField,proto3" json:"response_extraction_by_field,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=envoy.extensions.filters.http.proto_message_extraction.v3.MethodExtraction_ExtractDirective"` -} - -func (x *MethodExtraction) Reset() { - *x = MethodExtraction{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MethodExtraction) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MethodExtraction) ProtoMessage() {} - -func (x *MethodExtraction) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use MethodExtraction.ProtoReflect.Descriptor instead. -func (*MethodExtraction) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_rawDescGZIP(), []int{1} -} - -func (x *MethodExtraction) GetRequestExtractionByField() map[string]MethodExtraction_ExtractDirective { - if x != nil { - return x.RequestExtractionByField - } - return nil -} - -func (x *MethodExtraction) GetResponseExtractionByField() map[string]MethodExtraction_ExtractDirective { - if x != nil { - return x.ResponseExtractionByField - } - return nil -} - -var File_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto protoreflect.FileDescriptor - -var file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_rawDesc = []byte{ - 0x0a, 0x46, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x65, 0x78, - 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x39, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, - 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, - 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x76, 0x33, 0x1a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, - 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x78, 0x64, 0x73, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x33, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, - 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb0, 0x05, 0x0a, 0x1c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x43, 0x0a, 0x0b, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, - 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, - 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x48, 0x00, 0x52, 0x0a, - 0x64, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x47, 0x0a, 0x1f, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x74, - 0x79, 0x70, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x1c, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x44, 0x65, 0x73, 0x63, - 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, 0x64, 0x4d, 0x65, 0x74, 0x61, 0x64, - 0x61, 0x74, 0x61, 0x12, 0x77, 0x0a, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x0e, 0x32, 0x63, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, - 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, - 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, - 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x45, 0x78, 0x74, 0x72, 0x61, - 0x63, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x12, 0xa1, 0x01, 0x0a, - 0x14, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x79, 0x5f, 0x6d, - 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x6f, 0x2e, 0x65, 0x6e, - 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, - 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, - 0x79, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x12, 0x65, 0x78, - 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, - 0x1a, 0x92, 0x01, 0x0a, 0x17, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, - 0x79, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x61, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4b, 0x2e, - 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, - 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x72, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, - 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3e, 0x0a, 0x0b, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, - 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x1b, 0x0a, 0x17, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4d, - 0x6f, 0x64, 0x65, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, - 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x46, 0x49, 0x52, 0x53, 0x54, 0x5f, 0x41, 0x4e, 0x44, 0x5f, 0x4c, - 0x41, 0x53, 0x54, 0x10, 0x01, 0x42, 0x10, 0x0a, 0x0e, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, - 0x74, 0x6f, 0x72, 0x5f, 0x73, 0x65, 0x74, 0x22, 0x9b, 0x06, 0x0a, 0x10, 0x4d, 0x65, 0x74, 0x68, - 0x6f, 0x64, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0xa8, 0x01, 0x0a, - 0x1b, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x79, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x69, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, - 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, - 0x74, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x5f, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4d, - 0x65, 0x74, 0x68, 0x6f, 0x64, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x42, 0x79, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x18, 0x72, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x42, 0x79, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0xab, 0x01, 0x0a, 0x1c, 0x72, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, - 0x62, 0x79, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x6a, - 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, - 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x65, 0x78, 0x74, - 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, - 0x64, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, - 0x46, 0x69, 0x65, 0x6c, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x19, 0x72, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, - 0x46, 0x69, 0x65, 0x6c, 0x64, 0x1a, 0xa9, 0x01, 0x0a, 0x1d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x46, 0x69, 0x65, - 0x6c, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x72, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x5c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, - 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, - 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x45, 0x78, 0x74, 0x72, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x44, 0x69, 0x72, - 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x1a, 0xaa, 0x01, 0x0a, 0x1e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x45, 0x78, - 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x72, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x5c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, - 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, - 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, - 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x2e, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, - 0x69, 0x76, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x55, - 0x0a, 0x10, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, - 0x76, 0x65, 0x12, 0x20, 0x0a, 0x1c, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x44, 0x69, 0x72, - 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, - 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x45, 0x58, 0x54, 0x52, 0x41, 0x43, 0x54, 0x10, - 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x45, 0x58, 0x54, 0x52, 0x41, 0x43, 0x54, 0x5f, 0x52, 0x45, 0x44, - 0x41, 0x43, 0x54, 0x10, 0x02, 0x42, 0xe5, 0x01, 0x0a, 0x47, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, - 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, - 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, - 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, - 0x33, 0x42, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, - 0x5a, 0x7b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, - 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, - 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, - 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2f, - 0x76, 0x33, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x5f, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x76, 0x33, 0xba, 0x80, 0xc8, - 0xd1, 0x06, 0x02, 0x10, 0x02, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_rawDescOnce sync.Once - file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_rawDescData = file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_rawDesc -) - -func file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_rawDescGZIP() []byte { - file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_rawDescOnce.Do(func() { - file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_rawDescData) - }) - return file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_rawDescData -} - -var file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_enumTypes = make([]protoimpl.EnumInfo, 2) -var file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_msgTypes = make([]protoimpl.MessageInfo, 5) -var file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_goTypes = []interface{}{ - (ProtoMessageExtractionConfig_ExtractMode)(0), // 0: envoy.extensions.filters.http.proto_message_extraction.v3.ProtoMessageExtractionConfig.ExtractMode - (MethodExtraction_ExtractDirective)(0), // 1: envoy.extensions.filters.http.proto_message_extraction.v3.MethodExtraction.ExtractDirective - (*ProtoMessageExtractionConfig)(nil), // 2: envoy.extensions.filters.http.proto_message_extraction.v3.ProtoMessageExtractionConfig - (*MethodExtraction)(nil), // 3: envoy.extensions.filters.http.proto_message_extraction.v3.MethodExtraction - nil, // 4: envoy.extensions.filters.http.proto_message_extraction.v3.ProtoMessageExtractionConfig.ExtractionByMethodEntry - nil, // 5: envoy.extensions.filters.http.proto_message_extraction.v3.MethodExtraction.RequestExtractionByFieldEntry - nil, // 6: envoy.extensions.filters.http.proto_message_extraction.v3.MethodExtraction.ResponseExtractionByFieldEntry - (*v3.DataSource)(nil), // 7: envoy.config.core.v3.DataSource -} -var file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_depIdxs = []int32{ - 7, // 0: envoy.extensions.filters.http.proto_message_extraction.v3.ProtoMessageExtractionConfig.data_source:type_name -> envoy.config.core.v3.DataSource - 0, // 1: envoy.extensions.filters.http.proto_message_extraction.v3.ProtoMessageExtractionConfig.mode:type_name -> envoy.extensions.filters.http.proto_message_extraction.v3.ProtoMessageExtractionConfig.ExtractMode - 4, // 2: envoy.extensions.filters.http.proto_message_extraction.v3.ProtoMessageExtractionConfig.extraction_by_method:type_name -> envoy.extensions.filters.http.proto_message_extraction.v3.ProtoMessageExtractionConfig.ExtractionByMethodEntry - 5, // 3: envoy.extensions.filters.http.proto_message_extraction.v3.MethodExtraction.request_extraction_by_field:type_name -> envoy.extensions.filters.http.proto_message_extraction.v3.MethodExtraction.RequestExtractionByFieldEntry - 6, // 4: envoy.extensions.filters.http.proto_message_extraction.v3.MethodExtraction.response_extraction_by_field:type_name -> envoy.extensions.filters.http.proto_message_extraction.v3.MethodExtraction.ResponseExtractionByFieldEntry - 3, // 5: envoy.extensions.filters.http.proto_message_extraction.v3.ProtoMessageExtractionConfig.ExtractionByMethodEntry.value:type_name -> envoy.extensions.filters.http.proto_message_extraction.v3.MethodExtraction - 1, // 6: envoy.extensions.filters.http.proto_message_extraction.v3.MethodExtraction.RequestExtractionByFieldEntry.value:type_name -> envoy.extensions.filters.http.proto_message_extraction.v3.MethodExtraction.ExtractDirective - 1, // 7: envoy.extensions.filters.http.proto_message_extraction.v3.MethodExtraction.ResponseExtractionByFieldEntry.value:type_name -> envoy.extensions.filters.http.proto_message_extraction.v3.MethodExtraction.ExtractDirective - 8, // [8:8] is the sub-list for method output_type - 8, // [8:8] is the sub-list for method input_type - 8, // [8:8] is the sub-list for extension type_name - 8, // [8:8] is the sub-list for extension extendee - 0, // [0:8] is the sub-list for field type_name -} - -func init() { file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_init() } -func file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_init() { - if File_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProtoMessageExtractionConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MethodExtraction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_msgTypes[0].OneofWrappers = []interface{}{ - (*ProtoMessageExtractionConfig_DataSource)(nil), - (*ProtoMessageExtractionConfig_ProtoDescriptorTypedMetadata)(nil), - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_rawDesc, - NumEnums: 2, - NumMessages: 5, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_goTypes, - DependencyIndexes: file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_depIdxs, - EnumInfos: file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_enumTypes, - MessageInfos: file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_msgTypes, - }.Build() - File_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto = out.File - file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_rawDesc = nil - file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_goTypes = nil - file_envoy_extensions_filters_http_proto_message_extraction_v3_config_proto_depIdxs = nil -} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/http/proto_message_extraction/v3/config.pb.validate.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/http/proto_message_extraction/v3/config.pb.validate.go deleted file mode 100644 index 6baef2f4e3..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/http/proto_message_extraction/v3/config.pb.validate.go +++ /dev/null @@ -1,349 +0,0 @@ -// Code generated by protoc-gen-validate. DO NOT EDIT. -// source: envoy/extensions/filters/http/proto_message_extraction/v3/config.proto - -package proto_message_extractionv3 - -import ( - "bytes" - "errors" - "fmt" - "net" - "net/mail" - "net/url" - "regexp" - "sort" - "strings" - "time" - "unicode/utf8" - - "google.golang.org/protobuf/types/known/anypb" -) - -// ensure the imports are used -var ( - _ = bytes.MinRead - _ = errors.New("") - _ = fmt.Print - _ = utf8.UTFMax - _ = (*regexp.Regexp)(nil) - _ = (*strings.Reader)(nil) - _ = net.IPv4len - _ = time.Duration(0) - _ = (*url.URL)(nil) - _ = (*mail.Address)(nil) - _ = anypb.Any{} - _ = sort.Sort -) - -// Validate checks the field values on ProtoMessageExtractionConfig with the -// rules defined in the proto definition for this message. If any rules are -// violated, the first error encountered is returned, or nil if there are no violations. -func (m *ProtoMessageExtractionConfig) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on ProtoMessageExtractionConfig with the -// rules defined in the proto definition for this message. If any rules are -// violated, the result is a list of violation errors wrapped in -// ProtoMessageExtractionConfigMultiError, or nil if none found. -func (m *ProtoMessageExtractionConfig) ValidateAll() error { - return m.validate(true) -} - -func (m *ProtoMessageExtractionConfig) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - // no validation rules for Mode - - { - sorted_keys := make([]string, len(m.GetExtractionByMethod())) - i := 0 - for key := range m.GetExtractionByMethod() { - sorted_keys[i] = key - i++ - } - sort.Slice(sorted_keys, func(i, j int) bool { return sorted_keys[i] < sorted_keys[j] }) - for _, key := range sorted_keys { - val := m.GetExtractionByMethod()[key] - _ = val - - // no validation rules for ExtractionByMethod[key] - - if all { - switch v := interface{}(val).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, ProtoMessageExtractionConfigValidationError{ - field: fmt.Sprintf("ExtractionByMethod[%v]", key), - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, ProtoMessageExtractionConfigValidationError{ - field: fmt.Sprintf("ExtractionByMethod[%v]", key), - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(val).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return ProtoMessageExtractionConfigValidationError{ - field: fmt.Sprintf("ExtractionByMethod[%v]", key), - reason: "embedded message failed validation", - cause: err, - } - } - } - - } - } - - switch v := m.DescriptorSet.(type) { - case *ProtoMessageExtractionConfig_DataSource: - if v == nil { - err := ProtoMessageExtractionConfigValidationError{ - field: "DescriptorSet", - reason: "oneof value cannot be a typed-nil", - } - if !all { - return err - } - errors = append(errors, err) - } - - if all { - switch v := interface{}(m.GetDataSource()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, ProtoMessageExtractionConfigValidationError{ - field: "DataSource", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, ProtoMessageExtractionConfigValidationError{ - field: "DataSource", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetDataSource()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return ProtoMessageExtractionConfigValidationError{ - field: "DataSource", - reason: "embedded message failed validation", - cause: err, - } - } - } - - case *ProtoMessageExtractionConfig_ProtoDescriptorTypedMetadata: - if v == nil { - err := ProtoMessageExtractionConfigValidationError{ - field: "DescriptorSet", - reason: "oneof value cannot be a typed-nil", - } - if !all { - return err - } - errors = append(errors, err) - } - // no validation rules for ProtoDescriptorTypedMetadata - default: - _ = v // ensures v is used - } - - if len(errors) > 0 { - return ProtoMessageExtractionConfigMultiError(errors) - } - - return nil -} - -// ProtoMessageExtractionConfigMultiError is an error wrapping multiple -// validation errors returned by ProtoMessageExtractionConfig.ValidateAll() if -// the designated constraints aren't met. -type ProtoMessageExtractionConfigMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m ProtoMessageExtractionConfigMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m ProtoMessageExtractionConfigMultiError) AllErrors() []error { return m } - -// ProtoMessageExtractionConfigValidationError is the validation error returned -// by ProtoMessageExtractionConfig.Validate if the designated constraints -// aren't met. -type ProtoMessageExtractionConfigValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e ProtoMessageExtractionConfigValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e ProtoMessageExtractionConfigValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e ProtoMessageExtractionConfigValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e ProtoMessageExtractionConfigValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e ProtoMessageExtractionConfigValidationError) ErrorName() string { - return "ProtoMessageExtractionConfigValidationError" -} - -// Error satisfies the builtin error interface -func (e ProtoMessageExtractionConfigValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sProtoMessageExtractionConfig.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = ProtoMessageExtractionConfigValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = ProtoMessageExtractionConfigValidationError{} - -// Validate checks the field values on MethodExtraction with the rules defined -// in the proto definition for this message. If any rules are violated, the -// first error encountered is returned, or nil if there are no violations. -func (m *MethodExtraction) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on MethodExtraction with the rules -// defined in the proto definition for this message. If any rules are -// violated, the result is a list of violation errors wrapped in -// MethodExtractionMultiError, or nil if none found. -func (m *MethodExtraction) ValidateAll() error { - return m.validate(true) -} - -func (m *MethodExtraction) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - // no validation rules for RequestExtractionByField - - // no validation rules for ResponseExtractionByField - - if len(errors) > 0 { - return MethodExtractionMultiError(errors) - } - - return nil -} - -// MethodExtractionMultiError is an error wrapping multiple validation errors -// returned by MethodExtraction.ValidateAll() if the designated constraints -// aren't met. -type MethodExtractionMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m MethodExtractionMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m MethodExtractionMultiError) AllErrors() []error { return m } - -// MethodExtractionValidationError is the validation error returned by -// MethodExtraction.Validate if the designated constraints aren't met. -type MethodExtractionValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e MethodExtractionValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e MethodExtractionValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e MethodExtractionValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e MethodExtractionValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e MethodExtractionValidationError) ErrorName() string { return "MethodExtractionValidationError" } - -// Error satisfies the builtin error interface -func (e MethodExtractionValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sMethodExtraction.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = MethodExtractionValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = MethodExtractionValidationError{} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/action/v3/action.pb.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/action/v3/action.pb.go deleted file mode 100644 index 8e48135163..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/action/v3/action.pb.go +++ /dev/null @@ -1,334 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.23.0 -// protoc v5.26.1 -// source: envoy/extensions/filters/network/generic_proxy/action/v3/action.proto - -package actionv3 - -import ( - v3 "github.com/cilium/proxy/go/envoy/config/core/v3" - v31 "github.com/cilium/proxy/go/envoy/config/route/v3" - _ "github.com/cncf/xds/go/udpa/annotations" - _ "github.com/cncf/xds/go/xds/annotations/v3" - _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - anypb "google.golang.org/protobuf/types/known/anypb" - durationpb "google.golang.org/protobuf/types/known/durationpb" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - -// Configuration for the route match action. -// [#next-free-field: 8] -type RouteAction struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // The name of the route action. This should be unique across all route actions. - Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` - // Types that are assignable to ClusterSpecifier: - // - // *RouteAction_Cluster - // *RouteAction_WeightedClusters - ClusterSpecifier isRouteAction_ClusterSpecifier `protobuf_oneof:"cluster_specifier"` - // Route metadata. - Metadata *v3.Metadata `protobuf:"bytes,3,opt,name=metadata,proto3" json:"metadata,omitempty"` - // Route level config for L7 generic filters. The key should be the related :ref:`extension name - // ` in the :ref:`generic filters - // `. - PerFilterConfig map[string]*anypb.Any `protobuf:"bytes,4,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - // Specifies the upstream timeout for the route. If not specified, the default is 15s. This - // spans between the point at which the entire downstream request (i.e. end-of-stream) has been - // processed and when the upstream response has been completely processed. A value of 0 will - // disable the route's timeout. - Timeout *durationpb.Duration `protobuf:"bytes,6,opt,name=timeout,proto3" json:"timeout,omitempty"` - // Specifies the retry policy for the route. If not specified, then no retries will be performed. - // - // .. note:: - // - // Only simplest retry policy is supported and only ``num_retries`` field is used for generic - // proxy. The default value for ``num_retries`` is 1 means that the request will be tried once - // and no additional retries will be performed. - RetryPolicy *v3.RetryPolicy `protobuf:"bytes,7,opt,name=retry_policy,json=retryPolicy,proto3" json:"retry_policy,omitempty"` -} - -func (x *RouteAction) Reset() { - *x = RouteAction{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RouteAction) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RouteAction) ProtoMessage() {} - -func (x *RouteAction) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use RouteAction.ProtoReflect.Descriptor instead. -func (*RouteAction) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_rawDescGZIP(), []int{0} -} - -func (x *RouteAction) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -func (m *RouteAction) GetClusterSpecifier() isRouteAction_ClusterSpecifier { - if m != nil { - return m.ClusterSpecifier - } - return nil -} - -func (x *RouteAction) GetCluster() string { - if x, ok := x.GetClusterSpecifier().(*RouteAction_Cluster); ok { - return x.Cluster - } - return "" -} - -func (x *RouteAction) GetWeightedClusters() *v31.WeightedCluster { - if x, ok := x.GetClusterSpecifier().(*RouteAction_WeightedClusters); ok { - return x.WeightedClusters - } - return nil -} - -func (x *RouteAction) GetMetadata() *v3.Metadata { - if x != nil { - return x.Metadata - } - return nil -} - -func (x *RouteAction) GetPerFilterConfig() map[string]*anypb.Any { - if x != nil { - return x.PerFilterConfig - } - return nil -} - -func (x *RouteAction) GetTimeout() *durationpb.Duration { - if x != nil { - return x.Timeout - } - return nil -} - -func (x *RouteAction) GetRetryPolicy() *v3.RetryPolicy { - if x != nil { - return x.RetryPolicy - } - return nil -} - -type isRouteAction_ClusterSpecifier interface { - isRouteAction_ClusterSpecifier() -} - -type RouteAction_Cluster struct { - // Indicates the upstream cluster to which the request should be routed. - Cluster string `protobuf:"bytes,1,opt,name=cluster,proto3,oneof"` -} - -type RouteAction_WeightedClusters struct { - // [#not-implemented-hide:] - // Multiple upstream clusters can be specified for a given route. The request is routed to one - // of the upstream clusters based on weights assigned to each cluster. - // Currently ClusterWeight only supports the name and weight fields. - WeightedClusters *v31.WeightedCluster `protobuf:"bytes,2,opt,name=weighted_clusters,json=weightedClusters,proto3,oneof"` -} - -func (*RouteAction_Cluster) isRouteAction_ClusterSpecifier() {} - -func (*RouteAction_WeightedClusters) isRouteAction_ClusterSpecifier() {} - -var File_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto protoreflect.FileDescriptor - -var file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_rawDesc = []byte{ - 0x0a, 0x45, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, - 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x33, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x38, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, - 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, - 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, - 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, - 0x33, 0x1a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, - 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x2c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, - 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, - 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x78, 0x64, 0x73, - 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x33, 0x2f, - 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, - 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, - 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc8, 0x04, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, - 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6c, 0x75, - 0x73, 0x74, 0x65, 0x72, 0x12, 0x55, 0x0a, 0x11, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, - 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, - 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x00, 0x52, 0x10, 0x77, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x65, 0x64, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x12, 0x3a, 0x0a, 0x08, 0x6d, - 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, - 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, - 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x08, 0x6d, - 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x86, 0x01, 0x0a, 0x11, 0x70, 0x65, 0x72, 0x5f, - 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x5a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, - 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, - 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, - 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x52, - 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x65, 0x72, 0x46, 0x69, - 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x0f, 0x70, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, - 0x12, 0x33, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x74, 0x69, - 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x44, 0x0a, 0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, - 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, - 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, - 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0b, - 0x72, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x1a, 0x58, 0x0a, 0x14, 0x50, - 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x18, 0x0a, 0x11, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, - 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, - 0xd1, 0x01, 0x0a, 0x46, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, - 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x2e, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, - 0x2e, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x0b, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x68, 0x67, 0x69, 0x74, 0x68, 0x75, - 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, - 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, - 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, - 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, - 0x02, 0x08, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_rawDescOnce sync.Once - file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_rawDescData = file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_rawDesc -) - -func file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_rawDescGZIP() []byte { - file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_rawDescOnce.Do(func() { - file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_rawDescData) - }) - return file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_rawDescData -} - -var file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_goTypes = []interface{}{ - (*RouteAction)(nil), // 0: envoy.extensions.filters.network.generic_proxy.action.v3.RouteAction - nil, // 1: envoy.extensions.filters.network.generic_proxy.action.v3.RouteAction.PerFilterConfigEntry - (*v31.WeightedCluster)(nil), // 2: envoy.config.route.v3.WeightedCluster - (*v3.Metadata)(nil), // 3: envoy.config.core.v3.Metadata - (*durationpb.Duration)(nil), // 4: google.protobuf.Duration - (*v3.RetryPolicy)(nil), // 5: envoy.config.core.v3.RetryPolicy - (*anypb.Any)(nil), // 6: google.protobuf.Any -} -var file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_depIdxs = []int32{ - 2, // 0: envoy.extensions.filters.network.generic_proxy.action.v3.RouteAction.weighted_clusters:type_name -> envoy.config.route.v3.WeightedCluster - 3, // 1: envoy.extensions.filters.network.generic_proxy.action.v3.RouteAction.metadata:type_name -> envoy.config.core.v3.Metadata - 1, // 2: envoy.extensions.filters.network.generic_proxy.action.v3.RouteAction.per_filter_config:type_name -> envoy.extensions.filters.network.generic_proxy.action.v3.RouteAction.PerFilterConfigEntry - 4, // 3: envoy.extensions.filters.network.generic_proxy.action.v3.RouteAction.timeout:type_name -> google.protobuf.Duration - 5, // 4: envoy.extensions.filters.network.generic_proxy.action.v3.RouteAction.retry_policy:type_name -> envoy.config.core.v3.RetryPolicy - 6, // 5: envoy.extensions.filters.network.generic_proxy.action.v3.RouteAction.PerFilterConfigEntry.value:type_name -> google.protobuf.Any - 6, // [6:6] is the sub-list for method output_type - 6, // [6:6] is the sub-list for method input_type - 6, // [6:6] is the sub-list for extension type_name - 6, // [6:6] is the sub-list for extension extendee - 0, // [0:6] is the sub-list for field type_name -} - -func init() { file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_init() } -func file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_init() { - if File_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_msgTypes[0].OneofWrappers = []interface{}{ - (*RouteAction_Cluster)(nil), - (*RouteAction_WeightedClusters)(nil), - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_rawDesc, - NumEnums: 0, - NumMessages: 2, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_goTypes, - DependencyIndexes: file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_depIdxs, - MessageInfos: file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_msgTypes, - }.Build() - File_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto = out.File - file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_rawDesc = nil - file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_goTypes = nil - file_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_depIdxs = nil -} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/action/v3/action.pb.validate.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/action/v3/action.pb.validate.go deleted file mode 100644 index d87b455cb1..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/action/v3/action.pb.validate.go +++ /dev/null @@ -1,341 +0,0 @@ -// Code generated by protoc-gen-validate. DO NOT EDIT. -// source: envoy/extensions/filters/network/generic_proxy/action/v3/action.proto - -package actionv3 - -import ( - "bytes" - "errors" - "fmt" - "net" - "net/mail" - "net/url" - "regexp" - "sort" - "strings" - "time" - "unicode/utf8" - - "google.golang.org/protobuf/types/known/anypb" -) - -// ensure the imports are used -var ( - _ = bytes.MinRead - _ = errors.New("") - _ = fmt.Print - _ = utf8.UTFMax - _ = (*regexp.Regexp)(nil) - _ = (*strings.Reader)(nil) - _ = net.IPv4len - _ = time.Duration(0) - _ = (*url.URL)(nil) - _ = (*mail.Address)(nil) - _ = anypb.Any{} - _ = sort.Sort -) - -// Validate checks the field values on RouteAction with the rules defined in -// the proto definition for this message. If any rules are violated, the first -// error encountered is returned, or nil if there are no violations. -func (m *RouteAction) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on RouteAction with the rules defined in -// the proto definition for this message. If any rules are violated, the -// result is a list of violation errors wrapped in RouteActionMultiError, or -// nil if none found. -func (m *RouteAction) ValidateAll() error { - return m.validate(true) -} - -func (m *RouteAction) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - // no validation rules for Name - - if all { - switch v := interface{}(m.GetMetadata()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, RouteActionValidationError{ - field: "Metadata", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, RouteActionValidationError{ - field: "Metadata", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: "Metadata", - reason: "embedded message failed validation", - cause: err, - } - } - } - - { - sorted_keys := make([]string, len(m.GetPerFilterConfig())) - i := 0 - for key := range m.GetPerFilterConfig() { - sorted_keys[i] = key - i++ - } - sort.Slice(sorted_keys, func(i, j int) bool { return sorted_keys[i] < sorted_keys[j] }) - for _, key := range sorted_keys { - val := m.GetPerFilterConfig()[key] - _ = val - - // no validation rules for PerFilterConfig[key] - - if all { - switch v := interface{}(val).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, RouteActionValidationError{ - field: fmt.Sprintf("PerFilterConfig[%v]", key), - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, RouteActionValidationError{ - field: fmt.Sprintf("PerFilterConfig[%v]", key), - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(val).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: fmt.Sprintf("PerFilterConfig[%v]", key), - reason: "embedded message failed validation", - cause: err, - } - } - } - - } - } - - if all { - switch v := interface{}(m.GetTimeout()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, RouteActionValidationError{ - field: "Timeout", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, RouteActionValidationError{ - field: "Timeout", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetTimeout()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: "Timeout", - reason: "embedded message failed validation", - cause: err, - } - } - } - - if all { - switch v := interface{}(m.GetRetryPolicy()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, RouteActionValidationError{ - field: "RetryPolicy", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, RouteActionValidationError{ - field: "RetryPolicy", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetRetryPolicy()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: "RetryPolicy", - reason: "embedded message failed validation", - cause: err, - } - } - } - - oneofClusterSpecifierPresent := false - switch v := m.ClusterSpecifier.(type) { - case *RouteAction_Cluster: - if v == nil { - err := RouteActionValidationError{ - field: "ClusterSpecifier", - reason: "oneof value cannot be a typed-nil", - } - if !all { - return err - } - errors = append(errors, err) - } - oneofClusterSpecifierPresent = true - // no validation rules for Cluster - case *RouteAction_WeightedClusters: - if v == nil { - err := RouteActionValidationError{ - field: "ClusterSpecifier", - reason: "oneof value cannot be a typed-nil", - } - if !all { - return err - } - errors = append(errors, err) - } - oneofClusterSpecifierPresent = true - - if all { - switch v := interface{}(m.GetWeightedClusters()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, RouteActionValidationError{ - field: "WeightedClusters", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, RouteActionValidationError{ - field: "WeightedClusters", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetWeightedClusters()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: "WeightedClusters", - reason: "embedded message failed validation", - cause: err, - } - } - } - - default: - _ = v // ensures v is used - } - if !oneofClusterSpecifierPresent { - err := RouteActionValidationError{ - field: "ClusterSpecifier", - reason: "value is required", - } - if !all { - return err - } - errors = append(errors, err) - } - - if len(errors) > 0 { - return RouteActionMultiError(errors) - } - - return nil -} - -// RouteActionMultiError is an error wrapping multiple validation errors -// returned by RouteAction.ValidateAll() if the designated constraints aren't met. -type RouteActionMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m RouteActionMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m RouteActionMultiError) AllErrors() []error { return m } - -// RouteActionValidationError is the validation error returned by -// RouteAction.Validate if the designated constraints aren't met. -type RouteActionValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e RouteActionValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e RouteActionValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e RouteActionValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e RouteActionValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e RouteActionValidationError) ErrorName() string { return "RouteActionValidationError" } - -// Error satisfies the builtin error interface -func (e RouteActionValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sRouteAction.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = RouteActionValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = RouteActionValidationError{} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.pb.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.pb.go deleted file mode 100644 index f9a92e5794..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.pb.go +++ /dev/null @@ -1,163 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.23.0 -// protoc v5.26.1 -// source: envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.proto - -package dubbov3 - -import ( - _ "github.com/cncf/xds/go/udpa/annotations" - _ "github.com/cncf/xds/go/xds/annotations/v3" - proto "github.com/golang/protobuf/proto" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - -type DubboCodecConfig struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *DubboCodecConfig) Reset() { - *x = DubboCodecConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *DubboCodecConfig) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*DubboCodecConfig) ProtoMessage() {} - -func (x *DubboCodecConfig) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use DubboCodecConfig.ProtoReflect.Descriptor instead. -func (*DubboCodecConfig) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_rawDescGZIP(), []int{0} -} - -var File_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto protoreflect.FileDescriptor - -var file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_rawDesc = []byte{ - 0x0a, 0x4a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, - 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x73, 0x2f, 0x64, 0x75, 0x62, 0x62, 0x6f, 0x2f, 0x76, 0x33, - 0x2f, 0x64, 0x75, 0x62, 0x62, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x3e, 0x65, 0x6e, - 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, - 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x67, - 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x63, 0x6f, 0x64, - 0x65, 0x63, 0x73, 0x2e, 0x64, 0x75, 0x62, 0x62, 0x6f, 0x2e, 0x76, 0x33, 0x1a, 0x1f, 0x78, 0x64, - 0x73, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x33, - 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, - 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, - 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12, 0x0a, 0x10, - 0x44, 0x75, 0x62, 0x62, 0x6f, 0x43, 0x6f, 0x64, 0x65, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, - 0x42, 0xdb, 0x01, 0x0a, 0x4c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, - 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, - 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, - 0x6f, 0x72, 0x6b, 0x2e, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, - 0x79, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x73, 0x2e, 0x64, 0x75, 0x62, 0x62, 0x6f, 0x2e, 0x76, - 0x33, 0x42, 0x0a, 0x44, 0x75, 0x62, 0x62, 0x6f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, - 0x6d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, - 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, - 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, - 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, - 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x73, 0x2f, 0x64, 0x75, - 0x62, 0x62, 0x6f, 0x2f, 0x76, 0x33, 0x3b, 0x64, 0x75, 0x62, 0x62, 0x6f, 0x76, 0x33, 0xba, 0x80, - 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_rawDescOnce sync.Once - file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_rawDescData = file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_rawDesc -) - -func file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_rawDescGZIP() []byte { - file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_rawDescOnce.Do(func() { - file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_rawDescData) - }) - return file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_rawDescData -} - -var file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_goTypes = []interface{}{ - (*DubboCodecConfig)(nil), // 0: envoy.extensions.filters.network.generic_proxy.codecs.dubbo.v3.DubboCodecConfig -} -var file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_depIdxs = []int32{ - 0, // [0:0] is the sub-list for method output_type - 0, // [0:0] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name -} - -func init() { file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_init() } -func file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_init() { - if File_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DubboCodecConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_rawDesc, - NumEnums: 0, - NumMessages: 1, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_goTypes, - DependencyIndexes: file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_depIdxs, - MessageInfos: file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_msgTypes, - }.Build() - File_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto = out.File - file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_rawDesc = nil - file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_goTypes = nil - file_envoy_extensions_filters_network_generic_proxy_codecs_dubbo_v3_dubbo_proto_depIdxs = nil -} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.pb.validate.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.pb.validate.go deleted file mode 100644 index 3e7d97daec..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.pb.validate.go +++ /dev/null @@ -1,136 +0,0 @@ -// Code generated by protoc-gen-validate. DO NOT EDIT. -// source: envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.proto - -package dubbov3 - -import ( - "bytes" - "errors" - "fmt" - "net" - "net/mail" - "net/url" - "regexp" - "sort" - "strings" - "time" - "unicode/utf8" - - "google.golang.org/protobuf/types/known/anypb" -) - -// ensure the imports are used -var ( - _ = bytes.MinRead - _ = errors.New("") - _ = fmt.Print - _ = utf8.UTFMax - _ = (*regexp.Regexp)(nil) - _ = (*strings.Reader)(nil) - _ = net.IPv4len - _ = time.Duration(0) - _ = (*url.URL)(nil) - _ = (*mail.Address)(nil) - _ = anypb.Any{} - _ = sort.Sort -) - -// Validate checks the field values on DubboCodecConfig with the rules defined -// in the proto definition for this message. If any rules are violated, the -// first error encountered is returned, or nil if there are no violations. -func (m *DubboCodecConfig) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on DubboCodecConfig with the rules -// defined in the proto definition for this message. If any rules are -// violated, the result is a list of violation errors wrapped in -// DubboCodecConfigMultiError, or nil if none found. -func (m *DubboCodecConfig) ValidateAll() error { - return m.validate(true) -} - -func (m *DubboCodecConfig) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if len(errors) > 0 { - return DubboCodecConfigMultiError(errors) - } - - return nil -} - -// DubboCodecConfigMultiError is an error wrapping multiple validation errors -// returned by DubboCodecConfig.ValidateAll() if the designated constraints -// aren't met. -type DubboCodecConfigMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m DubboCodecConfigMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m DubboCodecConfigMultiError) AllErrors() []error { return m } - -// DubboCodecConfigValidationError is the validation error returned by -// DubboCodecConfig.Validate if the designated constraints aren't met. -type DubboCodecConfigValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e DubboCodecConfigValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e DubboCodecConfigValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e DubboCodecConfigValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e DubboCodecConfigValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e DubboCodecConfigValidationError) ErrorName() string { return "DubboCodecConfigValidationError" } - -// Error satisfies the builtin error interface -func (e DubboCodecConfigValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sDubboCodecConfig.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = DubboCodecConfigValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = DubboCodecConfigValidationError{} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.pb.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.pb.go deleted file mode 100644 index 0dc6b0b061..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.pb.go +++ /dev/null @@ -1,221 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.23.0 -// protoc v5.26.1 -// source: envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.proto - -package http1v3 - -import ( - _ "github.com/cncf/xds/go/udpa/annotations" - _ "github.com/cncf/xds/go/xds/annotations/v3" - proto "github.com/golang/protobuf/proto" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - -// Configuration for HTTP codec. This HTTP1 codec is used to parse and serialize HTTP1 messages -// for the generic proxy filter. -// Any decoding error will result in the generic proxy closing the connection. -// -// .. note:: -// -// This codec only supports HTTP1.1 messages and does not support HTTP1.0 messages. And it limits -// part of the HTTP1.1 features, such as upgrade, connect, etc. -// This codec is mainly designed for the features evaluation of the generic proxy filter. Please -// be cautious when using it in production. -type Http1CodecConfig struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // If true, the codec will parse and serialize HTTP1 messages in a single frame per message. - // - // A frame is a minimal unit of data that can be processed by the generic proxy. If false, the - // codec will parse and serialize HTTP1 messages in a streaming way. In this case, the codec - // will output multiple frames for a single HTTP1 message to the generic proxy. - // If true, the codec will buffer the entire HTTP1 message body before sending it to the generic - // proxy. This may have better performance in small message scenarios and is more friendly to - // handle the HTTP1 message body. This also may result in higher memory usage and latency if - // the message body is large. - // - // Default is true. - SingleFrameMode *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=single_frame_mode,json=singleFrameMode,proto3" json:"single_frame_mode,omitempty"` - // The maximum size of the HTTP1 message body in bytes. If not set, 8*1024*1024 (8MB) is used. - // This only makes sense when single_frame_mode is true. - // If the HTTP1 message body size exceeds this value, this will result in a decoding error - // and the generic proxy will close the connection. - MaxBufferSize *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_buffer_size,json=maxBufferSize,proto3" json:"max_buffer_size,omitempty"` -} - -func (x *Http1CodecConfig) Reset() { - *x = Http1CodecConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *Http1CodecConfig) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*Http1CodecConfig) ProtoMessage() {} - -func (x *Http1CodecConfig) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use Http1CodecConfig.ProtoReflect.Descriptor instead. -func (*Http1CodecConfig) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_rawDescGZIP(), []int{0} -} - -func (x *Http1CodecConfig) GetSingleFrameMode() *wrapperspb.BoolValue { - if x != nil { - return x.SingleFrameMode - } - return nil -} - -func (x *Http1CodecConfig) GetMaxBufferSize() *wrapperspb.UInt32Value { - if x != nil { - return x.MaxBufferSize - } - return nil -} - -var File_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto protoreflect.FileDescriptor - -var file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_rawDesc = []byte{ - 0x0a, 0x4a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, - 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x31, 0x2f, 0x76, 0x33, - 0x2f, 0x68, 0x74, 0x74, 0x70, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x3e, 0x65, 0x6e, - 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, - 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x67, - 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x63, 0x6f, 0x64, - 0x65, 0x63, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x31, 0x2e, 0x76, 0x33, 0x1a, 0x1e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, - 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x78, 0x64, - 0x73, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x33, - 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, - 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, - 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa0, 0x01, 0x0a, - 0x10, 0x48, 0x74, 0x74, 0x70, 0x31, 0x43, 0x6f, 0x64, 0x65, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, - 0x67, 0x12, 0x46, 0x0a, 0x11, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x5f, 0x66, 0x72, 0x61, 0x6d, - 0x65, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, - 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, - 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, - 0x46, 0x72, 0x61, 0x6d, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x44, 0x0a, 0x0f, 0x6d, 0x61, 0x78, - 0x5f, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x52, 0x0d, 0x6d, 0x61, 0x78, 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x53, 0x69, 0x7a, 0x65, 0x42, - 0xdb, 0x01, 0x0a, 0x4c, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, - 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x2e, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, - 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x31, 0x2e, 0x76, 0x33, - 0x42, 0x0a, 0x48, 0x74, 0x74, 0x70, 0x31, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x6d, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, - 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, - 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, - 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, - 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x73, 0x2f, 0x68, 0x74, 0x74, - 0x70, 0x31, 0x2f, 0x76, 0x33, 0x3b, 0x68, 0x74, 0x74, 0x70, 0x31, 0x76, 0x33, 0xba, 0x80, 0xc8, - 0xd1, 0x06, 0x02, 0x10, 0x02, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_rawDescOnce sync.Once - file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_rawDescData = file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_rawDesc -) - -func file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_rawDescGZIP() []byte { - file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_rawDescOnce.Do(func() { - file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_rawDescData) - }) - return file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_rawDescData -} - -var file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_goTypes = []interface{}{ - (*Http1CodecConfig)(nil), // 0: envoy.extensions.filters.network.generic_proxy.codecs.http1.v3.Http1CodecConfig - (*wrapperspb.BoolValue)(nil), // 1: google.protobuf.BoolValue - (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value -} -var file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_depIdxs = []int32{ - 1, // 0: envoy.extensions.filters.network.generic_proxy.codecs.http1.v3.Http1CodecConfig.single_frame_mode:type_name -> google.protobuf.BoolValue - 2, // 1: envoy.extensions.filters.network.generic_proxy.codecs.http1.v3.Http1CodecConfig.max_buffer_size:type_name -> google.protobuf.UInt32Value - 2, // [2:2] is the sub-list for method output_type - 2, // [2:2] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name -} - -func init() { file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_init() } -func file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_init() { - if File_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Http1CodecConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_rawDesc, - NumEnums: 0, - NumMessages: 1, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_goTypes, - DependencyIndexes: file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_depIdxs, - MessageInfos: file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_msgTypes, - }.Build() - File_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto = out.File - file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_rawDesc = nil - file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_goTypes = nil - file_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_depIdxs = nil -} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.pb.validate.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.pb.validate.go deleted file mode 100644 index be5a6be651..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.pb.validate.go +++ /dev/null @@ -1,194 +0,0 @@ -// Code generated by protoc-gen-validate. DO NOT EDIT. -// source: envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.proto - -package http1v3 - -import ( - "bytes" - "errors" - "fmt" - "net" - "net/mail" - "net/url" - "regexp" - "sort" - "strings" - "time" - "unicode/utf8" - - "google.golang.org/protobuf/types/known/anypb" -) - -// ensure the imports are used -var ( - _ = bytes.MinRead - _ = errors.New("") - _ = fmt.Print - _ = utf8.UTFMax - _ = (*regexp.Regexp)(nil) - _ = (*strings.Reader)(nil) - _ = net.IPv4len - _ = time.Duration(0) - _ = (*url.URL)(nil) - _ = (*mail.Address)(nil) - _ = anypb.Any{} - _ = sort.Sort -) - -// Validate checks the field values on Http1CodecConfig with the rules defined -// in the proto definition for this message. If any rules are violated, the -// first error encountered is returned, or nil if there are no violations. -func (m *Http1CodecConfig) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on Http1CodecConfig with the rules -// defined in the proto definition for this message. If any rules are -// violated, the result is a list of violation errors wrapped in -// Http1CodecConfigMultiError, or nil if none found. -func (m *Http1CodecConfig) ValidateAll() error { - return m.validate(true) -} - -func (m *Http1CodecConfig) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if all { - switch v := interface{}(m.GetSingleFrameMode()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, Http1CodecConfigValidationError{ - field: "SingleFrameMode", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, Http1CodecConfigValidationError{ - field: "SingleFrameMode", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetSingleFrameMode()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return Http1CodecConfigValidationError{ - field: "SingleFrameMode", - reason: "embedded message failed validation", - cause: err, - } - } - } - - if all { - switch v := interface{}(m.GetMaxBufferSize()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, Http1CodecConfigValidationError{ - field: "MaxBufferSize", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, Http1CodecConfigValidationError{ - field: "MaxBufferSize", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetMaxBufferSize()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return Http1CodecConfigValidationError{ - field: "MaxBufferSize", - reason: "embedded message failed validation", - cause: err, - } - } - } - - if len(errors) > 0 { - return Http1CodecConfigMultiError(errors) - } - - return nil -} - -// Http1CodecConfigMultiError is an error wrapping multiple validation errors -// returned by Http1CodecConfig.ValidateAll() if the designated constraints -// aren't met. -type Http1CodecConfigMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m Http1CodecConfigMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m Http1CodecConfigMultiError) AllErrors() []error { return m } - -// Http1CodecConfigValidationError is the validation error returned by -// Http1CodecConfig.Validate if the designated constraints aren't met. -type Http1CodecConfigValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e Http1CodecConfigValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e Http1CodecConfigValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e Http1CodecConfigValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e Http1CodecConfigValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e Http1CodecConfigValidationError) ErrorName() string { return "Http1CodecConfigValidationError" } - -// Error satisfies the builtin error interface -func (e Http1CodecConfigValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sHttp1CodecConfig.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = Http1CodecConfigValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = Http1CodecConfigValidationError{} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.pb.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.pb.go deleted file mode 100644 index 01b023e1b4..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.pb.go +++ /dev/null @@ -1,653 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.23.0 -// protoc v5.26.1 -// source: envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.proto - -package matcherv3 - -import ( - v3 "github.com/cilium/proxy/go/envoy/type/matcher/v3" - _ "github.com/cncf/xds/go/udpa/annotations" - _ "github.com/cncf/xds/go/xds/annotations/v3" - _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - -// Used to match request service of the downstream request. Only applicable if a service provided -// by the application protocol. -// This is deprecated and should be replaced by HostMatchInput. This is kept for backward compatibility. -type ServiceMatchInput struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *ServiceMatchInput) Reset() { - *x = ServiceMatchInput{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ServiceMatchInput) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ServiceMatchInput) ProtoMessage() {} - -func (x *ServiceMatchInput) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ServiceMatchInput.ProtoReflect.Descriptor instead. -func (*ServiceMatchInput) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDescGZIP(), []int{0} -} - -// Used to match request host of the generic downstream request. Only applicable if a host provided -// by the application protocol. -// This is same with the ServiceMatchInput and this should be preferred over ServiceMatchInput. -type HostMatchInput struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *HostMatchInput) Reset() { - *x = HostMatchInput{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *HostMatchInput) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*HostMatchInput) ProtoMessage() {} - -func (x *HostMatchInput) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use HostMatchInput.ProtoReflect.Descriptor instead. -func (*HostMatchInput) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDescGZIP(), []int{1} -} - -// Used to match request path of the generic downstream request. Only applicable if a path provided -// by the application protocol. -type PathMatchInput struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *PathMatchInput) Reset() { - *x = PathMatchInput{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PathMatchInput) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PathMatchInput) ProtoMessage() {} - -func (x *PathMatchInput) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use PathMatchInput.ProtoReflect.Descriptor instead. -func (*PathMatchInput) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDescGZIP(), []int{2} -} - -// Used to match request method of the generic downstream request. Only applicable if a method provided -// by the application protocol. -type MethodMatchInput struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *MethodMatchInput) Reset() { - *x = MethodMatchInput{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MethodMatchInput) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MethodMatchInput) ProtoMessage() {} - -func (x *MethodMatchInput) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use MethodMatchInput.ProtoReflect.Descriptor instead. -func (*MethodMatchInput) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDescGZIP(), []int{3} -} - -// Used to match an arbitrary property of the generic downstream request. -// These properties are populated by the codecs of application protocols. -type PropertyMatchInput struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // The property name to match on. - PropertyName string `protobuf:"bytes,1,opt,name=property_name,json=propertyName,proto3" json:"property_name,omitempty"` -} - -func (x *PropertyMatchInput) Reset() { - *x = PropertyMatchInput{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PropertyMatchInput) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PropertyMatchInput) ProtoMessage() {} - -func (x *PropertyMatchInput) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use PropertyMatchInput.ProtoReflect.Descriptor instead. -func (*PropertyMatchInput) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDescGZIP(), []int{4} -} - -func (x *PropertyMatchInput) GetPropertyName() string { - if x != nil { - return x.PropertyName - } - return "" -} - -// Used to match an whole generic downstream request. -type RequestMatchInput struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *RequestMatchInput) Reset() { - *x = RequestMatchInput{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RequestMatchInput) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RequestMatchInput) ProtoMessage() {} - -func (x *RequestMatchInput) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use RequestMatchInput.ProtoReflect.Descriptor instead. -func (*RequestMatchInput) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDescGZIP(), []int{5} -} - -// Used to match an arbitrary key-value pair for headers, trailers or properties. -type KeyValueMatchEntry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // The key name to match on. - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - // The key value pattern. - StringMatch *v3.StringMatcher `protobuf:"bytes,2,opt,name=string_match,json=stringMatch,proto3" json:"string_match,omitempty"` -} - -func (x *KeyValueMatchEntry) Reset() { - *x = KeyValueMatchEntry{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *KeyValueMatchEntry) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*KeyValueMatchEntry) ProtoMessage() {} - -func (x *KeyValueMatchEntry) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use KeyValueMatchEntry.ProtoReflect.Descriptor instead. -func (*KeyValueMatchEntry) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDescGZIP(), []int{6} -} - -func (x *KeyValueMatchEntry) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -func (x *KeyValueMatchEntry) GetStringMatch() *v3.StringMatcher { - if x != nil { - return x.StringMatch - } - return nil -} - -// Custom matcher to match on the generic downstream request. This is used to match -// multiple fields of the downstream request and avoid complex combinations of -// HostMatchInput, PathMatchInput, MethodMatchInput and PropertyMatchInput. -type RequestMatcher struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Optional host pattern to match on. If not specified, any host will match. - Host *v3.StringMatcher `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"` - // Optional path pattern to match on. If not specified, any path will match. - Path *v3.StringMatcher `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` - // Optional method pattern to match on. If not specified, any method will match. - Method *v3.StringMatcher `protobuf:"bytes,3,opt,name=method,proto3" json:"method,omitempty"` - // Optional arbitrary properties to match on. If not specified, any properties - // will match. The key is the property name and the value is the property value - // to match on. - Properties []*KeyValueMatchEntry `protobuf:"bytes,4,rep,name=properties,proto3" json:"properties,omitempty"` -} - -func (x *RequestMatcher) Reset() { - *x = RequestMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RequestMatcher) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RequestMatcher) ProtoMessage() {} - -func (x *RequestMatcher) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use RequestMatcher.ProtoReflect.Descriptor instead. -func (*RequestMatcher) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDescGZIP(), []int{7} -} - -func (x *RequestMatcher) GetHost() *v3.StringMatcher { - if x != nil { - return x.Host - } - return nil -} - -func (x *RequestMatcher) GetPath() *v3.StringMatcher { - if x != nil { - return x.Path - } - return nil -} - -func (x *RequestMatcher) GetMethod() *v3.StringMatcher { - if x != nil { - return x.Method - } - return nil -} - -func (x *RequestMatcher) GetProperties() []*KeyValueMatchEntry { - if x != nil { - return x.Properties - } - return nil -} - -var File_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto protoreflect.FileDescriptor - -var file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDesc = []byte{ - 0x0a, 0x47, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, - 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x2f, 0x6d, 0x61, 0x74, 0x63, - 0x68, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x39, 0x65, 0x6e, 0x76, 0x6f, 0x79, - 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, - 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x67, 0x65, 0x6e, 0x65, - 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, - 0x72, 0x2e, 0x76, 0x33, 0x1a, 0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, - 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x2f, 0x73, 0x74, 0x72, 0x69, - 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x78, 0x64, 0x73, 0x2f, 0x61, 0x6e, - 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x33, 0x2f, 0x73, 0x74, 0x61, - 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, - 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, - 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, - 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x22, 0x13, 0x0a, 0x11, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4d, 0x61, 0x74, 0x63, - 0x68, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x22, 0x10, 0x0a, 0x0e, 0x48, 0x6f, 0x73, 0x74, 0x4d, 0x61, - 0x74, 0x63, 0x68, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x22, 0x10, 0x0a, 0x0e, 0x50, 0x61, 0x74, 0x68, - 0x4d, 0x61, 0x74, 0x63, 0x68, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x22, 0x12, 0x0a, 0x10, 0x4d, 0x65, - 0x74, 0x68, 0x6f, 0x64, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x22, 0x42, - 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x49, - 0x6e, 0x70, 0x75, 0x74, 0x12, 0x2c, 0x0a, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, - 0x72, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x4e, 0x61, - 0x6d, 0x65, 0x22, 0x13, 0x0a, 0x11, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x61, 0x74, - 0x63, 0x68, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x22, 0x84, 0x01, 0x0a, 0x12, 0x4b, 0x65, 0x79, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x1b, - 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, - 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x51, 0x0a, 0x0c, 0x73, - 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, - 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, - 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, - 0x01, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x22, 0xb1, - 0x02, 0x0a, 0x0e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, - 0x72, 0x12, 0x38, 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, - 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, - 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x04, 0x70, - 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, - 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, - 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, - 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3c, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, - 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, - 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x65, 0x74, - 0x68, 0x6f, 0x64, 0x12, 0x6d, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, - 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x4d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, - 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, - 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x67, 0x65, 0x6e, 0x65, 0x72, - 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, - 0x2e, 0x76, 0x33, 0x2e, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, - 0x68, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, - 0x65, 0x73, 0x42, 0xd5, 0x01, 0x0a, 0x47, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, - 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, - 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, - 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, - 0x6f, 0x78, 0x79, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0c, - 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x6a, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, - 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, - 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, - 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, - 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, - 0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, - 0x10, 0x02, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, -} - -var ( - file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDescOnce sync.Once - file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDescData = file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDesc -) - -func file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDescGZIP() []byte { - file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDescOnce.Do(func() { - file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDescData) - }) - return file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDescData -} - -var file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_goTypes = []interface{}{ - (*ServiceMatchInput)(nil), // 0: envoy.extensions.filters.network.generic_proxy.matcher.v3.ServiceMatchInput - (*HostMatchInput)(nil), // 1: envoy.extensions.filters.network.generic_proxy.matcher.v3.HostMatchInput - (*PathMatchInput)(nil), // 2: envoy.extensions.filters.network.generic_proxy.matcher.v3.PathMatchInput - (*MethodMatchInput)(nil), // 3: envoy.extensions.filters.network.generic_proxy.matcher.v3.MethodMatchInput - (*PropertyMatchInput)(nil), // 4: envoy.extensions.filters.network.generic_proxy.matcher.v3.PropertyMatchInput - (*RequestMatchInput)(nil), // 5: envoy.extensions.filters.network.generic_proxy.matcher.v3.RequestMatchInput - (*KeyValueMatchEntry)(nil), // 6: envoy.extensions.filters.network.generic_proxy.matcher.v3.KeyValueMatchEntry - (*RequestMatcher)(nil), // 7: envoy.extensions.filters.network.generic_proxy.matcher.v3.RequestMatcher - (*v3.StringMatcher)(nil), // 8: envoy.type.matcher.v3.StringMatcher -} -var file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_depIdxs = []int32{ - 8, // 0: envoy.extensions.filters.network.generic_proxy.matcher.v3.KeyValueMatchEntry.string_match:type_name -> envoy.type.matcher.v3.StringMatcher - 8, // 1: envoy.extensions.filters.network.generic_proxy.matcher.v3.RequestMatcher.host:type_name -> envoy.type.matcher.v3.StringMatcher - 8, // 2: envoy.extensions.filters.network.generic_proxy.matcher.v3.RequestMatcher.path:type_name -> envoy.type.matcher.v3.StringMatcher - 8, // 3: envoy.extensions.filters.network.generic_proxy.matcher.v3.RequestMatcher.method:type_name -> envoy.type.matcher.v3.StringMatcher - 6, // 4: envoy.extensions.filters.network.generic_proxy.matcher.v3.RequestMatcher.properties:type_name -> envoy.extensions.filters.network.generic_proxy.matcher.v3.KeyValueMatchEntry - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 5, // [5:5] is the sub-list for extension extendee - 0, // [0:5] is the sub-list for field type_name -} - -func init() { file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_init() } -func file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_init() { - if File_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ServiceMatchInput); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HostMatchInput); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PathMatchInput); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MethodMatchInput); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PropertyMatchInput); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RequestMatchInput); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*KeyValueMatchEntry); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RequestMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDesc, - NumEnums: 0, - NumMessages: 8, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_goTypes, - DependencyIndexes: file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_depIdxs, - MessageInfos: file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_msgTypes, - }.Build() - File_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto = out.File - file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_rawDesc = nil - file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_goTypes = nil - file_envoy_extensions_filters_network_generic_proxy_matcher_v3_matcher_proto_depIdxs = nil -} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.pb.validate.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.pb.validate.go deleted file mode 100644 index 747486cc4c..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.pb.validate.go +++ /dev/null @@ -1,1027 +0,0 @@ -// Code generated by protoc-gen-validate. DO NOT EDIT. -// source: envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.proto - -package matcherv3 - -import ( - "bytes" - "errors" - "fmt" - "net" - "net/mail" - "net/url" - "regexp" - "sort" - "strings" - "time" - "unicode/utf8" - - "google.golang.org/protobuf/types/known/anypb" -) - -// ensure the imports are used -var ( - _ = bytes.MinRead - _ = errors.New("") - _ = fmt.Print - _ = utf8.UTFMax - _ = (*regexp.Regexp)(nil) - _ = (*strings.Reader)(nil) - _ = net.IPv4len - _ = time.Duration(0) - _ = (*url.URL)(nil) - _ = (*mail.Address)(nil) - _ = anypb.Any{} - _ = sort.Sort -) - -// Validate checks the field values on ServiceMatchInput with the rules defined -// in the proto definition for this message. If any rules are violated, the -// first error encountered is returned, or nil if there are no violations. -func (m *ServiceMatchInput) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on ServiceMatchInput with the rules -// defined in the proto definition for this message. If any rules are -// violated, the result is a list of violation errors wrapped in -// ServiceMatchInputMultiError, or nil if none found. -func (m *ServiceMatchInput) ValidateAll() error { - return m.validate(true) -} - -func (m *ServiceMatchInput) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if len(errors) > 0 { - return ServiceMatchInputMultiError(errors) - } - - return nil -} - -// ServiceMatchInputMultiError is an error wrapping multiple validation errors -// returned by ServiceMatchInput.ValidateAll() if the designated constraints -// aren't met. -type ServiceMatchInputMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m ServiceMatchInputMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m ServiceMatchInputMultiError) AllErrors() []error { return m } - -// ServiceMatchInputValidationError is the validation error returned by -// ServiceMatchInput.Validate if the designated constraints aren't met. -type ServiceMatchInputValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e ServiceMatchInputValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e ServiceMatchInputValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e ServiceMatchInputValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e ServiceMatchInputValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e ServiceMatchInputValidationError) ErrorName() string { - return "ServiceMatchInputValidationError" -} - -// Error satisfies the builtin error interface -func (e ServiceMatchInputValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sServiceMatchInput.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = ServiceMatchInputValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = ServiceMatchInputValidationError{} - -// Validate checks the field values on HostMatchInput with the rules defined in -// the proto definition for this message. If any rules are violated, the first -// error encountered is returned, or nil if there are no violations. -func (m *HostMatchInput) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on HostMatchInput with the rules defined -// in the proto definition for this message. If any rules are violated, the -// result is a list of violation errors wrapped in HostMatchInputMultiError, -// or nil if none found. -func (m *HostMatchInput) ValidateAll() error { - return m.validate(true) -} - -func (m *HostMatchInput) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if len(errors) > 0 { - return HostMatchInputMultiError(errors) - } - - return nil -} - -// HostMatchInputMultiError is an error wrapping multiple validation errors -// returned by HostMatchInput.ValidateAll() if the designated constraints -// aren't met. -type HostMatchInputMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m HostMatchInputMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m HostMatchInputMultiError) AllErrors() []error { return m } - -// HostMatchInputValidationError is the validation error returned by -// HostMatchInput.Validate if the designated constraints aren't met. -type HostMatchInputValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e HostMatchInputValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e HostMatchInputValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e HostMatchInputValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e HostMatchInputValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e HostMatchInputValidationError) ErrorName() string { return "HostMatchInputValidationError" } - -// Error satisfies the builtin error interface -func (e HostMatchInputValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sHostMatchInput.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = HostMatchInputValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = HostMatchInputValidationError{} - -// Validate checks the field values on PathMatchInput with the rules defined in -// the proto definition for this message. If any rules are violated, the first -// error encountered is returned, or nil if there are no violations. -func (m *PathMatchInput) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on PathMatchInput with the rules defined -// in the proto definition for this message. If any rules are violated, the -// result is a list of violation errors wrapped in PathMatchInputMultiError, -// or nil if none found. -func (m *PathMatchInput) ValidateAll() error { - return m.validate(true) -} - -func (m *PathMatchInput) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if len(errors) > 0 { - return PathMatchInputMultiError(errors) - } - - return nil -} - -// PathMatchInputMultiError is an error wrapping multiple validation errors -// returned by PathMatchInput.ValidateAll() if the designated constraints -// aren't met. -type PathMatchInputMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m PathMatchInputMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m PathMatchInputMultiError) AllErrors() []error { return m } - -// PathMatchInputValidationError is the validation error returned by -// PathMatchInput.Validate if the designated constraints aren't met. -type PathMatchInputValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e PathMatchInputValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e PathMatchInputValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e PathMatchInputValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e PathMatchInputValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e PathMatchInputValidationError) ErrorName() string { return "PathMatchInputValidationError" } - -// Error satisfies the builtin error interface -func (e PathMatchInputValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sPathMatchInput.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = PathMatchInputValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = PathMatchInputValidationError{} - -// Validate checks the field values on MethodMatchInput with the rules defined -// in the proto definition for this message. If any rules are violated, the -// first error encountered is returned, or nil if there are no violations. -func (m *MethodMatchInput) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on MethodMatchInput with the rules -// defined in the proto definition for this message. If any rules are -// violated, the result is a list of violation errors wrapped in -// MethodMatchInputMultiError, or nil if none found. -func (m *MethodMatchInput) ValidateAll() error { - return m.validate(true) -} - -func (m *MethodMatchInput) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if len(errors) > 0 { - return MethodMatchInputMultiError(errors) - } - - return nil -} - -// MethodMatchInputMultiError is an error wrapping multiple validation errors -// returned by MethodMatchInput.ValidateAll() if the designated constraints -// aren't met. -type MethodMatchInputMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m MethodMatchInputMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m MethodMatchInputMultiError) AllErrors() []error { return m } - -// MethodMatchInputValidationError is the validation error returned by -// MethodMatchInput.Validate if the designated constraints aren't met. -type MethodMatchInputValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e MethodMatchInputValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e MethodMatchInputValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e MethodMatchInputValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e MethodMatchInputValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e MethodMatchInputValidationError) ErrorName() string { return "MethodMatchInputValidationError" } - -// Error satisfies the builtin error interface -func (e MethodMatchInputValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sMethodMatchInput.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = MethodMatchInputValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = MethodMatchInputValidationError{} - -// Validate checks the field values on PropertyMatchInput with the rules -// defined in the proto definition for this message. If any rules are -// violated, the first error encountered is returned, or nil if there are no violations. -func (m *PropertyMatchInput) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on PropertyMatchInput with the rules -// defined in the proto definition for this message. If any rules are -// violated, the result is a list of violation errors wrapped in -// PropertyMatchInputMultiError, or nil if none found. -func (m *PropertyMatchInput) ValidateAll() error { - return m.validate(true) -} - -func (m *PropertyMatchInput) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if utf8.RuneCountInString(m.GetPropertyName()) < 1 { - err := PropertyMatchInputValidationError{ - field: "PropertyName", - reason: "value length must be at least 1 runes", - } - if !all { - return err - } - errors = append(errors, err) - } - - if len(errors) > 0 { - return PropertyMatchInputMultiError(errors) - } - - return nil -} - -// PropertyMatchInputMultiError is an error wrapping multiple validation errors -// returned by PropertyMatchInput.ValidateAll() if the designated constraints -// aren't met. -type PropertyMatchInputMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m PropertyMatchInputMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m PropertyMatchInputMultiError) AllErrors() []error { return m } - -// PropertyMatchInputValidationError is the validation error returned by -// PropertyMatchInput.Validate if the designated constraints aren't met. -type PropertyMatchInputValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e PropertyMatchInputValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e PropertyMatchInputValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e PropertyMatchInputValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e PropertyMatchInputValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e PropertyMatchInputValidationError) ErrorName() string { - return "PropertyMatchInputValidationError" -} - -// Error satisfies the builtin error interface -func (e PropertyMatchInputValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sPropertyMatchInput.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = PropertyMatchInputValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = PropertyMatchInputValidationError{} - -// Validate checks the field values on RequestMatchInput with the rules defined -// in the proto definition for this message. If any rules are violated, the -// first error encountered is returned, or nil if there are no violations. -func (m *RequestMatchInput) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on RequestMatchInput with the rules -// defined in the proto definition for this message. If any rules are -// violated, the result is a list of violation errors wrapped in -// RequestMatchInputMultiError, or nil if none found. -func (m *RequestMatchInput) ValidateAll() error { - return m.validate(true) -} - -func (m *RequestMatchInput) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if len(errors) > 0 { - return RequestMatchInputMultiError(errors) - } - - return nil -} - -// RequestMatchInputMultiError is an error wrapping multiple validation errors -// returned by RequestMatchInput.ValidateAll() if the designated constraints -// aren't met. -type RequestMatchInputMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m RequestMatchInputMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m RequestMatchInputMultiError) AllErrors() []error { return m } - -// RequestMatchInputValidationError is the validation error returned by -// RequestMatchInput.Validate if the designated constraints aren't met. -type RequestMatchInputValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e RequestMatchInputValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e RequestMatchInputValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e RequestMatchInputValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e RequestMatchInputValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e RequestMatchInputValidationError) ErrorName() string { - return "RequestMatchInputValidationError" -} - -// Error satisfies the builtin error interface -func (e RequestMatchInputValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sRequestMatchInput.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = RequestMatchInputValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = RequestMatchInputValidationError{} - -// Validate checks the field values on KeyValueMatchEntry with the rules -// defined in the proto definition for this message. If any rules are -// violated, the first error encountered is returned, or nil if there are no violations. -func (m *KeyValueMatchEntry) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on KeyValueMatchEntry with the rules -// defined in the proto definition for this message. If any rules are -// violated, the result is a list of violation errors wrapped in -// KeyValueMatchEntryMultiError, or nil if none found. -func (m *KeyValueMatchEntry) ValidateAll() error { - return m.validate(true) -} - -func (m *KeyValueMatchEntry) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if utf8.RuneCountInString(m.GetName()) < 1 { - err := KeyValueMatchEntryValidationError{ - field: "Name", - reason: "value length must be at least 1 runes", - } - if !all { - return err - } - errors = append(errors, err) - } - - if m.GetStringMatch() == nil { - err := KeyValueMatchEntryValidationError{ - field: "StringMatch", - reason: "value is required", - } - if !all { - return err - } - errors = append(errors, err) - } - - if all { - switch v := interface{}(m.GetStringMatch()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, KeyValueMatchEntryValidationError{ - field: "StringMatch", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, KeyValueMatchEntryValidationError{ - field: "StringMatch", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetStringMatch()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return KeyValueMatchEntryValidationError{ - field: "StringMatch", - reason: "embedded message failed validation", - cause: err, - } - } - } - - if len(errors) > 0 { - return KeyValueMatchEntryMultiError(errors) - } - - return nil -} - -// KeyValueMatchEntryMultiError is an error wrapping multiple validation errors -// returned by KeyValueMatchEntry.ValidateAll() if the designated constraints -// aren't met. -type KeyValueMatchEntryMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m KeyValueMatchEntryMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m KeyValueMatchEntryMultiError) AllErrors() []error { return m } - -// KeyValueMatchEntryValidationError is the validation error returned by -// KeyValueMatchEntry.Validate if the designated constraints aren't met. -type KeyValueMatchEntryValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e KeyValueMatchEntryValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e KeyValueMatchEntryValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e KeyValueMatchEntryValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e KeyValueMatchEntryValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e KeyValueMatchEntryValidationError) ErrorName() string { - return "KeyValueMatchEntryValidationError" -} - -// Error satisfies the builtin error interface -func (e KeyValueMatchEntryValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sKeyValueMatchEntry.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = KeyValueMatchEntryValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = KeyValueMatchEntryValidationError{} - -// Validate checks the field values on RequestMatcher with the rules defined in -// the proto definition for this message. If any rules are violated, the first -// error encountered is returned, or nil if there are no violations. -func (m *RequestMatcher) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on RequestMatcher with the rules defined -// in the proto definition for this message. If any rules are violated, the -// result is a list of violation errors wrapped in RequestMatcherMultiError, -// or nil if none found. -func (m *RequestMatcher) ValidateAll() error { - return m.validate(true) -} - -func (m *RequestMatcher) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if all { - switch v := interface{}(m.GetHost()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, RequestMatcherValidationError{ - field: "Host", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, RequestMatcherValidationError{ - field: "Host", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetHost()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return RequestMatcherValidationError{ - field: "Host", - reason: "embedded message failed validation", - cause: err, - } - } - } - - if all { - switch v := interface{}(m.GetPath()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, RequestMatcherValidationError{ - field: "Path", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, RequestMatcherValidationError{ - field: "Path", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetPath()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return RequestMatcherValidationError{ - field: "Path", - reason: "embedded message failed validation", - cause: err, - } - } - } - - if all { - switch v := interface{}(m.GetMethod()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, RequestMatcherValidationError{ - field: "Method", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, RequestMatcherValidationError{ - field: "Method", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetMethod()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return RequestMatcherValidationError{ - field: "Method", - reason: "embedded message failed validation", - cause: err, - } - } - } - - for idx, item := range m.GetProperties() { - _, _ = idx, item - - if all { - switch v := interface{}(item).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, RequestMatcherValidationError{ - field: fmt.Sprintf("Properties[%v]", idx), - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, RequestMatcherValidationError{ - field: fmt.Sprintf("Properties[%v]", idx), - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(item).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return RequestMatcherValidationError{ - field: fmt.Sprintf("Properties[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } - } - - } - - if len(errors) > 0 { - return RequestMatcherMultiError(errors) - } - - return nil -} - -// RequestMatcherMultiError is an error wrapping multiple validation errors -// returned by RequestMatcher.ValidateAll() if the designated constraints -// aren't met. -type RequestMatcherMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m RequestMatcherMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m RequestMatcherMultiError) AllErrors() []error { return m } - -// RequestMatcherValidationError is the validation error returned by -// RequestMatcher.Validate if the designated constraints aren't met. -type RequestMatcherValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e RequestMatcherValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e RequestMatcherValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e RequestMatcherValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e RequestMatcherValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e RequestMatcherValidationError) ErrorName() string { return "RequestMatcherValidationError" } - -// Error satisfies the builtin error interface -func (e RequestMatcherValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sRequestMatcher.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = RequestMatcherValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = RequestMatcherValidationError{} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/router/v3/router.pb.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/router/v3/router.pb.go deleted file mode 100644 index d2e92e7616..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/router/v3/router.pb.go +++ /dev/null @@ -1,196 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.23.0 -// protoc v5.26.1 -// source: envoy/extensions/filters/network/generic_proxy/router/v3/router.proto - -package routerv3 - -import ( - _ "github.com/cncf/xds/go/udpa/annotations" - _ "github.com/cncf/xds/go/xds/annotations/v3" - proto "github.com/golang/protobuf/proto" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - -type Router struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Set to true if the upstream connection should be bound to the downstream connection, false - // otherwise. - // - // By default, one random upstream connection will be selected from the upstream connection pool - // and used for every request. And after the request is finished, the upstream connection will be - // released back to the upstream connection pool. - // - // If this option is true, the upstream connection will be bound to the downstream connection and - // have same lifetime as the downstream connection. The same upstream connection will be used for - // all requests from the same downstream connection. - // - // And if this options is true, one of the following requirements must be met: - // - // 1. The request must be handled one by one. That is, the next request can not be sent to the - // upstream until the previous request is finished. - // 2. Unique request id must be provided for each request and response. The request id must be - // unique for each request and response pair in same connection pair. And the request id must - // be the same for the corresponding request and response. - // - // This could be useful for some protocols that require the same upstream connection to be used - // for all requests from the same downstream connection. For example, the protocol using stateful - // connection. - BindUpstreamConnection bool `protobuf:"varint,1,opt,name=bind_upstream_connection,json=bindUpstreamConnection,proto3" json:"bind_upstream_connection,omitempty"` -} - -func (x *Router) Reset() { - *x = Router{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *Router) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*Router) ProtoMessage() {} - -func (x *Router) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use Router.ProtoReflect.Descriptor instead. -func (*Router) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_rawDescGZIP(), []int{0} -} - -func (x *Router) GetBindUpstreamConnection() bool { - if x != nil { - return x.BindUpstreamConnection - } - return false -} - -var File_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto protoreflect.FileDescriptor - -var file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_rawDesc = []byte{ - 0x0a, 0x45, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, - 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, - 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x38, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, - 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, - 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, - 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2e, 0x76, - 0x33, 0x1a, 0x1f, 0x78, 0x64, 0x73, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x76, 0x33, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x22, 0x42, 0x0a, 0x06, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x12, 0x38, 0x0a, 0x18, 0x62, - 0x69, 0x6e, 0x64, 0x5f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x63, 0x6f, 0x6e, - 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x16, 0x62, - 0x69, 0x6e, 0x64, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x6e, 0x65, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0xd1, 0x01, 0x0a, 0x46, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, - 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, - 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, - 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, - 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, - 0x42, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, - 0x68, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, - 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, - 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, - 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, - 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x33, - 0x3b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, - 0x02, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, -} - -var ( - file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_rawDescOnce sync.Once - file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_rawDescData = file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_rawDesc -) - -func file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_rawDescGZIP() []byte { - file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_rawDescOnce.Do(func() { - file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_rawDescData) - }) - return file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_rawDescData -} - -var file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_goTypes = []interface{}{ - (*Router)(nil), // 0: envoy.extensions.filters.network.generic_proxy.router.v3.Router -} -var file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_depIdxs = []int32{ - 0, // [0:0] is the sub-list for method output_type - 0, // [0:0] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name -} - -func init() { file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_init() } -func file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_init() { - if File_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Router); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_rawDesc, - NumEnums: 0, - NumMessages: 1, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_goTypes, - DependencyIndexes: file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_depIdxs, - MessageInfos: file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_msgTypes, - }.Build() - File_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto = out.File - file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_rawDesc = nil - file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_goTypes = nil - file_envoy_extensions_filters_network_generic_proxy_router_v3_router_proto_depIdxs = nil -} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/router/v3/router.pb.validate.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/router/v3/router.pb.validate.go deleted file mode 100644 index d525c74fb3..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/router/v3/router.pb.validate.go +++ /dev/null @@ -1,136 +0,0 @@ -// Code generated by protoc-gen-validate. DO NOT EDIT. -// source: envoy/extensions/filters/network/generic_proxy/router/v3/router.proto - -package routerv3 - -import ( - "bytes" - "errors" - "fmt" - "net" - "net/mail" - "net/url" - "regexp" - "sort" - "strings" - "time" - "unicode/utf8" - - "google.golang.org/protobuf/types/known/anypb" -) - -// ensure the imports are used -var ( - _ = bytes.MinRead - _ = errors.New("") - _ = fmt.Print - _ = utf8.UTFMax - _ = (*regexp.Regexp)(nil) - _ = (*strings.Reader)(nil) - _ = net.IPv4len - _ = time.Duration(0) - _ = (*url.URL)(nil) - _ = (*mail.Address)(nil) - _ = anypb.Any{} - _ = sort.Sort -) - -// Validate checks the field values on Router with the rules defined in the -// proto definition for this message. If any rules are violated, the first -// error encountered is returned, or nil if there are no violations. -func (m *Router) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on Router with the rules defined in the -// proto definition for this message. If any rules are violated, the result is -// a list of violation errors wrapped in RouterMultiError, or nil if none found. -func (m *Router) ValidateAll() error { - return m.validate(true) -} - -func (m *Router) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - // no validation rules for BindUpstreamConnection - - if len(errors) > 0 { - return RouterMultiError(errors) - } - - return nil -} - -// RouterMultiError is an error wrapping multiple validation errors returned by -// Router.ValidateAll() if the designated constraints aren't met. -type RouterMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m RouterMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m RouterMultiError) AllErrors() []error { return m } - -// RouterValidationError is the validation error returned by Router.Validate if -// the designated constraints aren't met. -type RouterValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e RouterValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e RouterValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e RouterValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e RouterValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e RouterValidationError) ErrorName() string { return "RouterValidationError" } - -// Error satisfies the builtin error interface -func (e RouterValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sRouter.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = RouterValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = RouterValidationError{} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.pb.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.pb.go deleted file mode 100644 index f4763e6821..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.pb.go +++ /dev/null @@ -1,415 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.23.0 -// protoc v5.26.1 -// source: envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto - -package generic_proxyv3 - -import ( - v32 "github.com/cilium/proxy/go/envoy/config/accesslog/v3" - v3 "github.com/cilium/proxy/go/envoy/config/core/v3" - v31 "github.com/cilium/proxy/go/envoy/extensions/filters/network/http_connection_manager/v3" - _ "github.com/cncf/xds/go/udpa/annotations" - _ "github.com/cncf/xds/go/xds/annotations/v3" - _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - -// [#next-free-field: 8] -type GenericProxy struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // The human readable prefix to use when emitting statistics. - StatPrefix string `protobuf:"bytes,1,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"` - // The codec which encodes and decodes the application protocol. - // [#extension-category: envoy.generic_proxy.codecs] - CodecConfig *v3.TypedExtensionConfig `protobuf:"bytes,2,opt,name=codec_config,json=codecConfig,proto3" json:"codec_config,omitempty"` - // Types that are assignable to RouteSpecifier: - // - // *GenericProxy_GenericRds - // *GenericProxy_RouteConfig - RouteSpecifier isGenericProxy_RouteSpecifier `protobuf_oneof:"route_specifier"` - // A list of individual Layer-7 filters that make up the filter chain for requests made to the - // proxy. Order matters as the filters are processed sequentially as request events - // happen. - // [#extension-category: envoy.generic_proxy.filters] - Filters []*v3.TypedExtensionConfig `protobuf:"bytes,5,rep,name=filters,proto3" json:"filters,omitempty"` - // Tracing configuration for the generic proxy. - Tracing *v31.HttpConnectionManager_Tracing `protobuf:"bytes,6,opt,name=tracing,proto3" json:"tracing,omitempty"` - // Configuration for :ref:`access logs ` emitted by generic proxy. - AccessLog []*v32.AccessLog `protobuf:"bytes,7,rep,name=access_log,json=accessLog,proto3" json:"access_log,omitempty"` -} - -func (x *GenericProxy) Reset() { - *x = GenericProxy{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *GenericProxy) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*GenericProxy) ProtoMessage() {} - -func (x *GenericProxy) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use GenericProxy.ProtoReflect.Descriptor instead. -func (*GenericProxy) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_rawDescGZIP(), []int{0} -} - -func (x *GenericProxy) GetStatPrefix() string { - if x != nil { - return x.StatPrefix - } - return "" -} - -func (x *GenericProxy) GetCodecConfig() *v3.TypedExtensionConfig { - if x != nil { - return x.CodecConfig - } - return nil -} - -func (m *GenericProxy) GetRouteSpecifier() isGenericProxy_RouteSpecifier { - if m != nil { - return m.RouteSpecifier - } - return nil -} - -func (x *GenericProxy) GetGenericRds() *GenericRds { - if x, ok := x.GetRouteSpecifier().(*GenericProxy_GenericRds); ok { - return x.GenericRds - } - return nil -} - -func (x *GenericProxy) GetRouteConfig() *RouteConfiguration { - if x, ok := x.GetRouteSpecifier().(*GenericProxy_RouteConfig); ok { - return x.RouteConfig - } - return nil -} - -func (x *GenericProxy) GetFilters() []*v3.TypedExtensionConfig { - if x != nil { - return x.Filters - } - return nil -} - -func (x *GenericProxy) GetTracing() *v31.HttpConnectionManager_Tracing { - if x != nil { - return x.Tracing - } - return nil -} - -func (x *GenericProxy) GetAccessLog() []*v32.AccessLog { - if x != nil { - return x.AccessLog - } - return nil -} - -type isGenericProxy_RouteSpecifier interface { - isGenericProxy_RouteSpecifier() -} - -type GenericProxy_GenericRds struct { - // The generic proxies route table will be dynamically loaded via the meta RDS API. - GenericRds *GenericRds `protobuf:"bytes,3,opt,name=generic_rds,json=genericRds,proto3,oneof"` -} - -type GenericProxy_RouteConfig struct { - // The route table for the generic proxy is static and is specified in this property. - RouteConfig *RouteConfiguration `protobuf:"bytes,4,opt,name=route_config,json=routeConfig,proto3,oneof"` -} - -func (*GenericProxy_GenericRds) isGenericProxy_RouteSpecifier() {} - -func (*GenericProxy_RouteConfig) isGenericProxy_RouteSpecifier() {} - -type GenericRds struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Configuration source specifier for RDS. - ConfigSource *v3.ConfigSource `protobuf:"bytes,1,opt,name=config_source,json=configSource,proto3" json:"config_source,omitempty"` - // The name of the route configuration. This name will be passed to the RDS API. This allows an - // Envoy configuration with multiple generic proxies to use different route configurations. - RouteConfigName string `protobuf:"bytes,2,opt,name=route_config_name,json=routeConfigName,proto3" json:"route_config_name,omitempty"` -} - -func (x *GenericRds) Reset() { - *x = GenericRds{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *GenericRds) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*GenericRds) ProtoMessage() {} - -func (x *GenericRds) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use GenericRds.ProtoReflect.Descriptor instead. -func (*GenericRds) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_rawDescGZIP(), []int{1} -} - -func (x *GenericRds) GetConfigSource() *v3.ConfigSource { - if x != nil { - return x.ConfigSource - } - return nil -} - -func (x *GenericRds) GetRouteConfigName() string { - if x != nil { - return x.RouteConfigName - } - return "" -} - -var File_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto protoreflect.FileDescriptor - -var file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_rawDesc = []byte{ - 0x0a, 0x45, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, - 0x2f, 0x76, 0x33, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, - 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x31, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, - 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, - 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, - 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x76, 0x33, 0x1a, 0x29, 0x65, 0x6e, 0x76, 0x6f, - 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, - 0x6f, 0x67, 0x2f, 0x76, 0x33, 0x2f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6c, 0x6f, 0x67, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, - 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, - 0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, - 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x3d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, - 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, - 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, - 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x76, 0x33, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x59, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, - 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x6e, - 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, - 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f, 0x76, - 0x33, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, - 0x1f, 0x78, 0x64, 0x73, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x2f, 0x76, 0x33, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, - 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, - 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf8, 0x04, 0x0a, 0x0c, 0x47, 0x65, 0x6e, - 0x65, 0x72, 0x69, 0x63, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x28, 0x0a, 0x0b, 0x73, 0x74, 0x61, - 0x74, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, - 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x50, 0x72, 0x65, - 0x66, 0x69, 0x78, 0x12, 0x57, 0x0a, 0x0c, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x5f, 0x63, 0x6f, 0x6e, - 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, - 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, - 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, - 0x0b, 0x63, 0x6f, 0x64, 0x65, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x60, 0x0a, 0x0b, - 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x72, 0x64, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x3d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, - 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, - 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, - 0x78, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x52, 0x64, 0x73, - 0x48, 0x00, 0x52, 0x0a, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x52, 0x64, 0x73, 0x12, 0x6a, - 0x0a, 0x0c, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x45, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, - 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, - 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, - 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x0b, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x44, 0x0a, 0x07, 0x66, 0x69, - 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, - 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, - 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, - 0x12, 0x74, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x5a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, - 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, - 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, - 0x48, 0x74, 0x74, 0x70, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x61, - 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x74, - 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x12, 0x43, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, - 0x5f, 0x6c, 0x6f, 0x67, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, - 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, - 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, - 0x52, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x42, 0x16, 0x0a, 0x0f, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, - 0xf8, 0x42, 0x01, 0x22, 0x94, 0x01, 0x0a, 0x0a, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x52, - 0x64, 0x73, 0x12, 0x51, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, - 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, - 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x08, 0xfa, - 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x33, 0x0a, 0x11, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x63, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0f, 0x72, 0x6f, 0x75, 0x74, 0x65, - 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0xd0, 0x01, 0x0a, 0x3f, 0x69, - 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, - 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, - 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x67, 0x65, - 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x76, 0x33, 0x42, 0x11, - 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x50, 0x01, 0x5a, 0x68, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, - 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, - 0x74, 0x65, 0x72, 0x73, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, - 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x76, 0x33, 0x3b, 0x67, 0x65, - 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x76, 0x33, 0xba, 0x80, 0xc8, - 0xd1, 0x06, 0x02, 0x10, 0x02, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_rawDescOnce sync.Once - file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_rawDescData = file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_rawDesc -) - -func file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_rawDescGZIP() []byte { - file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_rawDescOnce.Do(func() { - file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_rawDescData) - }) - return file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_rawDescData -} - -var file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_goTypes = []interface{}{ - (*GenericProxy)(nil), // 0: envoy.extensions.filters.network.generic_proxy.v3.GenericProxy - (*GenericRds)(nil), // 1: envoy.extensions.filters.network.generic_proxy.v3.GenericRds - (*v3.TypedExtensionConfig)(nil), // 2: envoy.config.core.v3.TypedExtensionConfig - (*RouteConfiguration)(nil), // 3: envoy.extensions.filters.network.generic_proxy.v3.RouteConfiguration - (*v31.HttpConnectionManager_Tracing)(nil), // 4: envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing - (*v32.AccessLog)(nil), // 5: envoy.config.accesslog.v3.AccessLog - (*v3.ConfigSource)(nil), // 6: envoy.config.core.v3.ConfigSource -} -var file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_depIdxs = []int32{ - 2, // 0: envoy.extensions.filters.network.generic_proxy.v3.GenericProxy.codec_config:type_name -> envoy.config.core.v3.TypedExtensionConfig - 1, // 1: envoy.extensions.filters.network.generic_proxy.v3.GenericProxy.generic_rds:type_name -> envoy.extensions.filters.network.generic_proxy.v3.GenericRds - 3, // 2: envoy.extensions.filters.network.generic_proxy.v3.GenericProxy.route_config:type_name -> envoy.extensions.filters.network.generic_proxy.v3.RouteConfiguration - 2, // 3: envoy.extensions.filters.network.generic_proxy.v3.GenericProxy.filters:type_name -> envoy.config.core.v3.TypedExtensionConfig - 4, // 4: envoy.extensions.filters.network.generic_proxy.v3.GenericProxy.tracing:type_name -> envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing - 5, // 5: envoy.extensions.filters.network.generic_proxy.v3.GenericProxy.access_log:type_name -> envoy.config.accesslog.v3.AccessLog - 6, // 6: envoy.extensions.filters.network.generic_proxy.v3.GenericRds.config_source:type_name -> envoy.config.core.v3.ConfigSource - 7, // [7:7] is the sub-list for method output_type - 7, // [7:7] is the sub-list for method input_type - 7, // [7:7] is the sub-list for extension type_name - 7, // [7:7] is the sub-list for extension extendee - 0, // [0:7] is the sub-list for field type_name -} - -func init() { file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_init() } -func file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_init() { - if File_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto != nil { - return - } - file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_init() - if !protoimpl.UnsafeEnabled { - file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GenericProxy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GenericRds); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_msgTypes[0].OneofWrappers = []interface{}{ - (*GenericProxy_GenericRds)(nil), - (*GenericProxy_RouteConfig)(nil), - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_rawDesc, - NumEnums: 0, - NumMessages: 2, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_goTypes, - DependencyIndexes: file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_depIdxs, - MessageInfos: file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_msgTypes, - }.Build() - File_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto = out.File - file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_rawDesc = nil - file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_goTypes = nil - file_envoy_extensions_filters_network_generic_proxy_v3_generic_proxy_proto_depIdxs = nil -} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.pb.validate.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.pb.validate.go deleted file mode 100644 index 37483bbacb..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.pb.validate.go +++ /dev/null @@ -1,533 +0,0 @@ -// Code generated by protoc-gen-validate. DO NOT EDIT. -// source: envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto - -package generic_proxyv3 - -import ( - "bytes" - "errors" - "fmt" - "net" - "net/mail" - "net/url" - "regexp" - "sort" - "strings" - "time" - "unicode/utf8" - - "google.golang.org/protobuf/types/known/anypb" -) - -// ensure the imports are used -var ( - _ = bytes.MinRead - _ = errors.New("") - _ = fmt.Print - _ = utf8.UTFMax - _ = (*regexp.Regexp)(nil) - _ = (*strings.Reader)(nil) - _ = net.IPv4len - _ = time.Duration(0) - _ = (*url.URL)(nil) - _ = (*mail.Address)(nil) - _ = anypb.Any{} - _ = sort.Sort -) - -// Validate checks the field values on GenericProxy with the rules defined in -// the proto definition for this message. If any rules are violated, the first -// error encountered is returned, or nil if there are no violations. -func (m *GenericProxy) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on GenericProxy with the rules defined -// in the proto definition for this message. If any rules are violated, the -// result is a list of violation errors wrapped in GenericProxyMultiError, or -// nil if none found. -func (m *GenericProxy) ValidateAll() error { - return m.validate(true) -} - -func (m *GenericProxy) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if utf8.RuneCountInString(m.GetStatPrefix()) < 1 { - err := GenericProxyValidationError{ - field: "StatPrefix", - reason: "value length must be at least 1 runes", - } - if !all { - return err - } - errors = append(errors, err) - } - - if m.GetCodecConfig() == nil { - err := GenericProxyValidationError{ - field: "CodecConfig", - reason: "value is required", - } - if !all { - return err - } - errors = append(errors, err) - } - - if all { - switch v := interface{}(m.GetCodecConfig()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, GenericProxyValidationError{ - field: "CodecConfig", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, GenericProxyValidationError{ - field: "CodecConfig", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetCodecConfig()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return GenericProxyValidationError{ - field: "CodecConfig", - reason: "embedded message failed validation", - cause: err, - } - } - } - - for idx, item := range m.GetFilters() { - _, _ = idx, item - - if all { - switch v := interface{}(item).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, GenericProxyValidationError{ - field: fmt.Sprintf("Filters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, GenericProxyValidationError{ - field: fmt.Sprintf("Filters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(item).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return GenericProxyValidationError{ - field: fmt.Sprintf("Filters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } - } - - } - - if all { - switch v := interface{}(m.GetTracing()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, GenericProxyValidationError{ - field: "Tracing", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, GenericProxyValidationError{ - field: "Tracing", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetTracing()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return GenericProxyValidationError{ - field: "Tracing", - reason: "embedded message failed validation", - cause: err, - } - } - } - - for idx, item := range m.GetAccessLog() { - _, _ = idx, item - - if all { - switch v := interface{}(item).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, GenericProxyValidationError{ - field: fmt.Sprintf("AccessLog[%v]", idx), - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, GenericProxyValidationError{ - field: fmt.Sprintf("AccessLog[%v]", idx), - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(item).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return GenericProxyValidationError{ - field: fmt.Sprintf("AccessLog[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } - } - - } - - oneofRouteSpecifierPresent := false - switch v := m.RouteSpecifier.(type) { - case *GenericProxy_GenericRds: - if v == nil { - err := GenericProxyValidationError{ - field: "RouteSpecifier", - reason: "oneof value cannot be a typed-nil", - } - if !all { - return err - } - errors = append(errors, err) - } - oneofRouteSpecifierPresent = true - - if all { - switch v := interface{}(m.GetGenericRds()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, GenericProxyValidationError{ - field: "GenericRds", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, GenericProxyValidationError{ - field: "GenericRds", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetGenericRds()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return GenericProxyValidationError{ - field: "GenericRds", - reason: "embedded message failed validation", - cause: err, - } - } - } - - case *GenericProxy_RouteConfig: - if v == nil { - err := GenericProxyValidationError{ - field: "RouteSpecifier", - reason: "oneof value cannot be a typed-nil", - } - if !all { - return err - } - errors = append(errors, err) - } - oneofRouteSpecifierPresent = true - - if all { - switch v := interface{}(m.GetRouteConfig()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, GenericProxyValidationError{ - field: "RouteConfig", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, GenericProxyValidationError{ - field: "RouteConfig", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetRouteConfig()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return GenericProxyValidationError{ - field: "RouteConfig", - reason: "embedded message failed validation", - cause: err, - } - } - } - - default: - _ = v // ensures v is used - } - if !oneofRouteSpecifierPresent { - err := GenericProxyValidationError{ - field: "RouteSpecifier", - reason: "value is required", - } - if !all { - return err - } - errors = append(errors, err) - } - - if len(errors) > 0 { - return GenericProxyMultiError(errors) - } - - return nil -} - -// GenericProxyMultiError is an error wrapping multiple validation errors -// returned by GenericProxy.ValidateAll() if the designated constraints aren't met. -type GenericProxyMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m GenericProxyMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m GenericProxyMultiError) AllErrors() []error { return m } - -// GenericProxyValidationError is the validation error returned by -// GenericProxy.Validate if the designated constraints aren't met. -type GenericProxyValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e GenericProxyValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e GenericProxyValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e GenericProxyValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e GenericProxyValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e GenericProxyValidationError) ErrorName() string { return "GenericProxyValidationError" } - -// Error satisfies the builtin error interface -func (e GenericProxyValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sGenericProxy.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = GenericProxyValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = GenericProxyValidationError{} - -// Validate checks the field values on GenericRds with the rules defined in the -// proto definition for this message. If any rules are violated, the first -// error encountered is returned, or nil if there are no violations. -func (m *GenericRds) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on GenericRds with the rules defined in -// the proto definition for this message. If any rules are violated, the -// result is a list of violation errors wrapped in GenericRdsMultiError, or -// nil if none found. -func (m *GenericRds) ValidateAll() error { - return m.validate(true) -} - -func (m *GenericRds) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if m.GetConfigSource() == nil { - err := GenericRdsValidationError{ - field: "ConfigSource", - reason: "value is required", - } - if !all { - return err - } - errors = append(errors, err) - } - - if all { - switch v := interface{}(m.GetConfigSource()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, GenericRdsValidationError{ - field: "ConfigSource", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, GenericRdsValidationError{ - field: "ConfigSource", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetConfigSource()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return GenericRdsValidationError{ - field: "ConfigSource", - reason: "embedded message failed validation", - cause: err, - } - } - } - - if utf8.RuneCountInString(m.GetRouteConfigName()) < 1 { - err := GenericRdsValidationError{ - field: "RouteConfigName", - reason: "value length must be at least 1 runes", - } - if !all { - return err - } - errors = append(errors, err) - } - - if len(errors) > 0 { - return GenericRdsMultiError(errors) - } - - return nil -} - -// GenericRdsMultiError is an error wrapping multiple validation errors -// returned by GenericRds.ValidateAll() if the designated constraints aren't met. -type GenericRdsMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m GenericRdsMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m GenericRdsMultiError) AllErrors() []error { return m } - -// GenericRdsValidationError is the validation error returned by -// GenericRds.Validate if the designated constraints aren't met. -type GenericRdsValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e GenericRdsValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e GenericRdsValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e GenericRdsValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e GenericRdsValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e GenericRdsValidationError) ErrorName() string { return "GenericRdsValidationError" } - -// Error satisfies the builtin error interface -func (e GenericRdsValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sGenericRds.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = GenericRdsValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = GenericRdsValidationError{} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3/route.pb.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3/route.pb.go deleted file mode 100644 index d82cfcb2bf..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3/route.pb.go +++ /dev/null @@ -1,362 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.23.0 -// protoc v5.26.1 -// source: envoy/extensions/filters/network/generic_proxy/v3/route.proto - -package generic_proxyv3 - -import ( - _ "github.com/cncf/xds/go/udpa/annotations" - _ "github.com/cncf/xds/go/xds/annotations/v3" - v3 "github.com/cncf/xds/go/xds/type/matcher/v3" - _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - -type VirtualHost struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // The name of the virtual host. - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - // A list of hosts that will be matched to this virtual host. Wildcard hosts are supported in - // the suffix or prefix form. - // - // Host search order: - // 1. Exact names: “www.foo.com“. - // 2. Suffix wildcards: “*.foo.com“ or “*-bar.foo.com“. - // 3. Prefix wildcards: “foo.*“ or “foo-*“. - // 4. Special wildcard “*“ matching any host and will be the default virtual host. - // - // .. note:: - // - // The wildcard will not match the empty string. - // e.g. ``*-bar.foo.com`` will match ``baz-bar.foo.com`` but not ``-bar.foo.com``. - // The longest wildcards match first. - // Only a single virtual host in the entire route configuration can match on ``*``. A domain - // must be unique across all virtual hosts or the config will fail to load. - Hosts []string `protobuf:"bytes,2,rep,name=hosts,proto3" json:"hosts,omitempty"` - // The match tree to use when resolving route actions for incoming requests. - Routes *v3.Matcher `protobuf:"bytes,3,opt,name=routes,proto3" json:"routes,omitempty"` -} - -func (x *VirtualHost) Reset() { - *x = VirtualHost{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *VirtualHost) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*VirtualHost) ProtoMessage() {} - -func (x *VirtualHost) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use VirtualHost.ProtoReflect.Descriptor instead. -func (*VirtualHost) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_rawDescGZIP(), []int{0} -} - -func (x *VirtualHost) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -func (x *VirtualHost) GetHosts() []string { - if x != nil { - return x.Hosts - } - return nil -} - -func (x *VirtualHost) GetRoutes() *v3.Matcher { - if x != nil { - return x.Routes - } - return nil -} - -// The generic proxy makes use of the xDS matching API for routing configurations. -// -// In the below example, we combine a top level tree matcher with a linear matcher to match -// the incoming requests, and send the matching requests to v1 of the upstream service. -// -// .. code-block:: yaml -// -// name: example -// routes: -// matcher_tree: -// input: -// name: request-service -// typed_config: -// "@type": type.googleapis.com/envoy.extensions.filters.network.generic_proxy.matcher.v3.ServiceMatchInput -// exact_match_map: -// map: -// service_name_0: -// matcher: -// matcher_list: -// matchers: -// - predicate: -// and_matcher: -// predicate: -// - single_predicate: -// input: -// name: request-properties -// typed_config: -// "@type": type.googleapis.com/envoy.extensions.filters.network.generic_proxy.matcher.v3.PropertyMatchInput -// property_name: version -// value_match: -// exact: v1 -// - single_predicate: -// input: -// name: request-properties -// typed_config: -// "@type": type.googleapis.com/envoy.extensions.filters.network.generic_proxy.matcher.v3.PropertyMatchInput -// property_name: user -// value_match: -// exact: john -// on_match: -// action: -// name: route -// typed_config: -// "@type": type.googleapis.com/envoy.extensions.filters.network.generic_proxy.action.v3.routeAction -// cluster: cluster_0 -type RouteConfiguration struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // The name of the route configuration. For example, it might match route_config_name in - // envoy.extensions.filters.network.generic_proxy.v3.Rds. - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - // The match tree to use when resolving route actions for incoming requests. - // If no any virtual host is configured in the “virtual_hosts“ field or no special wildcard - // virtual host is configured, the “routes“ field will be used as the default route table. - // If both the wildcard virtual host and “routes“ are configured, the configuration will fail - // to load. - Routes *v3.Matcher `protobuf:"bytes,2,opt,name=routes,proto3" json:"routes,omitempty"` - // An array of virtual hosts that make up the route table. - VirtualHosts []*VirtualHost `protobuf:"bytes,3,rep,name=virtual_hosts,json=virtualHosts,proto3" json:"virtual_hosts,omitempty"` -} - -func (x *RouteConfiguration) Reset() { - *x = RouteConfiguration{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RouteConfiguration) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RouteConfiguration) ProtoMessage() {} - -func (x *RouteConfiguration) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use RouteConfiguration.ProtoReflect.Descriptor instead. -func (*RouteConfiguration) Descriptor() ([]byte, []int) { - return file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_rawDescGZIP(), []int{1} -} - -func (x *RouteConfiguration) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -func (x *RouteConfiguration) GetRoutes() *v3.Matcher { - if x != nil { - return x.Routes - } - return nil -} - -func (x *RouteConfiguration) GetVirtualHosts() []*VirtualHost { - if x != nil { - return x.VirtualHosts - } - return nil -} - -var File_envoy_extensions_filters_network_generic_proxy_v3_route_proto protoreflect.FileDescriptor - -var file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_rawDesc = []byte{ - 0x0a, 0x3d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, - 0x2f, 0x76, 0x33, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, - 0x31, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, - 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, - 0x6b, 0x2e, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, - 0x76, 0x33, 0x1a, 0x1f, 0x78, 0x64, 0x73, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x33, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x78, 0x64, 0x73, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, - 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, - 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, - 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8a, - 0x01, 0x0a, 0x0b, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x12, 0x1b, - 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, - 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x05, 0x68, - 0x6f, 0x73, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, - 0x01, 0x02, 0x08, 0x01, 0x52, 0x05, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x12, 0x3e, 0x0a, 0x06, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x78, 0x64, - 0x73, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, - 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, - 0x02, 0x10, 0x01, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x22, 0xcc, 0x01, 0x0a, 0x12, - 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, - 0x34, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1c, 0x2e, 0x78, 0x64, 0x73, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, - 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x06, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x63, 0x0a, 0x0d, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, - 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x65, - 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, - 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, - 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x76, 0x33, - 0x2e, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x52, 0x0c, 0x76, 0x69, - 0x72, 0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x73, 0x42, 0xc9, 0x01, 0x0a, 0x3f, 0x69, - 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, - 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, - 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x67, 0x65, - 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x76, 0x33, 0x42, 0x0a, - 0x52, 0x6f, 0x75, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x68, 0x67, 0x69, - 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, - 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, - 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, - 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x6e, 0x65, - 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, 0x72, - 0x6f, 0x78, 0x79, 0x2f, 0x76, 0x33, 0x3b, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x70, - 0x72, 0x6f, 0x78, 0x79, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0xd2, 0xc6, - 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_rawDescOnce sync.Once - file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_rawDescData = file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_rawDesc -) - -func file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_rawDescGZIP() []byte { - file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_rawDescOnce.Do(func() { - file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_rawDescData) - }) - return file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_rawDescData -} - -var file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_goTypes = []interface{}{ - (*VirtualHost)(nil), // 0: envoy.extensions.filters.network.generic_proxy.v3.VirtualHost - (*RouteConfiguration)(nil), // 1: envoy.extensions.filters.network.generic_proxy.v3.RouteConfiguration - (*v3.Matcher)(nil), // 2: xds.type.matcher.v3.Matcher -} -var file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_depIdxs = []int32{ - 2, // 0: envoy.extensions.filters.network.generic_proxy.v3.VirtualHost.routes:type_name -> xds.type.matcher.v3.Matcher - 2, // 1: envoy.extensions.filters.network.generic_proxy.v3.RouteConfiguration.routes:type_name -> xds.type.matcher.v3.Matcher - 0, // 2: envoy.extensions.filters.network.generic_proxy.v3.RouteConfiguration.virtual_hosts:type_name -> envoy.extensions.filters.network.generic_proxy.v3.VirtualHost - 3, // [3:3] is the sub-list for method output_type - 3, // [3:3] is the sub-list for method input_type - 3, // [3:3] is the sub-list for extension type_name - 3, // [3:3] is the sub-list for extension extendee - 0, // [0:3] is the sub-list for field type_name -} - -func init() { file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_init() } -func file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_init() { - if File_envoy_extensions_filters_network_generic_proxy_v3_route_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualHost); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteConfiguration); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_rawDesc, - NumEnums: 0, - NumMessages: 2, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_goTypes, - DependencyIndexes: file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_depIdxs, - MessageInfos: file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_msgTypes, - }.Build() - File_envoy_extensions_filters_network_generic_proxy_v3_route_proto = out.File - file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_rawDesc = nil - file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_goTypes = nil - file_envoy_extensions_filters_network_generic_proxy_v3_route_proto_depIdxs = nil -} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3/route.pb.validate.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3/route.pb.validate.go deleted file mode 100644 index 1dbcc023db..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3/route.pb.validate.go +++ /dev/null @@ -1,373 +0,0 @@ -// Code generated by protoc-gen-validate. DO NOT EDIT. -// source: envoy/extensions/filters/network/generic_proxy/v3/route.proto - -package generic_proxyv3 - -import ( - "bytes" - "errors" - "fmt" - "net" - "net/mail" - "net/url" - "regexp" - "sort" - "strings" - "time" - "unicode/utf8" - - "google.golang.org/protobuf/types/known/anypb" -) - -// ensure the imports are used -var ( - _ = bytes.MinRead - _ = errors.New("") - _ = fmt.Print - _ = utf8.UTFMax - _ = (*regexp.Regexp)(nil) - _ = (*strings.Reader)(nil) - _ = net.IPv4len - _ = time.Duration(0) - _ = (*url.URL)(nil) - _ = (*mail.Address)(nil) - _ = anypb.Any{} - _ = sort.Sort -) - -// Validate checks the field values on VirtualHost with the rules defined in -// the proto definition for this message. If any rules are violated, the first -// error encountered is returned, or nil if there are no violations. -func (m *VirtualHost) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on VirtualHost with the rules defined in -// the proto definition for this message. If any rules are violated, the -// result is a list of violation errors wrapped in VirtualHostMultiError, or -// nil if none found. -func (m *VirtualHost) ValidateAll() error { - return m.validate(true) -} - -func (m *VirtualHost) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if utf8.RuneCountInString(m.GetName()) < 1 { - err := VirtualHostValidationError{ - field: "Name", - reason: "value length must be at least 1 runes", - } - if !all { - return err - } - errors = append(errors, err) - } - - if len(m.GetHosts()) < 1 { - err := VirtualHostValidationError{ - field: "Hosts", - reason: "value must contain at least 1 item(s)", - } - if !all { - return err - } - errors = append(errors, err) - } - - if m.GetRoutes() == nil { - err := VirtualHostValidationError{ - field: "Routes", - reason: "value is required", - } - if !all { - return err - } - errors = append(errors, err) - } - - if all { - switch v := interface{}(m.GetRoutes()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, VirtualHostValidationError{ - field: "Routes", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, VirtualHostValidationError{ - field: "Routes", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetRoutes()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return VirtualHostValidationError{ - field: "Routes", - reason: "embedded message failed validation", - cause: err, - } - } - } - - if len(errors) > 0 { - return VirtualHostMultiError(errors) - } - - return nil -} - -// VirtualHostMultiError is an error wrapping multiple validation errors -// returned by VirtualHost.ValidateAll() if the designated constraints aren't met. -type VirtualHostMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m VirtualHostMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m VirtualHostMultiError) AllErrors() []error { return m } - -// VirtualHostValidationError is the validation error returned by -// VirtualHost.Validate if the designated constraints aren't met. -type VirtualHostValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e VirtualHostValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e VirtualHostValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e VirtualHostValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e VirtualHostValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e VirtualHostValidationError) ErrorName() string { return "VirtualHostValidationError" } - -// Error satisfies the builtin error interface -func (e VirtualHostValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sVirtualHost.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = VirtualHostValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = VirtualHostValidationError{} - -// Validate checks the field values on RouteConfiguration with the rules -// defined in the proto definition for this message. If any rules are -// violated, the first error encountered is returned, or nil if there are no violations. -func (m *RouteConfiguration) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on RouteConfiguration with the rules -// defined in the proto definition for this message. If any rules are -// violated, the result is a list of violation errors wrapped in -// RouteConfigurationMultiError, or nil if none found. -func (m *RouteConfiguration) ValidateAll() error { - return m.validate(true) -} - -func (m *RouteConfiguration) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if utf8.RuneCountInString(m.GetName()) < 1 { - err := RouteConfigurationValidationError{ - field: "Name", - reason: "value length must be at least 1 runes", - } - if !all { - return err - } - errors = append(errors, err) - } - - if all { - switch v := interface{}(m.GetRoutes()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, RouteConfigurationValidationError{ - field: "Routes", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, RouteConfigurationValidationError{ - field: "Routes", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetRoutes()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return RouteConfigurationValidationError{ - field: "Routes", - reason: "embedded message failed validation", - cause: err, - } - } - } - - for idx, item := range m.GetVirtualHosts() { - _, _ = idx, item - - if all { - switch v := interface{}(item).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, RouteConfigurationValidationError{ - field: fmt.Sprintf("VirtualHosts[%v]", idx), - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, RouteConfigurationValidationError{ - field: fmt.Sprintf("VirtualHosts[%v]", idx), - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(item).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return RouteConfigurationValidationError{ - field: fmt.Sprintf("VirtualHosts[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } - } - - } - - if len(errors) > 0 { - return RouteConfigurationMultiError(errors) - } - - return nil -} - -// RouteConfigurationMultiError is an error wrapping multiple validation errors -// returned by RouteConfiguration.ValidateAll() if the designated constraints -// aren't met. -type RouteConfigurationMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m RouteConfigurationMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m RouteConfigurationMultiError) AllErrors() []error { return m } - -// RouteConfigurationValidationError is the validation error returned by -// RouteConfiguration.Validate if the designated constraints aren't met. -type RouteConfigurationValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e RouteConfigurationValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e RouteConfigurationValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e RouteConfigurationValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e RouteConfigurationValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e RouteConfigurationValidationError) ErrorName() string { - return "RouteConfigurationValidationError" -} - -// Error satisfies the builtin error interface -func (e RouteConfigurationValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sRouteConfiguration.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = RouteConfigurationValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = RouteConfigurationValidationError{} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/matching/input_matchers/metadata/v3/metadata.pb.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/matching/input_matchers/metadata/v3/metadata.pb.go deleted file mode 100644 index e85588aa50..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/matching/input_matchers/metadata/v3/metadata.pb.go +++ /dev/null @@ -1,190 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.23.0 -// protoc v5.26.1 -// source: envoy/extensions/matching/input_matchers/metadata/v3/metadata.proto - -package metadatav3 - -import ( - v3 "github.com/cilium/proxy/go/envoy/type/matcher/v3" - _ "github.com/cncf/xds/go/udpa/annotations" - _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - -// Metadata matcher for metadata from http matching input data. -type Metadata struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // The Metadata is matched if the value retrieved by metadata matching input is matched to this value. - Value *v3.ValueMatcher `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` - // If true, the match result will be inverted. - Invert bool `protobuf:"varint,4,opt,name=invert,proto3" json:"invert,omitempty"` -} - -func (x *Metadata) Reset() { - *x = Metadata{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *Metadata) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*Metadata) ProtoMessage() {} - -func (x *Metadata) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use Metadata.ProtoReflect.Descriptor instead. -func (*Metadata) Descriptor() ([]byte, []int) { - return file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_rawDescGZIP(), []int{0} -} - -func (x *Metadata) GetValue() *v3.ValueMatcher { - if x != nil { - return x.Value - } - return nil -} - -func (x *Metadata) GetInvert() bool { - if x != nil { - return x.Invert - } - return false -} - -var File_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto protoreflect.FileDescriptor - -var file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_rawDesc = []byte{ - 0x0a, 0x43, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x2f, 0x69, 0x6e, 0x70, 0x75, - 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x73, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x64, - 0x61, 0x74, 0x61, 0x2f, 0x76, 0x33, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x34, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, - 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x69, 0x6e, 0x67, - 0x2e, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x73, 0x2e, - 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x76, 0x33, 0x1a, 0x21, 0x65, 0x6e, 0x76, - 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, - 0x76, 0x33, 0x2f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, - 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, - 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x67, 0x0a, 0x08, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, - 0x74, 0x61, 0x12, 0x43, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, - 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, - 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x6e, 0x76, 0x65, 0x72, - 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x42, - 0xc5, 0x01, 0x0a, 0x42, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, - 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x2e, 0x69, 0x6e, 0x70, 0x75, - 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x73, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x64, - 0x61, 0x74, 0x61, 0x2e, 0x76, 0x33, 0x42, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x66, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, - 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, - 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, - 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x2f, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, - 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x73, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, - 0x61, 0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x76, 0x33, 0xba, - 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_rawDescOnce sync.Once - file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_rawDescData = file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_rawDesc -) - -func file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_rawDescGZIP() []byte { - file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_rawDescOnce.Do(func() { - file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_rawDescData) - }) - return file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_rawDescData -} - -var file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_goTypes = []interface{}{ - (*Metadata)(nil), // 0: envoy.extensions.matching.input_matchers.metadata.v3.Metadata - (*v3.ValueMatcher)(nil), // 1: envoy.type.matcher.v3.ValueMatcher -} -var file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_depIdxs = []int32{ - 1, // 0: envoy.extensions.matching.input_matchers.metadata.v3.Metadata.value:type_name -> envoy.type.matcher.v3.ValueMatcher - 1, // [1:1] is the sub-list for method output_type - 1, // [1:1] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name -} - -func init() { file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_init() } -func file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_init() { - if File_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Metadata); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_rawDesc, - NumEnums: 0, - NumMessages: 1, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_goTypes, - DependencyIndexes: file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_depIdxs, - MessageInfos: file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_msgTypes, - }.Build() - File_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto = out.File - file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_rawDesc = nil - file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_goTypes = nil - file_envoy_extensions_matching_input_matchers_metadata_v3_metadata_proto_depIdxs = nil -} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/matching/input_matchers/metadata/v3/metadata.pb.validate.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/matching/input_matchers/metadata/v3/metadata.pb.validate.go deleted file mode 100644 index 340e11121c..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/matching/input_matchers/metadata/v3/metadata.pb.validate.go +++ /dev/null @@ -1,177 +0,0 @@ -// Code generated by protoc-gen-validate. DO NOT EDIT. -// source: envoy/extensions/matching/input_matchers/metadata/v3/metadata.proto - -package metadatav3 - -import ( - "bytes" - "errors" - "fmt" - "net" - "net/mail" - "net/url" - "regexp" - "sort" - "strings" - "time" - "unicode/utf8" - - "google.golang.org/protobuf/types/known/anypb" -) - -// ensure the imports are used -var ( - _ = bytes.MinRead - _ = errors.New("") - _ = fmt.Print - _ = utf8.UTFMax - _ = (*regexp.Regexp)(nil) - _ = (*strings.Reader)(nil) - _ = net.IPv4len - _ = time.Duration(0) - _ = (*url.URL)(nil) - _ = (*mail.Address)(nil) - _ = anypb.Any{} - _ = sort.Sort -) - -// Validate checks the field values on Metadata with the rules defined in the -// proto definition for this message. If any rules are violated, the first -// error encountered is returned, or nil if there are no violations. -func (m *Metadata) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on Metadata with the rules defined in -// the proto definition for this message. If any rules are violated, the -// result is a list of violation errors wrapped in MetadataMultiError, or nil -// if none found. -func (m *Metadata) ValidateAll() error { - return m.validate(true) -} - -func (m *Metadata) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if m.GetValue() == nil { - err := MetadataValidationError{ - field: "Value", - reason: "value is required", - } - if !all { - return err - } - errors = append(errors, err) - } - - if all { - switch v := interface{}(m.GetValue()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, MetadataValidationError{ - field: "Value", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, MetadataValidationError{ - field: "Value", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetValue()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return MetadataValidationError{ - field: "Value", - reason: "embedded message failed validation", - cause: err, - } - } - } - - // no validation rules for Invert - - if len(errors) > 0 { - return MetadataMultiError(errors) - } - - return nil -} - -// MetadataMultiError is an error wrapping multiple validation errors returned -// by Metadata.ValidateAll() if the designated constraints aren't met. -type MetadataMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m MetadataMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m MetadataMultiError) AllErrors() []error { return m } - -// MetadataValidationError is the validation error returned by -// Metadata.Validate if the designated constraints aren't met. -type MetadataValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e MetadataValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e MetadataValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e MetadataValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e MetadataValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e MetadataValidationError) ErrorName() string { return "MetadataValidationError" } - -// Error satisfies the builtin error interface -func (e MetadataValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sMetadata.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = MetadataValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = MetadataValidationError{} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/resource_monitors/cpu_utilization/v3/cpu_utilization.pb.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/resource_monitors/cpu_utilization/v3/cpu_utilization.pb.go deleted file mode 100644 index 551da8df97..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/resource_monitors/cpu_utilization/v3/cpu_utilization.pb.go +++ /dev/null @@ -1,161 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.23.0 -// protoc v5.26.1 -// source: envoy/extensions/resource_monitors/cpu_utilization/v3/cpu_utilization.proto - -package cpu_utilizationv3 - -import ( - _ "github.com/cncf/xds/go/udpa/annotations" - proto "github.com/golang/protobuf/proto" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - -// The CPU utilization resource monitor reports the Envoy process the CPU Utilization of the entire host. -// Today, this only works on Linux and is calculated using the stats in the /proc/stat file. -type CpuUtilizationConfig struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *CpuUtilizationConfig) Reset() { - *x = CpuUtilizationConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CpuUtilizationConfig) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CpuUtilizationConfig) ProtoMessage() {} - -func (x *CpuUtilizationConfig) ProtoReflect() protoreflect.Message { - mi := &file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use CpuUtilizationConfig.ProtoReflect.Descriptor instead. -func (*CpuUtilizationConfig) Descriptor() ([]byte, []int) { - return file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_rawDescGZIP(), []int{0} -} - -var File_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto protoreflect.FileDescriptor - -var file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_rawDesc = []byte{ - 0x0a, 0x4b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x6f, 0x6e, 0x69, - 0x74, 0x6f, 0x72, 0x73, 0x2f, 0x63, 0x70, 0x75, 0x5f, 0x75, 0x74, 0x69, 0x6c, 0x69, 0x7a, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x70, 0x75, 0x5f, 0x75, 0x74, 0x69, 0x6c, - 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x35, 0x65, - 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, - 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, - 0x73, 0x2e, 0x63, 0x70, 0x75, 0x5f, 0x75, 0x74, 0x69, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x2e, 0x76, 0x33, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x22, 0x16, 0x0a, 0x14, 0x43, 0x70, 0x75, 0x55, 0x74, 0x69, 0x6c, 0x69, 0x7a, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xd4, 0x01, 0x0a, 0x43, - 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, - 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x72, - 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x73, - 0x2e, 0x63, 0x70, 0x75, 0x5f, 0x75, 0x74, 0x69, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x76, 0x33, 0x42, 0x13, 0x43, 0x70, 0x75, 0x55, 0x74, 0x69, 0x6c, 0x69, 0x7a, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x6e, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, - 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, - 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, - 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x6f, 0x6e, - 0x69, 0x74, 0x6f, 0x72, 0x73, 0x2f, 0x63, 0x70, 0x75, 0x5f, 0x75, 0x74, 0x69, 0x6c, 0x69, 0x7a, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x70, 0x75, 0x5f, 0x75, 0x74, 0x69, - 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, - 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_rawDescOnce sync.Once - file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_rawDescData = file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_rawDesc -) - -func file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_rawDescGZIP() []byte { - file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_rawDescOnce.Do(func() { - file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_rawDescData) - }) - return file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_rawDescData -} - -var file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_goTypes = []interface{}{ - (*CpuUtilizationConfig)(nil), // 0: envoy.extensions.resource_monitors.cpu_utilization.v3.CpuUtilizationConfig -} -var file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_depIdxs = []int32{ - 0, // [0:0] is the sub-list for method output_type - 0, // [0:0] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name -} - -func init() { file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_init() } -func file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_init() { - if File_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CpuUtilizationConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_rawDesc, - NumEnums: 0, - NumMessages: 1, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_goTypes, - DependencyIndexes: file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_depIdxs, - MessageInfos: file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_msgTypes, - }.Build() - File_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto = out.File - file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_rawDesc = nil - file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_goTypes = nil - file_envoy_extensions_resource_monitors_cpu_utilization_v3_cpu_utilization_proto_depIdxs = nil -} diff --git a/vendor/github.com/cilium/proxy/go/envoy/extensions/resource_monitors/cpu_utilization/v3/cpu_utilization.pb.validate.go b/vendor/github.com/cilium/proxy/go/envoy/extensions/resource_monitors/cpu_utilization/v3/cpu_utilization.pb.validate.go deleted file mode 100644 index 0878117008..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/extensions/resource_monitors/cpu_utilization/v3/cpu_utilization.pb.validate.go +++ /dev/null @@ -1,138 +0,0 @@ -// Code generated by protoc-gen-validate. DO NOT EDIT. -// source: envoy/extensions/resource_monitors/cpu_utilization/v3/cpu_utilization.proto - -package cpu_utilizationv3 - -import ( - "bytes" - "errors" - "fmt" - "net" - "net/mail" - "net/url" - "regexp" - "sort" - "strings" - "time" - "unicode/utf8" - - "google.golang.org/protobuf/types/known/anypb" -) - -// ensure the imports are used -var ( - _ = bytes.MinRead - _ = errors.New("") - _ = fmt.Print - _ = utf8.UTFMax - _ = (*regexp.Regexp)(nil) - _ = (*strings.Reader)(nil) - _ = net.IPv4len - _ = time.Duration(0) - _ = (*url.URL)(nil) - _ = (*mail.Address)(nil) - _ = anypb.Any{} - _ = sort.Sort -) - -// Validate checks the field values on CpuUtilizationConfig with the rules -// defined in the proto definition for this message. If any rules are -// violated, the first error encountered is returned, or nil if there are no violations. -func (m *CpuUtilizationConfig) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on CpuUtilizationConfig with the rules -// defined in the proto definition for this message. If any rules are -// violated, the result is a list of violation errors wrapped in -// CpuUtilizationConfigMultiError, or nil if none found. -func (m *CpuUtilizationConfig) ValidateAll() error { - return m.validate(true) -} - -func (m *CpuUtilizationConfig) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if len(errors) > 0 { - return CpuUtilizationConfigMultiError(errors) - } - - return nil -} - -// CpuUtilizationConfigMultiError is an error wrapping multiple validation -// errors returned by CpuUtilizationConfig.ValidateAll() if the designated -// constraints aren't met. -type CpuUtilizationConfigMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m CpuUtilizationConfigMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m CpuUtilizationConfigMultiError) AllErrors() []error { return m } - -// CpuUtilizationConfigValidationError is the validation error returned by -// CpuUtilizationConfig.Validate if the designated constraints aren't met. -type CpuUtilizationConfigValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e CpuUtilizationConfigValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e CpuUtilizationConfigValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e CpuUtilizationConfigValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e CpuUtilizationConfigValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e CpuUtilizationConfigValidationError) ErrorName() string { - return "CpuUtilizationConfigValidationError" -} - -// Error satisfies the builtin error interface -func (e CpuUtilizationConfigValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sCpuUtilizationConfig.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = CpuUtilizationConfigValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = CpuUtilizationConfigValidationError{} diff --git a/vendor/github.com/cilium/proxy/go/envoy/service/redis_auth/v3/redis_external_auth.pb.go b/vendor/github.com/cilium/proxy/go/envoy/service/redis_auth/v3/redis_external_auth.pb.go deleted file mode 100644 index 6f777549c3..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/service/redis_auth/v3/redis_external_auth.pb.go +++ /dev/null @@ -1,377 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.23.0 -// protoc v5.26.1 -// source: envoy/service/redis_auth/v3/redis_external_auth.proto - -package redis_authv3 - -import ( - context "context" - _ "github.com/cncf/xds/go/udpa/annotations" - proto "github.com/golang/protobuf/proto" - status "google.golang.org/genproto/googleapis/rpc/status" - grpc "google.golang.org/grpc" - codes "google.golang.org/grpc/codes" - status1 "google.golang.org/grpc/status" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - timestamppb "google.golang.org/protobuf/types/known/timestamppb" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - -type RedisProxyExternalAuthRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Username, if applicable. Otherwise, empty. - Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` - // Password sent with the AUTH command. - Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` -} - -func (x *RedisProxyExternalAuthRequest) Reset() { - *x = RedisProxyExternalAuthRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_service_redis_auth_v3_redis_external_auth_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RedisProxyExternalAuthRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RedisProxyExternalAuthRequest) ProtoMessage() {} - -func (x *RedisProxyExternalAuthRequest) ProtoReflect() protoreflect.Message { - mi := &file_envoy_service_redis_auth_v3_redis_external_auth_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use RedisProxyExternalAuthRequest.ProtoReflect.Descriptor instead. -func (*RedisProxyExternalAuthRequest) Descriptor() ([]byte, []int) { - return file_envoy_service_redis_auth_v3_redis_external_auth_proto_rawDescGZIP(), []int{0} -} - -func (x *RedisProxyExternalAuthRequest) GetUsername() string { - if x != nil { - return x.Username - } - return "" -} - -func (x *RedisProxyExternalAuthRequest) GetPassword() string { - if x != nil { - return x.Password - } - return "" -} - -type RedisProxyExternalAuthResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Status of the authentication check. - Status *status.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` - // Optional expiration time for the authentication. - // If set, the authentication will be valid until this time. - // If not set, the authentication will be valid indefinitely. - Expiration *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=expiration,proto3" json:"expiration,omitempty"` - // Optional message to be sent back to the client. - Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"` -} - -func (x *RedisProxyExternalAuthResponse) Reset() { - *x = RedisProxyExternalAuthResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_envoy_service_redis_auth_v3_redis_external_auth_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RedisProxyExternalAuthResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RedisProxyExternalAuthResponse) ProtoMessage() {} - -func (x *RedisProxyExternalAuthResponse) ProtoReflect() protoreflect.Message { - mi := &file_envoy_service_redis_auth_v3_redis_external_auth_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use RedisProxyExternalAuthResponse.ProtoReflect.Descriptor instead. -func (*RedisProxyExternalAuthResponse) Descriptor() ([]byte, []int) { - return file_envoy_service_redis_auth_v3_redis_external_auth_proto_rawDescGZIP(), []int{1} -} - -func (x *RedisProxyExternalAuthResponse) GetStatus() *status.Status { - if x != nil { - return x.Status - } - return nil -} - -func (x *RedisProxyExternalAuthResponse) GetExpiration() *timestamppb.Timestamp { - if x != nil { - return x.Expiration - } - return nil -} - -func (x *RedisProxyExternalAuthResponse) GetMessage() string { - if x != nil { - return x.Message - } - return "" -} - -var File_envoy_service_redis_auth_v3_redis_external_auth_proto protoreflect.FileDescriptor - -var file_envoy_service_redis_auth_v3_redis_external_auth_proto_rawDesc = []byte{ - 0x0a, 0x35, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, - 0x72, 0x65, 0x64, 0x69, 0x73, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x72, 0x65, - 0x64, 0x69, 0x73, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x61, 0x75, 0x74, - 0x68, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x5f, 0x61, 0x75, 0x74, - 0x68, 0x2e, 0x76, 0x33, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x72, 0x70, - 0x63, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, - 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x57, 0x0a, - 0x1d, 0x52, 0x65, 0x64, 0x69, 0x73, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x45, 0x78, 0x74, 0x65, 0x72, - 0x6e, 0x61, 0x6c, 0x41, 0x75, 0x74, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, - 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x22, 0xa2, 0x01, 0x0a, 0x1e, 0x52, 0x65, 0x64, 0x69, 0x73, - 0x50, 0x72, 0x6f, 0x78, 0x79, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x41, 0x75, 0x74, - 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2a, 0x0a, 0x06, 0x73, 0x74, 0x61, - 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x3a, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, - 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0xa4, 0x01, 0x0a, 0x16, - 0x52, 0x65, 0x64, 0x69, 0x73, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x41, 0x75, 0x74, 0x68, 0x12, 0x89, 0x01, 0x0a, 0x0c, 0x41, 0x75, 0x74, 0x68, 0x65, - 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x5f, 0x61, 0x75, - 0x74, 0x68, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x64, 0x69, 0x73, 0x50, 0x72, 0x6f, 0x78, 0x79, - 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x41, 0x75, 0x74, 0x68, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x3b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, - 0x33, 0x2e, 0x52, 0x65, 0x64, 0x69, 0x73, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x45, 0x78, 0x74, 0x65, - 0x72, 0x6e, 0x61, 0x6c, 0x41, 0x75, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x00, 0x42, 0x9e, 0x01, 0x0a, 0x29, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, - 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x33, - 0x42, 0x16, 0x52, 0x65, 0x64, 0x69, 0x73, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x41, - 0x75, 0x74, 0x68, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4f, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, - 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, - 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2f, 0x72, 0x65, 0x64, 0x69, 0x73, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x3b, 0x72, - 0x65, 0x64, 0x69, 0x73, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x76, 0x33, 0xba, 0x80, 0xc8, 0xd1, 0x06, - 0x02, 0x10, 0x02, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_envoy_service_redis_auth_v3_redis_external_auth_proto_rawDescOnce sync.Once - file_envoy_service_redis_auth_v3_redis_external_auth_proto_rawDescData = file_envoy_service_redis_auth_v3_redis_external_auth_proto_rawDesc -) - -func file_envoy_service_redis_auth_v3_redis_external_auth_proto_rawDescGZIP() []byte { - file_envoy_service_redis_auth_v3_redis_external_auth_proto_rawDescOnce.Do(func() { - file_envoy_service_redis_auth_v3_redis_external_auth_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_service_redis_auth_v3_redis_external_auth_proto_rawDescData) - }) - return file_envoy_service_redis_auth_v3_redis_external_auth_proto_rawDescData -} - -var file_envoy_service_redis_auth_v3_redis_external_auth_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_envoy_service_redis_auth_v3_redis_external_auth_proto_goTypes = []interface{}{ - (*RedisProxyExternalAuthRequest)(nil), // 0: envoy.service.redis_auth.v3.RedisProxyExternalAuthRequest - (*RedisProxyExternalAuthResponse)(nil), // 1: envoy.service.redis_auth.v3.RedisProxyExternalAuthResponse - (*status.Status)(nil), // 2: google.rpc.Status - (*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp -} -var file_envoy_service_redis_auth_v3_redis_external_auth_proto_depIdxs = []int32{ - 2, // 0: envoy.service.redis_auth.v3.RedisProxyExternalAuthResponse.status:type_name -> google.rpc.Status - 3, // 1: envoy.service.redis_auth.v3.RedisProxyExternalAuthResponse.expiration:type_name -> google.protobuf.Timestamp - 0, // 2: envoy.service.redis_auth.v3.RedisProxyExternalAuth.Authenticate:input_type -> envoy.service.redis_auth.v3.RedisProxyExternalAuthRequest - 1, // 3: envoy.service.redis_auth.v3.RedisProxyExternalAuth.Authenticate:output_type -> envoy.service.redis_auth.v3.RedisProxyExternalAuthResponse - 3, // [3:4] is the sub-list for method output_type - 2, // [2:3] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name -} - -func init() { file_envoy_service_redis_auth_v3_redis_external_auth_proto_init() } -func file_envoy_service_redis_auth_v3_redis_external_auth_proto_init() { - if File_envoy_service_redis_auth_v3_redis_external_auth_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_envoy_service_redis_auth_v3_redis_external_auth_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RedisProxyExternalAuthRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_envoy_service_redis_auth_v3_redis_external_auth_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RedisProxyExternalAuthResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_envoy_service_redis_auth_v3_redis_external_auth_proto_rawDesc, - NumEnums: 0, - NumMessages: 2, - NumExtensions: 0, - NumServices: 1, - }, - GoTypes: file_envoy_service_redis_auth_v3_redis_external_auth_proto_goTypes, - DependencyIndexes: file_envoy_service_redis_auth_v3_redis_external_auth_proto_depIdxs, - MessageInfos: file_envoy_service_redis_auth_v3_redis_external_auth_proto_msgTypes, - }.Build() - File_envoy_service_redis_auth_v3_redis_external_auth_proto = out.File - file_envoy_service_redis_auth_v3_redis_external_auth_proto_rawDesc = nil - file_envoy_service_redis_auth_v3_redis_external_auth_proto_goTypes = nil - file_envoy_service_redis_auth_v3_redis_external_auth_proto_depIdxs = nil -} - -// Reference imports to suppress errors if they are not otherwise used. -var _ context.Context -var _ grpc.ClientConnInterface - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion6 - -// RedisProxyExternalAuthClient is the client API for RedisProxyExternalAuth service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type RedisProxyExternalAuthClient interface { - // Performs authentication check based on the data sent with the AUTH request. - // Returns either an OK status or an error status. - Authenticate(ctx context.Context, in *RedisProxyExternalAuthRequest, opts ...grpc.CallOption) (*RedisProxyExternalAuthResponse, error) -} - -type redisProxyExternalAuthClient struct { - cc grpc.ClientConnInterface -} - -func NewRedisProxyExternalAuthClient(cc grpc.ClientConnInterface) RedisProxyExternalAuthClient { - return &redisProxyExternalAuthClient{cc} -} - -func (c *redisProxyExternalAuthClient) Authenticate(ctx context.Context, in *RedisProxyExternalAuthRequest, opts ...grpc.CallOption) (*RedisProxyExternalAuthResponse, error) { - out := new(RedisProxyExternalAuthResponse) - err := c.cc.Invoke(ctx, "/envoy.service.redis_auth.v3.RedisProxyExternalAuth/Authenticate", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -// RedisProxyExternalAuthServer is the server API for RedisProxyExternalAuth service. -type RedisProxyExternalAuthServer interface { - // Performs authentication check based on the data sent with the AUTH request. - // Returns either an OK status or an error status. - Authenticate(context.Context, *RedisProxyExternalAuthRequest) (*RedisProxyExternalAuthResponse, error) -} - -// UnimplementedRedisProxyExternalAuthServer can be embedded to have forward compatible implementations. -type UnimplementedRedisProxyExternalAuthServer struct { -} - -func (*UnimplementedRedisProxyExternalAuthServer) Authenticate(context.Context, *RedisProxyExternalAuthRequest) (*RedisProxyExternalAuthResponse, error) { - return nil, status1.Errorf(codes.Unimplemented, "method Authenticate not implemented") -} - -func RegisterRedisProxyExternalAuthServer(s *grpc.Server, srv RedisProxyExternalAuthServer) { - s.RegisterService(&_RedisProxyExternalAuth_serviceDesc, srv) -} - -func _RedisProxyExternalAuth_Authenticate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(RedisProxyExternalAuthRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(RedisProxyExternalAuthServer).Authenticate(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/envoy.service.redis_auth.v3.RedisProxyExternalAuth/Authenticate", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(RedisProxyExternalAuthServer).Authenticate(ctx, req.(*RedisProxyExternalAuthRequest)) - } - return interceptor(ctx, in, info, handler) -} - -var _RedisProxyExternalAuth_serviceDesc = grpc.ServiceDesc{ - ServiceName: "envoy.service.redis_auth.v3.RedisProxyExternalAuth", - HandlerType: (*RedisProxyExternalAuthServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "Authenticate", - Handler: _RedisProxyExternalAuth_Authenticate_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "envoy/service/redis_auth/v3/redis_external_auth.proto", -} diff --git a/vendor/github.com/cilium/proxy/go/envoy/service/redis_auth/v3/redis_external_auth.pb.validate.go b/vendor/github.com/cilium/proxy/go/envoy/service/redis_auth/v3/redis_external_auth.pb.validate.go deleted file mode 100644 index 35ce849423..0000000000 --- a/vendor/github.com/cilium/proxy/go/envoy/service/redis_auth/v3/redis_external_auth.pb.validate.go +++ /dev/null @@ -1,306 +0,0 @@ -// Code generated by protoc-gen-validate. DO NOT EDIT. -// source: envoy/service/redis_auth/v3/redis_external_auth.proto - -package redis_authv3 - -import ( - "bytes" - "errors" - "fmt" - "net" - "net/mail" - "net/url" - "regexp" - "sort" - "strings" - "time" - "unicode/utf8" - - "google.golang.org/protobuf/types/known/anypb" -) - -// ensure the imports are used -var ( - _ = bytes.MinRead - _ = errors.New("") - _ = fmt.Print - _ = utf8.UTFMax - _ = (*regexp.Regexp)(nil) - _ = (*strings.Reader)(nil) - _ = net.IPv4len - _ = time.Duration(0) - _ = (*url.URL)(nil) - _ = (*mail.Address)(nil) - _ = anypb.Any{} - _ = sort.Sort -) - -// Validate checks the field values on RedisProxyExternalAuthRequest with the -// rules defined in the proto definition for this message. If any rules are -// violated, the first error encountered is returned, or nil if there are no violations. -func (m *RedisProxyExternalAuthRequest) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on RedisProxyExternalAuthRequest with -// the rules defined in the proto definition for this message. If any rules -// are violated, the result is a list of violation errors wrapped in -// RedisProxyExternalAuthRequestMultiError, or nil if none found. -func (m *RedisProxyExternalAuthRequest) ValidateAll() error { - return m.validate(true) -} - -func (m *RedisProxyExternalAuthRequest) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - // no validation rules for Username - - // no validation rules for Password - - if len(errors) > 0 { - return RedisProxyExternalAuthRequestMultiError(errors) - } - - return nil -} - -// RedisProxyExternalAuthRequestMultiError is an error wrapping multiple -// validation errors returned by RedisProxyExternalAuthRequest.ValidateAll() -// if the designated constraints aren't met. -type RedisProxyExternalAuthRequestMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m RedisProxyExternalAuthRequestMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m RedisProxyExternalAuthRequestMultiError) AllErrors() []error { return m } - -// RedisProxyExternalAuthRequestValidationError is the validation error -// returned by RedisProxyExternalAuthRequest.Validate if the designated -// constraints aren't met. -type RedisProxyExternalAuthRequestValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e RedisProxyExternalAuthRequestValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e RedisProxyExternalAuthRequestValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e RedisProxyExternalAuthRequestValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e RedisProxyExternalAuthRequestValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e RedisProxyExternalAuthRequestValidationError) ErrorName() string { - return "RedisProxyExternalAuthRequestValidationError" -} - -// Error satisfies the builtin error interface -func (e RedisProxyExternalAuthRequestValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sRedisProxyExternalAuthRequest.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = RedisProxyExternalAuthRequestValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = RedisProxyExternalAuthRequestValidationError{} - -// Validate checks the field values on RedisProxyExternalAuthResponse with the -// rules defined in the proto definition for this message. If any rules are -// violated, the first error encountered is returned, or nil if there are no violations. -func (m *RedisProxyExternalAuthResponse) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on RedisProxyExternalAuthResponse with -// the rules defined in the proto definition for this message. If any rules -// are violated, the result is a list of violation errors wrapped in -// RedisProxyExternalAuthResponseMultiError, or nil if none found. -func (m *RedisProxyExternalAuthResponse) ValidateAll() error { - return m.validate(true) -} - -func (m *RedisProxyExternalAuthResponse) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if all { - switch v := interface{}(m.GetStatus()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, RedisProxyExternalAuthResponseValidationError{ - field: "Status", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, RedisProxyExternalAuthResponseValidationError{ - field: "Status", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetStatus()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return RedisProxyExternalAuthResponseValidationError{ - field: "Status", - reason: "embedded message failed validation", - cause: err, - } - } - } - - if all { - switch v := interface{}(m.GetExpiration()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, RedisProxyExternalAuthResponseValidationError{ - field: "Expiration", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, RedisProxyExternalAuthResponseValidationError{ - field: "Expiration", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetExpiration()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return RedisProxyExternalAuthResponseValidationError{ - field: "Expiration", - reason: "embedded message failed validation", - cause: err, - } - } - } - - // no validation rules for Message - - if len(errors) > 0 { - return RedisProxyExternalAuthResponseMultiError(errors) - } - - return nil -} - -// RedisProxyExternalAuthResponseMultiError is an error wrapping multiple -// validation errors returned by RedisProxyExternalAuthResponse.ValidateAll() -// if the designated constraints aren't met. -type RedisProxyExternalAuthResponseMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m RedisProxyExternalAuthResponseMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m RedisProxyExternalAuthResponseMultiError) AllErrors() []error { return m } - -// RedisProxyExternalAuthResponseValidationError is the validation error -// returned by RedisProxyExternalAuthResponse.Validate if the designated -// constraints aren't met. -type RedisProxyExternalAuthResponseValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e RedisProxyExternalAuthResponseValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e RedisProxyExternalAuthResponseValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e RedisProxyExternalAuthResponseValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e RedisProxyExternalAuthResponseValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e RedisProxyExternalAuthResponseValidationError) ErrorName() string { - return "RedisProxyExternalAuthResponseValidationError" -} - -// Error satisfies the builtin error interface -func (e RedisProxyExternalAuthResponseValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sRedisProxyExternalAuthResponse.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = RedisProxyExternalAuthResponseValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = RedisProxyExternalAuthResponseValidationError{} diff --git a/vendor/modules.txt b/vendor/modules.txt index 196dcaf4be..a490935004 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -55,7 +55,7 @@ github.com/chai2010/gettext-go/po # github.com/cilium/charts v0.0.0-20241218153829-9518b30a2027 ## explicit; go 1.17 github.com/cilium/charts -# github.com/cilium/cilium v1.17.0-pre.3.0.20250108154004-47bb433883b2 +# github.com/cilium/cilium v1.17.0-rc.2 ## explicit; go 1.23.0 github.com/cilium/cilium/api/v1/client github.com/cilium/cilium/api/v1/client/bgp @@ -264,7 +264,7 @@ github.com/cilium/ebpf/internal/testutils/fdtrace github.com/cilium/ebpf/internal/tracefs github.com/cilium/ebpf/internal/unix github.com/cilium/ebpf/link -# github.com/cilium/hive v0.0.0-20241213121623-605c1412b9b3 +# github.com/cilium/hive v0.0.0-20250121145729-e67f66eb0375 ## explicit; go 1.21.3 github.com/cilium/hive github.com/cilium/hive/cell @@ -374,7 +374,6 @@ github.com/cilium/proxy/go/envoy/extensions/filters/http/lua/v3 github.com/cilium/proxy/go/envoy/extensions/filters/http/oauth2/v3 github.com/cilium/proxy/go/envoy/extensions/filters/http/on_demand/v3 github.com/cilium/proxy/go/envoy/extensions/filters/http/original_src/v3 -github.com/cilium/proxy/go/envoy/extensions/filters/http/proto_message_extraction/v3 github.com/cilium/proxy/go/envoy/extensions/filters/http/proto_message_logging/v3 github.com/cilium/proxy/go/envoy/extensions/filters/http/rate_limit_quota/v3 github.com/cilium/proxy/go/envoy/extensions/filters/http/ratelimit/v3 @@ -399,12 +398,6 @@ github.com/cilium/proxy/go/envoy/extensions/filters/network/dubbo_proxy/router/v github.com/cilium/proxy/go/envoy/extensions/filters/network/dubbo_proxy/v3 github.com/cilium/proxy/go/envoy/extensions/filters/network/echo/v3 github.com/cilium/proxy/go/envoy/extensions/filters/network/ext_authz/v3 -github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/action/v3 -github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3 -github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3 -github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/matcher/v3 -github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/router/v3 -github.com/cilium/proxy/go/envoy/extensions/filters/network/generic_proxy/v3 github.com/cilium/proxy/go/envoy/extensions/filters/network/http_connection_manager/v3 github.com/cilium/proxy/go/envoy/extensions/filters/network/local_ratelimit/v3 github.com/cilium/proxy/go/envoy/extensions/filters/network/mongo_proxy/v3 @@ -467,7 +460,6 @@ github.com/cilium/proxy/go/envoy/extensions/matching/common_inputs/network/v3 github.com/cilium/proxy/go/envoy/extensions/matching/common_inputs/ssl/v3 github.com/cilium/proxy/go/envoy/extensions/matching/input_matchers/consistent_hashing/v3 github.com/cilium/proxy/go/envoy/extensions/matching/input_matchers/ip/v3 -github.com/cilium/proxy/go/envoy/extensions/matching/input_matchers/metadata/v3 github.com/cilium/proxy/go/envoy/extensions/matching/input_matchers/runtime_fraction/v3 github.com/cilium/proxy/go/envoy/extensions/network/dns_resolver/apple/v3 github.com/cilium/proxy/go/envoy/extensions/network/dns_resolver/cares/v3 @@ -487,7 +479,6 @@ github.com/cilium/proxy/go/envoy/extensions/rbac/audit_loggers/stream/v3 github.com/cilium/proxy/go/envoy/extensions/rbac/matchers/upstream_ip_port/v3 github.com/cilium/proxy/go/envoy/extensions/regex_engines/v3 github.com/cilium/proxy/go/envoy/extensions/request_id/uuid/v3 -github.com/cilium/proxy/go/envoy/extensions/resource_monitors/cpu_utilization/v3 github.com/cilium/proxy/go/envoy/extensions/resource_monitors/downstream_connections/v3 github.com/cilium/proxy/go/envoy/extensions/resource_monitors/fixed_heap/v3 github.com/cilium/proxy/go/envoy/extensions/resource_monitors/injected_resource/v3 @@ -537,7 +528,6 @@ github.com/cilium/proxy/go/envoy/service/load_stats/v3 github.com/cilium/proxy/go/envoy/service/metrics/v3 github.com/cilium/proxy/go/envoy/service/rate_limit_quota/v3 github.com/cilium/proxy/go/envoy/service/ratelimit/v3 -github.com/cilium/proxy/go/envoy/service/redis_auth/v3 github.com/cilium/proxy/go/envoy/service/route/v3 github.com/cilium/proxy/go/envoy/service/runtime/v3 github.com/cilium/proxy/go/envoy/service/secret/v3 @@ -2000,8 +1990,8 @@ sigs.k8s.io/kustomize/kyaml/yaml/internal/k8sgen/pkg/util/validation/field sigs.k8s.io/kustomize/kyaml/yaml/merge2 sigs.k8s.io/kustomize/kyaml/yaml/schema sigs.k8s.io/kustomize/kyaml/yaml/walk -# sigs.k8s.io/mcs-api v0.1.1-0.20241217092652-fede3192824f -## explicit; go 1.22.0 +# sigs.k8s.io/mcs-api v0.1.1-0.20250116162235-62ede9a032dc +## explicit; go 1.23.0 sigs.k8s.io/mcs-api/pkg/apis/v1alpha1 sigs.k8s.io/mcs-api/pkg/client/clientset/versioned sigs.k8s.io/mcs-api/pkg/client/clientset/versioned/fake diff --git a/vendor/sigs.k8s.io/mcs-api/pkg/apis/v1alpha1/serviceimport.go b/vendor/sigs.k8s.io/mcs-api/pkg/apis/v1alpha1/serviceimport.go index 11103da04e..813cc7a74f 100644 --- a/vendor/sigs.k8s.io/mcs-api/pkg/apis/v1alpha1/serviceimport.go +++ b/vendor/sigs.k8s.io/mcs-api/pkg/apis/v1alpha1/serviceimport.go @@ -53,7 +53,7 @@ type ServiceImportSpec struct { // +listType=atomic Ports []ServicePort `json:"ports"` // ip will be used as the VIP for this service when type is ClusterSetIP. - // +kubebuilder:validation:MaxItems:=1 + // +kubebuilder:validation:MaxItems:=2 // +optional IPs []string `json:"ips,omitempty"` // type defines the type of this service.