diff --git a/api/BUILD b/api/BUILD index f814a6d06e58d..11eb3d4bdb3ce 100644 --- a/api/BUILD +++ b/api/BUILD @@ -18,17 +18,31 @@ proto_library( "//envoy/api/v2/ratelimit:pkg", "//envoy/api/v2/route:pkg", "//envoy/config/bootstrap/v2:pkg", + "//envoy/config/cluster/dynamic_forward_proxy/v2alpha:pkg", + "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg", + "//envoy/config/common/tap/v2alpha:pkg", "//envoy/config/filter/accesslog/v2:pkg", "//envoy/config/filter/fault/v2:pkg", + "//envoy/config/filter/http/compressor/v2:pkg", + "//envoy/config/filter/http/dynamic_forward_proxy/v2alpha:pkg", + "//envoy/config/filter/http/gzip/v2:pkg", + "//envoy/config/filter/http/rate_limit/v2:pkg", + "//envoy/config/filter/http/rbac/v2:pkg", + "//envoy/config/filter/network/dubbo_proxy/v2alpha1:pkg", "//envoy/config/filter/network/http_connection_manager/v2:pkg", + "//envoy/config/filter/network/rate_limit/v2:pkg", + "//envoy/config/filter/network/rbac/v2:pkg", "//envoy/config/filter/network/redis_proxy/v2:pkg", "//envoy/config/filter/network/tcp_proxy/v2:pkg", "//envoy/config/filter/network/thrift_proxy/v2alpha1:pkg", + "//envoy/config/filter/thrift/rate_limit/v2alpha1:pkg", "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v2:pkg", "//envoy/config/metrics/v2:pkg", "//envoy/config/overload/v2alpha:pkg", + "//envoy/config/ratelimit/v2:pkg", + "//envoy/config/rbac/v2:pkg", "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", "//envoy/config/retry/omit_canary_hosts/v2:pkg", @@ -36,6 +50,7 @@ proto_library( "//envoy/config/trace/v2:pkg", "//envoy/config/trace/v2alpha:pkg", "//envoy/config/transport_socket/alts/v2alpha:pkg", + "//envoy/config/transport_socket/tap/v2alpha:pkg", "//envoy/data/accesslog/v2:pkg", "//envoy/data/tap/v2alpha:pkg", "//envoy/service/accesslog/v2:pkg", diff --git a/api/envoy/admin/v3/BUILD b/api/envoy/admin/v3/BUILD index 548dc41982ab6..507cffde4aded 100644 --- a/api/envoy/admin/v3/BUILD +++ b/api/envoy/admin/v3/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/admin/v2alpha:pkg", "//envoy/config/bootstrap/v3:pkg", "//envoy/config/cluster/v3:pkg", "//envoy/config/core/v3:pkg", diff --git a/api/envoy/config/accesslog/v3/BUILD b/api/envoy/config/accesslog/v3/BUILD index 27f7828529fd3..7e5e77fc70f55 100644 --- a/api/envoy/config/accesslog/v3/BUILD +++ b/api/envoy/config/accesslog/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/config/core/v3:pkg", - "//envoy/config/filter/accesslog/v2:pkg", "//envoy/config/route/v3:pkg", "//envoy/type/matcher/v3:pkg", "//envoy/type/v3:pkg", diff --git a/api/envoy/config/bootstrap/v3/BUILD b/api/envoy/config/bootstrap/v3/BUILD index 48e8fb522c993..23067e57ca463 100644 --- a/api/envoy/config/bootstrap/v3/BUILD +++ b/api/envoy/config/bootstrap/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( deps = [ "//envoy/annotations:pkg", "//envoy/config/accesslog/v3:pkg", - "//envoy/config/bootstrap/v2:pkg", "//envoy/config/cluster/v3:pkg", "//envoy/config/core/v3:pkg", "//envoy/config/listener/v3:pkg", diff --git a/api/envoy/config/cluster/v3/BUILD b/api/envoy/config/cluster/v3/BUILD index 92530e0fa197a..21528bbc7bfbb 100644 --- a/api/envoy/config/cluster/v3/BUILD +++ b/api/envoy/config/cluster/v3/BUILD @@ -7,8 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2:pkg", - "//envoy/api/v2/cluster:pkg", "//envoy/config/core/v3:pkg", "//envoy/config/endpoint/v3:pkg", "//envoy/type/v3:pkg", diff --git a/api/envoy/config/core/v3/BUILD b/api/envoy/config/core/v3/BUILD index 3fbb6b0e1f186..812e942fc3b0c 100644 --- a/api/envoy/config/core/v3/BUILD +++ b/api/envoy/config/core/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2/core:pkg", "//envoy/type/matcher/v3:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", diff --git a/api/envoy/config/endpoint/v3/BUILD b/api/envoy/config/endpoint/v3/BUILD index 420cd0878233b..ad2fc9a9a84fd 100644 --- a/api/envoy/config/endpoint/v3/BUILD +++ b/api/envoy/config/endpoint/v3/BUILD @@ -6,8 +6,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2:pkg", - "//envoy/api/v2/endpoint:pkg", "//envoy/config/core/v3:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", diff --git a/api/envoy/config/listener/v3/BUILD b/api/envoy/config/listener/v3/BUILD index bea12662c0d76..c2d6c133a73ae 100644 --- a/api/envoy/config/listener/v3/BUILD +++ b/api/envoy/config/listener/v3/BUILD @@ -7,11 +7,8 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2:pkg", - "//envoy/api/v2/listener:pkg", "//envoy/config/accesslog/v3:pkg", "//envoy/config/core/v3:pkg", - "//envoy/config/listener/v2:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", "@com_github_cncf_udpa//xds/core/v3:pkg", diff --git a/api/envoy/config/metrics/v3/BUILD b/api/envoy/config/metrics/v3/BUILD index 6de4af36aa4bd..3f3a5395d2aa7 100644 --- a/api/envoy/config/metrics/v3/BUILD +++ b/api/envoy/config/metrics/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/config/core/v3:pkg", - "//envoy/config/metrics/v2:pkg", "//envoy/type/matcher/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/api/envoy/config/overload/v3/BUILD b/api/envoy/config/overload/v3/BUILD index 9fdea99c648da..9a76b7e148e03 100644 --- a/api/envoy/config/overload/v3/BUILD +++ b/api/envoy/config/overload/v3/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/config/overload/v2alpha:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/api/envoy/config/route/v3/BUILD b/api/envoy/config/route/v3/BUILD index b82843eee7dd0..385c2c8c40e0c 100644 --- a/api/envoy/config/route/v3/BUILD +++ b/api/envoy/config/route/v3/BUILD @@ -7,8 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2:pkg", - "//envoy/api/v2/route:pkg", "//envoy/config/core/v3:pkg", "//envoy/type/matcher/v3:pkg", "//envoy/type/metadata/v3:pkg", diff --git a/api/envoy/config/tap/v3/BUILD b/api/envoy/config/tap/v3/BUILD index 416ccc0f9403c..a457820fce67f 100644 --- a/api/envoy/config/tap/v3/BUILD +++ b/api/envoy/config/tap/v3/BUILD @@ -10,7 +10,6 @@ api_proto_package( "//envoy/config/common/matcher/v3:pkg", "//envoy/config/core/v3:pkg", "//envoy/config/route/v3:pkg", - "//envoy/service/tap/v2alpha:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/api/envoy/config/trace/v3/BUILD b/api/envoy/config/trace/v3/BUILD index ec0d9dd6a65ba..94596540dfc4b 100644 --- a/api/envoy/config/trace/v3/BUILD +++ b/api/envoy/config/trace/v3/BUILD @@ -8,8 +8,6 @@ api_proto_package( deps = [ "//envoy/annotations:pkg", "//envoy/config/core/v3:pkg", - "//envoy/config/trace/v2:pkg", - "//envoy/config/trace/v2alpha:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto", ], diff --git a/api/envoy/data/accesslog/v3/BUILD b/api/envoy/data/accesslog/v3/BUILD index 9065b1b5c331e..1c1a6f6b44235 100644 --- a/api/envoy/data/accesslog/v3/BUILD +++ b/api/envoy/data/accesslog/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/config/core/v3:pkg", - "//envoy/data/accesslog/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/api/envoy/data/tap/v3/BUILD b/api/envoy/data/tap/v3/BUILD index 7cdbc28e7cd45..1c1a6f6b44235 100644 --- a/api/envoy/data/tap/v3/BUILD +++ b/api/envoy/data/tap/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/config/core/v3:pkg", - "//envoy/data/tap/v2alpha:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/api/envoy/extensions/common/ratelimit/v3/BUILD b/api/envoy/extensions/common/ratelimit/v3/BUILD index 660d629ab7b00..9a76b7e148e03 100644 --- a/api/envoy/extensions/common/ratelimit/v3/BUILD +++ b/api/envoy/extensions/common/ratelimit/v3/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/ratelimit:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/api/envoy/extensions/filters/common/fault/v3/BUILD b/api/envoy/extensions/filters/common/fault/v3/BUILD index f1a783082847f..9a76b7e148e03 100644 --- a/api/envoy/extensions/filters/common/fault/v3/BUILD +++ b/api/envoy/extensions/filters/common/fault/v3/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/config/filter/fault/v2:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/api/envoy/extensions/filters/network/http_connection_manager/v3/BUILD b/api/envoy/extensions/filters/network/http_connection_manager/v3/BUILD index 55b63248136ce..b244acf916a03 100644 --- a/api/envoy/extensions/filters/network/http_connection_manager/v3/BUILD +++ b/api/envoy/extensions/filters/network/http_connection_manager/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( deps = [ "//envoy/config/accesslog/v3:pkg", "//envoy/config/core/v3:pkg", - "//envoy/config/filter/network/http_connection_manager/v2:pkg", "//envoy/config/route/v3:pkg", "//envoy/config/trace/v3:pkg", "//envoy/type/http/v3:pkg", diff --git a/api/envoy/extensions/filters/network/redis_proxy/v3/BUILD b/api/envoy/extensions/filters/network/redis_proxy/v3/BUILD index bbf960251284e..1c1a6f6b44235 100644 --- a/api/envoy/extensions/filters/network/redis_proxy/v3/BUILD +++ b/api/envoy/extensions/filters/network/redis_proxy/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/config/core/v3:pkg", - "//envoy/config/filter/network/redis_proxy/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/api/envoy/extensions/filters/network/tcp_proxy/v3/BUILD b/api/envoy/extensions/filters/network/tcp_proxy/v3/BUILD index 67dc2ebcf9f57..16c00029d091a 100644 --- a/api/envoy/extensions/filters/network/tcp_proxy/v3/BUILD +++ b/api/envoy/extensions/filters/network/tcp_proxy/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( deps = [ "//envoy/config/accesslog/v3:pkg", "//envoy/config/core/v3:pkg", - "//envoy/config/filter/network/tcp_proxy/v2:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/api/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD b/api/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD index c24f669b9bbde..ee92fb652582e 100644 --- a/api/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD +++ b/api/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/filter/thrift/router/v2alpha1:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/api/envoy/extensions/filters/network/thrift_proxy/v3/BUILD b/api/envoy/extensions/filters/network/thrift_proxy/v3/BUILD index ccacc55735afa..6eb33fe8151ad 100644 --- a/api/envoy/extensions/filters/network/thrift_proxy/v3/BUILD +++ b/api/envoy/extensions/filters/network/thrift_proxy/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/config/core/v3:pkg", - "//envoy/config/filter/network/thrift_proxy/v2alpha1:pkg", "//envoy/config/route/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/api/envoy/extensions/health_checkers/redis/v3/BUILD b/api/envoy/extensions/health_checkers/redis/v3/BUILD index 1cb4c6154f26e..ee92fb652582e 100644 --- a/api/envoy/extensions/health_checkers/redis/v3/BUILD +++ b/api/envoy/extensions/health_checkers/redis/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/health_checker/redis/v2:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/api/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD b/api/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD index 3fb51ff1ccaa9..ee92fb652582e 100644 --- a/api/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD +++ b/api/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/api/envoy/extensions/resource_monitors/injected_resource/v3/BUILD b/api/envoy/extensions/resource_monitors/injected_resource/v3/BUILD index 975b8fcbd5a32..ee92fb652582e 100644 --- a/api/envoy/extensions/resource_monitors/injected_resource/v3/BUILD +++ b/api/envoy/extensions/resource_monitors/injected_resource/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/api/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD b/api/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD index 0eab79b89fdaf..ee92fb652582e 100644 --- a/api/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD +++ b/api/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/retry/omit_canary_hosts/v2:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/api/envoy/extensions/retry/host/previous_hosts/v3/BUILD b/api/envoy/extensions/retry/host/previous_hosts/v3/BUILD index 88d9a6e255a3a..ee92fb652582e 100644 --- a/api/envoy/extensions/retry/host/previous_hosts/v3/BUILD +++ b/api/envoy/extensions/retry/host/previous_hosts/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/retry/previous_hosts/v2:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/api/envoy/extensions/transport_sockets/alts/v3/BUILD b/api/envoy/extensions/transport_sockets/alts/v3/BUILD index 8a8435d89897d..ee92fb652582e 100644 --- a/api/envoy/extensions/transport_sockets/alts/v3/BUILD +++ b/api/envoy/extensions/transport_sockets/alts/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/transport_socket/alts/v2alpha:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/api/envoy/extensions/transport_sockets/tls/v3/BUILD b/api/envoy/extensions/transport_sockets/tls/v3/BUILD index 47b9b9ae57e96..75026a89c29ba 100644 --- a/api/envoy/extensions/transport_sockets/tls/v3/BUILD +++ b/api/envoy/extensions/transport_sockets/tls/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2/auth:pkg", "//envoy/config/core/v3:pkg", "//envoy/type/matcher/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", diff --git a/api/envoy/service/accesslog/v3/BUILD b/api/envoy/service/accesslog/v3/BUILD index d44839fbe0952..c913d31f62fee 100644 --- a/api/envoy/service/accesslog/v3/BUILD +++ b/api/envoy/service/accesslog/v3/BUILD @@ -9,7 +9,6 @@ api_proto_package( deps = [ "//envoy/config/core/v3:pkg", "//envoy/data/accesslog/v3:pkg", - "//envoy/service/accesslog/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/api/envoy/service/auth/v3/BUILD b/api/envoy/service/auth/v3/BUILD index 0774dda23e421..f39e4f85d88f4 100644 --- a/api/envoy/service/auth/v3/BUILD +++ b/api/envoy/service/auth/v3/BUILD @@ -9,7 +9,6 @@ api_proto_package( deps = [ "//envoy/annotations:pkg", "//envoy/config/core/v3:pkg", - "//envoy/service/auth/v2:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/api/envoy/service/cluster/v3/BUILD b/api/envoy/service/cluster/v3/BUILD index d3be4fae57fa4..9f2ae1e747c54 100644 --- a/api/envoy/service/cluster/v3/BUILD +++ b/api/envoy/service/cluster/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( has_services = True, deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2:pkg", "//envoy/service/discovery/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/api/envoy/service/discovery/v3/BUILD b/api/envoy/service/discovery/v3/BUILD index 074bab85eb710..7753cfeb3d6e5 100644 --- a/api/envoy/service/discovery/v3/BUILD +++ b/api/envoy/service/discovery/v3/BUILD @@ -7,9 +7,7 @@ licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v2:pkg", "//envoy/config/core/v3:pkg", - "//envoy/service/discovery/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/api/envoy/service/endpoint/v3/BUILD b/api/envoy/service/endpoint/v3/BUILD index d3be4fae57fa4..9f2ae1e747c54 100644 --- a/api/envoy/service/endpoint/v3/BUILD +++ b/api/envoy/service/endpoint/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( has_services = True, deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2:pkg", "//envoy/service/discovery/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/api/envoy/service/health/v3/BUILD b/api/envoy/service/health/v3/BUILD index 30ba155208b5d..b283839974678 100644 --- a/api/envoy/service/health/v3/BUILD +++ b/api/envoy/service/health/v3/BUILD @@ -11,7 +11,6 @@ api_proto_package( "//envoy/config/cluster/v3:pkg", "//envoy/config/core/v3:pkg", "//envoy/config/endpoint/v3:pkg", - "//envoy/service/discovery/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/api/envoy/service/listener/v3/BUILD b/api/envoy/service/listener/v3/BUILD index d3be4fae57fa4..9f2ae1e747c54 100644 --- a/api/envoy/service/listener/v3/BUILD +++ b/api/envoy/service/listener/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( has_services = True, deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2:pkg", "//envoy/service/discovery/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/api/envoy/service/load_stats/v3/BUILD b/api/envoy/service/load_stats/v3/BUILD index d69e005bae22f..1ee733dc7d825 100644 --- a/api/envoy/service/load_stats/v3/BUILD +++ b/api/envoy/service/load_stats/v3/BUILD @@ -9,7 +9,6 @@ api_proto_package( deps = [ "//envoy/config/core/v3:pkg", "//envoy/config/endpoint/v3:pkg", - "//envoy/service/load_stats/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/api/envoy/service/metrics/v3/BUILD b/api/envoy/service/metrics/v3/BUILD index b266dfc5558d2..b9a1679e2cb87 100644 --- a/api/envoy/service/metrics/v3/BUILD +++ b/api/envoy/service/metrics/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( has_services = True, deps = [ "//envoy/config/core/v3:pkg", - "//envoy/service/metrics/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", "@prometheus_metrics_model//:client_model", ], diff --git a/api/envoy/service/ratelimit/v3/BUILD b/api/envoy/service/ratelimit/v3/BUILD index 222b9ac522924..1cec1e02cde97 100644 --- a/api/envoy/service/ratelimit/v3/BUILD +++ b/api/envoy/service/ratelimit/v3/BUILD @@ -9,7 +9,6 @@ api_proto_package( deps = [ "//envoy/config/core/v3:pkg", "//envoy/extensions/common/ratelimit/v3:pkg", - "//envoy/service/ratelimit/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/api/envoy/service/route/v3/BUILD b/api/envoy/service/route/v3/BUILD index d3be4fae57fa4..9f2ae1e747c54 100644 --- a/api/envoy/service/route/v3/BUILD +++ b/api/envoy/service/route/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( has_services = True, deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2:pkg", "//envoy/service/discovery/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/api/envoy/service/runtime/v3/BUILD b/api/envoy/service/runtime/v3/BUILD index fb6a1656ca9bf..9f2ae1e747c54 100644 --- a/api/envoy/service/runtime/v3/BUILD +++ b/api/envoy/service/runtime/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( has_services = True, deps = [ "//envoy/annotations:pkg", - "//envoy/service/discovery/v2:pkg", "//envoy/service/discovery/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/api/envoy/service/secret/v3/BUILD b/api/envoy/service/secret/v3/BUILD index fb6a1656ca9bf..9f2ae1e747c54 100644 --- a/api/envoy/service/secret/v3/BUILD +++ b/api/envoy/service/secret/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( has_services = True, deps = [ "//envoy/annotations:pkg", - "//envoy/service/discovery/v2:pkg", "//envoy/service/discovery/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/api/envoy/service/status/v3/BUILD b/api/envoy/service/status/v3/BUILD index a73963967ef77..45ec162b90937 100644 --- a/api/envoy/service/status/v3/BUILD +++ b/api/envoy/service/status/v3/BUILD @@ -10,7 +10,6 @@ api_proto_package( "//envoy/admin/v3:pkg", "//envoy/annotations:pkg", "//envoy/config/core/v3:pkg", - "//envoy/service/status/v2:pkg", "//envoy/type/matcher/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/api/envoy/service/tap/v3/BUILD b/api/envoy/service/tap/v3/BUILD index 5ee1ce553f48b..8948f580a51e3 100644 --- a/api/envoy/service/tap/v3/BUILD +++ b/api/envoy/service/tap/v3/BUILD @@ -9,7 +9,6 @@ api_proto_package( deps = [ "//envoy/config/core/v3:pkg", "//envoy/data/tap/v3:pkg", - "//envoy/service/tap/v2alpha:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/api/envoy/type/matcher/v3/BUILD b/api/envoy/type/matcher/v3/BUILD index a117fd27e4ff0..fb28aa0e973d4 100644 --- a/api/envoy/type/matcher/v3/BUILD +++ b/api/envoy/type/matcher/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/annotations:pkg", - "//envoy/type/matcher:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/api/envoy/type/metadata/v3/BUILD b/api/envoy/type/metadata/v3/BUILD index aa64935f43d18..ee92fb652582e 100644 --- a/api/envoy/type/metadata/v3/BUILD +++ b/api/envoy/type/metadata/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/type/metadata/v2:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/api/envoy/type/tracing/v3/BUILD b/api/envoy/type/tracing/v3/BUILD index 38eb160d482bf..c797ae66c28ad 100644 --- a/api/envoy/type/tracing/v3/BUILD +++ b/api/envoy/type/tracing/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/type/metadata/v3:pkg", - "//envoy/type/tracing/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/api/envoy/type/v3/BUILD b/api/envoy/type/v3/BUILD index da3a8659d2a8b..ee92fb652582e 100644 --- a/api/envoy/type/v3/BUILD +++ b/api/envoy/type/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/type:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/source/common/runtime/BUILD b/source/common/runtime/BUILD index ce7a517e9a4a5..25d0265256226 100644 --- a/source/common/runtime/BUILD +++ b/source/common/runtime/BUILD @@ -74,7 +74,6 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", - "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", "@envoy_api//envoy/service/runtime/v3:pkg_cc_proto", "@envoy_api//envoy/type/v3:pkg_cc_proto", diff --git a/source/common/runtime/runtime_impl.cc b/source/common/runtime/runtime_impl.cc index bf5ad44ffe5e7..824054f8412da 100644 --- a/source/common/runtime/runtime_impl.cc +++ b/source/common/runtime/runtime_impl.cc @@ -6,7 +6,6 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/config/core/v3/config_source.pb.h" #include "envoy/event/dispatcher.h" -#include "envoy/service/discovery/v2/rtds.pb.h" #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/thread_local/thread_local.h" #include "envoy/type/v3/percent.pb.h" diff --git a/test/extensions/filters/http/wasm/test_data/test_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_cpp.cc index f049ee8bc6b69..039713e0e76a3 100644 --- a/test/extensions/filters/http/wasm/test_data/test_cpp.cc +++ b/test/extensions/filters/http/wasm/test_data/test_cpp.cc @@ -175,8 +175,8 @@ FilterHeadersStatus TestContext::onRequestHeaders(uint32_t, bool) { { // Validate a valid CEL expression const std::string expr = R"( - envoy.api.v2.core.GrpcService{ - envoy_grpc: envoy.api.v2.core.GrpcService.EnvoyGrpc { + envoy.config.core.v3.GrpcService{ + envoy_grpc: envoy.config.core.v3.GrpcService.EnvoyGrpc { cluster_name: "test" } })"; diff --git a/test/server/api_listener_test.cc b/test/server/api_listener_test.cc index ee51447e4e404..4e4064ade789d 100644 --- a/test/server/api_listener_test.cc +++ b/test/server/api_listener_test.cc @@ -109,7 +109,7 @@ name: test_api_listener port_value: 1234 api_listener: api_listener: - "@type": type.googleapis.com/envoy.api.v2.Cluster + "@type": type.googleapis.com/envoy.config.cluster.v3.Cluster name: cluster1 type: EDS eds_cluster_config: @@ -123,7 +123,8 @@ name: test_api_listener HttpApiListener(config, *listener_manager_, config.name()), EnvoyException, "Unable to unpack as " "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager: " - "[type.googleapis.com/envoy.api.v2.Cluster] {\n name: \"cluster1\"\n type: EDS\n " + "[type.googleapis.com/envoy.config.cluster.v3.Cluster] {\n name: \"cluster1\"\n type: " + "EDS\n " "eds_cluster_config {\n eds_config {\n path: \"eds path\"\n }\n }\n}\n"); } diff --git a/tools/proto_format/proto_format.sh b/tools/proto_format/proto_format.sh index d6ae826618efa..cf5f36ed9ef5c 100755 --- a/tools/proto_format/proto_format.sh +++ b/tools/proto_format/proto_format.sh @@ -35,8 +35,8 @@ if [[ "$1" == "freeze" ]]; then fi # Invoke protoxform aspect. -bazel build "${BAZEL_BUILD_OPTIONS[@]}" --//tools/api_proto_plugin:default_type_db_target=@envoy_api//versioning:active_protos ${FREEZE_ARG} \ - @envoy_api//versioning:active_protos --aspects //tools/protoxform:protoxform.bzl%protoxform_aspect --output_groups=proto +bazel build "${BAZEL_BUILD_OPTIONS[@]}" --//tools/api_proto_plugin:default_type_db_target=@envoy_api//:all_protos ${FREEZE_ARG} \ + @envoy_api//versioning:active_protos @envoy_api//versioning:frozen_protos --aspects //tools/protoxform:protoxform.bzl%protoxform_aspect --output_groups=proto # Find all source protos. PROTO_TARGETS=() diff --git a/tools/proto_format/proto_sync.py b/tools/proto_format/proto_sync.py index 8d878309c6982..4d7c0fda000c5 100755 --- a/tools/proto_format/proto_sync.py +++ b/tools/proto_format/proto_sync.py @@ -56,78 +56,6 @@ api_proto_package($fields) """) -IGNORED_V2_PROTOS = [ - "envoy/config/accesslog/v2", - "envoy/config/cluster/aggregate/v2alpha", - "envoy/config/cluster/dynamic_forward_proxy/v2alpha", - "envoy/config/cluster/redis", - "envoy/config/common/dynamic_forward_proxy/v2alpha", - "envoy/config/common/tap/v2alpha", - "envoy/config/filter/dubbo/router/v2alpha1", - "envoy/config/filter/http/adaptive_concurrency/v2alpha", - "envoy/config/filter/http/aws_lambda/v2alpha", - "envoy/config/filter/http/aws_request_signing/v2alpha", - "envoy/config/filter/http/buffer/v2", - "envoy/config/filter/http/cache/v2alpha", - "envoy/config/filter/http/compressor/v2", - "envoy/config/filter/http/cors/v2", - "envoy/config/filter/http/csrf/v2", - "envoy/config/filter/http/dynamic_forward_proxy/v2alpha", - "envoy/config/filter/http/dynamo/v2", - "envoy/config/filter/http/ext_authz/v2", - "envoy/config/filter/http/fault/v2", - "envoy/config/filter/http/grpc_http1_bridge/v2", - "envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1", - "envoy/config/filter/http/grpc_stats/v2alpha", - "envoy/config/filter/http/grpc_web/v2", - "envoy/config/filter/http/gzip/v2", - "envoy/config/filter/http/header_to_metadata/v2", - "envoy/config/filter/http/health_check/v2", - "envoy/config/filter/http/ip_tagging/v2", - "envoy/config/filter/http/jwt_authn/v2alpha", - "envoy/config/filter/http/lua/v2", - "envoy/config/filter/http/on_demand/v2", - "envoy/config/filter/http/original_src/v2alpha1", - "envoy/config/filter/http/rate_limit/v2", - "envoy/config/filter/http/rbac/v2", - "envoy/config/filter/http/router/v2", - "envoy/config/filter/http/squash/v2", - "envoy/config/filter/http/tap/v2alpha", - "envoy/config/filter/http/transcoder/v2", - "envoy/config/filter/listener/http_inspector/v2", - "envoy/config/filter/listener/original_dst/v2", - "envoy/config/filter/listener/original_src/v2alpha1", - "envoy/config/filter/listener/proxy_protocol/v2", - "envoy/config/filter/listener/tls_inspector/v2", - "envoy/config/filter/network/client_ssl_auth/v2", - "envoy/config/filter/network/direct_response/v2", - "envoy/config/filter/network/dubbo_proxy/v2alpha1", - "envoy/config/filter/network/echo/v2", - "envoy/config/filter/network/ext_authz/v2", - "envoy/config/filter/network/kafka_broker/v2alpha1", - "envoy/config/filter/network/local_rate_limit/v2alpha", - "envoy/config/filter/network/mongo_proxy/v2", - "envoy/config/filter/network/mysql_proxy/v1alpha1", - "envoy/config/filter/network/rate_limit/v2", - "envoy/config/filter/network/rbac/v2", - "envoy/config/filter/network/sni_cluster/v2", - "envoy/config/filter/network/zookeeper_proxy/v1alpha1", - "envoy/config/filter/thrift/rate_limit/v2alpha1", - "envoy/config/filter/udp/udp_proxy/v2alpha", - "envoy/config/grpc_credential/v2alpha", - "envoy/config/ratelimit/v2", - "envoy/config/rbac/v2", - "envoy/config/retry/omit_host_metadata/v2", - "envoy/config/retry/previous_priorities", - "envoy/config/transport_socket/raw_buffer/v2", - "envoy/config/transport_socket/tap/v2alpha", - "envoy/data/cluster/v2alpha", - "envoy/data/dns/v2alpha", - "envoy/data/core/v2alpha", - "envoy/service/event_reporting/v2alpha", - "envoy/service/trace/v2", -] - IMPORT_REGEX = re.compile('import "(.*)";') SERVICE_REGEX = re.compile('service \w+ {') PACKAGE_REGEX = re.compile('\npackage: "([^"]*)"') @@ -182,7 +110,7 @@ def get_destination_path(src): dst_path = pathlib.Path('contrib').joinpath(dst_path) # Non-contrib can not use alpha. if not 'contrib' in src: - if not 'v2alpha' in package and 'alpha' in package: + if (not 'v2alpha' in package and not 'v1alpha1' in package) and 'alpha' in package: raise ProtoSyncError( "package '{}' uses an alpha namespace. This is not allowed. Instead mark with " "(xds.annotations.v3.file_status).work_in_progress or related annotation.".format( @@ -294,28 +222,6 @@ def get_import_deps(proto_path): return imports -def get_previous_message_type_deps(proto_path): - """Obtain the Bazel dependencies for the previous version of messages in a .proto file. - - We need to link in earlier proto descriptors to support Envoy reflection upgrades. - - Args: - proto_path: path to .proto. - - Returns: - A list of Bazel targets reflecting the previous message types in the .proto at proto_path. - """ - contents = pathlib.Path(proto_path).read_text(encoding='utf8') - matches = re.findall(PREVIOUS_MESSAGE_TYPE_REGEX, contents) - deps = [] - for m in matches: - pkg = get_directory_from_package(m) - if pkg in IGNORED_V2_PROTOS: - continue - deps.append('//%s:pkg' % pkg) - return deps - - def has_services(proto_path): """Does a .proto file have any service definitions? @@ -347,10 +253,7 @@ def build_file_contents(root, files): Returns: A string containing the canonical BUILD file content for root. """ - import_deps = set(sum([get_import_deps(os.path.join(root, f)) for f in files], [])) - history_deps = set( - sum([get_previous_message_type_deps(os.path.join(root, f)) for f in files], [])) - deps = import_deps.union(history_deps) + deps = set(sum([get_import_deps(os.path.join(root, f)) for f in files], [])) _has_services = any(has_services(os.path.join(root, f)) for f in files) fields = [] if _has_services: @@ -396,14 +299,12 @@ def generate_current_api_dir(api_dir, dst_dir): dst = dst_dir.joinpath("envoy") shutil.copytree(str(api_dir.joinpath("envoy")), str(dst)) - for p in dst.glob('**/*.md'): - p.unlink() # envoy.service.auth.v2alpha exist for compatibility while we don't run in protoxform # so we ignore it here. shutil.rmtree(str(dst.joinpath("service", "auth", "v2alpha"))) - for proto in IGNORED_V2_PROTOS: - shutil.rmtree(str(dst.joinpath(proto[6:]))) + for p in dst.glob('**/*.md'): + p.unlink() def git_status(path): diff --git a/tools/type_whisperer/BUILD b/tools/type_whisperer/BUILD index 37eead8dc9066..f83eecb2e3fc5 100644 --- a/tools/type_whisperer/BUILD +++ b/tools/type_whisperer/BUILD @@ -56,7 +56,7 @@ py_binary( label_flag( name = "api_type_db_target", - build_setting_default = "@envoy_api//versioning:active_protos", + build_setting_default = "@envoy_api//:all_protos", visibility = ["//visibility:public"], )