From 49663da866e608e1a6c16da2d62429401b135ec0 Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Wed, 9 Nov 2022 15:06:05 -0500 Subject: [PATCH 1/4] build: moving eds cluster to extensions Signed-off-by: Alyssa Wilk --- CODEOWNERS | 1 + changelogs/current.yaml | 3 +- .../upstream/service_discovery.rst | 3 +- source/common/upstream/BUILD | 62 +---------- source/common/upstream/upstream_impl.cc | 1 - source/extensions/clusters/eds/BUILD | 66 ++++++++++++ .../clusters/eds}/eds.cc | 2 +- .../clusters/eds}/eds.h | 2 +- .../clusters/eds}/leds.cc | 2 +- .../clusters/eds}/leds.h | 0 source/extensions/extensions_build_config.bzl | 1 + source/extensions/extensions_metadata.yaml | 5 + test/common/upstream/BUILD | 90 ---------------- test/extensions/clusters/eds/BUILD | 101 ++++++++++++++++++ .../clusters/eds}/eds_speed_test.cc | 2 +- .../clusters/eds}/eds_test.cc | 2 +- .../clusters/eds}/leds_test.cc | 2 +- tools/code_format/config.yaml | 1 + 18 files changed, 185 insertions(+), 161 deletions(-) create mode 100644 source/extensions/clusters/eds/BUILD rename source/{common/upstream => extensions/clusters/eds}/eds.cc (99%) rename source/{common/upstream => extensions/clusters/eds}/eds.h (99%) rename source/{common/upstream => extensions/clusters/eds}/leds.cc (98%) rename source/{common/upstream => extensions/clusters/eds}/leds.h (100%) create mode 100644 test/extensions/clusters/eds/BUILD rename test/{common/upstream => extensions/clusters/eds}/eds_speed_test.cc (99%) rename test/{common/upstream => extensions/clusters/eds}/eds_test.cc (99%) rename test/{common/upstream => extensions/clusters/eds}/leds_test.cc (99%) diff --git a/CODEOWNERS b/CODEOWNERS index 749a89644b5d3..c7fa84c2eb59e 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -284,6 +284,7 @@ extensions/filters/http/oauth2 @derekargueta @snowp /*/extensions/clusters/original_dst @UNOWNED @UNOWNED /*/extensions/clusters/logical_dns/ @UNOWNED @UNOWNED /*/extensions/clusters/common/ @UNOWNED @UNOWNED +/*/extensions/clusters/eds/ @UNOWNED @UNOWNED # URL Pattern Match and Rewrite Library /*/extensions/path/uri_template_lib @alyssawilk @yanjunxiang-google diff --git a/changelogs/current.yaml b/changelogs/current.yaml index dfbfc6d7b7c98..0f2e37f7f2f79 100644 --- a/changelogs/current.yaml +++ b/changelogs/current.yaml @@ -16,8 +16,7 @@ behavior_changes: this kind of update will be rejected. The runtime flag ``envoy.reloadable_features.enable_update_listener_socket_options`` can be used for revert this behavior. - area: build change: | - moved the strict_dns, original_dst, and logical_dns clusters to extensions. If you use these clusters and override extensions_build_config.bzl you will now need to include it explicitly. - moved the static, strict_dns and original_dst clusters to extensions. If you use these clusters and override extensions_build_config.bzl you will now need to include it explicitly. + moved the static, strict_dns, original_dst, logical_dns, and eds clusters to extensions. If you use these clusters and override extensions_build_config.bzl you will now need to include it explicitly. minor_behavior_changes: # *Changes that may cause incompatibilities for some users, but should not for most* diff --git a/docs/root/intro/arch_overview/upstream/service_discovery.rst b/docs/root/intro/arch_overview/upstream/service_discovery.rst index 1f389d45bca7a..5cd3762c857ee 100644 --- a/docs/root/intro/arch_overview/upstream/service_discovery.rst +++ b/docs/root/intro/arch_overview/upstream/service_discovery.rst @@ -105,7 +105,8 @@ When using the original destination cluster for HTTP upstreams, please set :ref: .. _arch_overview_service_discovery_types_eds: Endpoint discovery service (EDS) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. _extension_envoy.clusters.eds: The *endpoint discovery service* is a :ref:`xDS management server based on gRPC or REST-JSON API server ` used by Envoy to fetch cluster members. The cluster members are called diff --git a/source/common/upstream/BUILD b/source/common/upstream/BUILD index 44cee17f4f736..76c958f39aee0 100644 --- a/source/common/upstream/BUILD +++ b/source/common/upstream/BUILD @@ -4,10 +4,6 @@ load( "envoy_package", "envoy_select_enable_http3", ) -load( - "@envoy_build_config//:extensions_build_config.bzl", - "LEGACY_ALWAYSLINK", -) licenses(["notice"]) # Apache 2 @@ -405,62 +401,6 @@ envoy_cc_library( ], ) -envoy_cc_library( - name = "eds_lib", - srcs = ["eds.cc"], - hdrs = ["eds.h"], - deps = [ - ":cluster_factory_lib", - ":leds_lib", - ":upstream_includes", - "//envoy/config:grpc_mux_interface", - "//envoy/config:subscription_factory_interface", - "//envoy/config:subscription_interface", - "//envoy/local_info:local_info_interface", - "//envoy/secret:secret_manager_interface", - "//envoy/upstream:cluster_factory_interface", - "//envoy/upstream:locality_lib", - "//source/common/config:api_version_lib", - "//source/common/config:decoded_resource_lib", - "//source/common/config:metadata_lib", - "//source/common/config:subscription_base_interface", - "//source/common/config:subscription_factory_lib", - "//source/common/config:utility_lib", - "//source/common/network:address_lib", - "//source/common/network:resolver_lib", - "//source/common/network:utility_lib", - "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", - "@envoy_api//envoy/config/core/v3:pkg_cc_proto", - "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", - "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", - ], - alwayslink = LEGACY_ALWAYSLINK, -) - -envoy_cc_library( - name = "leds_lib", - srcs = ["leds.cc"], - hdrs = ["leds.h"], - deps = [ - ":upstream_includes", - "//envoy/config:grpc_mux_interface", - "//envoy/config:subscription_factory_interface", - "//envoy/config:subscription_interface", - "//envoy/local_info:local_info_interface", - "//source/common/config:decoded_resource_lib", - "//source/common/config:subscription_base_interface", - "//source/common/config:subscription_factory_lib", - "//source/common/config:utility_lib", - "//source/common/network:address_lib", - "//source/common/network:resolver_lib", - "//source/common/network:utility_lib", - "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/config/core/v3:pkg_cc_proto", - "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", - ], -) - envoy_cc_library( name = "subset_lb_lib", srcs = ["subset_lb.cc"], @@ -486,7 +426,7 @@ envoy_cc_library( name = "upstream_lib", srcs = ["upstream_impl.cc"], deps = [ - ":eds_lib", + ":cluster_factory_lib", ":health_checker_lib", # TODO(mattklein123): Move the clusters to extensions so they can be compiled out. ":upstream_includes", diff --git a/source/common/upstream/upstream_impl.cc b/source/common/upstream/upstream_impl.cc index 6cb3411ad28ea..6319c23c409e8 100644 --- a/source/common/upstream/upstream_impl.cc +++ b/source/common/upstream/upstream_impl.cc @@ -49,7 +49,6 @@ #include "source/common/runtime/runtime_features.h" #include "source/common/runtime/runtime_impl.h" #include "source/common/upstream/cluster_factory_impl.h" -#include "source/common/upstream/eds.h" #include "source/common/upstream/health_checker_impl.h" #include "source/extensions/filters/network/http_connection_manager/config.h" #include "source/server/transport_socket_config_impl.h" diff --git a/source/extensions/clusters/eds/BUILD b/source/extensions/clusters/eds/BUILD new file mode 100644 index 0000000000000..30c994f7b1ab5 --- /dev/null +++ b/source/extensions/clusters/eds/BUILD @@ -0,0 +1,66 @@ +load( + "//bazel:envoy_build_system.bzl", + "envoy_cc_library", + "envoy_extension_package", + "envoy_package", +) + +licenses(["notice"]) # Apache 2 + +envoy_extension_package() + +envoy_cc_library( + name = "eds_lib", + srcs = ["eds.cc"], + hdrs = ["eds.h"], + visibility = ["//visibility:public"], + deps = [ + "leds_lib", + "//envoy/config:grpc_mux_interface", + "//envoy/config:subscription_factory_interface", + "//envoy/config:subscription_interface", + "//envoy/local_info:local_info_interface", + "//envoy/secret:secret_manager_interface", + "//envoy/upstream:cluster_factory_interface", + "//envoy/upstream:locality_lib", + "//source/common/config:api_version_lib", + "//source/common/config:decoded_resource_lib", + "//source/common/config:metadata_lib", + "//source/common/config:subscription_base_interface", + "//source/common/config:subscription_factory_lib", + "//source/common/config:utility_lib", + "//source/common/network:address_lib", + "//source/common/network:resolver_lib", + "//source/common/network:utility_lib", + "//source/common/protobuf:utility_lib", + "//source/common/upstream:cluster_factory_lib", + "//source/common/upstream:upstream_includes", + "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", + "@envoy_api//envoy/config/core/v3:pkg_cc_proto", + "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", + "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", + ], +) + +envoy_cc_library( + name = "leds_lib", + srcs = ["leds.cc"], + hdrs = ["leds.h"], + deps = [ + "//envoy/config:grpc_mux_interface", + "//envoy/config:subscription_factory_interface", + "//envoy/config:subscription_interface", + "//envoy/local_info:local_info_interface", + "//source/common/config:decoded_resource_lib", + "//source/common/config:subscription_base_interface", + "//source/common/config:subscription_factory_lib", + "//source/common/config:utility_lib", + "//source/common/network:address_lib", + "//source/common/network:resolver_lib", + "//source/common/network:utility_lib", + "//source/common/protobuf:utility_lib", + "//source/common/upstream:upstream_includes", + "@envoy_api//envoy/config/core/v3:pkg_cc_proto", + "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", + ], +) diff --git a/source/common/upstream/eds.cc b/source/extensions/clusters/eds/eds.cc similarity index 99% rename from source/common/upstream/eds.cc rename to source/extensions/clusters/eds/eds.cc index dda70e1f37364..9f2998f378285 100644 --- a/source/common/upstream/eds.cc +++ b/source/extensions/clusters/eds/eds.cc @@ -1,4 +1,4 @@ -#include "source/common/upstream/eds.h" +#include "source/extensions/clusters/eds/eds.h" #include "envoy/common/exception.h" #include "envoy/config/cluster/v3/cluster.pb.h" diff --git a/source/common/upstream/eds.h b/source/extensions/clusters/eds/eds.h similarity index 99% rename from source/common/upstream/eds.h rename to source/extensions/clusters/eds/eds.h index ff4ecdc735142..57adb83c7aaa9 100644 --- a/source/common/upstream/eds.h +++ b/source/extensions/clusters/eds/eds.h @@ -17,8 +17,8 @@ #include "source/common/config/subscription_base.h" #include "source/common/upstream/cluster_factory_impl.h" -#include "source/common/upstream/leds.h" #include "source/common/upstream/upstream_impl.h" +#include "source/extensions/clusters/eds/leds.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/leds.cc b/source/extensions/clusters/eds/leds.cc similarity index 98% rename from source/common/upstream/leds.cc rename to source/extensions/clusters/eds/leds.cc index ef23bd0cdeeb6..2e2ed0db69410 100644 --- a/source/common/upstream/leds.cc +++ b/source/extensions/clusters/eds/leds.cc @@ -1,4 +1,4 @@ -#include "source/common/upstream/leds.h" +#include "source/extensions/clusters/eds/leds.h" #include "envoy/common/exception.h" #include "envoy/config/core/v3/config_source.pb.h" diff --git a/source/common/upstream/leds.h b/source/extensions/clusters/eds/leds.h similarity index 100% rename from source/common/upstream/leds.h rename to source/extensions/clusters/eds/leds.h diff --git a/source/extensions/extensions_build_config.bzl b/source/extensions/extensions_build_config.bzl index 56519a62d018b..2839a9bae6bd2 100644 --- a/source/extensions/extensions_build_config.bzl +++ b/source/extensions/extensions_build_config.bzl @@ -19,6 +19,7 @@ EXTENSIONS = { "envoy.clusters.aggregate": "//source/extensions/clusters/aggregate:cluster", "envoy.clusters.dynamic_forward_proxy": "//source/extensions/clusters/dynamic_forward_proxy:cluster", + "envoy.clusters.eds": "//source/extensions/clusters/eds:eds_lib", "envoy.clusters.redis": "//source/extensions/clusters/redis:redis_cluster", "envoy.clusters.static": "//source/extensions/clusters/static:static_cluster_lib", "envoy.clusters.strict_dns": "//source/extensions/clusters/strict_dns:strict_dns_cluster_lib", diff --git a/source/extensions/extensions_metadata.yaml b/source/extensions/extensions_metadata.yaml index c4c4fc9f52993..822c01f829e66 100644 --- a/source/extensions/extensions_metadata.yaml +++ b/source/extensions/extensions_metadata.yaml @@ -100,6 +100,11 @@ envoy.clusters.original_dst: - envoy.clusters security_posture: robust_to_untrusted_downstream_and_upstream status: stable +envoy.clusters.eds: + categories: + - envoy.clusters + security_posture: robust_to_untrusted_downstream_and_upstream + status: stable envoy.clusters.redis: categories: - envoy.clusters diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index 09873c20313bd..3376c09e703da 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -137,96 +137,6 @@ envoy_cc_test( deps = ["//source/common/upstream:scheduler_lib"], ) -envoy_cc_test( - name = "eds_test", - srcs = ["eds_test.cc"], - deps = [ - ":utility_lib", - "//source/common/config:utility_lib", - "//source/common/upstream:eds_lib", - "//source/extensions/transport_sockets/raw_buffer:config", - "//source/extensions/transport_sockets/tls:config", - "//source/server:transport_socket_config_lib", - "//test/common/stats:stat_test_utility_lib", - "//test/integration/load_balancers:custom_lb_policy", - "//test/mocks/local_info:local_info_mocks", - "//test/mocks/protobuf:protobuf_mocks", - "//test/mocks/runtime:runtime_mocks", - "//test/mocks/server:admin_mocks", - "//test/mocks/server:instance_mocks", - "//test/mocks/ssl:ssl_mocks", - "//test/mocks/upstream:cluster_manager_mocks", - "//test/mocks/upstream:health_checker_mocks", - "//test/test_common:test_runtime_lib", - "//test/test_common:utility_lib", - "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", - "@envoy_api//envoy/config/core/v3:pkg_cc_proto", - "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", - "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", - ], -) - -envoy_cc_benchmark_binary( - name = "eds_speed_test", - srcs = ["eds_speed_test.cc"], - external_deps = [ - "benchmark", - ], - deps = [ - ":utility_lib", - "//envoy/config:xds_resources_delegate_interface", - "//source/common/config:grpc_mux_lib", - "//source/common/config:grpc_subscription_lib", - "//source/common/config:protobuf_link_hacks", - "//source/common/config:utility_lib", - "//source/common/config/xds_mux:grpc_mux_lib", - "//source/common/upstream:eds_lib", - "//source/extensions/transport_sockets/raw_buffer:config", - "//source/server:transport_socket_config_lib", - "//test/mocks/config:custom_config_validators_mocks", - "//test/mocks/local_info:local_info_mocks", - "//test/mocks/protobuf:protobuf_mocks", - "//test/mocks/runtime:runtime_mocks", - "//test/mocks/server:admin_mocks", - "//test/mocks/server:instance_mocks", - "//test/mocks/ssl:ssl_mocks", - "//test/mocks/upstream:cluster_manager_mocks", - "//test/test_common:test_runtime_lib", - "//test/test_common:utility_lib", - "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", - "@envoy_api//envoy/config/core/v3:pkg_cc_proto", - "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", - "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", - ], -) - -envoy_benchmark_test( - name = "eds_speed_test_benchmark_test", - benchmark_binary = "eds_speed_test", -) - -envoy_cc_test( - name = "leds_test", - srcs = ["leds_test.cc"], - deps = [ - ":utility_lib", - "//source/common/config:utility_lib", - "//source/common/upstream:leds_lib", - "//source/extensions/transport_sockets/raw_buffer:config", - "//source/server:transport_socket_config_lib", - "//test/common/stats:stat_test_utility_lib", - "//test/mocks/local_info:local_info_mocks", - "//test/mocks/protobuf:protobuf_mocks", - "//test/mocks/runtime:runtime_mocks", - "//test/mocks/server:admin_mocks", - "//test/mocks/server:instance_mocks", - "//test/mocks/ssl:ssl_mocks", - "//test/mocks/upstream:cluster_manager_mocks", - "//test/test_common:utility_lib", - "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", - ], -) - envoy_cc_test_library( name = "health_check_fuzz_utils_lib", srcs = [ diff --git a/test/extensions/clusters/eds/BUILD b/test/extensions/clusters/eds/BUILD new file mode 100644 index 0000000000000..29a3e3ddb2b6e --- /dev/null +++ b/test/extensions/clusters/eds/BUILD @@ -0,0 +1,101 @@ +load( + "//bazel:envoy_build_system.bzl", + "envoy_benchmark_test", + "envoy_cc_benchmark_binary", + "envoy_cc_test", + "envoy_package", +) + +licenses(["notice"]) # Apache 2 + +envoy_package() + +envoy_cc_test( + name = "eds_test", + srcs = ["eds_test.cc"], + deps = [ + "//source/common/config:utility_lib", + "//source/extensions/clusters/eds:eds_lib", + "//source/extensions/transport_sockets/raw_buffer:config", + "//source/extensions/transport_sockets/tls:config", + "//source/server:transport_socket_config_lib", + "//test/common/stats:stat_test_utility_lib", + "//test/common/upstream:utility_lib", + "//test/integration/load_balancers:custom_lb_policy", + "//test/mocks/local_info:local_info_mocks", + "//test/mocks/protobuf:protobuf_mocks", + "//test/mocks/runtime:runtime_mocks", + "//test/mocks/server:admin_mocks", + "//test/mocks/server:instance_mocks", + "//test/mocks/ssl:ssl_mocks", + "//test/mocks/upstream:cluster_manager_mocks", + "//test/mocks/upstream:health_checker_mocks", + "//test/test_common:test_runtime_lib", + "//test/test_common:utility_lib", + "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", + "@envoy_api//envoy/config/core/v3:pkg_cc_proto", + "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", + "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", + ], +) + +envoy_cc_benchmark_binary( + name = "eds_speed_test", + srcs = ["eds_speed_test.cc"], + external_deps = [ + "benchmark", + ], + deps = [ + "//envoy/config:xds_resources_delegate_interface", + "//source/common/config:grpc_mux_lib", + "//source/common/config:grpc_subscription_lib", + "//source/common/config:protobuf_link_hacks", + "//source/common/config:utility_lib", + "//source/common/config/xds_mux:grpc_mux_lib", + "//source/extensions/clusters/eds:eds_lib", + "//source/extensions/transport_sockets/raw_buffer:config", + "//source/server:transport_socket_config_lib", + "//test/common/upstream:utility_lib", + "//test/mocks/config:custom_config_validators_mocks", + "//test/mocks/local_info:local_info_mocks", + "//test/mocks/protobuf:protobuf_mocks", + "//test/mocks/runtime:runtime_mocks", + "//test/mocks/server:admin_mocks", + "//test/mocks/server:instance_mocks", + "//test/mocks/ssl:ssl_mocks", + "//test/mocks/upstream:cluster_manager_mocks", + "//test/test_common:test_runtime_lib", + "//test/test_common:utility_lib", + "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", + "@envoy_api//envoy/config/core/v3:pkg_cc_proto", + "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", + "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", + ], +) + +envoy_benchmark_test( + name = "eds_speed_test_benchmark_test", + benchmark_binary = "eds_speed_test", +) + +envoy_cc_test( + name = "leds_test", + srcs = ["leds_test.cc"], + deps = [ + "//source/common/config:utility_lib", + "//source/extensions/clusters/eds:leds_lib", + "//source/extensions/transport_sockets/raw_buffer:config", + "//source/server:transport_socket_config_lib", + "//test/common/stats:stat_test_utility_lib", + "//test/common/upstream:utility_lib", + "//test/mocks/local_info:local_info_mocks", + "//test/mocks/protobuf:protobuf_mocks", + "//test/mocks/runtime:runtime_mocks", + "//test/mocks/server:admin_mocks", + "//test/mocks/server:instance_mocks", + "//test/mocks/ssl:ssl_mocks", + "//test/mocks/upstream:cluster_manager_mocks", + "//test/test_common:utility_lib", + "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", + ], +) diff --git a/test/common/upstream/eds_speed_test.cc b/test/extensions/clusters/eds/eds_speed_test.cc similarity index 99% rename from test/common/upstream/eds_speed_test.cc rename to test/extensions/clusters/eds/eds_speed_test.cc index 613310534192c..db144ecad7f40 100644 --- a/test/common/upstream/eds_speed_test.cc +++ b/test/extensions/clusters/eds/eds_speed_test.cc @@ -15,7 +15,7 @@ #include "source/common/config/utility.h" #include "source/common/config/xds_mux/grpc_mux_impl.h" #include "source/common/singleton/manager_impl.h" -#include "source/common/upstream/eds.h" +#include "source/extensions/clusters/eds/eds.h" #include "source/server/transport_socket_config_impl.h" #include "test/benchmark/main.h" diff --git a/test/common/upstream/eds_test.cc b/test/extensions/clusters/eds/eds_test.cc similarity index 99% rename from test/common/upstream/eds_test.cc rename to test/extensions/clusters/eds/eds_test.cc index 88fb82a0c9b2d..758dafda64714 100644 --- a/test/common/upstream/eds_test.cc +++ b/test/extensions/clusters/eds/eds_test.cc @@ -9,7 +9,7 @@ #include "source/common/config/utility.h" #include "source/common/singleton/manager_impl.h" -#include "source/common/upstream/eds.h" +#include "source/extensions/clusters/eds/eds.h" #include "source/server/transport_socket_config_impl.h" #include "test/common/stats/stat_test_utility.h" diff --git a/test/common/upstream/leds_test.cc b/test/extensions/clusters/eds/leds_test.cc similarity index 99% rename from test/common/upstream/leds_test.cc rename to test/extensions/clusters/eds/leds_test.cc index 476c9c1a0e382..8e30b3fbeb119 100644 --- a/test/common/upstream/leds_test.cc +++ b/test/extensions/clusters/eds/leds_test.cc @@ -7,7 +7,7 @@ #include "source/common/config/utility.h" #include "source/common/config/xds_resource.h" #include "source/common/singleton/manager_impl.h" -#include "source/common/upstream/leds.h" +#include "source/extensions/clusters/eds/leds.h" #include "test/common/stats/stat_test_utility.h" #include "test/mocks/local_info/mocks.h" diff --git a/tools/code_format/config.yaml b/tools/code_format/config.yaml index e6d0d7543383e..d295905360f84 100644 --- a/tools/code_format/config.yaml +++ b/tools/code_format/config.yaml @@ -290,6 +290,7 @@ unsorted_flags: # https://github.com/envoyproxy/envoy/issues/9953 # PLEASE DO NOT ADD FILES TO THIS LIST WITHOUT SENIOR MAINTAINER APPROVAL visibility_excludes: +- source/extensions/clusters/eds/ - source/extensions/clusters/strict_dns/ - source/extensions/clusters/static/ - source/extensions/clusters/original_dst/ From 71f17efa7a718bf61f14009bc9a5f388b785b41b Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Thu, 10 Nov 2022 09:28:20 -0500 Subject: [PATCH 2/4] format Signed-off-by: Alyssa Wilk --- source/extensions/clusters/eds/BUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/extensions/clusters/eds/BUILD b/source/extensions/clusters/eds/BUILD index 30c994f7b1ab5..cbdbbd402395a 100644 --- a/source/extensions/clusters/eds/BUILD +++ b/source/extensions/clusters/eds/BUILD @@ -1,15 +1,15 @@ load( "//bazel:envoy_build_system.bzl", + "envoy_cc_extension", "envoy_cc_library", "envoy_extension_package", - "envoy_package", ) licenses(["notice"]) # Apache 2 envoy_extension_package() -envoy_cc_library( +envoy_cc_extension( name = "eds_lib", srcs = ["eds.cc"], hdrs = ["eds.h"], From f44068d8f20e339d04ed6e2c2b55b4896d750ab9 Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Thu, 10 Nov 2022 12:40:40 -0500 Subject: [PATCH 3/4] build fix Signed-off-by: Alyssa Wilk --- test/integration/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/BUILD b/test/integration/BUILD index ac776e9198899..8d162d6a6c040 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -876,6 +876,7 @@ envoy_cc_test_library( "//source/common/config:api_version_lib", "//source/extensions/network/dns_resolver/cares:config", "//source/extensions/clusters/static:static_cluster_lib", + "//source/extensions/clusters/eds:eds_lib", "//source/extensions/transport_sockets/tls:context_config_lib", "//source/extensions/transport_sockets/tls:context_lib", "//source/extensions/transport_sockets/tls:ssl_socket_lib", From 24682ca3fa5f0fb548d8ab6ab7882a2fea67a47a Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Thu, 10 Nov 2022 14:51:59 -0500 Subject: [PATCH 4/4] unit Signed-off-by: Alyssa Wilk --- test/common/upstream/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index 3376c09e703da..a026e08fa2689 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -72,6 +72,7 @@ envoy_cc_test( ":test_cluster_manager", "//source/common/router:context_lib", "//source/common/upstream:load_balancer_factory_base_lib", + "//source/extensions/clusters/eds:eds_lib", "//source/extensions/clusters/logical_dns:logical_dns_cluster_lib", "//source/extensions/clusters/original_dst:original_dst_cluster_lib", "//source/extensions/clusters/static:static_cluster_lib",