From 47022bff1c3e49f9c67936bb3034d7af8187dc37 Mon Sep 17 00:00:00 2001 From: htuch Date: Sat, 5 Oct 2019 20:12:45 -0400 Subject: [PATCH] api/build: switch to only package level targets in API. (#8495) As part of #8082, we want to be able to (1) automatically generate BUILD files and (2) treat packages as atomic from a "upgrade / do not upgrade" decision perspective. This is simplified by having our BUILD targets at package granularity, since this is what the protoxform plugin operates on. This PR broadens the package-level treatment that was already introduced for Go in #8003 to Python and C++. This simplifies BUILD files significantly and opens the way to automated generation. There is some technical debt introduced, since all visibility controls have been removed. This is slated for reintroduction in https://github.com/envoyproxy/envoy/issues/8491. As a bonus (useful for BUILD file generation), also removed the inconsistency in BUILD package target naming for packages in envoy.api.* and envoy.type.*. E.g. //envoy/api/v2:v2 is now //envoy/api/v2:pkg. Risk level: Low (but this will break internal builds and require BUILD fixups to consuming projects). Testing: bazel test //test/... @envoy_api//... Signed-off-by: Harvey Tuch --- api/bazel/api_build_system.bzl | 151 ++++++++---------- api/bazel/repositories.bzl | 12 +- api/docs/BUILD | 144 ++++++++--------- api/envoy/admin/v2alpha/BUILD | 83 +--------- api/envoy/admin/v3alpha/BUILD | 83 +--------- api/envoy/api/v2/BUILD | 110 +------------ api/envoy/api/v2/auth/BUILD | 30 +--- api/envoy/api/v2/cluster/BUILD | 34 +--- api/envoy/api/v2/core/BUILD | 91 +---------- api/envoy/api/v2/endpoint/BUILD | 30 +--- api/envoy/api/v2/endpoint/load_report.proto | 19 ++- api/envoy/api/v2/listener/BUILD | 32 +--- api/envoy/api/v2/ratelimit/BUILD | 8 +- api/envoy/api/v2/route/BUILD | 21 +-- api/envoy/api/v3alpha/BUILD | 110 +------------ api/envoy/api/v3alpha/auth/BUILD | 30 +--- api/envoy/api/v3alpha/cluster/BUILD | 34 +--- api/envoy/api/v3alpha/core/BUILD | 91 +---------- api/envoy/api/v3alpha/endpoint/BUILD | 30 +--- .../api/v3alpha/endpoint/load_report.proto | 19 ++- api/envoy/api/v3alpha/listener/BUILD | 32 +--- api/envoy/api/v3alpha/ratelimit/BUILD | 8 +- api/envoy/api/v3alpha/route/BUILD | 21 +-- api/envoy/config/accesslog/v2/BUILD | 17 +- api/envoy/config/accesslog/v3alpha/BUILD | 17 +- api/envoy/config/bootstrap/v2/BUILD | 27 +--- api/envoy/config/bootstrap/v3alpha/BUILD | 27 +--- .../dynamic_forward_proxy/v2alpha/BUILD | 10 +- .../dynamic_forward_proxy/v3alpha/BUILD | 10 +- api/envoy/config/cluster/redis/BUILD | 7 +- .../dynamic_forward_proxy/v2alpha/BUILD | 13 +- .../dynamic_forward_proxy/v3alpha/BUILD | 13 +- api/envoy/config/common/tap/v2alpha/BUILD | 14 +- api/envoy/config/common/tap/v3alpha/BUILD | 14 +- api/envoy/config/filter/accesslog/v2/BUILD | 21 +-- .../config/filter/accesslog/v3alpha/BUILD | 21 +-- .../config/filter/dubbo/router/v2alpha1/BUILD | 7 +- .../config/filter/dubbo/router/v3alpha/BUILD | 7 +- api/envoy/config/filter/fault/v2/BUILD | 14 +- api/envoy/config/filter/fault/v3alpha/BUILD | 14 +- .../http/adaptive_concurrency/v2alpha/BUILD | 15 +- .../http/adaptive_concurrency/v3alpha/BUILD | 15 +- api/envoy/config/filter/http/buffer/v2/BUILD | 7 +- .../config/filter/http/buffer/v3alpha/BUILD | 7 +- api/envoy/config/filter/http/csrf/v2/BUILD | 15 +- .../config/filter/http/csrf/v3alpha/BUILD | 15 +- .../http/dynamic_forward_proxy/v2alpha/BUILD | 10 +- .../http/dynamic_forward_proxy/v3alpha/BUILD | 10 +- .../config/filter/http/ext_authz/v2/BUILD | 20 +-- .../filter/http/ext_authz/v3alpha/BUILD | 20 +-- api/envoy/config/filter/http/fault/v2/BUILD | 14 +- .../config/filter/http/fault/v3alpha/BUILD | 14 +- .../grpc_http1_reverse_bridge/v2alpha1/BUILD | 7 +- .../grpc_http1_reverse_bridge/v3alpha/BUILD | 7 +- api/envoy/config/filter/http/gzip/v2/BUILD | 7 +- .../config/filter/http/gzip/v3alpha/BUILD | 7 +- .../filter/http/header_to_metadata/v2/BUILD | 7 +- .../http/header_to_metadata/v3alpha/BUILD | 7 +- .../config/filter/http/health_check/v2/BUILD | 13 +- .../filter/http/health_check/v3alpha/BUILD | 13 +- .../config/filter/http/ip_tagging/v2/BUILD | 10 +- .../filter/http/ip_tagging/v3alpha/BUILD | 10 +- .../filter/http/jwt_authn/v2alpha/BUILD | 14 +- .../filter/http/jwt_authn/v3alpha/BUILD | 14 +- api/envoy/config/filter/http/lua/v2/BUILD | 7 +- .../config/filter/http/lua/v3alpha/BUILD | 7 +- .../filter/http/original_src/v2alpha1/BUILD | 7 +- .../filter/http/original_src/v3alpha/BUILD | 7 +- .../config/filter/http/rate_limit/v2/BUILD | 10 +- .../filter/http/rate_limit/v3alpha/BUILD | 10 +- api/envoy/config/filter/http/rbac/v2/BUILD | 8 +- .../config/filter/http/rbac/v3alpha/BUILD | 8 +- api/envoy/config/filter/http/router/v2/BUILD | 8 +- .../config/filter/http/router/v3alpha/BUILD | 8 +- api/envoy/config/filter/http/squash/v2/BUILD | 7 +- .../config/filter/http/squash/v3alpha/BUILD | 7 +- .../config/filter/http/tap/v2alpha/BUILD | 10 +- .../config/filter/http/tap/v3alpha/BUILD | 10 +- .../config/filter/http/transcoder/v2/BUILD | 7 +- .../filter/http/transcoder/v3alpha/BUILD | 7 +- .../listener/original_src/v2alpha1/BUILD | 7 +- .../listener/original_src/v3alpha/BUILD | 7 +- .../filter/network/client_ssl_auth/v2/BUILD | 10 +- .../network/client_ssl_auth/v3alpha/BUILD | 10 +- .../filter/network/dubbo_proxy/v2alpha1/BUILD | 22 +-- .../filter/network/dubbo_proxy/v3alpha/BUILD | 22 +-- .../config/filter/network/ext_authz/v2/BUILD | 10 +- .../filter/network/ext_authz/v3alpha/BUILD | 10 +- .../network/http_connection_manager/v2/BUILD | 22 +-- .../http_connection_manager/v3alpha/BUILD | 22 +-- .../filter/network/mongo_proxy/v2/BUILD | 8 +- .../filter/network/mongo_proxy/v3alpha/BUILD | 8 +- .../filter/network/mysql_proxy/v1alpha1/BUILD | 7 +- .../config/filter/network/rate_limit/v2/BUILD | 11 +- .../filter/network/rate_limit/v3alpha/BUILD | 11 +- api/envoy/config/filter/network/rbac/v2/BUILD | 8 +- .../config/filter/network/rbac/v3alpha/BUILD | 8 +- .../filter/network/redis_proxy/v2/BUILD | 15 +- .../filter/network/redis_proxy/v3alpha/BUILD | 15 +- .../config/filter/network/tcp_proxy/v2/BUILD | 14 +- .../filter/network/tcp_proxy/v3alpha/BUILD | 14 +- .../network/thrift_proxy/v2alpha1/BUILD | 16 +- .../filter/network/thrift_proxy/v3alpha/BUILD | 16 +- .../network/zookeeper_proxy/v1alpha1/BUILD | 7 +- .../filter/thrift/rate_limit/v2alpha1/BUILD | 11 +- .../filter/thrift/rate_limit/v3alpha/BUILD | 11 +- .../filter/thrift/router/v2alpha1/BUILD | 7 +- .../config/filter/thrift/router/v3alpha/BUILD | 7 +- .../config/grpc_credential/v2alpha/BUILD | 15 +- .../config/grpc_credential/v3alpha/BUILD | 15 +- .../config/health_checker/redis/v2/BUILD | 7 +- .../config/health_checker/redis/v3alpha/BUILD | 7 +- api/envoy/config/listener/v2/BUILD | 15 +- api/envoy/config/listener/v3alpha/BUILD | 15 +- api/envoy/config/metrics/v2/BUILD | 29 +--- api/envoy/config/metrics/v3alpha/BUILD | 29 +--- api/envoy/config/overload/v2alpha/BUILD | 8 +- api/envoy/config/overload/v3alpha/BUILD | 8 +- api/envoy/config/ratelimit/v2/BUILD | 13 +- api/envoy/config/ratelimit/v3alpha/BUILD | 13 +- api/envoy/config/rbac/v2/BUILD | 27 +--- api/envoy/config/rbac/v3alpha/BUILD | 27 +--- .../resource_monitor/fixed_heap/v2alpha/BUILD | 8 +- .../resource_monitor/fixed_heap/v3alpha/BUILD | 8 +- .../injected_resource/v2alpha/BUILD | 8 +- .../injected_resource/v3alpha/BUILD | 8 +- .../config/retry/previous_priorities/BUILD | 12 +- api/envoy/config/trace/v2/BUILD | 16 +- api/envoy/config/trace/v3alpha/BUILD | 16 +- .../transport_socket/alts/v2alpha/BUILD | 12 +- .../transport_socket/alts/v3alpha/BUILD | 12 +- .../config/transport_socket/tap/v2alpha/BUILD | 13 +- .../config/transport_socket/tap/v3alpha/BUILD | 13 +- api/envoy/data/accesslog/v2/BUILD | 16 +- api/envoy/data/accesslog/v3alpha/BUILD | 16 +- api/envoy/data/cluster/v2alpha/BUILD | 10 +- api/envoy/data/cluster/v3alpha/BUILD | 10 +- api/envoy/data/core/v2alpha/BUILD | 16 +- api/envoy/data/core/v3alpha/BUILD | 16 +- api/envoy/data/tap/v2alpha/BUILD | 38 +---- api/envoy/data/tap/v3alpha/BUILD | 38 +---- api/envoy/service/accesslog/v2/BUILD | 15 +- api/envoy/service/accesslog/v3alpha/BUILD | 15 +- api/envoy/service/auth/v2/BUILD | 31 +--- api/envoy/service/auth/v2alpha/BUILD | 11 +- api/envoy/service/auth/v3alpha/BUILD | 31 +--- api/envoy/service/discovery/v2/BUILD | 44 +---- api/envoy/service/discovery/v2/hds.proto | 21 ++- api/envoy/service/discovery/v2/sds.proto | 20 +-- api/envoy/service/discovery/v3alpha/BUILD | 44 +---- api/envoy/service/discovery/v3alpha/hds.proto | 21 ++- api/envoy/service/discovery/v3alpha/sds.proto | 22 +-- api/envoy/service/load_stats/v2/BUILD | 14 +- api/envoy/service/load_stats/v3alpha/BUILD | 14 +- api/envoy/service/metrics/v2/BUILD | 16 +- api/envoy/service/metrics/v3alpha/BUILD | 16 +- api/envoy/service/ratelimit/v2/BUILD | 15 +- api/envoy/service/ratelimit/v3alpha/BUILD | 15 +- api/envoy/service/tap/v2alpha/BUILD | 39 +---- api/envoy/service/tap/v2alpha/tap.proto | 39 ++--- api/envoy/service/tap/v2alpha/tapds.proto | 27 ++-- api/envoy/service/tap/v3alpha/BUILD | 39 +---- api/envoy/service/tap/v3alpha/tap.proto | 39 ++--- api/envoy/service/tap/v3alpha/tapds.proto | 29 ++-- api/envoy/service/trace/v2/BUILD | 15 +- api/envoy/service/trace/v3alpha/BUILD | 15 +- api/envoy/type/BUILD | 24 +-- api/envoy/type/matcher/BUILD | 48 +----- api/test/build/BUILD | 23 ++- api/test/validate/BUILD | 47 +++--- api/tools/BUILD | 8 +- bazel/envoy_library.bzl | 11 +- docs/conf.py | 9 +- include/envoy/config/BUILD | 4 +- include/envoy/grpc/BUILD | 4 +- include/envoy/http/BUILD | 2 +- include/envoy/local_info/BUILD | 2 +- include/envoy/network/BUILD | 6 +- include/envoy/router/BUILD | 4 +- include/envoy/runtime/BUILD | 2 +- include/envoy/secret/BUILD | 6 +- include/envoy/server/BUILD | 12 +- include/envoy/ssl/BUILD | 2 +- include/envoy/ssl/private_key/BUILD | 2 +- include/envoy/upstream/BUILD | 16 +- source/common/access_log/BUILD | 2 +- source/common/common/BUILD | 7 +- source/common/config/BUILD | 77 ++++----- source/common/http/BUILD | 11 +- source/common/network/BUILD | 11 +- source/common/protobuf/BUILD | 2 +- source/common/router/BUILD | 20 +-- source/common/runtime/BUILD | 4 +- source/common/secret/BUILD | 6 +- source/common/ssl/BUILD | 4 +- source/common/stats/BUILD | 6 +- source/common/tcp_proxy/BUILD | 2 +- source/common/upstream/BUILD | 40 ++--- source/extensions/access_loggers/file/BUILD | 2 +- source/extensions/access_loggers/grpc/BUILD | 10 +- .../clusters/dynamic_forward_proxy/BUILD | 2 +- source/extensions/clusters/redis/BUILD | 2 +- .../common/dynamic_forward_proxy/BUILD | 2 +- source/extensions/common/tap/BUILD | 10 +- .../extensions/filters/common/ext_authz/BUILD | 8 +- source/extensions/filters/common/fault/BUILD | 2 +- .../extensions/filters/common/ratelimit/BUILD | 8 +- source/extensions/filters/common/rbac/BUILD | 12 +- .../filters/http/adaptive_concurrency/BUILD | 2 +- .../concurrency_controller/BUILD | 2 +- source/extensions/filters/http/buffer/BUILD | 2 +- source/extensions/filters/http/common/BUILD | 2 +- source/extensions/filters/http/csrf/BUILD | 2 +- .../filters/http/dynamic_forward_proxy/BUILD | 2 +- .../extensions/filters/http/ext_authz/BUILD | 2 +- source/extensions/filters/http/fault/BUILD | 2 +- .../http/grpc_http1_reverse_bridge/BUILD | 2 +- .../filters/http/grpc_json_transcoder/BUILD | 2 +- source/extensions/filters/http/gzip/BUILD | 2 +- .../filters/http/header_to_metadata/BUILD | 2 +- .../filters/http/health_check/BUILD | 2 +- .../extensions/filters/http/ip_tagging/BUILD | 2 +- .../extensions/filters/http/jwt_authn/BUILD | 6 +- .../filters/http/original_src/BUILD | 4 +- .../extensions/filters/http/ratelimit/BUILD | 2 +- source/extensions/filters/http/rbac/BUILD | 2 +- source/extensions/filters/http/squash/BUILD | 2 +- source/extensions/filters/http/tap/BUILD | 8 +- .../filters/listener/original_src/BUILD | 4 +- .../filters/network/client_ssl_auth/BUILD | 2 +- .../filters/network/common/redis/BUILD | 2 +- .../filters/network/dubbo_proxy/BUILD | 4 +- .../filters/network/dubbo_proxy/router/BUILD | 8 +- .../filters/network/ext_authz/BUILD | 4 +- .../network/http_connection_manager/BUILD | 2 +- .../filters/network/mongo_proxy/BUILD | 2 +- .../filters/network/mysql_proxy/BUILD | 2 +- .../filters/network/ratelimit/BUILD | 2 +- source/extensions/filters/network/rbac/BUILD | 2 +- .../filters/network/redis_proxy/BUILD | 10 +- .../filters/network/thrift_proxy/BUILD | 2 +- .../thrift_proxy/filters/ratelimit/BUILD | 2 +- .../filters/network/thrift_proxy/router/BUILD | 6 +- .../filters/network/zookeeper_proxy/BUILD | 2 +- .../extensions/grpc_credentials/aws_iam/BUILD | 2 +- .../file_based_metadata/BUILD | 2 +- source/extensions/health_checkers/redis/BUILD | 8 +- source/extensions/quic_listeners/quiche/BUILD | 4 +- .../resource_monitors/fixed_heap/BUILD | 2 +- .../resource_monitors/injected_resource/BUILD | 2 +- .../retry/priority/previous_priorities/BUILD | 2 +- source/extensions/stat_sinks/dog_statsd/BUILD | 2 +- source/extensions/stat_sinks/hystrix/BUILD | 2 +- .../stat_sinks/metrics_service/BUILD | 8 +- source/extensions/stat_sinks/statsd/BUILD | 2 +- source/extensions/tracers/opencensus/BUILD | 2 +- source/extensions/tracers/zipkin/BUILD | 2 +- .../extensions/transport_sockets/alts/BUILD | 2 +- source/extensions/transport_sockets/tap/BUILD | 6 +- source/extensions/transport_sockets/tls/BUILD | 4 +- .../transport_sockets/tls/private_key/BUILD | 2 +- source/server/BUILD | 30 ++-- source/server/config_validation/BUILD | 2 +- source/server/http/BUILD | 8 +- test/common/access_log/BUILD | 2 +- test/common/buffer/BUILD | 2 +- test/common/common/BUILD | 6 +- test/common/config/BUILD | 30 ++-- test/common/grpc/BUILD | 14 +- test/common/http/BUILD | 12 +- test/common/protobuf/BUILD | 4 +- test/common/router/BUILD | 18 +-- test/common/secret/BUILD | 4 +- test/common/stats/BUILD | 2 +- test/common/upstream/BUILD | 15 +- test/config/BUILD | 10 +- test/extensions/clusters/redis/BUILD | 4 +- .../extensions/filters/common/ext_authz/BUILD | 2 +- .../filters/http/grpc_json_transcoder/BUILD | 4 +- .../filters/http/original_src/BUILD | 6 +- .../filters/listener/original_src/BUILD | 6 +- .../filters/network/common/redis/BUILD | 2 +- .../filters/network/dubbo_proxy/BUILD | 6 +- .../filters/network/thrift_proxy/BUILD | 4 +- .../extensions/grpc_credentials/aws_iam/BUILD | 2 +- .../file_based_metadata/BUILD | 2 +- test/extensions/quic_listeners/quiche/BUILD | 2 +- .../resource_monitors/fixed_heap/BUILD | 2 +- .../resource_monitors/injected_resource/BUILD | 2 +- test/extensions/stats_sinks/dog_statsd/BUILD | 2 +- .../stats_sinks/metrics_service/BUILD | 2 +- test/extensions/transport_sockets/alts/BUILD | 2 +- .../transport_sockets/tls/integration/BUILD | 4 +- test/fuzz/BUILD | 4 +- test/integration/BUILD | 57 +++---- test/integration/clusters/BUILD | 2 +- test/mocks/config/BUILD | 5 +- test/mocks/network/BUILD | 2 +- test/mocks/server/BUILD | 2 +- test/proto/BUILD | 2 +- test/server/BUILD | 6 +- test/server/http/BUILD | 2 +- test/test_common/BUILD | 4 +- test/tools/router_check/BUILD | 4 +- test/tools/schema_validator/BUILD | 2 +- tools/BUILD | 2 +- 306 files changed, 999 insertions(+), 3291 deletions(-) diff --git a/api/bazel/api_build_system.bzl b/api/bazel/api_build_system.bzl index 25bca4673541..d58955897c59 100644 --- a/api/bazel/api_build_system.bzl +++ b/api/bazel/api_build_system.bzl @@ -4,10 +4,9 @@ load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library", "go_proto_library") load("@io_bazel_rules_go//go:def.bzl", "go_test") load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") -_PY_SUFFIX = "_py" -_CC_SUFFIX = "_cc" +_PY_PROTO_SUFFIX = "_py_proto" +_CC_PROTO_SUFFIX = "_cc_proto" _CC_GRPC_SUFFIX = "_cc_grpc" -_CC_EXPORT_SUFFIX = "_export_cc" _GO_PROTO_SUFFIX = "_go_proto" _GO_IMPORTPATH_PREFIX = "github.com/envoyproxy/go-control-plane/" @@ -20,30 +19,62 @@ _COMMON_PROTO_DEPS = [ "@com_google_protobuf//:timestamp_proto", "@com_google_protobuf//:wrappers_proto", "@com_google_googleapis//google/api:http_proto", + "@com_google_googleapis//google/api:httpbody_proto", "@com_google_googleapis//google/api:annotations_proto", "@com_google_googleapis//google/rpc:status_proto", "@com_envoyproxy_protoc_gen_validate//validate:validate_proto", ] -def _Suffix(d, suffix): - return d + suffix +# When we have external proto dependencies, we need to be able to map from the +# proto_library dependency to the relevant {cc,go,py}_library when generating +# the respective language library for some target. If you add a new API +# dependency on some external proto, please provide the mappings here for +# Go/C++/Python. -def _LibrarySuffix(library_name, suffix): - # Transform //a/b/c to //a/b/c:c in preparation for suffix operation below. - if library_name.startswith("//") and ":" not in library_name: - library_name += ":" + Label(library_name).name - return _Suffix(library_name, suffix) +_GO_BAZEL_RULE_MAPPING = { + "@opencensus_proto//opencensus/proto/trace/v1:trace_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_proto_go", + "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_and_config_proto_go", + "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@com_google_googleapis//google/api/expr/v1alpha1:cel_go_proto", +} + +_CC_BAZEL_RULE_MAPPING = { + "@opencensus_proto//opencensus/proto/trace/v1:trace_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_proto_cc", + "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto_cc", + "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto", +} + +_PY_BAZEL_RULE_MAPPING = { + "@opencensus_proto//opencensus/proto/trace/v1:trace_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_proto_py", + "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto_py", + "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@com_google_googleapis//google/api/expr/v1alpha1:syntax_py_proto", +} + +def _proto_mapping(dep, proto_dep_map, proto_suffix): + mapped = proto_dep_map.get(dep) + if mapped == None: + prefix = "@" + Label(dep).workspace_name if not dep.startswith("//") else "" + return prefix + "//" + Label(dep).package + ":" + Label(dep).name + proto_suffix + return mapped + +def _go_proto_mapping(dep): + return _proto_mapping(dep, _GO_BAZEL_RULE_MAPPING, _GO_PROTO_SUFFIX) + +def _cc_proto_mapping(dep): + return _proto_mapping(dep, _CC_BAZEL_RULE_MAPPING, _CC_PROTO_SUFFIX) + +def _py_proto_mapping(dep): + return _proto_mapping(dep, _PY_BAZEL_RULE_MAPPING, _PY_PROTO_SUFFIX) # TODO(htuch): Convert this to native py_proto_library once # https://github.com/bazelbuild/bazel/issues/3935 and/or # https://github.com/bazelbuild/bazel/issues/2626 are resolved. -def api_py_proto_library(name, srcs = [], deps = [], external_py_proto_deps = []): +def _api_py_proto_library(name, srcs = [], deps = []): _py_proto_library( - name = _Suffix(name, _PY_SUFFIX), + name = name + _PY_PROTO_SUFFIX, srcs = srcs, default_runtime = "@com_google_protobuf//:protobuf_python", protoc = "@com_google_protobuf//:protoc", - deps = [_LibrarySuffix(d, _PY_SUFFIX) for d in deps] + external_py_proto_deps + [ + deps = [_py_proto_mapping(dep) for dep in deps] + [ "@com_envoyproxy_protoc_gen_validate//validate:validate_py", "@com_google_googleapis//google/rpc:status_py_proto", "@com_google_googleapis//google/api:annotations_py_proto", @@ -83,113 +114,65 @@ def _api_cc_grpc_library(name, proto, deps = []): visibility = ["//visibility:public"], ) -def _ToCanonicalLabel(label): - # //my/app and //my/app:app are the same label. In places we mutate the incoming label adding different suffixes - # in order to generate multiple targets in a single rule. //my/app:app_grpc_cc. - # Skylark formatters and linters prefer the shorthand label whilst we need the latter. - rel = Label("//" + native.package_name()).relative(label) - return "//" + rel.package + ":" + rel.name - -# This is api_proto_library plus some logic internal to //envoy/api. -def api_proto_library_internal(visibility = ["//visibility:private"], **kwargs): - # //envoy/docs/build.sh needs visibility in order to generate documents. - if visibility == ["//visibility:private"]: - visibility = ["//docs"] - elif visibility != ["//visibility:public"]: - visibility = visibility + ["//docs"] - - api_proto_library(visibility = visibility, **kwargs) - -def api_proto_library( +def api_cc_py_proto_library( name, visibility = ["//visibility:private"], srcs = [], deps = [], - tags = [], - external_proto_deps = [], - external_cc_proto_deps = [], - external_py_proto_deps = [], - has_services = 0, - linkstatic = None, - require_py = 1): + linkstatic = 0, + has_services = 0): relative_name = ":" + name native.proto_library( name = name, srcs = srcs, - deps = deps + external_proto_deps + _COMMON_PROTO_DEPS, - tags = tags, + deps = deps + _COMMON_PROTO_DEPS, visibility = visibility, ) - cc_proto_library_name = _Suffix(name, _CC_SUFFIX) + cc_proto_library_name = name + _CC_PROTO_SUFFIX pgv_cc_proto_library( name = cc_proto_library_name, linkstatic = linkstatic, - cc_deps = [_LibrarySuffix(d, _CC_SUFFIX) for d in deps] + external_cc_proto_deps + [ + cc_deps = [_cc_proto_mapping(dep) for dep in deps] + [ "@com_google_googleapis//google/api:http_cc_proto", + "@com_google_googleapis//google/api:httpbody_cc_proto", "@com_google_googleapis//google/api:annotations_cc_proto", "@com_google_googleapis//google/rpc:status_cc_proto", ], deps = [relative_name], visibility = ["//visibility:public"], ) - py_export_suffixes = [] - if require_py: - api_py_proto_library(name, srcs, deps, external_py_proto_deps) - py_export_suffixes = ["_py", "_py_genproto"] + _api_py_proto_library(name, srcs, deps) # Optionally define gRPC services if has_services: # TODO: when Python services are required, add to the below stub generations. - cc_grpc_name = _Suffix(name, _CC_GRPC_SUFFIX) - cc_proto_deps = [cc_proto_library_name] + [_Suffix(_ToCanonicalLabel(x), _CC_SUFFIX) for x in deps] + cc_grpc_name = name + _CC_GRPC_SUFFIX + cc_proto_deps = [cc_proto_library_name] + [_cc_proto_mapping(dep) for dep in deps] _api_cc_grpc_library(name = cc_grpc_name, proto = relative_name, deps = cc_proto_deps) - # Allow unlimited visibility for consumers - export_suffixes = ["", "_cc", "_cc_validate"] + py_export_suffixes - for s in export_suffixes: - native.alias( - name = name + "_export" + s, - actual = name + s, - visibility = ["//visibility:public"], - ) - -def api_cc_test(name, srcs, proto_deps): +def api_cc_test(name, **kwargs): native.cc_test( name = name, - srcs = srcs, - deps = [_LibrarySuffix(d, _CC_EXPORT_SUFFIX) for d in proto_deps], + **kwargs ) -def api_go_test(name, size, importpath, srcs = [], deps = []): +def api_go_test(name, **kwargs): go_test( name = name, - size = size, - srcs = srcs, - importpath = importpath, - deps = deps, + **kwargs ) -_GO_BAZEL_RULE_MAPPING = { - "@opencensus_proto//opencensus/proto/trace/v1:trace_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_proto_go", - "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_and_config_proto_go", - "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@com_google_googleapis//google/api/expr/v1alpha1:cel_go_proto", -} - -def go_proto_mapping(dep): - mapped = _GO_BAZEL_RULE_MAPPING.get(dep) - if mapped == None: - return _Suffix("@" + Label(dep).workspace_name + "//" + Label(dep).package + ":" + Label(dep).name, _GO_PROTO_SUFFIX) - return mapped - -def api_proto_package(name = "pkg", srcs = [], deps = [], has_services = False, visibility = ["//visibility:public"]): +def api_proto_package(srcs = [], deps = [], has_services = False, visibility = ["//visibility:public"]): if srcs == []: srcs = native.glob(["*.proto"]) - native.proto_library( + name = "pkg" + api_cc_py_proto_library( name = name, - srcs = srcs, - deps = deps + _COMMON_PROTO_DEPS, visibility = visibility, + srcs = srcs, + deps = deps, + has_services = has_services, ) compilers = ["@io_bazel_rules_go//proto:go_proto", "//bazel:pgv_plugin_go"] @@ -197,12 +180,12 @@ def api_proto_package(name = "pkg", srcs = [], deps = [], has_services = False, compilers = ["@io_bazel_rules_go//proto:go_grpc", "//bazel:pgv_plugin_go"] go_proto_library( - name = _Suffix(name, _GO_PROTO_SUFFIX), + name = name + _GO_PROTO_SUFFIX, compilers = compilers, - importpath = _Suffix(_GO_IMPORTPATH_PREFIX, native.package_name()), + importpath = _GO_IMPORTPATH_PREFIX + native.package_name(), proto = name, visibility = ["//visibility:public"], - deps = [go_proto_mapping(dep) for dep in deps] + [ + deps = [_go_proto_mapping(dep) for dep in deps] + [ "@com_github_golang_protobuf//ptypes:go_default_library", "@com_github_golang_protobuf//ptypes/any:go_default_library", "@com_github_golang_protobuf//ptypes/duration:go_default_library", diff --git a/api/bazel/repositories.bzl b/api/bazel/repositories.bzl index 27d0219ae8af..f2c40ef9808e 100644 --- a/api/bazel/repositories.bzl +++ b/api/bazel/repositories.bzl @@ -41,10 +41,10 @@ def api_dependencies(): ) PROMETHEUSMETRICS_BUILD_CONTENT = """ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library") +load("@envoy_api//bazel:api_build_system.bzl", "api_cc_py_proto_library") load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") -api_proto_library( +api_cc_py_proto_library( name = "client_model", srcs = [ "metrics.proto", @@ -61,10 +61,10 @@ go_proto_library( """ OPENCENSUSTRACE_BUILD_CONTENT = """ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library") +load("@envoy_api//bazel:api_build_system.bzl", "api_cc_py_proto_library") load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") -api_proto_library( +api_cc_py_proto_library( name = "trace_model", srcs = [ "trace.proto", @@ -102,10 +102,10 @@ filegroup( ZIPKINAPI_BUILD_CONTENT = """ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library") +load("@envoy_api//bazel:api_build_system.bzl", "api_cc_py_proto_library") load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") -api_proto_library( +api_cc_py_proto_library( name = "zipkin", srcs = [ "zipkin-jsonv2.proto", diff --git a/api/docs/BUILD b/api/docs/BUILD index 31ed1ee5bae6..6d82e95d55a4 100644 --- a/api/docs/BUILD +++ b/api/docs/BUILD @@ -12,82 +12,74 @@ proto_library( name = "protos", deps = [ "//envoy/admin/v2alpha:pkg", - "//envoy/api/v2", - "//envoy/api/v2/auth", - "//envoy/api/v2/cluster", - "//envoy/api/v2/core", - "//envoy/api/v2/endpoint", + "//envoy/api/v2:pkg", + "//envoy/api/v2/auth:pkg", + "//envoy/api/v2/cluster:pkg", + "//envoy/api/v2/core:pkg", + "//envoy/api/v2/endpoint:pkg", "//envoy/api/v2/listener:pkg", - "//envoy/api/v2/ratelimit", - "//envoy/api/v2/route", - "//envoy/config/accesslog/v2:als", - "//envoy/config/accesslog/v2:file", - "//envoy/config/bootstrap/v2:bootstrap", - "//envoy/config/cluster/dynamic_forward_proxy/v2alpha:cluster", - "//envoy/config/cluster/redis:redis_cluster", - "//envoy/config/common/dynamic_forward_proxy/v2alpha:dns_cache", - "//envoy/config/common/tap/v2alpha:common", - "//envoy/config/filter/accesslog/v2:accesslog", - "//envoy/config/filter/dubbo/router/v2alpha1:router", - "//envoy/config/filter/fault/v2:fault", - "//envoy/config/filter/http/buffer/v2:buffer", - "//envoy/config/filter/http/csrf/v2:csrf", - "//envoy/config/filter/http/dynamic_forward_proxy/v2alpha:dynamic_forward_proxy", - "//envoy/config/filter/http/ext_authz/v2:ext_authz", - "//envoy/config/filter/http/fault/v2:fault", - "//envoy/config/filter/http/gzip/v2:gzip", - "//envoy/config/filter/http/header_to_metadata/v2:header_to_metadata", - "//envoy/config/filter/http/health_check/v2:health_check", - "//envoy/config/filter/http/ip_tagging/v2:ip_tagging", - "//envoy/config/filter/http/jwt_authn/v2alpha:jwt_authn", - "//envoy/config/filter/http/lua/v2:lua", - "//envoy/config/filter/http/original_src/v2alpha1:original_src", - "//envoy/config/filter/http/rate_limit/v2:rate_limit", - "//envoy/config/filter/http/rbac/v2:rbac", - "//envoy/config/filter/http/router/v2:router", - "//envoy/config/filter/http/squash/v2:squash", - "//envoy/config/filter/http/tap/v2alpha:tap", - "//envoy/config/filter/http/transcoder/v2:transcoder", - "//envoy/config/filter/listener/original_src/v2alpha1:original_src", - "//envoy/config/filter/network/client_ssl_auth/v2:client_ssl_auth", - "//envoy/config/filter/network/dubbo_proxy/v2alpha1:dubbo_proxy", - "//envoy/config/filter/network/ext_authz/v2:ext_authz", - "//envoy/config/filter/network/http_connection_manager/v2:http_connection_manager", - "//envoy/config/filter/network/mongo_proxy/v2:mongo_proxy", - "//envoy/config/filter/network/rate_limit/v2:rate_limit", - "//envoy/config/filter/network/rbac/v2:rbac", - "//envoy/config/filter/network/redis_proxy/v2:redis_proxy", - "//envoy/config/filter/network/tcp_proxy/v2:tcp_proxy", - "//envoy/config/filter/network/thrift_proxy/v2alpha1:thrift_proxy", - "//envoy/config/filter/thrift/rate_limit/v2alpha1:rate_limit", - "//envoy/config/filter/thrift/router/v2alpha1:router", - "//envoy/config/grpc_credential/v2alpha:aws_iam", - "//envoy/config/grpc_credential/v2alpha:file_based_metadata", - "//envoy/config/health_checker/redis/v2:redis", - "//envoy/config/metrics/v2:metrics_service", - "//envoy/config/metrics/v2:stats", - "//envoy/config/overload/v2alpha:overload", - "//envoy/config/ratelimit/v2:rls", - "//envoy/config/rbac/v2:rbac", - "//envoy/config/resource_monitor/fixed_heap/v2alpha:fixed_heap", - "//envoy/config/resource_monitor/injected_resource/v2alpha:injected_resource", - "//envoy/config/trace/v2:trace", - "//envoy/config/transport_socket/tap/v2alpha:tap", - "//envoy/data/accesslog/v2:accesslog", - "//envoy/data/cluster/v2alpha:outlier_detection_event", - "//envoy/data/core/v2alpha:health_check_event", - "//envoy/data/tap/v2alpha:common", - "//envoy/data/tap/v2alpha:http", - "//envoy/data/tap/v2alpha:transport", - "//envoy/data/tap/v2alpha:wrapper", - "//envoy/service/accesslog/v2:als", - "//envoy/service/auth/v2:attribute_context", - "//envoy/service/auth/v2:external_auth", - "//envoy/service/discovery/v2:ads", - "//envoy/service/discovery/v2:rtds", - "//envoy/service/ratelimit/v2:rls", - "//envoy/service/tap/v2alpha:common", - "//envoy/type", - "//envoy/type/matcher", + "//envoy/api/v2/ratelimit:pkg", + "//envoy/api/v2/route:pkg", + "//envoy/config/accesslog/v2:pkg", + "//envoy/config/bootstrap/v2:pkg", + "//envoy/config/cluster/dynamic_forward_proxy/v2alpha:pkg", + "//envoy/config/cluster/redis:pkg", + "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg", + "//envoy/config/common/tap/v2alpha:pkg", + "//envoy/config/filter/accesslog/v2:pkg", + "//envoy/config/filter/dubbo/router/v2alpha1:pkg", + "//envoy/config/filter/fault/v2:pkg", + "//envoy/config/filter/http/buffer/v2:pkg", + "//envoy/config/filter/http/csrf/v2:pkg", + "//envoy/config/filter/http/dynamic_forward_proxy/v2alpha:pkg", + "//envoy/config/filter/http/ext_authz/v2:pkg", + "//envoy/config/filter/http/fault/v2:pkg", + "//envoy/config/filter/http/gzip/v2:pkg", + "//envoy/config/filter/http/header_to_metadata/v2:pkg", + "//envoy/config/filter/http/health_check/v2:pkg", + "//envoy/config/filter/http/ip_tagging/v2:pkg", + "//envoy/config/filter/http/jwt_authn/v2alpha:pkg", + "//envoy/config/filter/http/lua/v2:pkg", + "//envoy/config/filter/http/original_src/v2alpha1:pkg", + "//envoy/config/filter/http/rate_limit/v2:pkg", + "//envoy/config/filter/http/rbac/v2:pkg", + "//envoy/config/filter/http/router/v2:pkg", + "//envoy/config/filter/http/squash/v2:pkg", + "//envoy/config/filter/http/tap/v2alpha:pkg", + "//envoy/config/filter/http/transcoder/v2:pkg", + "//envoy/config/filter/listener/original_src/v2alpha1:pkg", + "//envoy/config/filter/network/client_ssl_auth/v2:pkg", + "//envoy/config/filter/network/dubbo_proxy/v2alpha1:pkg", + "//envoy/config/filter/network/ext_authz/v2:pkg", + "//envoy/config/filter/network/http_connection_manager/v2:pkg", + "//envoy/config/filter/network/mongo_proxy/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/grpc_credential/v2alpha:pkg", + "//envoy/config/health_checker/redis/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/trace/v2:pkg", + "//envoy/config/transport_socket/tap/v2alpha:pkg", + "//envoy/data/accesslog/v2:pkg", + "//envoy/data/cluster/v2alpha:pkg", + "//envoy/data/core/v2alpha:pkg", + "//envoy/data/tap/v2alpha:pkg", + "//envoy/service/accesslog/v2:pkg", + "//envoy/service/auth/v2:pkg", + "//envoy/service/discovery/v2:pkg", + "//envoy/service/ratelimit/v2:pkg", + "//envoy/service/tap/v2alpha:pkg", + "//envoy/type:pkg", + "//envoy/type/matcher:pkg", ], ) diff --git a/api/envoy/admin/v2alpha/BUILD b/api/envoy/admin/v2alpha/BUILD index 850eb0515865..fefa408008c3 100644 --- a/api/envoy/admin/v2alpha/BUILD +++ b/api/envoy/admin/v2alpha/BUILD @@ -1,87 +1,14 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2", - "//envoy/api/v2/auth", - "//envoy/api/v2/core", + "//envoy/api/v2:pkg", + "//envoy/api/v2/auth:pkg", + "//envoy/api/v2/core:pkg", "//envoy/config/bootstrap/v2:pkg", "//envoy/service/tap/v2alpha:pkg", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "config_dump", - srcs = ["config_dump.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v2:cds", - "//envoy/api/v2:lds", - "//envoy/api/v2:rds", - "//envoy/api/v2:srds", - "//envoy/api/v2/auth:cert", - "//envoy/config/bootstrap/v2:bootstrap", - ], -) - -api_proto_library_internal( - name = "clusters", - srcs = ["clusters.proto"], - visibility = ["//visibility:public"], - deps = [ - ":metrics", - "//envoy/api/v2/core:address", - "//envoy/api/v2/core:health_check", - "//envoy/type:percent", - ], -) - -api_proto_library_internal( - name = "listeners", - srcs = ["listeners.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v2/core:address", - ], -) - -api_proto_library_internal( - name = "metrics", - srcs = ["metrics.proto"], - visibility = ["//visibility:public"], -) - -api_proto_library_internal( - name = "memory", - srcs = ["memory.proto"], - visibility = ["//visibility:public"], -) - -api_proto_library_internal( - name = "mutex_stats", - srcs = ["mutex_stats.proto"], - visibility = ["//visibility:public"], -) - -api_proto_library_internal( - name = "certs", - srcs = ["certs.proto"], - visibility = ["//visibility:public"], -) - -api_proto_library_internal( - name = "server_info", - srcs = ["server_info.proto"], - visibility = ["//visibility:public"], -) - -api_proto_library_internal( - name = "tap", - srcs = ["tap.proto"], - deps = [ - "//envoy/service/tap/v2alpha:common", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/admin/v3alpha/BUILD b/api/envoy/admin/v3alpha/BUILD index 9849282084a6..4ac3c55e4d3f 100644 --- a/api/envoy/admin/v3alpha/BUILD +++ b/api/envoy/admin/v3alpha/BUILD @@ -1,87 +1,14 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha", - "//envoy/api/v3alpha/auth", - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha:pkg", + "//envoy/api/v3alpha/auth:pkg", + "//envoy/api/v3alpha/core:pkg", "//envoy/config/bootstrap/v3alpha:pkg", "//envoy/service/tap/v3alpha:pkg", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "config_dump", - srcs = ["config_dump.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v3alpha:cds", - "//envoy/api/v3alpha:lds", - "//envoy/api/v3alpha:rds", - "//envoy/api/v3alpha:srds", - "//envoy/api/v3alpha/auth:cert", - "//envoy/config/bootstrap/v3alpha:bootstrap", - ], -) - -api_proto_library_internal( - name = "clusters", - srcs = ["clusters.proto"], - visibility = ["//visibility:public"], - deps = [ - ":metrics", - "//envoy/api/v3alpha/core:address", - "//envoy/api/v3alpha/core:health_check", - "//envoy/type:percent", - ], -) - -api_proto_library_internal( - name = "listeners", - srcs = ["listeners.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v3alpha/core:address", - ], -) - -api_proto_library_internal( - name = "metrics", - srcs = ["metrics.proto"], - visibility = ["//visibility:public"], -) - -api_proto_library_internal( - name = "memory", - srcs = ["memory.proto"], - visibility = ["//visibility:public"], -) - -api_proto_library_internal( - name = "mutex_stats", - srcs = ["mutex_stats.proto"], - visibility = ["//visibility:public"], -) - -api_proto_library_internal( - name = "certs", - srcs = ["certs.proto"], - visibility = ["//visibility:public"], -) - -api_proto_library_internal( - name = "server_info", - srcs = ["server_info.proto"], - visibility = ["//visibility:public"], -) - -api_proto_library_internal( - name = "tap", - srcs = ["tap.proto"], - deps = [ - "//envoy/service/tap/v3alpha:common", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/api/v2/BUILD b/api/envoy/api/v2/BUILD index 9bffa27360ee..c7e9e339e9aa 100644 --- a/api/envoy/api/v2/BUILD +++ b/api/envoy/api/v2/BUILD @@ -1,118 +1,18 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 -# Friends of core API packages - filters, services, service configs. -# Package //envoy/api/v2 contains xDS and discovery definitions that should -# be in //envoy/service/discovery, but remain here for backwards compatibility. -package_group( - name = "friends", - packages = [ - "//envoy/admin/...", - "//envoy/api/v2", - "//envoy/config/...", - "//envoy/data/...", - "//envoy/service/...", - ], -) - api_proto_package( - name = "v2", has_services = True, deps = [ - "//envoy/api/v2/auth", - "//envoy/api/v2/cluster", - "//envoy/api/v2/core", + "//envoy/api/v2/auth:pkg", + "//envoy/api/v2/cluster:pkg", + "//envoy/api/v2/core:pkg", "//envoy/api/v2/endpoint:pkg", "//envoy/api/v2/listener:pkg", "//envoy/api/v2/ratelimit:pkg", "//envoy/api/v2/route:pkg", "//envoy/config/listener/v2:pkg", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "discovery", - srcs = ["discovery.proto"], - has_services = 1, - visibility = [":friends"], - deps = ["//envoy/api/v2/core:base"], -) - -api_proto_library_internal( - name = "eds", - srcs = ["eds.proto"], - has_services = 1, - visibility = [":friends"], - deps = [ - ":discovery", - "//envoy/api/v2/core:address", - "//envoy/api/v2/core:base", - "//envoy/api/v2/core:health_check", - "//envoy/api/v2/endpoint", - "//envoy/type:percent", - ], -) - -api_proto_library_internal( - name = "cds", - srcs = ["cds.proto"], - has_services = 1, - visibility = [":friends"], - deps = [ - ":discovery", - ":eds", - "//envoy/api/v2/auth:cert", - "//envoy/api/v2/cluster:circuit_breaker", - "//envoy/api/v2/cluster:filter", - "//envoy/api/v2/cluster:outlier_detection", - "//envoy/api/v2/core:address", - "//envoy/api/v2/core:base", - "//envoy/api/v2/core:config_source", - "//envoy/api/v2/core:health_check", - "//envoy/api/v2/core:protocol", - "//envoy/api/v2/endpoint", - "//envoy/type:percent", - ], -) - -api_proto_library_internal( - name = "lds", - srcs = ["lds.proto"], - has_services = 1, - visibility = [":friends"], - deps = [ - ":discovery", - "//envoy/api/v2/core:address", - "//envoy/api/v2/core:base", - "//envoy/api/v2/listener", - "//envoy/api/v2/listener:udp_listener_config", - "//envoy/config/listener/v2:api_listener", - ], -) - -api_proto_library_internal( - name = "rds", - srcs = ["rds.proto"], - has_services = 1, - visibility = [":friends"], - deps = [ - ":discovery", - "//envoy/api/v2/core:base", - "//envoy/api/v2/core:config_source", - "//envoy/api/v2/route", - ], -) - -api_proto_library_internal( - name = "srds", - srcs = ["srds.proto"], - has_services = 1, - visibility = [":friends"], - deps = [ - ":discovery", - "//envoy/api/v2/core:base", - "//envoy/api/v2/route", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/api/v2/auth/BUILD b/api/envoy/api/v2/auth/BUILD index bb3951fb95aa..3de140ccc4f1 100644 --- a/api/envoy/api/v2/auth/BUILD +++ b/api/envoy/api/v2/auth/BUILD @@ -1,33 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 -package_group( - name = "friends", - includes = [ - "//envoy/api/v2:friends", - ], - packages = [ - "//envoy/api/v2/cluster", - "//envoy/api/v2/endpoint", - "//envoy/api/v2/listener", - "//envoy/api/v2/route", - ], -) - api_proto_package( - name = "auth", - deps = [ - "//envoy/api/v2/core", - ], -) - -api_proto_library_internal( - name = "cert", - srcs = ["cert.proto"], - visibility = [":friends"], - deps = [ - "//envoy/api/v2/core:base", - "//envoy/api/v2/core:config_source", - ], + deps = ["//envoy/api/v2/core:pkg"], ) diff --git a/api/envoy/api/v2/cluster/BUILD b/api/envoy/api/v2/cluster/BUILD index baf9a4bfdeb7..3de140ccc4f1 100644 --- a/api/envoy/api/v2/cluster/BUILD +++ b/api/envoy/api/v2/cluster/BUILD @@ -1,37 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - name = "cluster", - deps = [ - "//envoy/api/v2/core", - ], -) - -api_proto_library_internal( - name = "circuit_breaker", - srcs = ["circuit_breaker.proto"], - visibility = [ - "//envoy/api/v2:__pkg__", - ], - deps = [ - "//envoy/api/v2/core:base", - ], -) - -api_proto_library_internal( - name = "outlier_detection", - srcs = ["outlier_detection.proto"], - visibility = [ - "//envoy/api/v2:__pkg__", - ], -) - -api_proto_library_internal( - name = "filter", - srcs = ["filter.proto"], - visibility = [ - "//envoy/api/v2:__pkg__", - ], + deps = ["//envoy/api/v2/core:pkg"], ) diff --git a/api/envoy/api/v2/core/BUILD b/api/envoy/api/v2/core/BUILD index 01234d07b198..75e6ea0623e3 100644 --- a/api/envoy/api/v2/core/BUILD +++ b/api/envoy/api/v2/core/BUILD @@ -1,94 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 -package_group( - name = "friends", - includes = [ - "//envoy/api/v2:friends", - ], - packages = [ - "//envoy/api/v2/auth", - "//envoy/api/v2/cluster", - "//envoy/api/v2/endpoint", - "//envoy/api/v2/listener", - "//envoy/api/v2/route", - ], -) - api_proto_package( - name = "core", - deps = [ - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "address", - srcs = ["address.proto"], - visibility = [ - ":friends", - ], - deps = [":base"], -) - -api_proto_library_internal( - name = "base", - srcs = ["base.proto"], - visibility = [ - ":friends", - ], - deps = [ - ":http_uri", - "//envoy/type:percent", - ], -) - -api_proto_library_internal( - name = "health_check", - srcs = ["health_check.proto"], - visibility = [ - ":friends", - ], - deps = [ - ":base", - "//envoy/type:range", - ], -) - -api_proto_library_internal( - name = "config_source", - srcs = ["config_source.proto"], - visibility = [ - ":friends", - ], - deps = [ - ":base", - ":grpc_service", - ], -) - -api_proto_library_internal( - name = "http_uri", - srcs = ["http_uri.proto"], - visibility = [ - ":friends", - ], -) - -api_proto_library_internal( - name = "grpc_service", - srcs = ["grpc_service.proto"], - visibility = [ - ":friends", - ], - deps = [":base"], -) - -api_proto_library_internal( - name = "protocol", - srcs = ["protocol.proto"], - visibility = [ - ":friends", - ], + deps = ["//envoy/type:pkg"], ) diff --git a/api/envoy/api/v2/endpoint/BUILD b/api/envoy/api/v2/endpoint/BUILD index a12db37309ce..2572fb851e3d 100644 --- a/api/envoy/api/v2/endpoint/BUILD +++ b/api/envoy/api/v2/endpoint/BUILD @@ -1,34 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/auth", - "//envoy/api/v2/core", - ], -) - -api_proto_library_internal( - name = "endpoint", - srcs = ["endpoint.proto"], - visibility = ["//envoy/api/v2:friends"], - deps = [ - "//envoy/api/v2/auth:cert", - "//envoy/api/v2/core:address", - "//envoy/api/v2/core:base", - "//envoy/api/v2/core:config_source", - "//envoy/api/v2/core:health_check", - "//envoy/api/v2/core:protocol", - ], -) - -api_proto_library_internal( - name = "load_report", - srcs = ["load_report.proto"], - visibility = ["//envoy/api/v2:friends"], - deps = [ - "//envoy/api/v2/core:address", - "//envoy/api/v2/core:base", + "//envoy/api/v2/auth:pkg", + "//envoy/api/v2/core:pkg", ], ) diff --git a/api/envoy/api/v2/endpoint/load_report.proto b/api/envoy/api/v2/endpoint/load_report.proto index b44313ba4ee3..fdaa08115f30 100644 --- a/api/envoy/api/v2/endpoint/load_report.proto +++ b/api/envoy/api/v2/endpoint/load_report.proto @@ -53,6 +53,7 @@ message UpstreamLocalityStats { uint32 priority = 6; } +// [#not-implemented-hide:] Not configuration. TBD how to doc proto APIs. message UpstreamEndpointStats { // Upstream host address. core.Address address = 1; @@ -109,8 +110,16 @@ message EndpointLoadMetricStats { // [#not-implemented-hide:] Not configuration. TBD how to doc proto APIs. // Next ID: 7 message ClusterStats { + message DroppedRequests { + // Identifier for the policy specifying the drop. + string category = 1 [(validate.rules).string = {min_bytes: 1}]; + + // Total number of deliberately dropped requests for the category. + uint64 dropped_count = 2; + } + // The name of the cluster. - string cluster_name = 1 [(validate.rules).string.min_bytes = 1]; + string cluster_name = 1 [(validate.rules).string = {min_bytes: 1}]; // The eds_cluster_config service_name of the cluster. // It's possible that two clusters send the same service_name to EDS, @@ -119,7 +128,7 @@ message ClusterStats { // Need at least one. repeated UpstreamLocalityStats upstream_locality_stats = 2 - [(validate.rules).repeated .min_items = 1]; + [(validate.rules).repeated = {min_items: 1}]; // Cluster-level stats such as total_successful_requests may be computed by // summing upstream_locality_stats. In addition, below there are additional @@ -129,12 +138,6 @@ message ClusterStats { // deliberately dropped by the drop_overload policy and circuit breaking. uint64 total_dropped_requests = 3; - message DroppedRequests { - // Identifier for the policy specifying the drop. - string category = 1 [(validate.rules).string.min_bytes = 1]; - // Total number of deliberately dropped requests for the category. - uint64 dropped_count = 2; - } // Information about deliberately dropped requests for each category specified // in the DropOverload policy. repeated DroppedRequests dropped_requests = 5; diff --git a/api/envoy/api/v2/listener/BUILD b/api/envoy/api/v2/listener/BUILD index 99a82254d165..2572fb851e3d 100644 --- a/api/envoy/api/v2/listener/BUILD +++ b/api/envoy/api/v2/listener/BUILD @@ -1,36 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/auth", - "//envoy/api/v2/core", + "//envoy/api/v2/auth:pkg", + "//envoy/api/v2/core:pkg", ], ) - -api_proto_library_internal( - name = "listener", - srcs = ["listener.proto"], - visibility = ["//envoy/api/v2:friends"], - deps = [ - "//envoy/api/v2/auth:cert", - "//envoy/api/v2/core:address", - "//envoy/api/v2/core:base", - ], -) - -api_proto_library_internal( - name = "udp_listener_config", - srcs = ["udp_listener_config.proto"], - visibility = ["//envoy/api/v2:friends"], - deps = [ - "//envoy/api/v2/core:base", - ], -) - -api_proto_library_internal( - name = "quic_config", - srcs = ["quic_config.proto"], - visibility = ["//envoy/api/v2:friends"], -) diff --git a/api/envoy/api/v2/ratelimit/BUILD b/api/envoy/api/v2/ratelimit/BUILD index 234a3b20f16b..5c06e2deae7d 100644 --- a/api/envoy/api/v2/ratelimit/BUILD +++ b/api/envoy/api/v2/ratelimit/BUILD @@ -1,11 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "ratelimit", - srcs = ["ratelimit.proto"], - visibility = ["//envoy/api/v2:friends"], -) diff --git a/api/envoy/api/v2/route/BUILD b/api/envoy/api/v2/route/BUILD index 163281ca35df..6bc81c4ab0af 100644 --- a/api/envoy/api/v2/route/BUILD +++ b/api/envoy/api/v2/route/BUILD @@ -1,24 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/core", - "//envoy/type", - "//envoy/type/matcher", - ], -) - -api_proto_library_internal( - name = "route", - srcs = ["route.proto"], - visibility = ["//envoy/api/v2:friends"], - deps = [ - "//envoy/api/v2/core:base", - "//envoy/type:percent", - "//envoy/type:range", - "//envoy/type/matcher:regex", - "//envoy/type/matcher:string", + "//envoy/api/v2/core:pkg", + "//envoy/type:pkg", + "//envoy/type/matcher:pkg", ], ) diff --git a/api/envoy/api/v3alpha/BUILD b/api/envoy/api/v3alpha/BUILD index 87f1f03a3b1d..b98318e5907e 100644 --- a/api/envoy/api/v3alpha/BUILD +++ b/api/envoy/api/v3alpha/BUILD @@ -1,118 +1,18 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 -# Friends of core API packages - filters, services, service configs. -# Package //envoy/api/v3alpha contains xDS and discovery definitions that should -# be in //envoy/service/discovery, but remain here for backwards compatibility. -package_group( - name = "friends", - packages = [ - "//envoy/admin/...", - "//envoy/api/v3alpha", - "//envoy/config/...", - "//envoy/data/...", - "//envoy/service/...", - ], -) - api_proto_package( - name = "v3alpha", has_services = True, deps = [ - "//envoy/api/v3alpha/auth", - "//envoy/api/v3alpha/cluster", - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/auth:pkg", + "//envoy/api/v3alpha/cluster:pkg", + "//envoy/api/v3alpha/core:pkg", "//envoy/api/v3alpha/endpoint:pkg", "//envoy/api/v3alpha/listener:pkg", "//envoy/api/v3alpha/ratelimit:pkg", "//envoy/api/v3alpha/route:pkg", "//envoy/config/listener/v3alpha:pkg", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "discovery", - srcs = ["discovery.proto"], - has_services = 1, - visibility = [":friends"], - deps = ["//envoy/api/v3alpha/core:base"], -) - -api_proto_library_internal( - name = "eds", - srcs = ["eds.proto"], - has_services = 1, - visibility = [":friends"], - deps = [ - ":discovery", - "//envoy/api/v3alpha/core:address", - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/core:health_check", - "//envoy/api/v3alpha/endpoint", - "//envoy/type:percent", - ], -) - -api_proto_library_internal( - name = "cds", - srcs = ["cds.proto"], - has_services = 1, - visibility = [":friends"], - deps = [ - ":discovery", - ":eds", - "//envoy/api/v3alpha/auth:cert", - "//envoy/api/v3alpha/cluster:circuit_breaker", - "//envoy/api/v3alpha/cluster:filter", - "//envoy/api/v3alpha/cluster:outlier_detection", - "//envoy/api/v3alpha/core:address", - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/core:config_source", - "//envoy/api/v3alpha/core:health_check", - "//envoy/api/v3alpha/core:protocol", - "//envoy/api/v3alpha/endpoint", - "//envoy/type:percent", - ], -) - -api_proto_library_internal( - name = "lds", - srcs = ["lds.proto"], - has_services = 1, - visibility = [":friends"], - deps = [ - ":discovery", - "//envoy/api/v3alpha/core:address", - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/listener", - "//envoy/api/v3alpha/listener:udp_listener_config", - "//envoy/config/listener/v3alpha:api_listener", - ], -) - -api_proto_library_internal( - name = "rds", - srcs = ["rds.proto"], - has_services = 1, - visibility = [":friends"], - deps = [ - ":discovery", - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/core:config_source", - "//envoy/api/v3alpha/route", - ], -) - -api_proto_library_internal( - name = "srds", - srcs = ["srds.proto"], - has_services = 1, - visibility = [":friends"], - deps = [ - ":discovery", - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/route", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/api/v3alpha/auth/BUILD b/api/envoy/api/v3alpha/auth/BUILD index 6c47aff6e2a3..beef440f471b 100644 --- a/api/envoy/api/v3alpha/auth/BUILD +++ b/api/envoy/api/v3alpha/auth/BUILD @@ -1,33 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 -package_group( - name = "friends", - includes = [ - "//envoy/api/v3alpha:friends", - ], - packages = [ - "//envoy/api/v3alpha/cluster", - "//envoy/api/v3alpha/endpoint", - "//envoy/api/v3alpha/listener", - "//envoy/api/v3alpha/route", - ], -) - api_proto_package( - name = "auth", - deps = [ - "//envoy/api/v3alpha/core", - ], -) - -api_proto_library_internal( - name = "cert", - srcs = ["cert.proto"], - visibility = [":friends"], - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/core:config_source", - ], + deps = ["//envoy/api/v3alpha/core:pkg"], ) diff --git a/api/envoy/api/v3alpha/cluster/BUILD b/api/envoy/api/v3alpha/cluster/BUILD index ef01624057e0..beef440f471b 100644 --- a/api/envoy/api/v3alpha/cluster/BUILD +++ b/api/envoy/api/v3alpha/cluster/BUILD @@ -1,37 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - name = "cluster", - deps = [ - "//envoy/api/v3alpha/core", - ], -) - -api_proto_library_internal( - name = "circuit_breaker", - srcs = ["circuit_breaker.proto"], - visibility = [ - "//envoy/api/v3alpha:__pkg__", - ], - deps = [ - "//envoy/api/v3alpha/core:base", - ], -) - -api_proto_library_internal( - name = "outlier_detection", - srcs = ["outlier_detection.proto"], - visibility = [ - "//envoy/api/v3alpha:__pkg__", - ], -) - -api_proto_library_internal( - name = "filter", - srcs = ["filter.proto"], - visibility = [ - "//envoy/api/v3alpha:__pkg__", - ], + deps = ["//envoy/api/v3alpha/core:pkg"], ) diff --git a/api/envoy/api/v3alpha/core/BUILD b/api/envoy/api/v3alpha/core/BUILD index 871c9fe0e838..75e6ea0623e3 100644 --- a/api/envoy/api/v3alpha/core/BUILD +++ b/api/envoy/api/v3alpha/core/BUILD @@ -1,94 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 -package_group( - name = "friends", - includes = [ - "//envoy/api/v3alpha:friends", - ], - packages = [ - "//envoy/api/v3alpha/auth", - "//envoy/api/v3alpha/cluster", - "//envoy/api/v3alpha/endpoint", - "//envoy/api/v3alpha/listener", - "//envoy/api/v3alpha/route", - ], -) - api_proto_package( - name = "core", - deps = [ - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "address", - srcs = ["address.proto"], - visibility = [ - ":friends", - ], - deps = [":base"], -) - -api_proto_library_internal( - name = "base", - srcs = ["base.proto"], - visibility = [ - ":friends", - ], - deps = [ - ":http_uri", - "//envoy/type:percent", - ], -) - -api_proto_library_internal( - name = "health_check", - srcs = ["health_check.proto"], - visibility = [ - ":friends", - ], - deps = [ - ":base", - "//envoy/type:range", - ], -) - -api_proto_library_internal( - name = "config_source", - srcs = ["config_source.proto"], - visibility = [ - ":friends", - ], - deps = [ - ":base", - ":grpc_service", - ], -) - -api_proto_library_internal( - name = "http_uri", - srcs = ["http_uri.proto"], - visibility = [ - ":friends", - ], -) - -api_proto_library_internal( - name = "grpc_service", - srcs = ["grpc_service.proto"], - visibility = [ - ":friends", - ], - deps = [":base"], -) - -api_proto_library_internal( - name = "protocol", - srcs = ["protocol.proto"], - visibility = [ - ":friends", - ], + deps = ["//envoy/type:pkg"], ) diff --git a/api/envoy/api/v3alpha/endpoint/BUILD b/api/envoy/api/v3alpha/endpoint/BUILD index 733560514dbd..39c4b88042c0 100644 --- a/api/envoy/api/v3alpha/endpoint/BUILD +++ b/api/envoy/api/v3alpha/endpoint/BUILD @@ -1,34 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha/auth", - "//envoy/api/v3alpha/core", - ], -) - -api_proto_library_internal( - name = "endpoint", - srcs = ["endpoint.proto"], - visibility = ["//envoy/api/v3alpha:friends"], - deps = [ - "//envoy/api/v3alpha/auth:cert", - "//envoy/api/v3alpha/core:address", - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/core:config_source", - "//envoy/api/v3alpha/core:health_check", - "//envoy/api/v3alpha/core:protocol", - ], -) - -api_proto_library_internal( - name = "load_report", - srcs = ["load_report.proto"], - visibility = ["//envoy/api/v3alpha:friends"], - deps = [ - "//envoy/api/v3alpha/core:address", - "//envoy/api/v3alpha/core:base", + "//envoy/api/v3alpha/auth:pkg", + "//envoy/api/v3alpha/core:pkg", ], ) diff --git a/api/envoy/api/v3alpha/endpoint/load_report.proto b/api/envoy/api/v3alpha/endpoint/load_report.proto index 9ab814d30db2..e70581d208b7 100644 --- a/api/envoy/api/v3alpha/endpoint/load_report.proto +++ b/api/envoy/api/v3alpha/endpoint/load_report.proto @@ -53,6 +53,7 @@ message UpstreamLocalityStats { uint32 priority = 6; } +// [#not-implemented-hide:] Not configuration. TBD how to doc proto APIs. message UpstreamEndpointStats { // Upstream host address. core.Address address = 1; @@ -109,8 +110,16 @@ message EndpointLoadMetricStats { // [#not-implemented-hide:] Not configuration. TBD how to doc proto APIs. // Next ID: 7 message ClusterStats { + message DroppedRequests { + // Identifier for the policy specifying the drop. + string category = 1 [(validate.rules).string = {min_bytes: 1}]; + + // Total number of deliberately dropped requests for the category. + uint64 dropped_count = 2; + } + // The name of the cluster. - string cluster_name = 1 [(validate.rules).string.min_bytes = 1]; + string cluster_name = 1 [(validate.rules).string = {min_bytes: 1}]; // The eds_cluster_config service_name of the cluster. // It's possible that two clusters send the same service_name to EDS, @@ -119,7 +128,7 @@ message ClusterStats { // Need at least one. repeated UpstreamLocalityStats upstream_locality_stats = 2 - [(validate.rules).repeated .min_items = 1]; + [(validate.rules).repeated = {min_items: 1}]; // Cluster-level stats such as total_successful_requests may be computed by // summing upstream_locality_stats. In addition, below there are additional @@ -129,12 +138,6 @@ message ClusterStats { // deliberately dropped by the drop_overload policy and circuit breaking. uint64 total_dropped_requests = 3; - message DroppedRequests { - // Identifier for the policy specifying the drop. - string category = 1 [(validate.rules).string.min_bytes = 1]; - // Total number of deliberately dropped requests for the category. - uint64 dropped_count = 2; - } // Information about deliberately dropped requests for each category specified // in the DropOverload policy. repeated DroppedRequests dropped_requests = 5; diff --git a/api/envoy/api/v3alpha/listener/BUILD b/api/envoy/api/v3alpha/listener/BUILD index 4a4836db9412..39c4b88042c0 100644 --- a/api/envoy/api/v3alpha/listener/BUILD +++ b/api/envoy/api/v3alpha/listener/BUILD @@ -1,36 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha/auth", - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/auth:pkg", + "//envoy/api/v3alpha/core:pkg", ], ) - -api_proto_library_internal( - name = "listener", - srcs = ["listener.proto"], - visibility = ["//envoy/api/v3alpha:friends"], - deps = [ - "//envoy/api/v3alpha/auth:cert", - "//envoy/api/v3alpha/core:address", - "//envoy/api/v3alpha/core:base", - ], -) - -api_proto_library_internal( - name = "udp_listener_config", - srcs = ["udp_listener_config.proto"], - visibility = ["//envoy/api/v3alpha:friends"], - deps = [ - "//envoy/api/v3alpha/core:base", - ], -) - -api_proto_library_internal( - name = "quic_config", - srcs = ["quic_config.proto"], - visibility = ["//envoy/api/v3alpha:friends"], -) diff --git a/api/envoy/api/v3alpha/ratelimit/BUILD b/api/envoy/api/v3alpha/ratelimit/BUILD index a99624b1c421..5c06e2deae7d 100644 --- a/api/envoy/api/v3alpha/ratelimit/BUILD +++ b/api/envoy/api/v3alpha/ratelimit/BUILD @@ -1,11 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "ratelimit", - srcs = ["ratelimit.proto"], - visibility = ["//envoy/api/v3alpha:friends"], -) diff --git a/api/envoy/api/v3alpha/route/BUILD b/api/envoy/api/v3alpha/route/BUILD index cbed3ec01f4b..590354621ab4 100644 --- a/api/envoy/api/v3alpha/route/BUILD +++ b/api/envoy/api/v3alpha/route/BUILD @@ -1,24 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha/core", - "//envoy/type", - "//envoy/type/matcher", - ], -) - -api_proto_library_internal( - name = "route", - srcs = ["route.proto"], - visibility = ["//envoy/api/v3alpha:friends"], - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/type:percent", - "//envoy/type:range", - "//envoy/type/matcher:regex", - "//envoy/type/matcher:string", + "//envoy/api/v3alpha/core:pkg", + "//envoy/type:pkg", + "//envoy/type/matcher:pkg", ], ) diff --git a/api/envoy/config/accesslog/v2/BUILD b/api/envoy/config/accesslog/v2/BUILD index 22c48f795224..3de140ccc4f1 100644 --- a/api/envoy/config/accesslog/v2/BUILD +++ b/api/envoy/config/accesslog/v2/BUILD @@ -1,20 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v2/core"], -) - -api_proto_library_internal( - name = "als", - srcs = ["als.proto"], - deps = [ - "//envoy/api/v2/core:grpc_service", - ], -) - -api_proto_library_internal( - name = "file", - srcs = ["file.proto"], + deps = ["//envoy/api/v2/core:pkg"], ) diff --git a/api/envoy/config/accesslog/v3alpha/BUILD b/api/envoy/config/accesslog/v3alpha/BUILD index 8409598da650..beef440f471b 100644 --- a/api/envoy/config/accesslog/v3alpha/BUILD +++ b/api/envoy/config/accesslog/v3alpha/BUILD @@ -1,20 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v3alpha/core"], -) - -api_proto_library_internal( - name = "als", - srcs = ["als.proto"], - deps = [ - "//envoy/api/v3alpha/core:grpc_service", - ], -) - -api_proto_library_internal( - name = "file", - srcs = ["file.proto"], + deps = ["//envoy/api/v3alpha/core:pkg"], ) diff --git a/api/envoy/config/bootstrap/v2/BUILD b/api/envoy/config/bootstrap/v2/BUILD index 1f3a79104b60..814482dc7a82 100644 --- a/api/envoy/config/bootstrap/v2/BUILD +++ b/api/envoy/config/bootstrap/v2/BUILD @@ -1,34 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2", - "//envoy/api/v2/auth", - "//envoy/api/v2/core", + "//envoy/api/v2:pkg", + "//envoy/api/v2/auth:pkg", + "//envoy/api/v2/core:pkg", "//envoy/config/metrics/v2:pkg", "//envoy/config/overload/v2alpha:pkg", "//envoy/config/ratelimit/v2:pkg", "//envoy/config/trace/v2:pkg", ], ) - -api_proto_library_internal( - name = "bootstrap", - srcs = ["bootstrap.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v2:cds", - "//envoy/api/v2:lds", - "//envoy/api/v2/auth:cert", - "//envoy/api/v2/core:address", - "//envoy/api/v2/core:base", - "//envoy/api/v2/core:config_source", - "//envoy/config/metrics/v2:metrics_service", - "//envoy/config/metrics/v2:stats", - "//envoy/config/overload/v2alpha:overload", - "//envoy/config/ratelimit/v2:rls", - "//envoy/config/trace/v2:trace", - ], -) diff --git a/api/envoy/config/bootstrap/v3alpha/BUILD b/api/envoy/config/bootstrap/v3alpha/BUILD index c88b982492ce..e76b1f1116c5 100644 --- a/api/envoy/config/bootstrap/v3alpha/BUILD +++ b/api/envoy/config/bootstrap/v3alpha/BUILD @@ -1,34 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha", - "//envoy/api/v3alpha/auth", - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha:pkg", + "//envoy/api/v3alpha/auth:pkg", + "//envoy/api/v3alpha/core:pkg", "//envoy/config/metrics/v3alpha:pkg", "//envoy/config/overload/v3alpha:pkg", "//envoy/config/ratelimit/v3alpha:pkg", "//envoy/config/trace/v3alpha:pkg", ], ) - -api_proto_library_internal( - name = "bootstrap", - srcs = ["bootstrap.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v3alpha:cds", - "//envoy/api/v3alpha:lds", - "//envoy/api/v3alpha/auth:cert", - "//envoy/api/v3alpha/core:address", - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/core:config_source", - "//envoy/config/metrics/v3alpha:metrics_service", - "//envoy/config/metrics/v3alpha:stats", - "//envoy/config/overload/v3alpha:overload", - "//envoy/config/ratelimit/v3alpha:rls", - "//envoy/config/trace/v3alpha:trace", - ], -) diff --git a/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD b/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD index 669b6745ab74..31ce4d759d69 100644 --- a/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD +++ b/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD @@ -1,15 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = ["//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg"], ) - -api_proto_library_internal( - name = "cluster", - srcs = ["cluster.proto"], - deps = [ - "//envoy/config/common/dynamic_forward_proxy/v2alpha:dns_cache", - ], -) diff --git a/api/envoy/config/cluster/dynamic_forward_proxy/v3alpha/BUILD b/api/envoy/config/cluster/dynamic_forward_proxy/v3alpha/BUILD index 3c1d737802cb..96f5abe34c15 100644 --- a/api/envoy/config/cluster/dynamic_forward_proxy/v3alpha/BUILD +++ b/api/envoy/config/cluster/dynamic_forward_proxy/v3alpha/BUILD @@ -1,15 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = ["//envoy/config/common/dynamic_forward_proxy/v3alpha:pkg"], ) - -api_proto_library_internal( - name = "cluster", - srcs = ["cluster.proto"], - deps = [ - "//envoy/config/common/dynamic_forward_proxy/v3alpha:dns_cache", - ], -) diff --git a/api/envoy/config/cluster/redis/BUILD b/api/envoy/config/cluster/redis/BUILD index 760ae606c05d..5c06e2deae7d 100644 --- a/api/envoy/config/cluster/redis/BUILD +++ b/api/envoy/config/cluster/redis/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "redis_cluster", - srcs = ["redis_cluster.proto"], -) diff --git a/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD b/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD index 312ae36b3762..4bc8ffcbb852 100644 --- a/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD +++ b/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD @@ -1,16 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v2"], -) - -api_proto_library_internal( - name = "dns_cache", - srcs = ["dns_cache.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v2:cds", - ], + deps = ["//envoy/api/v2:pkg"], ) diff --git a/api/envoy/config/common/dynamic_forward_proxy/v3alpha/BUILD b/api/envoy/config/common/dynamic_forward_proxy/v3alpha/BUILD index e1853725da14..60b1c3ca2f38 100644 --- a/api/envoy/config/common/dynamic_forward_proxy/v3alpha/BUILD +++ b/api/envoy/config/common/dynamic_forward_proxy/v3alpha/BUILD @@ -1,16 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v3alpha"], -) - -api_proto_library_internal( - name = "dns_cache", - srcs = ["dns_cache.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v3alpha:cds", - ], + deps = ["//envoy/api/v3alpha:pkg"], ) diff --git a/api/envoy/config/common/tap/v2alpha/BUILD b/api/envoy/config/common/tap/v2alpha/BUILD index 898773297b51..77b5634431a7 100644 --- a/api/envoy/config/common/tap/v2alpha/BUILD +++ b/api/envoy/config/common/tap/v2alpha/BUILD @@ -1,20 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/core", + "//envoy/api/v2/core:pkg", "//envoy/service/tap/v2alpha:pkg", ], ) - -api_proto_library_internal( - name = "common", - srcs = ["common.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v2/core:config_source", - "//envoy/service/tap/v2alpha:common", - ], -) diff --git a/api/envoy/config/common/tap/v3alpha/BUILD b/api/envoy/config/common/tap/v3alpha/BUILD index 55147b12ba3d..d773a147bab5 100644 --- a/api/envoy/config/common/tap/v3alpha/BUILD +++ b/api/envoy/config/common/tap/v3alpha/BUILD @@ -1,20 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/core:pkg", "//envoy/service/tap/v3alpha:pkg", ], ) - -api_proto_library_internal( - name = "common", - srcs = ["common.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v3alpha/core:config_source", - "//envoy/service/tap/v3alpha:common", - ], -) diff --git a/api/envoy/config/filter/accesslog/v2/BUILD b/api/envoy/config/filter/accesslog/v2/BUILD index d9b740921357..1a3d38ba05c5 100644 --- a/api/envoy/config/filter/accesslog/v2/BUILD +++ b/api/envoy/config/filter/accesslog/v2/BUILD @@ -1,26 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/core", + "//envoy/api/v2/core:pkg", "//envoy/api/v2/route:pkg", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "accesslog", - srcs = ["accesslog.proto"], - visibility = [ - "//envoy/config/filter/http/router/v2:__pkg__", - "//envoy/config/filter/network/http_connection_manager/v2:__pkg__", - "//envoy/config/filter/network/tcp_proxy/v2:__pkg__", - ], - deps = [ - "//envoy/api/v2/core:base", - "//envoy/api/v2/route", - "//envoy/type:percent", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/config/filter/accesslog/v3alpha/BUILD b/api/envoy/config/filter/accesslog/v3alpha/BUILD index 454a1ab4a135..bb2224fda9b9 100644 --- a/api/envoy/config/filter/accesslog/v3alpha/BUILD +++ b/api/envoy/config/filter/accesslog/v3alpha/BUILD @@ -1,26 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/core:pkg", "//envoy/api/v3alpha/route:pkg", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "accesslog", - srcs = ["accesslog.proto"], - visibility = [ - "//envoy/config/filter/http/router/v3alpha:__pkg__", - "//envoy/config/filter/network/http_connection_manager/v3alpha:__pkg__", - "//envoy/config/filter/network/tcp_proxy/v3alpha:__pkg__", - ], - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/route", - "//envoy/type:percent", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD b/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD index 68bd8c126b80..5c06e2deae7d 100644 --- a/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD +++ b/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "router", - srcs = ["router.proto"], -) diff --git a/api/envoy/config/filter/dubbo/router/v3alpha/BUILD b/api/envoy/config/filter/dubbo/router/v3alpha/BUILD index 68bd8c126b80..5c06e2deae7d 100644 --- a/api/envoy/config/filter/dubbo/router/v3alpha/BUILD +++ b/api/envoy/config/filter/dubbo/router/v3alpha/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "router", - srcs = ["router.proto"], -) diff --git a/api/envoy/config/filter/fault/v2/BUILD b/api/envoy/config/filter/fault/v2/BUILD index 78687f4e4da4..75e6ea0623e3 100644 --- a/api/envoy/config/filter/fault/v2/BUILD +++ b/api/envoy/config/filter/fault/v2/BUILD @@ -1,17 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/type"], -) - -api_proto_library_internal( - name = "fault", - srcs = ["fault.proto"], - visibility = [ - "//envoy/config/filter/http/fault/v2:__pkg__", - "//envoy/config/filter/network/mongo_proxy/v2:__pkg__", - ], - deps = ["//envoy/type:percent"], + deps = ["//envoy/type:pkg"], ) diff --git a/api/envoy/config/filter/fault/v3alpha/BUILD b/api/envoy/config/filter/fault/v3alpha/BUILD index 61bc8dc6bc5e..75e6ea0623e3 100644 --- a/api/envoy/config/filter/fault/v3alpha/BUILD +++ b/api/envoy/config/filter/fault/v3alpha/BUILD @@ -1,17 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/type"], -) - -api_proto_library_internal( - name = "fault", - srcs = ["fault.proto"], - visibility = [ - "//envoy/config/filter/http/fault/v3alpha:__pkg__", - "//envoy/config/filter/network/mongo_proxy/v3alpha:__pkg__", - ], - deps = ["//envoy/type:percent"], + deps = ["//envoy/type:pkg"], ) diff --git a/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD b/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD index a02fc542756c..924e3e74a407 100644 --- a/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD +++ b/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD @@ -1,19 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha/core", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "adaptive_concurrency", - srcs = ["adaptive_concurrency.proto"], - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/type:percent", + "//envoy/api/v3alpha/core:pkg", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/config/filter/http/adaptive_concurrency/v3alpha/BUILD b/api/envoy/config/filter/http/adaptive_concurrency/v3alpha/BUILD index a02fc542756c..924e3e74a407 100644 --- a/api/envoy/config/filter/http/adaptive_concurrency/v3alpha/BUILD +++ b/api/envoy/config/filter/http/adaptive_concurrency/v3alpha/BUILD @@ -1,19 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha/core", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "adaptive_concurrency", - srcs = ["adaptive_concurrency.proto"], - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/type:percent", + "//envoy/api/v3alpha/core:pkg", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/config/filter/http/buffer/v2/BUILD b/api/envoy/config/filter/http/buffer/v2/BUILD index 039ebb63e6d2..5c06e2deae7d 100644 --- a/api/envoy/config/filter/http/buffer/v2/BUILD +++ b/api/envoy/config/filter/http/buffer/v2/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "buffer", - srcs = ["buffer.proto"], -) diff --git a/api/envoy/config/filter/http/buffer/v3alpha/BUILD b/api/envoy/config/filter/http/buffer/v3alpha/BUILD index 039ebb63e6d2..5c06e2deae7d 100644 --- a/api/envoy/config/filter/http/buffer/v3alpha/BUILD +++ b/api/envoy/config/filter/http/buffer/v3alpha/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "buffer", - srcs = ["buffer.proto"], -) diff --git a/api/envoy/config/filter/http/csrf/v2/BUILD b/api/envoy/config/filter/http/csrf/v2/BUILD index af3a87b07c05..02545e98b2a8 100644 --- a/api/envoy/config/filter/http/csrf/v2/BUILD +++ b/api/envoy/config/filter/http/csrf/v2/BUILD @@ -1,19 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/core", - "//envoy/type/matcher", - ], -) - -api_proto_library_internal( - name = "csrf", - srcs = ["csrf.proto"], - deps = [ - "//envoy/api/v2/core:base", - "//envoy/type/matcher:string", + "//envoy/api/v2/core:pkg", + "//envoy/type/matcher:pkg", ], ) diff --git a/api/envoy/config/filter/http/csrf/v3alpha/BUILD b/api/envoy/config/filter/http/csrf/v3alpha/BUILD index 676559830c1f..78fef75c6902 100644 --- a/api/envoy/config/filter/http/csrf/v3alpha/BUILD +++ b/api/envoy/config/filter/http/csrf/v3alpha/BUILD @@ -1,19 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha/core", - "//envoy/type/matcher", - ], -) - -api_proto_library_internal( - name = "csrf", - srcs = ["csrf.proto"], - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/type/matcher:string", + "//envoy/api/v3alpha/core:pkg", + "//envoy/type/matcher:pkg", ], ) diff --git a/api/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD b/api/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD index 15d184377ef7..31ce4d759d69 100644 --- a/api/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD +++ b/api/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD @@ -1,15 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = ["//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg"], ) - -api_proto_library_internal( - name = "dynamic_forward_proxy", - srcs = ["dynamic_forward_proxy.proto"], - deps = [ - "//envoy/config/common/dynamic_forward_proxy/v2alpha:dns_cache", - ], -) diff --git a/api/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/BUILD b/api/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/BUILD index c06227674a08..96f5abe34c15 100644 --- a/api/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/BUILD +++ b/api/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/BUILD @@ -1,15 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = ["//envoy/config/common/dynamic_forward_proxy/v3alpha:pkg"], ) - -api_proto_library_internal( - name = "dynamic_forward_proxy", - srcs = ["dynamic_forward_proxy.proto"], - deps = [ - "//envoy/config/common/dynamic_forward_proxy/v3alpha:dns_cache", - ], -) diff --git a/api/envoy/config/filter/http/ext_authz/v2/BUILD b/api/envoy/config/filter/http/ext_authz/v2/BUILD index 10187f48bd2c..6bc81c4ab0af 100644 --- a/api/envoy/config/filter/http/ext_authz/v2/BUILD +++ b/api/envoy/config/filter/http/ext_authz/v2/BUILD @@ -1,23 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/core", - "//envoy/type", - "//envoy/type/matcher", - ], -) - -api_proto_library_internal( - name = "ext_authz", - srcs = ["ext_authz.proto"], - deps = [ - "//envoy/api/v2/core:base", - "//envoy/api/v2/core:grpc_service", - "//envoy/api/v2/core:http_uri", - "//envoy/type:http_status", - "//envoy/type/matcher:string", + "//envoy/api/v2/core:pkg", + "//envoy/type:pkg", + "//envoy/type/matcher:pkg", ], ) diff --git a/api/envoy/config/filter/http/ext_authz/v3alpha/BUILD b/api/envoy/config/filter/http/ext_authz/v3alpha/BUILD index cb0d25a3eebf..590354621ab4 100644 --- a/api/envoy/config/filter/http/ext_authz/v3alpha/BUILD +++ b/api/envoy/config/filter/http/ext_authz/v3alpha/BUILD @@ -1,23 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha/core", - "//envoy/type", - "//envoy/type/matcher", - ], -) - -api_proto_library_internal( - name = "ext_authz", - srcs = ["ext_authz.proto"], - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/core:grpc_service", - "//envoy/api/v3alpha/core:http_uri", - "//envoy/type:http_status", - "//envoy/type/matcher:string", + "//envoy/api/v3alpha/core:pkg", + "//envoy/type:pkg", + "//envoy/type/matcher:pkg", ], ) diff --git a/api/envoy/config/filter/http/fault/v2/BUILD b/api/envoy/config/filter/http/fault/v2/BUILD index b169a0904860..b26b70654ea5 100644 --- a/api/envoy/config/filter/http/fault/v2/BUILD +++ b/api/envoy/config/filter/http/fault/v2/BUILD @@ -1,4 +1,4 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 @@ -6,16 +6,6 @@ api_proto_package( deps = [ "//envoy/api/v2/route:pkg", "//envoy/config/filter/fault/v2:pkg", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "fault", - srcs = ["fault.proto"], - deps = [ - "//envoy/api/v2/route", - "//envoy/config/filter/fault/v2:fault", - "//envoy/type:percent", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/config/filter/http/fault/v3alpha/BUILD b/api/envoy/config/filter/http/fault/v3alpha/BUILD index 508e2d3c92d2..c55cc6ebe9a5 100644 --- a/api/envoy/config/filter/http/fault/v3alpha/BUILD +++ b/api/envoy/config/filter/http/fault/v3alpha/BUILD @@ -1,4 +1,4 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 @@ -6,16 +6,6 @@ api_proto_package( deps = [ "//envoy/api/v3alpha/route:pkg", "//envoy/config/filter/fault/v3alpha:pkg", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "fault", - srcs = ["fault.proto"], - deps = [ - "//envoy/api/v3alpha/route", - "//envoy/config/filter/fault/v3alpha:fault", - "//envoy/type:percent", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/BUILD b/api/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/BUILD index a88ba2443cad..5c06e2deae7d 100644 --- a/api/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/BUILD +++ b/api/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library( - name = "config", - srcs = ["config.proto"], -) diff --git a/api/envoy/config/filter/http/grpc_http1_reverse_bridge/v3alpha/BUILD b/api/envoy/config/filter/http/grpc_http1_reverse_bridge/v3alpha/BUILD index a88ba2443cad..5c06e2deae7d 100644 --- a/api/envoy/config/filter/http/grpc_http1_reverse_bridge/v3alpha/BUILD +++ b/api/envoy/config/filter/http/grpc_http1_reverse_bridge/v3alpha/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library( - name = "config", - srcs = ["config.proto"], -) diff --git a/api/envoy/config/filter/http/gzip/v2/BUILD b/api/envoy/config/filter/http/gzip/v2/BUILD index a3f4b0af2a44..5c06e2deae7d 100644 --- a/api/envoy/config/filter/http/gzip/v2/BUILD +++ b/api/envoy/config/filter/http/gzip/v2/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "gzip", - srcs = ["gzip.proto"], -) diff --git a/api/envoy/config/filter/http/gzip/v3alpha/BUILD b/api/envoy/config/filter/http/gzip/v3alpha/BUILD index a3f4b0af2a44..5c06e2deae7d 100644 --- a/api/envoy/config/filter/http/gzip/v3alpha/BUILD +++ b/api/envoy/config/filter/http/gzip/v3alpha/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "gzip", - srcs = ["gzip.proto"], -) diff --git a/api/envoy/config/filter/http/header_to_metadata/v2/BUILD b/api/envoy/config/filter/http/header_to_metadata/v2/BUILD index cfd34fcf2b08..5c06e2deae7d 100644 --- a/api/envoy/config/filter/http/header_to_metadata/v2/BUILD +++ b/api/envoy/config/filter/http/header_to_metadata/v2/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "header_to_metadata", - srcs = ["header_to_metadata.proto"], -) diff --git a/api/envoy/config/filter/http/header_to_metadata/v3alpha/BUILD b/api/envoy/config/filter/http/header_to_metadata/v3alpha/BUILD index cfd34fcf2b08..5c06e2deae7d 100644 --- a/api/envoy/config/filter/http/header_to_metadata/v3alpha/BUILD +++ b/api/envoy/config/filter/http/header_to_metadata/v3alpha/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "header_to_metadata", - srcs = ["header_to_metadata.proto"], -) diff --git a/api/envoy/config/filter/http/health_check/v2/BUILD b/api/envoy/config/filter/http/health_check/v2/BUILD index 8a995f1694af..8a67bea301d2 100644 --- a/api/envoy/config/filter/http/health_check/v2/BUILD +++ b/api/envoy/config/filter/http/health_check/v2/BUILD @@ -1,19 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/api/v2/route:pkg", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "health_check", - srcs = ["health_check.proto"], - deps = [ - "//envoy/api/v2/route", - "//envoy/type:percent", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/config/filter/http/health_check/v3alpha/BUILD b/api/envoy/config/filter/http/health_check/v3alpha/BUILD index b583685750da..ccfa6a9df64b 100644 --- a/api/envoy/config/filter/http/health_check/v3alpha/BUILD +++ b/api/envoy/config/filter/http/health_check/v3alpha/BUILD @@ -1,19 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/api/v3alpha/route:pkg", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "health_check", - srcs = ["health_check.proto"], - deps = [ - "//envoy/api/v3alpha/route", - "//envoy/type:percent", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/config/filter/http/ip_tagging/v2/BUILD b/api/envoy/config/filter/http/ip_tagging/v2/BUILD index b318ae58f381..3de140ccc4f1 100644 --- a/api/envoy/config/filter/http/ip_tagging/v2/BUILD +++ b/api/envoy/config/filter/http/ip_tagging/v2/BUILD @@ -1,13 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v2/core"], -) - -api_proto_library_internal( - name = "ip_tagging", - srcs = ["ip_tagging.proto"], - deps = ["//envoy/api/v2/core:address"], + deps = ["//envoy/api/v2/core:pkg"], ) diff --git a/api/envoy/config/filter/http/ip_tagging/v3alpha/BUILD b/api/envoy/config/filter/http/ip_tagging/v3alpha/BUILD index a05f0fd96bb0..beef440f471b 100644 --- a/api/envoy/config/filter/http/ip_tagging/v3alpha/BUILD +++ b/api/envoy/config/filter/http/ip_tagging/v3alpha/BUILD @@ -1,13 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v3alpha/core"], -) - -api_proto_library_internal( - name = "ip_tagging", - srcs = ["ip_tagging.proto"], - deps = ["//envoy/api/v3alpha/core:address"], + deps = ["//envoy/api/v3alpha/core:pkg"], ) diff --git a/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD b/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD index 80b4345f6151..b3b56a788577 100644 --- a/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD +++ b/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD @@ -1,20 +1,10 @@ licenses(["notice"]) # Apache 2 -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") api_proto_package( deps = [ - "//envoy/api/v2/core", + "//envoy/api/v2/core:pkg", "//envoy/api/v2/route:pkg", ], ) - -api_proto_library_internal( - name = "jwt_authn", - srcs = ["config.proto"], - deps = [ - "//envoy/api/v2/core:base", - "//envoy/api/v2/core:http_uri", - "//envoy/api/v2/route", - ], -) diff --git a/api/envoy/config/filter/http/jwt_authn/v3alpha/BUILD b/api/envoy/config/filter/http/jwt_authn/v3alpha/BUILD index ea5d0d17b16a..b117c4fc29a0 100644 --- a/api/envoy/config/filter/http/jwt_authn/v3alpha/BUILD +++ b/api/envoy/config/filter/http/jwt_authn/v3alpha/BUILD @@ -1,20 +1,10 @@ licenses(["notice"]) # Apache 2 -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") api_proto_package( deps = [ - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/core:pkg", "//envoy/api/v3alpha/route:pkg", ], ) - -api_proto_library_internal( - name = "jwt_authn", - srcs = ["config.proto"], - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/core:http_uri", - "//envoy/api/v3alpha/route", - ], -) diff --git a/api/envoy/config/filter/http/lua/v2/BUILD b/api/envoy/config/filter/http/lua/v2/BUILD index 7aaf74617c96..5c06e2deae7d 100644 --- a/api/envoy/config/filter/http/lua/v2/BUILD +++ b/api/envoy/config/filter/http/lua/v2/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "lua", - srcs = ["lua.proto"], -) diff --git a/api/envoy/config/filter/http/lua/v3alpha/BUILD b/api/envoy/config/filter/http/lua/v3alpha/BUILD index 7aaf74617c96..5c06e2deae7d 100644 --- a/api/envoy/config/filter/http/lua/v3alpha/BUILD +++ b/api/envoy/config/filter/http/lua/v3alpha/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "lua", - srcs = ["lua.proto"], -) diff --git a/api/envoy/config/filter/http/original_src/v2alpha1/BUILD b/api/envoy/config/filter/http/original_src/v2alpha1/BUILD index a7435bb55cfc..5c06e2deae7d 100644 --- a/api/envoy/config/filter/http/original_src/v2alpha1/BUILD +++ b/api/envoy/config/filter/http/original_src/v2alpha1/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "original_src", - srcs = ["original_src.proto"], -) diff --git a/api/envoy/config/filter/http/original_src/v3alpha/BUILD b/api/envoy/config/filter/http/original_src/v3alpha/BUILD index a7435bb55cfc..5c06e2deae7d 100644 --- a/api/envoy/config/filter/http/original_src/v3alpha/BUILD +++ b/api/envoy/config/filter/http/original_src/v3alpha/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "original_src", - srcs = ["original_src.proto"], -) diff --git a/api/envoy/config/filter/http/rate_limit/v2/BUILD b/api/envoy/config/filter/http/rate_limit/v2/BUILD index 4a6d451da981..16ca7d22f693 100644 --- a/api/envoy/config/filter/http/rate_limit/v2/BUILD +++ b/api/envoy/config/filter/http/rate_limit/v2/BUILD @@ -1,15 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = ["//envoy/config/ratelimit/v2:pkg"], ) - -api_proto_library_internal( - name = "rate_limit", - srcs = ["rate_limit.proto"], - deps = [ - "//envoy/config/ratelimit/v2:rls", - ], -) diff --git a/api/envoy/config/filter/http/rate_limit/v3alpha/BUILD b/api/envoy/config/filter/http/rate_limit/v3alpha/BUILD index 7060f7e9ce38..8e8d5b5db851 100644 --- a/api/envoy/config/filter/http/rate_limit/v3alpha/BUILD +++ b/api/envoy/config/filter/http/rate_limit/v3alpha/BUILD @@ -1,15 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = ["//envoy/config/ratelimit/v3alpha:pkg"], ) - -api_proto_library_internal( - name = "rate_limit", - srcs = ["rate_limit.proto"], - deps = [ - "//envoy/config/ratelimit/v3alpha:rls", - ], -) diff --git a/api/envoy/config/filter/http/rbac/v2/BUILD b/api/envoy/config/filter/http/rbac/v2/BUILD index ca9aa2ca410c..457094fa0d22 100644 --- a/api/envoy/config/filter/http/rbac/v2/BUILD +++ b/api/envoy/config/filter/http/rbac/v2/BUILD @@ -1,13 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = ["//envoy/config/rbac/v2:pkg"], ) - -api_proto_library_internal( - name = "rbac", - srcs = ["rbac.proto"], - deps = ["//envoy/config/rbac/v2:rbac"], -) diff --git a/api/envoy/config/filter/http/rbac/v3alpha/BUILD b/api/envoy/config/filter/http/rbac/v3alpha/BUILD index 1e4d51b50453..2e9c9f3a0a57 100644 --- a/api/envoy/config/filter/http/rbac/v3alpha/BUILD +++ b/api/envoy/config/filter/http/rbac/v3alpha/BUILD @@ -1,13 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = ["//envoy/config/rbac/v3alpha:pkg"], ) - -api_proto_library_internal( - name = "rbac", - srcs = ["rbac.proto"], - deps = ["//envoy/config/rbac/v3alpha:rbac"], -) diff --git a/api/envoy/config/filter/http/router/v2/BUILD b/api/envoy/config/filter/http/router/v2/BUILD index 9ddaf54b2845..482ba33aa0f6 100644 --- a/api/envoy/config/filter/http/router/v2/BUILD +++ b/api/envoy/config/filter/http/router/v2/BUILD @@ -1,13 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = ["//envoy/config/filter/accesslog/v2:pkg"], ) - -api_proto_library_internal( - name = "router", - srcs = ["router.proto"], - deps = ["//envoy/config/filter/accesslog/v2:accesslog"], -) diff --git a/api/envoy/config/filter/http/router/v3alpha/BUILD b/api/envoy/config/filter/http/router/v3alpha/BUILD index d68a0ac2c2ee..04e75d1947f4 100644 --- a/api/envoy/config/filter/http/router/v3alpha/BUILD +++ b/api/envoy/config/filter/http/router/v3alpha/BUILD @@ -1,13 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = ["//envoy/config/filter/accesslog/v3alpha:pkg"], ) - -api_proto_library_internal( - name = "router", - srcs = ["router.proto"], - deps = ["//envoy/config/filter/accesslog/v3alpha:accesslog"], -) diff --git a/api/envoy/config/filter/http/squash/v2/BUILD b/api/envoy/config/filter/http/squash/v2/BUILD index 2a0c1c8e30fa..5c06e2deae7d 100644 --- a/api/envoy/config/filter/http/squash/v2/BUILD +++ b/api/envoy/config/filter/http/squash/v2/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "squash", - srcs = ["squash.proto"], -) diff --git a/api/envoy/config/filter/http/squash/v3alpha/BUILD b/api/envoy/config/filter/http/squash/v3alpha/BUILD index 2a0c1c8e30fa..5c06e2deae7d 100644 --- a/api/envoy/config/filter/http/squash/v3alpha/BUILD +++ b/api/envoy/config/filter/http/squash/v3alpha/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "squash", - srcs = ["squash.proto"], -) diff --git a/api/envoy/config/filter/http/tap/v2alpha/BUILD b/api/envoy/config/filter/http/tap/v2alpha/BUILD index 0949dad0c6ac..0cdd351ab8ba 100644 --- a/api/envoy/config/filter/http/tap/v2alpha/BUILD +++ b/api/envoy/config/filter/http/tap/v2alpha/BUILD @@ -1,15 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = ["//envoy/config/common/tap/v2alpha:pkg"], ) - -api_proto_library_internal( - name = "tap", - srcs = ["tap.proto"], - deps = [ - "//envoy/config/common/tap/v2alpha:common", - ], -) diff --git a/api/envoy/config/filter/http/tap/v3alpha/BUILD b/api/envoy/config/filter/http/tap/v3alpha/BUILD index 0535cfbc21ae..cb07068f355b 100644 --- a/api/envoy/config/filter/http/tap/v3alpha/BUILD +++ b/api/envoy/config/filter/http/tap/v3alpha/BUILD @@ -1,15 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = ["//envoy/config/common/tap/v3alpha:pkg"], ) - -api_proto_library_internal( - name = "tap", - srcs = ["tap.proto"], - deps = [ - "//envoy/config/common/tap/v3alpha:common", - ], -) diff --git a/api/envoy/config/filter/http/transcoder/v2/BUILD b/api/envoy/config/filter/http/transcoder/v2/BUILD index 33a99a23a061..5c06e2deae7d 100644 --- a/api/envoy/config/filter/http/transcoder/v2/BUILD +++ b/api/envoy/config/filter/http/transcoder/v2/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "transcoder", - srcs = ["transcoder.proto"], -) diff --git a/api/envoy/config/filter/http/transcoder/v3alpha/BUILD b/api/envoy/config/filter/http/transcoder/v3alpha/BUILD index 33a99a23a061..5c06e2deae7d 100644 --- a/api/envoy/config/filter/http/transcoder/v3alpha/BUILD +++ b/api/envoy/config/filter/http/transcoder/v3alpha/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "transcoder", - srcs = ["transcoder.proto"], -) diff --git a/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD b/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD index a7435bb55cfc..5c06e2deae7d 100644 --- a/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD +++ b/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "original_src", - srcs = ["original_src.proto"], -) diff --git a/api/envoy/config/filter/listener/original_src/v3alpha/BUILD b/api/envoy/config/filter/listener/original_src/v3alpha/BUILD index a7435bb55cfc..5c06e2deae7d 100644 --- a/api/envoy/config/filter/listener/original_src/v3alpha/BUILD +++ b/api/envoy/config/filter/listener/original_src/v3alpha/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "original_src", - srcs = ["original_src.proto"], -) diff --git a/api/envoy/config/filter/network/client_ssl_auth/v2/BUILD b/api/envoy/config/filter/network/client_ssl_auth/v2/BUILD index 96b5e9d0d47c..3de140ccc4f1 100644 --- a/api/envoy/config/filter/network/client_ssl_auth/v2/BUILD +++ b/api/envoy/config/filter/network/client_ssl_auth/v2/BUILD @@ -1,13 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v2/core"], -) - -api_proto_library_internal( - name = "client_ssl_auth", - srcs = ["client_ssl_auth.proto"], - deps = ["//envoy/api/v2/core:address"], + deps = ["//envoy/api/v2/core:pkg"], ) diff --git a/api/envoy/config/filter/network/client_ssl_auth/v3alpha/BUILD b/api/envoy/config/filter/network/client_ssl_auth/v3alpha/BUILD index 540d8b4aa1a4..beef440f471b 100644 --- a/api/envoy/config/filter/network/client_ssl_auth/v3alpha/BUILD +++ b/api/envoy/config/filter/network/client_ssl_auth/v3alpha/BUILD @@ -1,13 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v3alpha/core"], -) - -api_proto_library_internal( - name = "client_ssl_auth", - srcs = ["client_ssl_auth.proto"], - deps = ["//envoy/api/v3alpha/core:address"], + deps = ["//envoy/api/v3alpha/core:pkg"], ) diff --git a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD index c6cee209c654..22d90fefa9b0 100644 --- a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD +++ b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD @@ -1,26 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/core", + "//envoy/api/v2/core:pkg", "//envoy/api/v2/route:pkg", - "//envoy/type", - "//envoy/type/matcher", - ], -) - -api_proto_library_internal( - name = "dubbo_proxy", - srcs = [ - "dubbo_proxy.proto", - "route.proto", - ], - deps = [ - "//envoy/api/v2/core:base", - "//envoy/api/v2/route", - "//envoy/type:range", - "//envoy/type/matcher:string", + "//envoy/type:pkg", + "//envoy/type/matcher:pkg", ], ) diff --git a/api/envoy/config/filter/network/dubbo_proxy/v3alpha/BUILD b/api/envoy/config/filter/network/dubbo_proxy/v3alpha/BUILD index db73dfbd0848..5e8351556def 100644 --- a/api/envoy/config/filter/network/dubbo_proxy/v3alpha/BUILD +++ b/api/envoy/config/filter/network/dubbo_proxy/v3alpha/BUILD @@ -1,26 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/core:pkg", "//envoy/api/v3alpha/route:pkg", - "//envoy/type", - "//envoy/type/matcher", - ], -) - -api_proto_library_internal( - name = "dubbo_proxy", - srcs = [ - "dubbo_proxy.proto", - "route.proto", - ], - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/route", - "//envoy/type:range", - "//envoy/type/matcher:string", + "//envoy/type:pkg", + "//envoy/type/matcher:pkg", ], ) diff --git a/api/envoy/config/filter/network/ext_authz/v2/BUILD b/api/envoy/config/filter/network/ext_authz/v2/BUILD index 3bdae60659a1..3de140ccc4f1 100644 --- a/api/envoy/config/filter/network/ext_authz/v2/BUILD +++ b/api/envoy/config/filter/network/ext_authz/v2/BUILD @@ -1,13 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v2/core"], -) - -api_proto_library_internal( - name = "ext_authz", - srcs = ["ext_authz.proto"], - deps = ["//envoy/api/v2/core:grpc_service"], + deps = ["//envoy/api/v2/core:pkg"], ) diff --git a/api/envoy/config/filter/network/ext_authz/v3alpha/BUILD b/api/envoy/config/filter/network/ext_authz/v3alpha/BUILD index 58aa28906331..beef440f471b 100644 --- a/api/envoy/config/filter/network/ext_authz/v3alpha/BUILD +++ b/api/envoy/config/filter/network/ext_authz/v3alpha/BUILD @@ -1,13 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v3alpha/core"], -) - -api_proto_library_internal( - name = "ext_authz", - srcs = ["ext_authz.proto"], - deps = ["//envoy/api/v3alpha/core:grpc_service"], + deps = ["//envoy/api/v3alpha/core:pkg"], ) diff --git a/api/envoy/config/filter/network/http_connection_manager/v2/BUILD b/api/envoy/config/filter/network/http_connection_manager/v2/BUILD index 6a090f3a115d..e108b9e889c1 100644 --- a/api/envoy/config/filter/network/http_connection_manager/v2/BUILD +++ b/api/envoy/config/filter/network/http_connection_manager/v2/BUILD @@ -1,26 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2", - "//envoy/api/v2/core", + "//envoy/api/v2:pkg", + "//envoy/api/v2/core:pkg", "//envoy/config/filter/accesslog/v2:pkg", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "http_connection_manager", - srcs = ["http_connection_manager.proto"], - deps = [ - "//envoy/api/v2:rds", - "//envoy/api/v2:srds", - "//envoy/api/v2/core:base", - "//envoy/api/v2/core:config_source", - "//envoy/api/v2/core:protocol", - "//envoy/config/filter/accesslog/v2:accesslog", - "//envoy/type:percent", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/config/filter/network/http_connection_manager/v3alpha/BUILD b/api/envoy/config/filter/network/http_connection_manager/v3alpha/BUILD index 57e0528c2ea6..d233bf068eea 100644 --- a/api/envoy/config/filter/network/http_connection_manager/v3alpha/BUILD +++ b/api/envoy/config/filter/network/http_connection_manager/v3alpha/BUILD @@ -1,26 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha", - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha:pkg", + "//envoy/api/v3alpha/core:pkg", "//envoy/config/filter/accesslog/v3alpha:pkg", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "http_connection_manager", - srcs = ["http_connection_manager.proto"], - deps = [ - "//envoy/api/v3alpha:rds", - "//envoy/api/v3alpha:srds", - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/core:config_source", - "//envoy/api/v3alpha/core:protocol", - "//envoy/config/filter/accesslog/v3alpha:accesslog", - "//envoy/type:percent", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/config/filter/network/mongo_proxy/v2/BUILD b/api/envoy/config/filter/network/mongo_proxy/v2/BUILD index 59bad30ed94d..9f98e683ebaa 100644 --- a/api/envoy/config/filter/network/mongo_proxy/v2/BUILD +++ b/api/envoy/config/filter/network/mongo_proxy/v2/BUILD @@ -1,13 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = ["//envoy/config/filter/fault/v2:pkg"], ) - -api_proto_library_internal( - name = "mongo_proxy", - srcs = ["mongo_proxy.proto"], - deps = ["//envoy/config/filter/fault/v2:fault"], -) diff --git a/api/envoy/config/filter/network/mongo_proxy/v3alpha/BUILD b/api/envoy/config/filter/network/mongo_proxy/v3alpha/BUILD index 67dca3bb139a..700ff186e825 100644 --- a/api/envoy/config/filter/network/mongo_proxy/v3alpha/BUILD +++ b/api/envoy/config/filter/network/mongo_proxy/v3alpha/BUILD @@ -1,13 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = ["//envoy/config/filter/fault/v3alpha:pkg"], ) - -api_proto_library_internal( - name = "mongo_proxy", - srcs = ["mongo_proxy.proto"], - deps = ["//envoy/config/filter/fault/v3alpha:fault"], -) diff --git a/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD b/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD index 7f7da3af9276..5c06e2deae7d 100644 --- a/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD +++ b/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "mysql_proxy", - srcs = ["mysql_proxy.proto"], -) diff --git a/api/envoy/config/filter/network/rate_limit/v2/BUILD b/api/envoy/config/filter/network/rate_limit/v2/BUILD index fcdcd0dfa5ef..69864576af81 100644 --- a/api/envoy/config/filter/network/rate_limit/v2/BUILD +++ b/api/envoy/config/filter/network/rate_limit/v2/BUILD @@ -1,4 +1,4 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 @@ -8,12 +8,3 @@ api_proto_package( "//envoy/config/ratelimit/v2:pkg", ], ) - -api_proto_library_internal( - name = "rate_limit", - srcs = ["rate_limit.proto"], - deps = [ - "//envoy/api/v2/ratelimit", - "//envoy/config/ratelimit/v2:rls", - ], -) diff --git a/api/envoy/config/filter/network/rate_limit/v3alpha/BUILD b/api/envoy/config/filter/network/rate_limit/v3alpha/BUILD index a13183b9eb75..34a25c3da537 100644 --- a/api/envoy/config/filter/network/rate_limit/v3alpha/BUILD +++ b/api/envoy/config/filter/network/rate_limit/v3alpha/BUILD @@ -1,4 +1,4 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 @@ -8,12 +8,3 @@ api_proto_package( "//envoy/config/ratelimit/v3alpha:pkg", ], ) - -api_proto_library_internal( - name = "rate_limit", - srcs = ["rate_limit.proto"], - deps = [ - "//envoy/api/v3alpha/ratelimit", - "//envoy/config/ratelimit/v3alpha:rls", - ], -) diff --git a/api/envoy/config/filter/network/rbac/v2/BUILD b/api/envoy/config/filter/network/rbac/v2/BUILD index ca9aa2ca410c..457094fa0d22 100644 --- a/api/envoy/config/filter/network/rbac/v2/BUILD +++ b/api/envoy/config/filter/network/rbac/v2/BUILD @@ -1,13 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = ["//envoy/config/rbac/v2:pkg"], ) - -api_proto_library_internal( - name = "rbac", - srcs = ["rbac.proto"], - deps = ["//envoy/config/rbac/v2:rbac"], -) diff --git a/api/envoy/config/filter/network/rbac/v3alpha/BUILD b/api/envoy/config/filter/network/rbac/v3alpha/BUILD index 1e4d51b50453..2e9c9f3a0a57 100644 --- a/api/envoy/config/filter/network/rbac/v3alpha/BUILD +++ b/api/envoy/config/filter/network/rbac/v3alpha/BUILD @@ -1,13 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = ["//envoy/config/rbac/v3alpha:pkg"], ) - -api_proto_library_internal( - name = "rbac", - srcs = ["rbac.proto"], - deps = ["//envoy/config/rbac/v3alpha:rbac"], -) diff --git a/api/envoy/config/filter/network/redis_proxy/v2/BUILD b/api/envoy/config/filter/network/redis_proxy/v2/BUILD index d23450a55d1e..0cad4cb65e83 100644 --- a/api/envoy/config/filter/network/redis_proxy/v2/BUILD +++ b/api/envoy/config/filter/network/redis_proxy/v2/BUILD @@ -1,19 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/core", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "redis_proxy", - srcs = ["redis_proxy.proto"], - deps = [ - "//envoy/api/v2/core:base", - "//envoy/type:percent", + "//envoy/api/v2/core:pkg", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/config/filter/network/redis_proxy/v3alpha/BUILD b/api/envoy/config/filter/network/redis_proxy/v3alpha/BUILD index 4db47e3bb664..924e3e74a407 100644 --- a/api/envoy/config/filter/network/redis_proxy/v3alpha/BUILD +++ b/api/envoy/config/filter/network/redis_proxy/v3alpha/BUILD @@ -1,19 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha/core", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "redis_proxy", - srcs = ["redis_proxy.proto"], - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/type:percent", + "//envoy/api/v3alpha/core:pkg", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/config/filter/network/tcp_proxy/v2/BUILD b/api/envoy/config/filter/network/tcp_proxy/v2/BUILD index a0cc067086cc..e271c8061030 100644 --- a/api/envoy/config/filter/network/tcp_proxy/v2/BUILD +++ b/api/envoy/config/filter/network/tcp_proxy/v2/BUILD @@ -1,20 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/core", + "//envoy/api/v2/core:pkg", "//envoy/config/filter/accesslog/v2:pkg", ], ) - -api_proto_library_internal( - name = "tcp_proxy", - srcs = ["tcp_proxy.proto"], - deps = [ - "//envoy/api/v2/core:address", - "//envoy/api/v2/core:base", - "//envoy/config/filter/accesslog/v2:accesslog", - ], -) diff --git a/api/envoy/config/filter/network/tcp_proxy/v3alpha/BUILD b/api/envoy/config/filter/network/tcp_proxy/v3alpha/BUILD index 305e06bc8bfb..56ea7c58c5dd 100644 --- a/api/envoy/config/filter/network/tcp_proxy/v3alpha/BUILD +++ b/api/envoy/config/filter/network/tcp_proxy/v3alpha/BUILD @@ -1,20 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/core:pkg", "//envoy/config/filter/accesslog/v3alpha:pkg", ], ) - -api_proto_library_internal( - name = "tcp_proxy", - srcs = ["tcp_proxy.proto"], - deps = [ - "//envoy/api/v3alpha/core:address", - "//envoy/api/v3alpha/core:base", - "//envoy/config/filter/accesslog/v3alpha:accesslog", - ], -) diff --git a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD index 28a64a0a329e..6a19a7f39cd5 100644 --- a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD +++ b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD @@ -1,22 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/core", + "//envoy/api/v2/core:pkg", "//envoy/api/v2/route:pkg", ], ) - -api_proto_library_internal( - name = "thrift_proxy", - srcs = [ - "route.proto", - "thrift_proxy.proto", - ], - deps = [ - "//envoy/api/v2/core:base", - "//envoy/api/v2/route", - ], -) diff --git a/api/envoy/config/filter/network/thrift_proxy/v3alpha/BUILD b/api/envoy/config/filter/network/thrift_proxy/v3alpha/BUILD index 34a2c397ccb8..7f132f215749 100644 --- a/api/envoy/config/filter/network/thrift_proxy/v3alpha/BUILD +++ b/api/envoy/config/filter/network/thrift_proxy/v3alpha/BUILD @@ -1,22 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/core:pkg", "//envoy/api/v3alpha/route:pkg", ], ) - -api_proto_library_internal( - name = "thrift_proxy", - srcs = [ - "route.proto", - "thrift_proxy.proto", - ], - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/route", - ], -) diff --git a/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD b/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD index 02594c24b8ae..5c06e2deae7d 100644 --- a/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD +++ b/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "zookeeper_proxy", - srcs = ["zookeeper_proxy.proto"], -) diff --git a/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD b/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD index fcdcd0dfa5ef..69864576af81 100644 --- a/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD +++ b/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD @@ -1,4 +1,4 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 @@ -8,12 +8,3 @@ api_proto_package( "//envoy/config/ratelimit/v2:pkg", ], ) - -api_proto_library_internal( - name = "rate_limit", - srcs = ["rate_limit.proto"], - deps = [ - "//envoy/api/v2/ratelimit", - "//envoy/config/ratelimit/v2:rls", - ], -) diff --git a/api/envoy/config/filter/thrift/rate_limit/v3alpha/BUILD b/api/envoy/config/filter/thrift/rate_limit/v3alpha/BUILD index a13183b9eb75..34a25c3da537 100644 --- a/api/envoy/config/filter/thrift/rate_limit/v3alpha/BUILD +++ b/api/envoy/config/filter/thrift/rate_limit/v3alpha/BUILD @@ -1,4 +1,4 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 @@ -8,12 +8,3 @@ api_proto_package( "//envoy/config/ratelimit/v3alpha:pkg", ], ) - -api_proto_library_internal( - name = "rate_limit", - srcs = ["rate_limit.proto"], - deps = [ - "//envoy/api/v3alpha/ratelimit", - "//envoy/config/ratelimit/v3alpha:rls", - ], -) diff --git a/api/envoy/config/filter/thrift/router/v2alpha1/BUILD b/api/envoy/config/filter/thrift/router/v2alpha1/BUILD index 68bd8c126b80..5c06e2deae7d 100644 --- a/api/envoy/config/filter/thrift/router/v2alpha1/BUILD +++ b/api/envoy/config/filter/thrift/router/v2alpha1/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "router", - srcs = ["router.proto"], -) diff --git a/api/envoy/config/filter/thrift/router/v3alpha/BUILD b/api/envoy/config/filter/thrift/router/v3alpha/BUILD index 68bd8c126b80..5c06e2deae7d 100644 --- a/api/envoy/config/filter/thrift/router/v3alpha/BUILD +++ b/api/envoy/config/filter/thrift/router/v3alpha/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "router", - srcs = ["router.proto"], -) diff --git a/api/envoy/config/grpc_credential/v2alpha/BUILD b/api/envoy/config/grpc_credential/v2alpha/BUILD index 484aa5680d12..18018b36b083 100644 --- a/api/envoy/config/grpc_credential/v2alpha/BUILD +++ b/api/envoy/config/grpc_credential/v2alpha/BUILD @@ -1,18 +1,7 @@ licenses(["notice"]) # Apache 2 -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") api_proto_package( - deps = ["//envoy/api/v2/core"], -) - -api_proto_library_internal( - name = "file_based_metadata", - srcs = ["file_based_metadata.proto"], - deps = ["//envoy/api/v2/core:base"], -) - -api_proto_library_internal( - name = "aws_iam", - srcs = ["aws_iam.proto"], + deps = ["//envoy/api/v2/core:pkg"], ) diff --git a/api/envoy/config/grpc_credential/v3alpha/BUILD b/api/envoy/config/grpc_credential/v3alpha/BUILD index 7c327f91f031..0328e9776fe6 100644 --- a/api/envoy/config/grpc_credential/v3alpha/BUILD +++ b/api/envoy/config/grpc_credential/v3alpha/BUILD @@ -1,18 +1,7 @@ licenses(["notice"]) # Apache 2 -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") api_proto_package( - deps = ["//envoy/api/v3alpha/core"], -) - -api_proto_library_internal( - name = "file_based_metadata", - srcs = ["file_based_metadata.proto"], - deps = ["//envoy/api/v3alpha/core:base"], -) - -api_proto_library_internal( - name = "aws_iam", - srcs = ["aws_iam.proto"], + deps = ["//envoy/api/v3alpha/core:pkg"], ) diff --git a/api/envoy/config/health_checker/redis/v2/BUILD b/api/envoy/config/health_checker/redis/v2/BUILD index f7b289b08f69..5c06e2deae7d 100644 --- a/api/envoy/config/health_checker/redis/v2/BUILD +++ b/api/envoy/config/health_checker/redis/v2/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "redis", - srcs = ["redis.proto"], -) diff --git a/api/envoy/config/health_checker/redis/v3alpha/BUILD b/api/envoy/config/health_checker/redis/v3alpha/BUILD index f7b289b08f69..5c06e2deae7d 100644 --- a/api/envoy/config/health_checker/redis/v3alpha/BUILD +++ b/api/envoy/config/health_checker/redis/v3alpha/BUILD @@ -1,10 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "redis", - srcs = ["redis.proto"], -) diff --git a/api/envoy/config/listener/v2/BUILD b/api/envoy/config/listener/v2/BUILD index 031cd7ce37cd..5c06e2deae7d 100644 --- a/api/envoy/config/listener/v2/BUILD +++ b/api/envoy/config/listener/v2/BUILD @@ -1,18 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 -package_group( - name = "friends", - packages = [ - "//envoy/api/v2", - ], -) - api_proto_package() - -api_proto_library_internal( - name = "api_listener", - srcs = ["api_listener.proto"], - visibility = [":friends"], -) diff --git a/api/envoy/config/listener/v3alpha/BUILD b/api/envoy/config/listener/v3alpha/BUILD index cd728ed17ad1..5c06e2deae7d 100644 --- a/api/envoy/config/listener/v3alpha/BUILD +++ b/api/envoy/config/listener/v3alpha/BUILD @@ -1,18 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 -package_group( - name = "friends", - packages = [ - "//envoy/api/v3alpha", - ], -) - api_proto_package() - -api_proto_library_internal( - name = "api_listener", - srcs = ["api_listener.proto"], - visibility = [":friends"], -) diff --git a/api/envoy/config/metrics/v2/BUILD b/api/envoy/config/metrics/v2/BUILD index 13ac8bdd9992..02545e98b2a8 100644 --- a/api/envoy/config/metrics/v2/BUILD +++ b/api/envoy/config/metrics/v2/BUILD @@ -1,33 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/core", - "//envoy/type/matcher", - ], -) - -api_proto_library_internal( - name = "metrics_service", - srcs = ["metrics_service.proto"], - visibility = [ - "//envoy/config/bootstrap/v2:__pkg__", - ], - deps = [ - "//envoy/api/v2/core:grpc_service", - ], -) - -api_proto_library_internal( - name = "stats", - srcs = ["stats.proto"], - visibility = [ - "//envoy/config/bootstrap/v2:__pkg__", - ], - deps = [ - "//envoy/api/v2/core:address", - "//envoy/type/matcher:string", + "//envoy/api/v2/core:pkg", + "//envoy/type/matcher:pkg", ], ) diff --git a/api/envoy/config/metrics/v3alpha/BUILD b/api/envoy/config/metrics/v3alpha/BUILD index 399ec444208d..78fef75c6902 100644 --- a/api/envoy/config/metrics/v3alpha/BUILD +++ b/api/envoy/config/metrics/v3alpha/BUILD @@ -1,33 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha/core", - "//envoy/type/matcher", - ], -) - -api_proto_library_internal( - name = "metrics_service", - srcs = ["metrics_service.proto"], - visibility = [ - "//envoy/config/bootstrap/v3alpha:__pkg__", - ], - deps = [ - "//envoy/api/v3alpha/core:grpc_service", - ], -) - -api_proto_library_internal( - name = "stats", - srcs = ["stats.proto"], - visibility = [ - "//envoy/config/bootstrap/v3alpha:__pkg__", - ], - deps = [ - "//envoy/api/v3alpha/core:address", - "//envoy/type/matcher:string", + "//envoy/api/v3alpha/core:pkg", + "//envoy/type/matcher:pkg", ], ) diff --git a/api/envoy/config/overload/v2alpha/BUILD b/api/envoy/config/overload/v2alpha/BUILD index e247848d07a9..5c06e2deae7d 100644 --- a/api/envoy/config/overload/v2alpha/BUILD +++ b/api/envoy/config/overload/v2alpha/BUILD @@ -1,11 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "overload", - srcs = ["overload.proto"], - visibility = ["//visibility:public"], -) diff --git a/api/envoy/config/overload/v3alpha/BUILD b/api/envoy/config/overload/v3alpha/BUILD index e247848d07a9..5c06e2deae7d 100644 --- a/api/envoy/config/overload/v3alpha/BUILD +++ b/api/envoy/config/overload/v3alpha/BUILD @@ -1,11 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "overload", - srcs = ["overload.proto"], - visibility = ["//visibility:public"], -) diff --git a/api/envoy/config/ratelimit/v2/BUILD b/api/envoy/config/ratelimit/v2/BUILD index 432f4b9592d3..3de140ccc4f1 100644 --- a/api/envoy/config/ratelimit/v2/BUILD +++ b/api/envoy/config/ratelimit/v2/BUILD @@ -1,16 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v2/core"], -) - -api_proto_library_internal( - name = "rls", - srcs = ["rls.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v2/core:grpc_service", - ], + deps = ["//envoy/api/v2/core:pkg"], ) diff --git a/api/envoy/config/ratelimit/v3alpha/BUILD b/api/envoy/config/ratelimit/v3alpha/BUILD index 1d009164ba64..beef440f471b 100644 --- a/api/envoy/config/ratelimit/v3alpha/BUILD +++ b/api/envoy/config/ratelimit/v3alpha/BUILD @@ -1,16 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v3alpha/core"], -) - -api_proto_library_internal( - name = "rls", - srcs = ["rls.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v3alpha/core:grpc_service", - ], + deps = ["//envoy/api/v3alpha/core:pkg"], ) diff --git a/api/envoy/config/rbac/v2/BUILD b/api/envoy/config/rbac/v2/BUILD index 18b1bb24f29d..86f85fcd7b6d 100644 --- a/api/envoy/config/rbac/v2/BUILD +++ b/api/envoy/config/rbac/v2/BUILD @@ -1,33 +1,12 @@ licenses(["notice"]) # Apache 2 -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") api_proto_package( deps = [ - "//envoy/api/v2/core", + "//envoy/api/v2/core:pkg", "//envoy/api/v2/route:pkg", - "//envoy/type/matcher", + "//envoy/type/matcher:pkg", "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto", ], ) - -api_proto_library_internal( - name = "rbac", - srcs = ["rbac.proto"], - external_cc_proto_deps = [ - "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto", - ], - external_proto_deps = [ - "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto", - ], - external_py_proto_deps = [ - "@com_google_googleapis//google/api/expr/v1alpha1:syntax_py_proto", - ], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v2/core:address", - "//envoy/api/v2/route", - "//envoy/type/matcher:metadata", - "//envoy/type/matcher:string", - ], -) diff --git a/api/envoy/config/rbac/v3alpha/BUILD b/api/envoy/config/rbac/v3alpha/BUILD index 60200f034ea1..f2158efb3238 100644 --- a/api/envoy/config/rbac/v3alpha/BUILD +++ b/api/envoy/config/rbac/v3alpha/BUILD @@ -1,33 +1,12 @@ licenses(["notice"]) # Apache 2 -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") api_proto_package( deps = [ - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/core:pkg", "//envoy/api/v3alpha/route:pkg", - "//envoy/type/matcher", + "//envoy/type/matcher:pkg", "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto", ], ) - -api_proto_library_internal( - name = "rbac", - srcs = ["rbac.proto"], - external_cc_proto_deps = [ - "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto", - ], - external_proto_deps = [ - "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto", - ], - external_py_proto_deps = [ - "@com_google_googleapis//google/api/expr/v1alpha1:syntax_py_proto", - ], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v3alpha/core:address", - "//envoy/api/v3alpha/route", - "//envoy/type/matcher:metadata", - "//envoy/type/matcher:string", - ], -) diff --git a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD index a5003e219c8a..5c06e2deae7d 100644 --- a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD +++ b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD @@ -1,11 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "fixed_heap", - srcs = ["fixed_heap.proto"], - visibility = ["//visibility:public"], -) diff --git a/api/envoy/config/resource_monitor/fixed_heap/v3alpha/BUILD b/api/envoy/config/resource_monitor/fixed_heap/v3alpha/BUILD index a5003e219c8a..5c06e2deae7d 100644 --- a/api/envoy/config/resource_monitor/fixed_heap/v3alpha/BUILD +++ b/api/envoy/config/resource_monitor/fixed_heap/v3alpha/BUILD @@ -1,11 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "fixed_heap", - srcs = ["fixed_heap.proto"], - visibility = ["//visibility:public"], -) diff --git a/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD b/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD index 3a1764216b00..5c06e2deae7d 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD +++ b/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD @@ -1,11 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "injected_resource", - srcs = ["injected_resource.proto"], - visibility = ["//visibility:public"], -) diff --git a/api/envoy/config/resource_monitor/injected_resource/v3alpha/BUILD b/api/envoy/config/resource_monitor/injected_resource/v3alpha/BUILD index 3a1764216b00..5c06e2deae7d 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v3alpha/BUILD +++ b/api/envoy/config/resource_monitor/injected_resource/v3alpha/BUILD @@ -1,11 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library_internal( - name = "injected_resource", - srcs = ["injected_resource.proto"], - visibility = ["//visibility:public"], -) diff --git a/api/envoy/config/retry/previous_priorities/BUILD b/api/envoy/config/retry/previous_priorities/BUILD index 8140346d4747..18018b36b083 100644 --- a/api/envoy/config/retry/previous_priorities/BUILD +++ b/api/envoy/config/retry/previous_priorities/BUILD @@ -1,15 +1,7 @@ licenses(["notice"]) # Apache 2 -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") api_proto_package( - deps = ["//envoy/api/v2/core"], -) - -api_proto_library_internal( - name = "previous_priorities", - srcs = ["previous_priorities_config.proto"], - deps = [ - "//envoy/api/v2/core:base", - ], + deps = ["//envoy/api/v2/core:pkg"], ) diff --git a/api/envoy/config/trace/v2/BUILD b/api/envoy/config/trace/v2/BUILD index f894a5289fd5..5ddeb278c344 100644 --- a/api/envoy/config/trace/v2/BUILD +++ b/api/envoy/config/trace/v2/BUILD @@ -1,22 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/core", - "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto", - ], -) - -api_proto_library_internal( - name = "trace", - srcs = ["trace.proto"], - visibility = [ - "//envoy/config/bootstrap/v2:__pkg__", - ], - deps = [ - "//envoy/api/v2/core:grpc_service", + "//envoy/api/v2/core:pkg", "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto", ], ) diff --git a/api/envoy/config/trace/v3alpha/BUILD b/api/envoy/config/trace/v3alpha/BUILD index 97014ca68f6f..6d55ec0106b2 100644 --- a/api/envoy/config/trace/v3alpha/BUILD +++ b/api/envoy/config/trace/v3alpha/BUILD @@ -1,22 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha/core", - "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto", - ], -) - -api_proto_library_internal( - name = "trace", - srcs = ["trace.proto"], - visibility = [ - "//envoy/config/bootstrap/v3alpha:__pkg__", - ], - deps = [ - "//envoy/api/v3alpha/core:grpc_service", + "//envoy/api/v3alpha/core:pkg", "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto", ], ) diff --git a/api/envoy/config/transport_socket/alts/v2alpha/BUILD b/api/envoy/config/transport_socket/alts/v2alpha/BUILD index eb247ae14b04..3de140ccc4f1 100644 --- a/api/envoy/config/transport_socket/alts/v2alpha/BUILD +++ b/api/envoy/config/transport_socket/alts/v2alpha/BUILD @@ -1,15 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v2/core"], -) - -api_proto_library( - name = "alts", - srcs = ["alts.proto"], - deps = [ - "//envoy/api/v2/core:base", - ], + deps = ["//envoy/api/v2/core:pkg"], ) diff --git a/api/envoy/config/transport_socket/alts/v3alpha/BUILD b/api/envoy/config/transport_socket/alts/v3alpha/BUILD index 4e6642283e3a..beef440f471b 100644 --- a/api/envoy/config/transport_socket/alts/v3alpha/BUILD +++ b/api/envoy/config/transport_socket/alts/v3alpha/BUILD @@ -1,15 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v3alpha/core"], -) - -api_proto_library( - name = "alts", - srcs = ["alts.proto"], - deps = [ - "//envoy/api/v3alpha/core:base", - ], + deps = ["//envoy/api/v3alpha/core:pkg"], ) diff --git a/api/envoy/config/transport_socket/tap/v2alpha/BUILD b/api/envoy/config/transport_socket/tap/v2alpha/BUILD index e18d4fc1c128..fda31203f4f3 100644 --- a/api/envoy/config/transport_socket/tap/v2alpha/BUILD +++ b/api/envoy/config/transport_socket/tap/v2alpha/BUILD @@ -1,19 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/core", + "//envoy/api/v2/core:pkg", "//envoy/config/common/tap/v2alpha:pkg", ], ) - -api_proto_library_internal( - name = "tap", - srcs = ["tap.proto"], - deps = [ - "//envoy/api/v2/core:base", - "//envoy/config/common/tap/v2alpha:common", - ], -) diff --git a/api/envoy/config/transport_socket/tap/v3alpha/BUILD b/api/envoy/config/transport_socket/tap/v3alpha/BUILD index 0f24cca4c1a1..a4d3c2afa04f 100644 --- a/api/envoy/config/transport_socket/tap/v3alpha/BUILD +++ b/api/envoy/config/transport_socket/tap/v3alpha/BUILD @@ -1,19 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/core:pkg", "//envoy/config/common/tap/v3alpha:pkg", ], ) - -api_proto_library_internal( - name = "tap", - srcs = ["tap.proto"], - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/config/common/tap/v3alpha:common", - ], -) diff --git a/api/envoy/data/accesslog/v2/BUILD b/api/envoy/data/accesslog/v2/BUILD index 22c4c45ee847..3de140ccc4f1 100644 --- a/api/envoy/data/accesslog/v2/BUILD +++ b/api/envoy/data/accesslog/v2/BUILD @@ -1,19 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v2/core"], -) - -api_proto_library_internal( - name = "accesslog", - srcs = ["accesslog.proto"], - visibility = [ - "//envoy/service/accesslog/v2:__pkg__", - ], - deps = [ - "//envoy/api/v2/core:address", - "//envoy/api/v2/core:base", - ], + deps = ["//envoy/api/v2/core:pkg"], ) diff --git a/api/envoy/data/accesslog/v3alpha/BUILD b/api/envoy/data/accesslog/v3alpha/BUILD index e1fafc00343b..beef440f471b 100644 --- a/api/envoy/data/accesslog/v3alpha/BUILD +++ b/api/envoy/data/accesslog/v3alpha/BUILD @@ -1,19 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v3alpha/core"], -) - -api_proto_library_internal( - name = "accesslog", - srcs = ["accesslog.proto"], - visibility = [ - "//envoy/service/accesslog/v3alpha:__pkg__", - ], - deps = [ - "//envoy/api/v3alpha/core:address", - "//envoy/api/v3alpha/core:base", - ], + deps = ["//envoy/api/v3alpha/core:pkg"], ) diff --git a/api/envoy/data/cluster/v2alpha/BUILD b/api/envoy/data/cluster/v2alpha/BUILD index 4d921f4d97ac..5c06e2deae7d 100644 --- a/api/envoy/data/cluster/v2alpha/BUILD +++ b/api/envoy/data/cluster/v2alpha/BUILD @@ -1,13 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library( - name = "outlier_detection_event", - srcs = ["outlier_detection_event.proto"], - visibility = [ - "//visibility:public", - ], -) diff --git a/api/envoy/data/cluster/v3alpha/BUILD b/api/envoy/data/cluster/v3alpha/BUILD index 4d921f4d97ac..5c06e2deae7d 100644 --- a/api/envoy/data/cluster/v3alpha/BUILD +++ b/api/envoy/data/cluster/v3alpha/BUILD @@ -1,13 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package() - -api_proto_library( - name = "outlier_detection_event", - srcs = ["outlier_detection_event.proto"], - visibility = [ - "//visibility:public", - ], -) diff --git a/api/envoy/data/core/v2alpha/BUILD b/api/envoy/data/core/v2alpha/BUILD index 331032348388..3de140ccc4f1 100644 --- a/api/envoy/data/core/v2alpha/BUILD +++ b/api/envoy/data/core/v2alpha/BUILD @@ -1,19 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v2/core"], -) - -api_proto_library( - name = "health_check_event", - srcs = ["health_check_event.proto"], - visibility = [ - "//visibility:public", - ], - deps = [ - "//envoy/api/v2/core:address", - "//envoy/api/v2/core:base", - ], + deps = ["//envoy/api/v2/core:pkg"], ) diff --git a/api/envoy/data/core/v3alpha/BUILD b/api/envoy/data/core/v3alpha/BUILD index 6c44f3e4d79e..beef440f471b 100644 --- a/api/envoy/data/core/v3alpha/BUILD +++ b/api/envoy/data/core/v3alpha/BUILD @@ -1,19 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v3alpha/core"], -) - -api_proto_library( - name = "health_check_event", - srcs = ["health_check_event.proto"], - visibility = [ - "//visibility:public", - ], - deps = [ - "//envoy/api/v3alpha/core:address", - "//envoy/api/v3alpha/core:base", - ], + deps = ["//envoy/api/v3alpha/core:pkg"], ) diff --git a/api/envoy/data/tap/v2alpha/BUILD b/api/envoy/data/tap/v2alpha/BUILD index bf108c4792a1..3de140ccc4f1 100644 --- a/api/envoy/data/tap/v2alpha/BUILD +++ b/api/envoy/data/tap/v2alpha/BUILD @@ -1,41 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v2/core"], -) - -api_proto_library_internal( - name = "common", - srcs = ["common.proto"], -) - -api_proto_library_internal( - name = "transport", - srcs = ["transport.proto"], - deps = [ - ":common", - "//envoy/api/v2/core:address", - ], -) - -api_proto_library_internal( - name = "http", - srcs = ["http.proto"], - deps = [ - ":common", - "//envoy/api/v2/core:base", - ], -) - -api_proto_library_internal( - name = "wrapper", - srcs = ["wrapper.proto"], - visibility = ["//visibility:public"], - deps = [ - ":http", - ":transport", - "//envoy/api/v2/core:address", - ], + deps = ["//envoy/api/v2/core:pkg"], ) diff --git a/api/envoy/data/tap/v3alpha/BUILD b/api/envoy/data/tap/v3alpha/BUILD index 33d151e333a9..beef440f471b 100644 --- a/api/envoy/data/tap/v3alpha/BUILD +++ b/api/envoy/data/tap/v3alpha/BUILD @@ -1,41 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = ["//envoy/api/v3alpha/core"], -) - -api_proto_library_internal( - name = "common", - srcs = ["common.proto"], -) - -api_proto_library_internal( - name = "transport", - srcs = ["transport.proto"], - deps = [ - ":common", - "//envoy/api/v3alpha/core:address", - ], -) - -api_proto_library_internal( - name = "http", - srcs = ["http.proto"], - deps = [ - ":common", - "//envoy/api/v3alpha/core:base", - ], -) - -api_proto_library_internal( - name = "wrapper", - srcs = ["wrapper.proto"], - visibility = ["//visibility:public"], - deps = [ - ":http", - ":transport", - "//envoy/api/v3alpha/core:address", - ], + deps = ["//envoy/api/v3alpha/core:pkg"], ) diff --git a/api/envoy/service/accesslog/v2/BUILD b/api/envoy/service/accesslog/v2/BUILD index d4f7c300361e..e5af3f815a0c 100644 --- a/api/envoy/service/accesslog/v2/BUILD +++ b/api/envoy/service/accesslog/v2/BUILD @@ -1,22 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v2/core", + "//envoy/api/v2/core:pkg", "//envoy/data/accesslog/v2:pkg", ], ) - -api_proto_library_internal( - name = "als", - srcs = ["als.proto"], - has_services = 1, - deps = [ - "//envoy/api/v2/core:base", - "//envoy/api/v2/core:grpc_service", - "//envoy/data/accesslog/v2:accesslog", - ], -) diff --git a/api/envoy/service/accesslog/v3alpha/BUILD b/api/envoy/service/accesslog/v3alpha/BUILD index 0bb8716b82ab..1ed52fb6531e 100644 --- a/api/envoy/service/accesslog/v3alpha/BUILD +++ b/api/envoy/service/accesslog/v3alpha/BUILD @@ -1,22 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/core:pkg", "//envoy/data/accesslog/v3alpha:pkg", ], ) - -api_proto_library_internal( - name = "als", - srcs = ["als.proto"], - has_services = 1, - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/core:grpc_service", - "//envoy/data/accesslog/v3alpha:accesslog", - ], -) diff --git a/api/envoy/service/auth/v2/BUILD b/api/envoy/service/auth/v2/BUILD index 91a4eeebbf13..10b60f7db65d 100644 --- a/api/envoy/service/auth/v2/BUILD +++ b/api/envoy/service/auth/v2/BUILD @@ -1,36 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v2/core", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "attribute_context", - srcs = [ - "attribute_context.proto", - ], - deps = [ - "//envoy/api/v2/core:address", - "//envoy/api/v2/core:base", - ], -) - -api_proto_library_internal( - name = "external_auth", - srcs = [ - "external_auth.proto", - ], - has_services = 1, - visibility = ["//visibility:public"], - deps = [ - ":attribute_context", - "//envoy/api/v2/core:base", - "//envoy/type:http_status", + "//envoy/api/v2/core:pkg", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/service/auth/v2alpha/BUILD b/api/envoy/service/auth/v2alpha/BUILD index 1940f4f2f885..0f69d4ab9c70 100644 --- a/api/envoy/service/auth/v2alpha/BUILD +++ b/api/envoy/service/auth/v2alpha/BUILD @@ -1,4 +1,4 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 @@ -8,12 +8,3 @@ api_proto_package( "//envoy/service/auth/v2:pkg", ], ) - -api_proto_library_internal( - name = "external_auth", - srcs = [ - "external_auth.proto", - ], - has_services = 1, - deps = ["//envoy/service/auth/v2:external_auth"], -) diff --git a/api/envoy/service/auth/v3alpha/BUILD b/api/envoy/service/auth/v3alpha/BUILD index f6a70cb5b9bd..00fd83344d5c 100644 --- a/api/envoy/service/auth/v3alpha/BUILD +++ b/api/envoy/service/auth/v3alpha/BUILD @@ -1,36 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v3alpha/core", - "//envoy/type", - ], -) - -api_proto_library_internal( - name = "attribute_context", - srcs = [ - "attribute_context.proto", - ], - deps = [ - "//envoy/api/v3alpha/core:address", - "//envoy/api/v3alpha/core:base", - ], -) - -api_proto_library_internal( - name = "external_auth", - srcs = [ - "external_auth.proto", - ], - has_services = 1, - visibility = ["//visibility:public"], - deps = [ - ":attribute_context", - "//envoy/api/v3alpha/core:base", - "//envoy/type:http_status", + "//envoy/api/v3alpha/core:pkg", + "//envoy/type:pkg", ], ) diff --git a/api/envoy/service/discovery/v2/BUILD b/api/envoy/service/discovery/v2/BUILD index 13db2701c2a5..ea65e0f352fd 100644 --- a/api/envoy/service/discovery/v2/BUILD +++ b/api/envoy/service/discovery/v2/BUILD @@ -1,50 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v2", - "//envoy/api/v2/core", + "//envoy/api/v2:pkg", + "//envoy/api/v2/core:pkg", "//envoy/api/v2/endpoint:pkg", ], ) - -api_proto_library_internal( - name = "ads", - srcs = ["ads.proto"], - has_services = 1, - deps = [ - "//envoy/api/v2:discovery", - ], -) - -api_proto_library_internal( - name = "hds", - srcs = ["hds.proto"], - has_services = 1, - deps = [ - "//envoy/api/v2/core:base", - "//envoy/api/v2/core:health_check", - "//envoy/api/v2/endpoint", - ], -) - -api_proto_library_internal( - name = "sds", - srcs = ["sds.proto"], - has_services = 1, - deps = [ - "//envoy/api/v2:discovery", - ], -) - -api_proto_library_internal( - name = "rtds", - srcs = ["rtds.proto"], - has_services = 1, - deps = [ - "//envoy/api/v2:discovery", - ], -) diff --git a/api/envoy/service/discovery/v2/hds.proto b/api/envoy/service/discovery/v2/hds.proto index d1136831229d..fe96f06a8977 100644 --- a/api/envoy/service/discovery/v2/hds.proto +++ b/api/envoy/service/discovery/v2/hds.proto @@ -5,7 +5,6 @@ package envoy.service.discovery.v2; option java_outer_classname = "HdsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.discovery.v2"; - option java_generic_services = true; import "envoy/api/v2/core/base.proto"; @@ -80,17 +79,20 @@ message Capability { TCP = 1; REDIS = 2; } + repeated Protocol health_check_protocols = 1; } message HealthCheckRequest { - envoy.api.v2.core.Node node = 1; + api.v2.core.Node node = 1; + Capability capability = 2; } message EndpointHealth { - envoy.api.v2.endpoint.Endpoint endpoint = 1; - envoy.api.v2.core.HealthStatus health_status = 2; + api.v2.endpoint.Endpoint endpoint = 1; + + api.v2.core.HealthStatus health_status = 2; } message EndpointHealthResponse { @@ -100,13 +102,15 @@ message EndpointHealthResponse { message HealthCheckRequestOrEndpointHealthResponse { oneof request_type { HealthCheckRequest health_check_request = 1; + EndpointHealthResponse endpoint_health_response = 2; } } message LocalityEndpoints { - envoy.api.v2.core.Locality locality = 1; - repeated envoy.api.v2.endpoint.Endpoint endpoints = 2; + api.v2.core.Locality locality = 1; + + repeated api.v2.endpoint.Endpoint endpoints = 2; } // The cluster name and locality is provided to Envoy for the endpoints that it @@ -115,12 +119,15 @@ message LocalityEndpoints { // same cluster structure as that provided by EDS. message ClusterHealthCheck { string cluster_name = 1; - repeated envoy.api.v2.core.HealthCheck health_checks = 2; + + repeated api.v2.core.HealthCheck health_checks = 2; + repeated LocalityEndpoints locality_endpoints = 3; } message HealthCheckSpecifier { repeated ClusterHealthCheck cluster_health_checks = 1; + // The default is 1 second. google.protobuf.Duration interval = 2; } diff --git a/api/envoy/service/discovery/v2/sds.proto b/api/envoy/service/discovery/v2/sds.proto index 7e9ae261a369..3a61947ed2bb 100644 --- a/api/envoy/service/discovery/v2/sds.proto +++ b/api/envoy/service/discovery/v2/sds.proto @@ -5,29 +5,29 @@ package envoy.service.discovery.v2; option java_outer_classname = "SdsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.discovery.v2"; +option java_generic_services = true; import "envoy/api/v2/discovery.proto"; import "google/api/annotations.proto"; -// [#not-implemented-hide:] Not configuration. Workaround c++ protobuf issue with importing -// services: https://github.com/google/protobuf/issues/4221 -message SdsDummy { -} - service SecretDiscoveryService { - rpc DeltaSecrets(stream envoy.api.v2.DeltaDiscoveryRequest) - returns (stream envoy.api.v2.DeltaDiscoveryResponse) { + rpc DeltaSecrets(stream api.v2.DeltaDiscoveryRequest) + returns (stream api.v2.DeltaDiscoveryResponse) { } - rpc StreamSecrets(stream envoy.api.v2.DiscoveryRequest) - returns (stream envoy.api.v2.DiscoveryResponse) { + rpc StreamSecrets(stream api.v2.DiscoveryRequest) returns (stream api.v2.DiscoveryResponse) { } - rpc FetchSecrets(envoy.api.v2.DiscoveryRequest) returns (envoy.api.v2.DiscoveryResponse) { + rpc FetchSecrets(api.v2.DiscoveryRequest) returns (api.v2.DiscoveryResponse) { option (google.api.http) = { post: "/v2/discovery:secrets" body: "*" }; } } + +// [#not-implemented-hide:] Not configuration. Workaround c++ protobuf issue with importing +// services: https://github.com/google/protobuf/issues/4221 +message SdsDummy { +} diff --git a/api/envoy/service/discovery/v3alpha/BUILD b/api/envoy/service/discovery/v3alpha/BUILD index 138186e6ea05..d8c2fd47d938 100644 --- a/api/envoy/service/discovery/v3alpha/BUILD +++ b/api/envoy/service/discovery/v3alpha/BUILD @@ -1,50 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v3alpha", - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha:pkg", + "//envoy/api/v3alpha/core:pkg", "//envoy/api/v3alpha/endpoint:pkg", ], ) - -api_proto_library_internal( - name = "ads", - srcs = ["ads.proto"], - has_services = 1, - deps = [ - "//envoy/api/v3alpha:discovery", - ], -) - -api_proto_library_internal( - name = "hds", - srcs = ["hds.proto"], - has_services = 1, - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/core:health_check", - "//envoy/api/v3alpha/endpoint", - ], -) - -api_proto_library_internal( - name = "sds", - srcs = ["sds.proto"], - has_services = 1, - deps = [ - "//envoy/api/v3alpha:discovery", - ], -) - -api_proto_library_internal( - name = "rtds", - srcs = ["rtds.proto"], - has_services = 1, - deps = [ - "//envoy/api/v3alpha:discovery", - ], -) diff --git a/api/envoy/service/discovery/v3alpha/hds.proto b/api/envoy/service/discovery/v3alpha/hds.proto index 31c0cc77d588..242ae6f36b5f 100644 --- a/api/envoy/service/discovery/v3alpha/hds.proto +++ b/api/envoy/service/discovery/v3alpha/hds.proto @@ -5,7 +5,6 @@ package envoy.service.discovery.v3alpha; option java_outer_classname = "HdsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.discovery.v3alpha"; - option java_generic_services = true; import "envoy/api/v3alpha/core/base.proto"; @@ -80,17 +79,20 @@ message Capability { TCP = 1; REDIS = 2; } + repeated Protocol health_check_protocols = 1; } message HealthCheckRequest { - envoy.api.v3alpha.core.Node node = 1; + api.v3alpha.core.Node node = 1; + Capability capability = 2; } message EndpointHealth { - envoy.api.v3alpha.endpoint.Endpoint endpoint = 1; - envoy.api.v3alpha.core.HealthStatus health_status = 2; + api.v3alpha.endpoint.Endpoint endpoint = 1; + + api.v3alpha.core.HealthStatus health_status = 2; } message EndpointHealthResponse { @@ -100,13 +102,15 @@ message EndpointHealthResponse { message HealthCheckRequestOrEndpointHealthResponse { oneof request_type { HealthCheckRequest health_check_request = 1; + EndpointHealthResponse endpoint_health_response = 2; } } message LocalityEndpoints { - envoy.api.v3alpha.core.Locality locality = 1; - repeated envoy.api.v3alpha.endpoint.Endpoint endpoints = 2; + api.v3alpha.core.Locality locality = 1; + + repeated api.v3alpha.endpoint.Endpoint endpoints = 2; } // The cluster name and locality is provided to Envoy for the endpoints that it @@ -115,12 +119,15 @@ message LocalityEndpoints { // same cluster structure as that provided by EDS. message ClusterHealthCheck { string cluster_name = 1; - repeated envoy.api.v3alpha.core.HealthCheck health_checks = 2; + + repeated api.v3alpha.core.HealthCheck health_checks = 2; + repeated LocalityEndpoints locality_endpoints = 3; } message HealthCheckSpecifier { repeated ClusterHealthCheck cluster_health_checks = 1; + // The default is 1 second. google.protobuf.Duration interval = 2; } diff --git a/api/envoy/service/discovery/v3alpha/sds.proto b/api/envoy/service/discovery/v3alpha/sds.proto index 814edd07196d..df3dee17d867 100644 --- a/api/envoy/service/discovery/v3alpha/sds.proto +++ b/api/envoy/service/discovery/v3alpha/sds.proto @@ -5,30 +5,30 @@ package envoy.service.discovery.v3alpha; option java_outer_classname = "SdsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.discovery.v3alpha"; +option java_generic_services = true; import "envoy/api/v3alpha/discovery.proto"; import "google/api/annotations.proto"; -// [#not-implemented-hide:] Not configuration. Workaround c++ protobuf issue with importing -// services: https://github.com/google/protobuf/issues/4221 -message SdsDummy { -} - service SecretDiscoveryService { - rpc DeltaSecrets(stream envoy.api.v3alpha.DeltaDiscoveryRequest) - returns (stream envoy.api.v3alpha.DeltaDiscoveryResponse) { + rpc DeltaSecrets(stream api.v3alpha.DeltaDiscoveryRequest) + returns (stream api.v3alpha.DeltaDiscoveryResponse) { } - rpc StreamSecrets(stream envoy.api.v3alpha.DiscoveryRequest) - returns (stream envoy.api.v3alpha.DiscoveryResponse) { + rpc StreamSecrets(stream api.v3alpha.DiscoveryRequest) + returns (stream api.v3alpha.DiscoveryResponse) { } - rpc FetchSecrets(envoy.api.v3alpha.DiscoveryRequest) - returns (envoy.api.v3alpha.DiscoveryResponse) { + rpc FetchSecrets(api.v3alpha.DiscoveryRequest) returns (api.v3alpha.DiscoveryResponse) { option (google.api.http) = { post: "/v3alpha/discovery:secrets" body: "*" }; } } + +// [#not-implemented-hide:] Not configuration. Workaround c++ protobuf issue with importing +// services: https://github.com/google/protobuf/issues/4221 +message SdsDummy { +} diff --git a/api/envoy/service/load_stats/v2/BUILD b/api/envoy/service/load_stats/v2/BUILD index af07d8aa101c..8c5341e39cae 100644 --- a/api/envoy/service/load_stats/v2/BUILD +++ b/api/envoy/service/load_stats/v2/BUILD @@ -1,21 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v2/core", + "//envoy/api/v2/core:pkg", "//envoy/api/v2/endpoint:pkg", ], ) - -api_proto_library_internal( - name = "lrs", - srcs = ["lrs.proto"], - has_services = 1, - deps = [ - "//envoy/api/v2/core:base", - "//envoy/api/v2/endpoint:load_report", - ], -) diff --git a/api/envoy/service/load_stats/v3alpha/BUILD b/api/envoy/service/load_stats/v3alpha/BUILD index bc4ff2642c6d..d79852d1b08b 100644 --- a/api/envoy/service/load_stats/v3alpha/BUILD +++ b/api/envoy/service/load_stats/v3alpha/BUILD @@ -1,21 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/core:pkg", "//envoy/api/v3alpha/endpoint:pkg", ], ) - -api_proto_library_internal( - name = "lrs", - srcs = ["lrs.proto"], - has_services = 1, - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/endpoint:load_report", - ], -) diff --git a/api/envoy/service/metrics/v2/BUILD b/api/envoy/service/metrics/v2/BUILD index b2ff6a4cdac1..c139c4ec739c 100644 --- a/api/envoy/service/metrics/v2/BUILD +++ b/api/envoy/service/metrics/v2/BUILD @@ -1,23 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v2/core", - "@prometheus_metrics_model//:client_model", - ], -) - -api_proto_library_internal( - name = "metrics_service", - srcs = ["metrics_service.proto"], - has_services = 0, - require_py = 0, - deps = [ - "//envoy/api/v2/core:base", - "//envoy/api/v2/core:grpc_service", + "//envoy/api/v2/core:pkg", "@prometheus_metrics_model//:client_model", ], ) diff --git a/api/envoy/service/metrics/v3alpha/BUILD b/api/envoy/service/metrics/v3alpha/BUILD index 2a4076611e5b..880fcc7cecc9 100644 --- a/api/envoy/service/metrics/v3alpha/BUILD +++ b/api/envoy/service/metrics/v3alpha/BUILD @@ -1,23 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v3alpha/core", - "@prometheus_metrics_model//:client_model", - ], -) - -api_proto_library_internal( - name = "metrics_service", - srcs = ["metrics_service.proto"], - has_services = 0, - require_py = 0, - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/core:grpc_service", + "//envoy/api/v3alpha/core:pkg", "@prometheus_metrics_model//:client_model", ], ) diff --git a/api/envoy/service/ratelimit/v2/BUILD b/api/envoy/service/ratelimit/v2/BUILD index 7bc5db7113e7..02a06c008b6c 100644 --- a/api/envoy/service/ratelimit/v2/BUILD +++ b/api/envoy/service/ratelimit/v2/BUILD @@ -1,22 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v2/core", + "//envoy/api/v2/core:pkg", "//envoy/api/v2/ratelimit:pkg", ], ) - -api_proto_library_internal( - name = "rls", - srcs = ["rls.proto"], - has_services = 1, - deps = [ - "//envoy/api/v2/core:base", - "//envoy/api/v2/core:grpc_service", - "//envoy/api/v2/ratelimit", - ], -) diff --git a/api/envoy/service/ratelimit/v3alpha/BUILD b/api/envoy/service/ratelimit/v3alpha/BUILD index 965458beaec6..70166c1a74df 100644 --- a/api/envoy/service/ratelimit/v3alpha/BUILD +++ b/api/envoy/service/ratelimit/v3alpha/BUILD @@ -1,22 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/core:pkg", "//envoy/api/v3alpha/ratelimit:pkg", ], ) - -api_proto_library_internal( - name = "rls", - srcs = ["rls.proto"], - has_services = 1, - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/core:grpc_service", - "//envoy/api/v3alpha/ratelimit", - ], -) diff --git a/api/envoy/service/tap/v2alpha/BUILD b/api/envoy/service/tap/v2alpha/BUILD index 621bf208d495..dd6458c088f9 100644 --- a/api/envoy/service/tap/v2alpha/BUILD +++ b/api/envoy/service/tap/v2alpha/BUILD @@ -1,46 +1,13 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v2", - "//envoy/api/v2/core", + "//envoy/api/v2:pkg", + "//envoy/api/v2/core:pkg", "//envoy/api/v2/route:pkg", "//envoy/data/tap/v2alpha:pkg", ], ) - -api_proto_library_internal( - name = "common", - srcs = ["common.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v2/core:base", - "//envoy/api/v2/core:grpc_service", - "//envoy/api/v2/route", - ], -) - -api_proto_library_internal( - name = "tap", - srcs = ["tap.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v2:discovery", - "//envoy/api/v2/core:base", - "//envoy/data/tap/v2alpha:wrapper", - ], -) - -api_proto_library_internal( - name = "tapds", - srcs = ["tapds.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v2:discovery", - "//envoy/api/v2/core:base", - "//envoy/service/tap/v2alpha:common", - ], -) diff --git a/api/envoy/service/tap/v2alpha/tap.proto b/api/envoy/service/tap/v2alpha/tap.proto index 9dccbb314bab..8294f254d224 100644 --- a/api/envoy/service/tap/v2alpha/tap.proto +++ b/api/envoy/service/tap/v2alpha/tap.proto @@ -1,24 +1,36 @@ syntax = "proto3"; -import "envoy/api/v2/core/base.proto"; -import "envoy/data/tap/v2alpha/wrapper.proto"; - package envoy.service.tap.v2alpha; -import "validate/validate.proto"; - option java_outer_classname = "TapProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.tap.v2alpha"; +option java_generic_services = true; + +import "envoy/api/v2/core/base.proto"; +import "envoy/data/tap/v2alpha/wrapper.proto"; + +import "validate/validate.proto"; // [#protodoc-title: Tap Sink Service] +// [#not-implemented-hide:] A tap service to receive incoming taps. Envoy will call +// StreamTaps to deliver captured taps to the server +service TapSinkService { + // Envoy will connect and send StreamTapsRequest messages forever. It does not expect any + // response to be sent as nothing would be done in the case of failure. The server should + // disconnect if it expects Envoy to reconnect. + rpc StreamTaps(stream StreamTapsRequest) returns (StreamTapsResponse) { + } +} + // [#not-implemented-hide:] Stream message for the Tap API. Envoy will open a stream to the server // and stream taps without ever expecting a response. message StreamTapsRequest { message Identifier { // The node sending taps over the stream. - envoy.api.v2.core.Node node = 1 [(validate.rules).message.required = true]; + api.v2.core.Node node = 1 [(validate.rules).message = {required: true}]; + // The opaque identifier that was set in the :ref:`output config // `. string tap_id = 2; @@ -27,24 +39,15 @@ message StreamTapsRequest { // Identifier data effectively is a structured metadata. As a performance optimization this will // only be sent in the first message on the stream. Identifier identifier = 1; + // The trace id. this can be used to merge together a streaming trace. Note that the trace_id // is not guaranteed to be spatially or temporally unique. uint64 trace_id = 2; + // The trace data. - envoy.data.tap.v2alpha.TraceWrapper trace = 3; + data.tap.v2alpha.TraceWrapper trace = 3; } // [#not-implemented-hide:] message StreamTapsResponse { } - -// [#not-implemented-hide:] A tap service to receive incoming taps. Envoy will call -// StreamTaps to deliver captured taps to the server -service TapSinkService { - - // Envoy will connect and send StreamTapsRequest messages forever. It does not expect any - // response to be sent as nothing would be done in the case of failure. The server should - // disconnect if it expects Envoy to reconnect. - rpc StreamTaps(stream StreamTapsRequest) returns (StreamTapsResponse) { - } -} \ No newline at end of file diff --git a/api/envoy/service/tap/v2alpha/tapds.proto b/api/envoy/service/tap/v2alpha/tapds.proto index 2f61074ca131..246d9d17ae2d 100644 --- a/api/envoy/service/tap/v2alpha/tapds.proto +++ b/api/envoy/service/tap/v2alpha/tapds.proto @@ -1,30 +1,31 @@ syntax = "proto3"; +package envoy.service.tap.v2alpha; + +option java_outer_classname = "TapdsProto"; +option java_multiple_files = true; +option java_package = "io.envoyproxy.envoy.service.tap.v2alpha"; +option java_generic_services = true; + import "envoy/api/v2/discovery.proto"; import "envoy/service/tap/v2alpha/common.proto"; -import "validate/validate.proto"; - -package envoy.service.tap.v2alpha; import "google/api/annotations.proto"; -option java_outer_classname = "TapDsProto"; -option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.tap.v2alpha"; +import "validate/validate.proto"; // [#protodoc-title: Tap discovery service] // [#not-implemented-hide:] Tap discovery service. service TapDiscoveryService { - rpc StreamTapConfigs(stream envoy.api.v2.DiscoveryRequest) - returns (stream envoy.api.v2.DiscoveryResponse) { + rpc StreamTapConfigs(stream api.v2.DiscoveryRequest) returns (stream api.v2.DiscoveryResponse) { } - rpc DeltaTapConfigs(stream envoy.api.v2.DeltaDiscoveryRequest) - returns (stream envoy.api.v2.DeltaDiscoveryResponse) { + rpc DeltaTapConfigs(stream api.v2.DeltaDiscoveryRequest) + returns (stream api.v2.DeltaDiscoveryResponse) { } - rpc FetchTapConfigs(envoy.api.v2.DiscoveryRequest) returns (envoy.api.v2.DiscoveryResponse) { + rpc FetchTapConfigs(api.v2.DiscoveryRequest) returns (api.v2.DiscoveryResponse) { option (google.api.http) = { post: "/v2/discovery:tap_configs" body: "*" @@ -36,8 +37,8 @@ service TapDiscoveryService { // The filter TapDS config references this name. message TapResource { // The name of the tap configuration. - string name = 1 [(validate.rules).string.min_bytes = 1]; + string name = 1 [(validate.rules).string = {min_bytes: 1}]; // Tap config to apply TapConfig config = 2; -} \ No newline at end of file +} diff --git a/api/envoy/service/tap/v3alpha/BUILD b/api/envoy/service/tap/v3alpha/BUILD index 005ef96b61a0..82b1e661c579 100644 --- a/api/envoy/service/tap/v3alpha/BUILD +++ b/api/envoy/service/tap/v3alpha/BUILD @@ -1,46 +1,13 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v3alpha", - "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha:pkg", + "//envoy/api/v3alpha/core:pkg", "//envoy/api/v3alpha/route:pkg", "//envoy/data/tap/v3alpha:pkg", ], ) - -api_proto_library_internal( - name = "common", - srcs = ["common.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v3alpha/core:base", - "//envoy/api/v3alpha/core:grpc_service", - "//envoy/api/v3alpha/route", - ], -) - -api_proto_library_internal( - name = "tap", - srcs = ["tap.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v3alpha:discovery", - "//envoy/api/v3alpha/core:base", - "//envoy/data/tap/v3alpha:wrapper", - ], -) - -api_proto_library_internal( - name = "tapds", - srcs = ["tapds.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/api/v3alpha:discovery", - "//envoy/api/v3alpha/core:base", - "//envoy/service/tap/v3alpha:common", - ], -) diff --git a/api/envoy/service/tap/v3alpha/tap.proto b/api/envoy/service/tap/v3alpha/tap.proto index 1e69d421915c..b3808eb9aeca 100644 --- a/api/envoy/service/tap/v3alpha/tap.proto +++ b/api/envoy/service/tap/v3alpha/tap.proto @@ -1,24 +1,36 @@ syntax = "proto3"; -import "envoy/api/v3alpha/core/base.proto"; -import "envoy/data/tap/v3alpha/wrapper.proto"; - package envoy.service.tap.v3alpha; -import "validate/validate.proto"; - option java_outer_classname = "TapProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.tap.v3alpha"; +option java_generic_services = true; + +import "envoy/api/v3alpha/core/base.proto"; +import "envoy/data/tap/v3alpha/wrapper.proto"; + +import "validate/validate.proto"; // [#protodoc-title: Tap Sink Service] +// [#not-implemented-hide:] A tap service to receive incoming taps. Envoy will call +// StreamTaps to deliver captured taps to the server +service TapSinkService { + // Envoy will connect and send StreamTapsRequest messages forever. It does not expect any + // response to be sent as nothing would be done in the case of failure. The server should + // disconnect if it expects Envoy to reconnect. + rpc StreamTaps(stream StreamTapsRequest) returns (StreamTapsResponse) { + } +} + // [#not-implemented-hide:] Stream message for the Tap API. Envoy will open a stream to the server // and stream taps without ever expecting a response. message StreamTapsRequest { message Identifier { // The node sending taps over the stream. - envoy.api.v3alpha.core.Node node = 1 [(validate.rules).message.required = true]; + api.v3alpha.core.Node node = 1 [(validate.rules).message = {required: true}]; + // The opaque identifier that was set in the :ref:`output config // `. string tap_id = 2; @@ -27,24 +39,15 @@ message StreamTapsRequest { // Identifier data effectively is a structured metadata. As a performance optimization this will // only be sent in the first message on the stream. Identifier identifier = 1; + // The trace id. this can be used to merge together a streaming trace. Note that the trace_id // is not guaranteed to be spatially or temporally unique. uint64 trace_id = 2; + // The trace data. - envoy.data.tap.v3alpha.TraceWrapper trace = 3; + data.tap.v3alpha.TraceWrapper trace = 3; } // [#not-implemented-hide:] message StreamTapsResponse { } - -// [#not-implemented-hide:] A tap service to receive incoming taps. Envoy will call -// StreamTaps to deliver captured taps to the server -service TapSinkService { - - // Envoy will connect and send StreamTapsRequest messages forever. It does not expect any - // response to be sent as nothing would be done in the case of failure. The server should - // disconnect if it expects Envoy to reconnect. - rpc StreamTaps(stream StreamTapsRequest) returns (StreamTapsResponse) { - } -} \ No newline at end of file diff --git a/api/envoy/service/tap/v3alpha/tapds.proto b/api/envoy/service/tap/v3alpha/tapds.proto index 11eea61a1dc8..68d00b4f7892 100644 --- a/api/envoy/service/tap/v3alpha/tapds.proto +++ b/api/envoy/service/tap/v3alpha/tapds.proto @@ -1,31 +1,32 @@ syntax = "proto3"; +package envoy.service.tap.v3alpha; + +option java_outer_classname = "TapdsProto"; +option java_multiple_files = true; +option java_package = "io.envoyproxy.envoy.service.tap.v3alpha"; +option java_generic_services = true; + import "envoy/api/v3alpha/discovery.proto"; import "envoy/service/tap/v3alpha/common.proto"; -import "validate/validate.proto"; - -package envoy.service.tap.v3alpha; import "google/api/annotations.proto"; -option java_outer_classname = "TapDsProto"; -option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.tap.v3alpha"; +import "validate/validate.proto"; // [#protodoc-title: Tap discovery service] // [#not-implemented-hide:] Tap discovery service. service TapDiscoveryService { - rpc StreamTapConfigs(stream envoy.api.v3alpha.DiscoveryRequest) - returns (stream envoy.api.v3alpha.DiscoveryResponse) { + rpc StreamTapConfigs(stream api.v3alpha.DiscoveryRequest) + returns (stream api.v3alpha.DiscoveryResponse) { } - rpc DeltaTapConfigs(stream envoy.api.v3alpha.DeltaDiscoveryRequest) - returns (stream envoy.api.v3alpha.DeltaDiscoveryResponse) { + rpc DeltaTapConfigs(stream api.v3alpha.DeltaDiscoveryRequest) + returns (stream api.v3alpha.DeltaDiscoveryResponse) { } - rpc FetchTapConfigs(envoy.api.v3alpha.DiscoveryRequest) - returns (envoy.api.v3alpha.DiscoveryResponse) { + rpc FetchTapConfigs(api.v3alpha.DiscoveryRequest) returns (api.v3alpha.DiscoveryResponse) { option (google.api.http) = { post: "/v3alpha/discovery:tap_configs" body: "*" @@ -37,8 +38,8 @@ service TapDiscoveryService { // The filter TapDS config references this name. message TapResource { // The name of the tap configuration. - string name = 1 [(validate.rules).string.min_bytes = 1]; + string name = 1 [(validate.rules).string = {min_bytes: 1}]; // Tap config to apply TapConfig config = 2; -} \ No newline at end of file +} diff --git a/api/envoy/service/trace/v2/BUILD b/api/envoy/service/trace/v2/BUILD index 9f4ff694748d..f4e1d9abe2f4 100644 --- a/api/envoy/service/trace/v2/BUILD +++ b/api/envoy/service/trace/v2/BUILD @@ -1,22 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v2/core", - "@opencensus_proto//opencensus/proto/trace/v1:trace_proto", - ], -) - -api_proto_library_internal( - name = "trace_service", - srcs = ["trace_service.proto"], - has_services = 0, - require_py = 0, - deps = [ - "//envoy/api/v2/core:base", + "//envoy/api/v2/core:pkg", "@opencensus_proto//opencensus/proto/trace/v1:trace_proto", ], ) diff --git a/api/envoy/service/trace/v3alpha/BUILD b/api/envoy/service/trace/v3alpha/BUILD index 8518b28b984a..7e5229e36316 100644 --- a/api/envoy/service/trace/v3alpha/BUILD +++ b/api/envoy/service/trace/v3alpha/BUILD @@ -1,22 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v3alpha/core", - "@opencensus_proto//opencensus/proto/trace/v1:trace_proto", - ], -) - -api_proto_library_internal( - name = "trace_service", - srcs = ["trace_service.proto"], - has_services = 0, - require_py = 0, - deps = [ - "//envoy/api/v3alpha/core:base", + "//envoy/api/v3alpha/core:pkg", "@opencensus_proto//opencensus/proto/trace/v1:trace_proto", ], ) diff --git a/api/envoy/type/BUILD b/api/envoy/type/BUILD index 26dd9730d9ea..5c06e2deae7d 100644 --- a/api/envoy/type/BUILD +++ b/api/envoy/type/BUILD @@ -1,25 +1,5 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 -api_proto_package( - name = "type", -) - -api_proto_library_internal( - name = "http_status", - srcs = ["http_status.proto"], - visibility = ["//visibility:public"], -) - -api_proto_library_internal( - name = "percent", - srcs = ["percent.proto"], - visibility = ["//visibility:public"], -) - -api_proto_library_internal( - name = "range", - srcs = ["range.proto"], - visibility = ["//visibility:public"], -) +api_proto_package() diff --git a/api/envoy/type/matcher/BUILD b/api/envoy/type/matcher/BUILD index c7db01b6cdfe..75e6ea0623e3 100644 --- a/api/envoy/type/matcher/BUILD +++ b/api/envoy/type/matcher/BUILD @@ -1,51 +1,7 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - name = "matcher", - deps = ["//envoy/type"], -) - -api_proto_library_internal( - name = "metadata", - srcs = ["metadata.proto"], - visibility = ["//visibility:public"], - deps = [ - ":value", - ], -) - -api_proto_library_internal( - name = "number", - srcs = ["number.proto"], - visibility = ["//visibility:public"], - deps = [ - "//envoy/type:range", - ], -) - -api_proto_library_internal( - name = "string", - srcs = ["string.proto"], - visibility = ["//visibility:public"], - deps = [ - ":regex", - ], -) - -api_proto_library_internal( - name = "value", - srcs = ["value.proto"], - visibility = ["//visibility:public"], - deps = [ - ":number", - ":string", - ], -) - -api_proto_library_internal( - name = "regex", - srcs = ["regex.proto"], - visibility = ["//visibility:public"], + deps = ["//envoy/type:pkg"], ) diff --git a/api/test/build/BUILD b/api/test/build/BUILD index c8390c1fede4..3e4a9bd8e940 100644 --- a/api/test/build/BUILD +++ b/api/test/build/BUILD @@ -5,18 +5,13 @@ licenses(["notice"]) # Apache 2 api_cc_test( name = "build_test", srcs = ["build_test.cc"], - proto_deps = [ - "//envoy/api/v2:cds", - "//envoy/api/v2:eds", - "//envoy/api/v2:lds", - "//envoy/api/v2:rds", - "//envoy/service/accesslog/v2:als", - "//envoy/service/discovery/v2:ads", - "//envoy/service/discovery/v2:hds", - "//envoy/service/discovery/v2:rtds", - "//envoy/service/metrics/v2:metrics_service", - "//envoy/service/ratelimit/v2:rls", - "@com_github_cncf_udpa//udpa/service/orca/v1:orca", + deps = [ + "//envoy/api/v2:pkg_cc_proto", + "//envoy/service/accesslog/v2:pkg_cc_proto", + "//envoy/service/discovery/v2:pkg_cc_proto", + "//envoy/service/metrics/v2:pkg_cc_proto", + "//envoy/service/ratelimit/v2:pkg_cc_proto", + "@com_github_cncf_udpa//udpa/service/orca/v1:orca_export_cc", ], ) @@ -26,8 +21,8 @@ api_go_test( srcs = ["go_build_test.go"], importpath = "go_build_test", deps = [ - "//envoy/api/v2:v2_go_proto", - "//envoy/api/v2/auth:auth_go_proto", + "//envoy/api/v2:pkg_go_proto", + "//envoy/api/v2/auth:pkg_go_proto", "//envoy/config/bootstrap/v2:pkg_go_proto", "//envoy/service/accesslog/v2:pkg_go_proto", "//envoy/service/discovery/v2:pkg_go_proto", diff --git a/api/test/validate/BUILD b/api/test/validate/BUILD index 0df5bf38177e..ba734377b177 100644 --- a/api/test/validate/BUILD +++ b/api/test/validate/BUILD @@ -1,34 +1,29 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_cc_test", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_cc_test") licenses(["notice"]) # Apache 2 api_cc_test( name = "pgv_test", srcs = ["pgv_test.cc"], - proto_deps = [ - "//envoy/api/v2:cds", - "//envoy/api/v2:eds", - "//envoy/api/v2:lds", - "//envoy/api/v2:rds", - "//envoy/api/v2/core:protocol", - "//envoy/api/v2/listener", - "//envoy/api/v2/route", - "//envoy/config/bootstrap/v2:bootstrap", - "//envoy/config/filter/accesslog/v2:accesslog", - "//envoy/config/filter/http/buffer/v2:buffer", - "//envoy/config/filter/http/fault/v2:fault", - "//envoy/config/filter/http/gzip/v2:gzip", - "//envoy/config/filter/http/header_to_metadata/v2:header_to_metadata", - "//envoy/config/filter/http/health_check/v2:health_check", - "//envoy/config/filter/http/ip_tagging/v2:ip_tagging", - "//envoy/config/filter/http/lua/v2:lua", - "//envoy/config/filter/http/router/v2:router", - "//envoy/config/filter/http/squash/v2:squash", - "//envoy/config/filter/http/transcoder/v2:transcoder", - "//envoy/config/filter/network/http_connection_manager/v2:http_connection_manager", - "//envoy/config/filter/network/mongo_proxy/v2:mongo_proxy", - "//envoy/config/filter/network/redis_proxy/v2:redis_proxy", - "//envoy/config/filter/network/tcp_proxy/v2:tcp_proxy", - "//envoy/config/health_checker/redis/v2:redis", + deps = [ + "//envoy/api/v2:pkg_cc_proto", + "//envoy/api/v2/core:pkg_cc_proto", + "//envoy/config/bootstrap/v2:pkg_cc_proto", + "//envoy/config/filter/accesslog/v2:pkg_cc_proto", + "//envoy/config/filter/http/buffer/v2:pkg_cc_proto", + "//envoy/config/filter/http/fault/v2:pkg_cc_proto", + "//envoy/config/filter/http/gzip/v2:pkg_cc_proto", + "//envoy/config/filter/http/header_to_metadata/v2:pkg_cc_proto", + "//envoy/config/filter/http/health_check/v2:pkg_cc_proto", + "//envoy/config/filter/http/ip_tagging/v2:pkg_cc_proto", + "//envoy/config/filter/http/lua/v2:pkg_cc_proto", + "//envoy/config/filter/http/router/v2:pkg_cc_proto", + "//envoy/config/filter/http/squash/v2:pkg_cc_proto", + "//envoy/config/filter/http/transcoder/v2:pkg_cc_proto", + "//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", + "//envoy/config/filter/network/mongo_proxy/v2:pkg_cc_proto", + "//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", + "//envoy/config/filter/network/tcp_proxy/v2:pkg_cc_proto", + "//envoy/config/health_checker/redis/v2:pkg_cc_proto", ], ) diff --git a/api/tools/BUILD b/api/tools/BUILD index e90cfa0eef29..d94214d7bacd 100644 --- a/api/tools/BUILD +++ b/api/tools/BUILD @@ -6,9 +6,7 @@ py_binary( licenses = ["notice"], # Apache 2 python_version = "PY2", visibility = ["//visibility:public"], - deps = [ - "//envoy/data/tap/v2alpha:wrapper_py", - ], + deps = ["//envoy/data/tap/v2alpha:pkg_py_proto"], ) py_test( @@ -32,8 +30,8 @@ py_binary( licenses = ["notice"], # Apache 2 visibility = ["//visibility:public"], deps = [ - "//envoy/api/v2:lds_py", - "//envoy/config/filter/network/http_connection_manager/v2:http_connection_manager_py", + "//envoy/api/v2:pkg_py_proto", + "//envoy/config/filter/network/http_connection_manager/v2:pkg_py_proto", ], ) diff --git a/bazel/envoy_library.bzl b/bazel/envoy_library.bzl index 661e64be6cce..9aecc019a90f 100644 --- a/bazel/envoy_library.bzl +++ b/bazel/envoy_library.bzl @@ -7,7 +7,7 @@ load( "envoy_linkstatic", ) load("@com_google_protobuf//:protobuf.bzl", "cc_proto_library", "py_proto_library") -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library") +load("@envoy_api//bazel:api_build_system.bzl", "api_cc_py_proto_library") # As above, but wrapped in list form for adding to dep lists. This smell seems needed as # SelectorValue values have to match the attribute type. See @@ -125,15 +125,8 @@ def envoy_include_prefix(path): # Envoy proto targets should be specified with this function. def envoy_proto_library(name, external_deps = [], **kwargs): - external_proto_deps = [] - external_cc_proto_deps = [] - if "api_httpbody_protos" in external_deps: - external_cc_proto_deps.append("@com_google_googleapis//google/api:httpbody_cc_proto") - external_proto_deps.append("@com_google_googleapis//google/api:httpbody_proto") - api_proto_library( + api_cc_py_proto_library( name, - external_cc_proto_deps = external_cc_proto_deps, - external_proto_deps = external_proto_deps, # Avoid generating .so, we don't need it, can interfere with builds # such as OSS-Fuzz. linkstatic = 1, diff --git a/docs/conf.py b/docs/conf.py index 64c48a8f6c79..52d7cf9d6ace 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -126,7 +126,14 @@ def setup(app): # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. # This patterns also effect to html_static_path and html_extra_path -exclude_patterns = ['_build', '_venv', 'Thumbs.db', '.DS_Store'] +exclude_patterns = [ + '_build', + '_venv', + 'Thumbs.db', + '.DS_Store', + 'api-v2/api/v2/endpoint/load_report.proto.rst', + 'api-v2/service/discovery/v2/hds.proto.rst', +] # The reST default role (used for this markup: `text`) to use for all # documents. diff --git a/include/envoy/config/BUILD b/include/envoy/config/BUILD index 7df8a214104f..adc456e7a6ee 100644 --- a/include/envoy/config/BUILD +++ b/include/envoy/config/BUILD @@ -44,7 +44,7 @@ envoy_cc_library( hdrs = ["subscription_factory.h"], deps = [ ":subscription_interface", - "@envoy_api//envoy/api/v2/core:config_source_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -54,7 +54,7 @@ envoy_cc_library( deps = [ "//include/envoy/stats:stats_macros", "//source/common/protobuf", - "@envoy_api//envoy/api/v2:discovery_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) diff --git a/include/envoy/grpc/BUILD b/include/envoy/grpc/BUILD index f2a18416a8dc..35299022a2fa 100644 --- a/include/envoy/grpc/BUILD +++ b/include/envoy/grpc/BUILD @@ -28,7 +28,7 @@ envoy_cc_library( deps = [ ":async_client_interface", "//include/envoy/stats:stats_interface", - "@envoy_api//envoy/api/v2/core:grpc_service_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -49,7 +49,7 @@ envoy_cc_library( ], deps = [ "//include/envoy/api:api_interface", - "@envoy_api//envoy/api/v2/core:grpc_service_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/include/envoy/http/BUILD b/include/envoy/http/BUILD index 97477bfb77d0..caa6619a846e 100644 --- a/include/envoy/http/BUILD +++ b/include/envoy/http/BUILD @@ -16,7 +16,7 @@ envoy_cc_library( ":message_interface", "//include/envoy/event:dispatcher_interface", "//source/common/protobuf", - "@envoy_api//envoy/api/v2/route:route_cc", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", ], ) diff --git a/include/envoy/local_info/BUILD b/include/envoy/local_info/BUILD index 103028e273f5..351a969b6f96 100644 --- a/include/envoy/local_info/BUILD +++ b/include/envoy/local_info/BUILD @@ -13,6 +13,6 @@ envoy_cc_library( hdrs = ["local_info.h"], deps = [ "//include/envoy/network:address_interface", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/include/envoy/network/BUILD b/include/envoy/network/BUILD index 0a9c502f1f59..cf4e29043b21 100644 --- a/include/envoy/network/BUILD +++ b/include/envoy/network/BUILD @@ -79,7 +79,7 @@ envoy_cc_library( deps = [ ":address_interface", ":io_handle_interface", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -100,7 +100,7 @@ envoy_cc_library( ":connection_interface", ":listen_socket_interface", "//include/envoy/stats:stats_interface", - "@envoy_api//envoy/api/v2:lds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -109,6 +109,6 @@ envoy_cc_library( hdrs = ["resolver.h"], deps = [ ":address_interface", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/include/envoy/router/BUILD b/include/envoy/router/BUILD index b7877db25c79..cbb472bfc844 100644 --- a/include/envoy/router/BUILD +++ b/include/envoy/router/BUILD @@ -27,7 +27,7 @@ envoy_cc_library( "//include/envoy/stats:stats_interface", "//include/envoy/thread_local:thread_local_interface", "//include/envoy/upstream:cluster_manager_interface", - "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:http_connection_manager_cc", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -59,7 +59,7 @@ envoy_cc_library( "//include/envoy/upstream:retry_interface", "//source/common/protobuf", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/api/v2:rds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) diff --git a/include/envoy/runtime/BUILD b/include/envoy/runtime/BUILD index 8e510aeb09dd..1136b7617c3b 100644 --- a/include/envoy/runtime/BUILD +++ b/include/envoy/runtime/BUILD @@ -15,6 +15,6 @@ envoy_cc_library( deps = [ "//source/common/common:assert_lib", "//source/common/singleton:threadsafe_singleton", - "@envoy_api//envoy/type:percent_cc", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/include/envoy/secret/BUILD b/include/envoy/secret/BUILD index bcf14ebf9ad0..dd4bca328091 100644 --- a/include/envoy/secret/BUILD +++ b/include/envoy/secret/BUILD @@ -21,7 +21,7 @@ envoy_cc_library( "//include/envoy/common:callback", "//include/envoy/ssl:certificate_validation_context_config_interface", "//include/envoy/ssl:tls_certificate_config_interface", - "@envoy_api//envoy/api/v2/auth:cert_cc", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", ], ) @@ -30,7 +30,7 @@ envoy_cc_library( hdrs = ["secret_manager.h"], deps = [ ":secret_provider_interface", - "@envoy_api//envoy/api/v2/auth:cert_cc", - "@envoy_api//envoy/api/v2/core:config_source_cc", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/include/envoy/server/BUILD b/include/envoy/server/BUILD index db070132fbcf..11ba5bddc145 100644 --- a/include/envoy/server/BUILD +++ b/include/envoy/server/BUILD @@ -80,7 +80,7 @@ envoy_cc_library( deps = [ "//include/envoy/event:dispatcher_interface", "//include/envoy/thread:thread_interface", - "//source/server:hot_restart_cc", + "//source/server:hot_restart_cc_proto", ], ) @@ -118,8 +118,8 @@ envoy_cc_library( deps = [ "//include/envoy/network:address_interface", "//include/envoy/stats:stats_interface", - "@envoy_api//envoy/admin/v2alpha:server_info_cc", - "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -168,7 +168,7 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/common:macros", "//source/common/protobuf", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -191,7 +191,7 @@ envoy_cc_library( "//include/envoy/network:listen_socket_interface", "//include/envoy/ssl:context_interface", "//source/common/protobuf", - "@envoy_api//envoy/api/v2/listener:listener_cc", + "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", ], ) @@ -253,7 +253,7 @@ envoy_cc_library( deps = [ ":instance_interface", "//source/common/protobuf", - "@envoy_api//envoy/config/trace/v2:trace_cc", + "@envoy_api//envoy/config/trace/v2:pkg_cc_proto", ], ) diff --git a/include/envoy/ssl/BUILD b/include/envoy/ssl/BUILD index 8ea81a6e9090..80ec1a425756 100644 --- a/include/envoy/ssl/BUILD +++ b/include/envoy/ssl/BUILD @@ -21,7 +21,7 @@ envoy_cc_library( name = "context_interface", hdrs = ["context.h"], deps = [ - "@envoy_api//envoy/admin/v2alpha:certs_cc", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", ], ) diff --git a/include/envoy/ssl/private_key/BUILD b/include/envoy/ssl/private_key/BUILD index 4bb651d1f8d3..696b5fe0f8ac 100644 --- a/include/envoy/ssl/private_key/BUILD +++ b/include/envoy/ssl/private_key/BUILD @@ -15,7 +15,7 @@ envoy_cc_library( deps = [ ":private_key_callbacks_interface", "//include/envoy/event:dispatcher_interface", - "@envoy_api//envoy/api/v2/auth:cert_cc", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", ], ) diff --git a/include/envoy/upstream/BUILD b/include/envoy/upstream/BUILD index ab2f0d6a414e..c1e156341363 100644 --- a/include/envoy/upstream/BUILD +++ b/include/envoy/upstream/BUILD @@ -29,8 +29,8 @@ envoy_cc_library( "//include/envoy/singleton:manager_interface", "//include/envoy/tcp:conn_pool_interface", "//include/envoy/thread_local:thread_local_interface", - "@envoy_api//envoy/api/v2:cds_cc", - "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -39,7 +39,7 @@ envoy_cc_library( hdrs = ["health_checker.h"], deps = [ ":upstream_interface", - "@envoy_api//envoy/data/core/v2alpha:health_check_event_cc", + "@envoy_api//envoy/data/core/v2alpha:pkg_cc_proto", ], ) @@ -57,7 +57,7 @@ envoy_cc_library( "//include/envoy/network:address_interface", "//include/envoy/stats:primitive_stats_macros", "//include/envoy/stats:stats_macros", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -76,7 +76,7 @@ envoy_cc_library( hdrs = ["load_balancer_type.h"], deps = [ "//source/common/protobuf", - "@envoy_api//envoy/api/v2:cds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -85,7 +85,7 @@ envoy_cc_library( hdrs = ["locality.h"], deps = [ "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -95,7 +95,7 @@ envoy_cc_library( external_deps = ["abseil_optional"], deps = [ "//include/envoy/common:time_interface", - "@envoy_api//envoy/data/cluster/v2alpha:outlier_detection_event_cc", + "@envoy_api//envoy/data/cluster/v2alpha:pkg_cc_proto", ], ) @@ -169,6 +169,6 @@ envoy_cc_library( "//include/envoy/runtime:runtime_interface", "//include/envoy/ssl:context_interface", "//include/envoy/ssl:context_manager_interface", - "@envoy_api//envoy/api/v2:cds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) diff --git a/source/common/access_log/BUILD b/source/common/access_log/BUILD index 8506985f2676..46403d19b8d3 100644 --- a/source/common/access_log/BUILD +++ b/source/common/access_log/BUILD @@ -31,7 +31,7 @@ envoy_cc_library( "//source/common/runtime:uuid_util_lib", "//source/common/stream_info:stream_info_lib", "//source/common/tracing:http_tracer_lib", - "@envoy_api//envoy/config/filter/accesslog/v2:accesslog_cc", + "@envoy_api//envoy/config/filter/accesslog/v2:pkg_cc_proto", ], ) diff --git a/source/common/common/BUILD b/source/common/common/BUILD index 401d32364634..c8e4b2ae5b22 100644 --- a/source/common/common/BUILD +++ b/source/common/common/BUILD @@ -173,10 +173,7 @@ envoy_cc_library( "//source/common/common:regex_lib", "//source/common/config:metadata_lib", "//source/common/protobuf", - "@envoy_api//envoy/type/matcher:metadata_cc", - "@envoy_api//envoy/type/matcher:number_cc", - "@envoy_api//envoy/type/matcher:string_cc", - "@envoy_api//envoy/type/matcher:value_cc", + "@envoy_api//envoy/type/matcher:pkg_cc_proto", ], ) @@ -189,7 +186,7 @@ envoy_cc_library( "//include/envoy/common:regex_interface", "//source/common/protobuf:utility_lib", "@com_googlesource_code_re2//:re2", - "@envoy_api//envoy/type/matcher:regex_cc", + "@envoy_api//envoy/type/matcher:pkg_cc_proto", ], ) diff --git a/source/common/config/BUILD b/source/common/config/BUILD index 97d7b5907198..50599abd8842 100644 --- a/source/common/config/BUILD +++ b/source/common/config/BUILD @@ -17,7 +17,7 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/network:cidr_range_lib", "//source/common/network:utility_lib", - "@envoy_api//envoy/api/v2/core:address_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -27,7 +27,7 @@ envoy_cc_library( hdrs = ["base_json.h"], deps = [ "//include/envoy/json:json_object_interface", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -61,8 +61,7 @@ envoy_cc_library( "//source/common/common:empty_string", "//source/common/init:target_lib", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/api/v2/core:base_cc", - "@envoy_api//envoy/api/v2/core:http_uri_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -99,7 +98,7 @@ envoy_cc_library( "//source/common/common:token_bucket_impl_lib", "//source/common/grpc:common_lib", "//source/common/protobuf", - "@envoy_api//envoy/api/v2:discovery_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -155,21 +154,21 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/extensions/access_loggers:well_known_names", "//source/extensions/filters/http:well_known_names", - "@envoy_api//envoy/config/accesslog/v2:file_cc", - "@envoy_api//envoy/config/filter/http/buffer/v2:buffer_cc", - "@envoy_api//envoy/config/filter/http/fault/v2:fault_cc", - "@envoy_api//envoy/config/filter/http/gzip/v2:gzip_cc", - "@envoy_api//envoy/config/filter/http/health_check/v2:health_check_cc", - "@envoy_api//envoy/config/filter/http/lua/v2:lua_cc", - "@envoy_api//envoy/config/filter/http/rate_limit/v2:rate_limit_cc", - "@envoy_api//envoy/config/filter/http/router/v2:router_cc", - "@envoy_api//envoy/config/filter/http/squash/v2:squash_cc", - "@envoy_api//envoy/config/filter/http/transcoder/v2:transcoder_cc", - "@envoy_api//envoy/config/filter/network/client_ssl_auth/v2:client_ssl_auth_cc", - "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:http_connection_manager_cc", - "@envoy_api//envoy/config/filter/network/mongo_proxy/v2:mongo_proxy_cc", - "@envoy_api//envoy/config/filter/network/redis_proxy/v2:redis_proxy_cc", - "@envoy_api//envoy/config/filter/network/tcp_proxy/v2:tcp_proxy_cc", + "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/http/buffer/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/http/fault/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/http/gzip/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/http/health_check/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/http/lua/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/http/rate_limit/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/http/router/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/http/squash/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/http/transcoder/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/client_ssl_auth/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/mongo_proxy/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/tcp_proxy/v2:pkg_cc_proto", ], ) @@ -200,7 +199,7 @@ envoy_cc_library( "//source/common/common:minimal_logger_lib", "//source/common/grpc:common_lib", "//source/common/protobuf", - "@envoy_api//envoy/api/v2:discovery_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -213,7 +212,7 @@ envoy_cc_library( "//include/envoy/config:subscription_interface", "//include/envoy/event:dispatcher_interface", "//include/envoy/grpc:async_client_interface", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -248,7 +247,7 @@ envoy_cc_library( "//source/common/http:rest_api_fetcher_lib", "//source/common/protobuf", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -271,7 +270,7 @@ envoy_cc_library( "//include/envoy/registry", "//source/common/common:assert_lib", "//source/common/protobuf", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -281,7 +280,7 @@ envoy_cc_library( hdrs = ["pausable_ack_queue.h"], deps = [ "//source/common/common:assert_lib", - "@envoy_api//envoy/api/v2:discovery_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -289,10 +288,8 @@ envoy_cc_library( name = "protobuf_link_hacks", hdrs = ["protobuf_link_hacks.h"], deps = [ - "@envoy_api//envoy/service/discovery/v2:ads_cc", - "@envoy_api//envoy/service/discovery/v2:rtds_cc", - "@envoy_api//envoy/service/discovery/v2:sds_cc", - "@envoy_api//envoy/service/ratelimit/v2:rls_cc", + "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", + "@envoy_api//envoy/service/ratelimit/v2:pkg_cc_proto", ], ) @@ -303,7 +300,7 @@ envoy_cc_library( deps = [ ":json_utility_lib", "//include/envoy/json:json_object_interface", - "@envoy_api//envoy/api/v2/core:protocol_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -320,7 +317,7 @@ envoy_cc_library( "//source/common/config:utility_lib", "//source/common/json:config_schemas_lib", "//source/extensions/filters/http:well_known_names", - "@envoy_api//envoy/api/v2:rds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -334,7 +331,7 @@ envoy_cc_library( "//source/common/common:hex_lib", "//source/common/crypto:utility_lib", "//source/common/http:utility_lib", - "@envoy_api//envoy/api/v2/core:http_uri_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -348,7 +345,7 @@ envoy_cc_library( name = "runtime_utility_lib", srcs = ["runtime_utility.cc"], hdrs = ["runtime_utility.h"], - deps = ["@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc"], + deps = ["@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto"], ) envoy_cc_library( @@ -367,7 +364,7 @@ envoy_cc_library( "//include/envoy/config:subscription_interface", "//include/envoy/upstream:cluster_manager_interface", "//source/common/protobuf", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -378,12 +375,8 @@ envoy_cc_library( deps = [ "//source/common/grpc:common_lib", "//source/common/protobuf", - "@envoy_api//envoy/api/v2:cds_cc", - "@envoy_api//envoy/api/v2:eds_cc", - "@envoy_api//envoy/api/v2:lds_cc", - "@envoy_api//envoy/api/v2:rds_cc", - "@envoy_api//envoy/api/v2:srds_cc", - "@envoy_api//envoy/service/discovery/v2:rtds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) @@ -412,8 +405,8 @@ envoy_cc_library( "//source/common/stats:stats_lib", "//source/common/stats:stats_matcher_lib", "//source/common/stats:tag_producer_lib", - "@envoy_api//envoy/api/v2/core:base_cc", - "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:http_connection_manager_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) diff --git a/source/common/http/BUILD b/source/common/http/BUILD index 05553bd52916..7650f165a397 100644 --- a/source/common/http/BUILD +++ b/source/common/http/BUILD @@ -90,7 +90,7 @@ envoy_cc_library( "//source/common/common:enum_to_int", "//source/common/common:utility_lib", "//source/common/stats:symbol_table_lib", - "@envoy_api//envoy/type:http_status_cc", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) @@ -220,7 +220,7 @@ envoy_cc_library( deps = [ ":utility_lib", "//include/envoy/http:hash_policy_interface", - "@envoy_api//envoy/api/v2/route:route_cc", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", ], ) @@ -319,8 +319,7 @@ envoy_cc_library( "//source/common/json:json_loader_lib", "//source/common/network:utility_lib", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/api/v2/core:http_uri_cc", - "@envoy_api//envoy/api/v2/core:protocol_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -337,8 +336,8 @@ envoy_cc_library( "//source/common/common:utility_lib", "//source/common/config:rds_json_lib", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/api/v2/route:route_cc", - "@envoy_api//envoy/type:range_cc", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/source/common/network/BUILD b/source/common/network/BUILD index ad1bfb18dce9..76349cd71e1e 100644 --- a/source/common/network/BUILD +++ b/source/common/network/BUILD @@ -52,7 +52,7 @@ envoy_cc_library( "//include/envoy/network:address_interface", "//source/common/common:assert_lib", "//source/common/common:utility_lib", - "@envoy_api//envoy/api/v2/core:address_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -192,7 +192,7 @@ envoy_cc_library( "//source/common/buffer:buffer_lib", "//source/common/common:empty_string", "//source/common/http:headers_lib", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -208,7 +208,7 @@ envoy_cc_library( "//source/common/config:well_known_names", "//source/common/network:address_lib", "//source/common/protobuf", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -254,7 +254,7 @@ envoy_cc_library( ":socket_option_lib", "//include/envoy/network:listen_socket_interface", "//source/common/common:logger_lib", - "@envoy_api//envoy/api/v2/core:address_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -272,8 +272,7 @@ envoy_cc_library( "//source/common/common:cleanup_lib", "//source/common/common:utility_lib", "//source/common/protobuf", - "@envoy_api//envoy/api/v2/core:address_cc", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/source/common/protobuf/BUILD b/source/common/protobuf/BUILD index 4feeec55c982..0df251bd4171 100644 --- a/source/common/protobuf/BUILD +++ b/source/common/protobuf/BUILD @@ -62,6 +62,6 @@ envoy_cc_library( "//source/common/common:hash_lib", "//source/common/common:utility_lib", "//source/common/json:json_loader_lib", - "@envoy_api//envoy/type:percent_cc", + "@envoy_api//envoy/type:pkg_cc_proto", ], ) diff --git a/source/common/router/BUILD b/source/common/router/BUILD index afe8726a297b..bc9a864a5651 100644 --- a/source/common/router/BUILD +++ b/source/common/router/BUILD @@ -63,7 +63,7 @@ envoy_cc_library( "//source/common/config:rds_json_lib", "//source/common/http:headers_lib", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/api/v2:rds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -113,7 +113,7 @@ envoy_cc_library( "//source/common/init:target_lib", "//source/common/protobuf:utility_lib", "//source/common/router:route_config_update_impl_lib", - "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:http_connection_manager_cc", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -142,9 +142,9 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/common/router:route_config_update_impl_lib", "//source/common/router:vhds_lib", - "@envoy_api//envoy/admin/v2alpha:config_dump_cc", - "@envoy_api//envoy/api/v2:rds_cc", - "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:http_connection_manager_cc", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -160,8 +160,8 @@ envoy_cc_library( "//include/envoy/router:rds_interface", "//include/envoy/router:scopes_interface", "//include/envoy/thread_local:thread_local_interface", - "@envoy_api//envoy/api/v2:srds_cc", - "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:http_connection_manager_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -182,8 +182,8 @@ envoy_cc_library( "//source/common/config:config_provider_lib", "//source/common/init:manager_lib", "//source/common/init:watcher_lib", - "@envoy_api//envoy/admin/v2alpha:config_dump_cc", - "@envoy_api//envoy/api/v2:srds_cc", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -256,7 +256,7 @@ envoy_cc_library( "//source/common/stream_info:stream_info_lib", "//source/common/tracing:http_tracer_lib", "//source/common/upstream:load_balancer_lib", - "@envoy_api//envoy/config/filter/http/router/v2:router_cc", + "@envoy_api//envoy/config/filter/http/router/v2:pkg_cc_proto", ], ) diff --git a/source/common/runtime/BUILD b/source/common/runtime/BUILD index 2cbf39b5d36a..9192cf60b01c 100644 --- a/source/common/runtime/BUILD +++ b/source/common/runtime/BUILD @@ -37,8 +37,8 @@ envoy_cc_library( "//source/common/init:target_lib", "//source/common/protobuf:message_validator_lib", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc", - "@envoy_api//envoy/service/discovery/v2:rtds_cc", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) diff --git a/source/common/secret/BUILD b/source/common/secret/BUILD index b584cd57c7da..66820d714cc3 100644 --- a/source/common/secret/BUILD +++ b/source/common/secret/BUILD @@ -19,8 +19,8 @@ envoy_cc_library( "//include/envoy/server:transport_socket_config_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", - "@envoy_api//envoy/admin/v2alpha:config_dump_cc", - "@envoy_api//envoy/api/v2/auth:cert_cc", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", ], ) @@ -32,7 +32,7 @@ envoy_cc_library( "//include/envoy/secret:secret_provider_interface", "//source/common/ssl:certificate_validation_context_config_impl_lib", "//source/common/ssl:tls_certificate_config_impl_lib", - "@envoy_api//envoy/api/v2/auth:cert_cc", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", ], ) diff --git a/source/common/ssl/BUILD b/source/common/ssl/BUILD index ebbe62647302..290d53c96640 100644 --- a/source/common/ssl/BUILD +++ b/source/common/ssl/BUILD @@ -18,7 +18,7 @@ envoy_cc_library( "//include/envoy/ssl/private_key:private_key_interface", "//source/common/common:empty_string", "//source/common/config:datasource_lib", - "@envoy_api//envoy/api/v2/auth:cert_cc", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", ], ) @@ -31,6 +31,6 @@ envoy_cc_library( "//include/envoy/ssl:certificate_validation_context_config_interface", "//source/common/common:empty_string", "//source/common/config:datasource_lib", - "@envoy_api//envoy/api/v2/auth:cert_cc", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", ], ) diff --git a/source/common/stats/BUILD b/source/common/stats/BUILD index 224c006fc395..36325b71d36f 100644 --- a/source/common/stats/BUILD +++ b/source/common/stats/BUILD @@ -146,7 +146,7 @@ envoy_cc_library( "//source/common/common:utility_lib", "//source/common/protobuf", "//source/common/singleton:const_singleton", - "@envoy_api//envoy/config/metrics/v2:stats_cc", + "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) @@ -203,7 +203,7 @@ envoy_cc_library( "//source/common/common:perf_annotation_lib", "//source/common/config:well_known_names", "//source/common/protobuf", - "@envoy_api//envoy/config/metrics/v2:stats_cc", + "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) @@ -215,7 +215,7 @@ envoy_cc_library( "//include/envoy/stats:stats_interface", "//source/common/common:matchers_lib", "//source/common/protobuf", - "@envoy_api//envoy/config/metrics/v2:stats_cc", + "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) diff --git a/source/common/tcp_proxy/BUILD b/source/common/tcp_proxy/BUILD index adec34a52684..29e8f2824900 100644 --- a/source/common/tcp_proxy/BUILD +++ b/source/common/tcp_proxy/BUILD @@ -42,6 +42,6 @@ envoy_cc_library( "//source/common/router:metadatamatchcriteria_lib", "//source/common/stream_info:stream_info_lib", "//source/common/upstream:load_balancer_lib", - "@envoy_api//envoy/config/filter/network/tcp_proxy/v2:tcp_proxy_cc", + "@envoy_api//envoy/config/filter/network/tcp_proxy/v2:pkg_cc_proto", ], ) diff --git a/source/common/upstream/BUILD b/source/common/upstream/BUILD index cf2e800ef622..1111568b3ecc 100644 --- a/source/common/upstream/BUILD +++ b/source/common/upstream/BUILD @@ -22,8 +22,8 @@ envoy_cc_library( "//source/common/config:resources_lib", "//source/common/config:utility_lib", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/api/v2:cds_cc", - "@envoy_api//envoy/api/v2/cluster:outlier_detection_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/cluster:pkg_cc_proto", ], ) @@ -63,8 +63,8 @@ envoy_cc_library( "//source/common/tcp:conn_pool_lib", "//source/common/upstream:priority_conn_pool_map_impl_lib", "//source/common/upstream:upstream_lib", - "@envoy_api//envoy/admin/v2alpha:config_dump_cc", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -121,8 +121,8 @@ envoy_cc_library( deps = [ "//include/envoy/upstream:health_checker_interface", "//source/common/router:router_lib", - "@envoy_api//envoy/api/v2/core:health_check_cc", - "@envoy_api//envoy/data/core/v2alpha:health_check_event_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/data/core/v2alpha:pkg_cc_proto", ], ) @@ -178,7 +178,7 @@ envoy_cc_library( "//include/envoy/upstream:cluster_manager_interface", "//source/common/common:minimal_logger_lib", "//source/common/grpc:async_client_lib", - "@envoy_api//envoy/service/load_stats/v2:lrs_cc", + "@envoy_api//envoy/service/load_stats/v2:pkg_cc_proto", ], ) @@ -204,7 +204,7 @@ envoy_cc_library( "//source/common/network:resolver_lib", "//source/extensions/transport_sockets:well_known_names", "//source/server:transport_socket_config_lib", - "@envoy_api//envoy/service/discovery/v2:hds_cc", + "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) @@ -267,9 +267,9 @@ envoy_cc_library( "//source/common/common:utility_lib", "//source/common/http:codes_lib", "//source/common/protobuf", - "@envoy_api//envoy/api/v2:cds_cc", - "@envoy_api//envoy/api/v2/cluster:outlier_detection_cc", - "@envoy_api//envoy/data/cluster/v2alpha:outlier_detection_event_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/cluster:pkg_cc_proto", + "@envoy_api//envoy/data/cluster/v2alpha:pkg_cc_proto", ], ) @@ -336,9 +336,9 @@ envoy_cc_library( "//source/common/network:utility_lib", "//source/common/protobuf:utility_lib", "//source/extensions/clusters:well_known_names", - "@envoy_api//envoy/api/v2:eds_cc", - "@envoy_api//envoy/api/v2/core:base_cc", - "@envoy_api//envoy/api/v2/endpoint:endpoint_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", ], ) @@ -391,7 +391,7 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/extensions/transport_sockets:well_known_names", "//source/server:transport_socket_config_lib", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -445,8 +445,8 @@ envoy_cc_library( "//source/common/stats:isolated_store_lib", "//source/common/stats:stats_lib", "//source/server:transport_socket_config_lib", - "@envoy_api//envoy/api/v2/core:base_cc", - "@envoy_api//envoy/api/v2/endpoint:endpoint_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", ], ) @@ -476,7 +476,7 @@ envoy_cc_library( "//source/extensions/clusters:well_known_names", "//source/extensions/transport_sockets:well_known_names", "//source/server:transport_socket_config_lib", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -512,7 +512,7 @@ envoy_cc_library( "//source/common/stats:stats_lib", "//source/extensions/clusters:well_known_names", "//source/server:transport_socket_config_lib", - "@envoy_api//envoy/api/v2/core:base_cc", - "@envoy_api//envoy/api/v2/endpoint:endpoint_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", ], ) diff --git a/source/extensions/access_loggers/file/BUILD b/source/extensions/access_loggers/file/BUILD index 3ea8c8819c30..7a935f7223ee 100644 --- a/source/extensions/access_loggers/file/BUILD +++ b/source/extensions/access_loggers/file/BUILD @@ -31,6 +31,6 @@ envoy_cc_library( "//source/common/access_log:access_log_formatter_lib", "//source/common/protobuf", "//source/extensions/access_loggers:well_known_names", - "@envoy_api//envoy/config/accesslog/v2:file_cc", + "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/access_loggers/grpc/BUILD b/source/extensions/access_loggers/grpc/BUILD index e7ad7b299588..f663d1c46913 100644 --- a/source/extensions/access_loggers/grpc/BUILD +++ b/source/extensions/access_loggers/grpc/BUILD @@ -36,9 +36,9 @@ envoy_cc_library( "//source/common/grpc:async_client_lib", "//source/common/grpc:typed_async_client_lib", "//source/extensions/access_loggers/common:access_log_base", - "@envoy_api//envoy/config/accesslog/v2:als_cc", - "@envoy_api//envoy/config/filter/accesslog/v2:accesslog_cc", - "@envoy_api//envoy/service/accesslog/v2:als_cc", + "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/service/accesslog/v2:pkg_cc_proto", ], ) @@ -51,7 +51,7 @@ envoy_cc_library( "//source/common/network:utility_lib", "//source/common/stream_info:stream_info_lib", "//source/common/stream_info:utility_lib", - "@envoy_api//envoy/data/accesslog/v2:accesslog_cc", + "@envoy_api//envoy/data/accesslog/v2:pkg_cc_proto", ], ) @@ -82,7 +82,7 @@ envoy_cc_library( deps = [ "//source/common/common:assert_lib", "//source/common/protobuf", - "@envoy_api//envoy/service/accesslog/v2:als_cc", + "@envoy_api//envoy/service/accesslog/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/clusters/dynamic_forward_proxy/BUILD b/source/extensions/clusters/dynamic_forward_proxy/BUILD index 51ba531f70b7..feaa5cd8bb31 100644 --- a/source/extensions/clusters/dynamic_forward_proxy/BUILD +++ b/source/extensions/clusters/dynamic_forward_proxy/BUILD @@ -19,6 +19,6 @@ envoy_cc_library( "//source/extensions/clusters:well_known_names", "//source/extensions/common/dynamic_forward_proxy:dns_cache_interface", "//source/extensions/common/dynamic_forward_proxy:dns_cache_manager_impl", - "@envoy_api//envoy/config/cluster/dynamic_forward_proxy/v2alpha:cluster_cc", + "@envoy_api//envoy/config/cluster/dynamic_forward_proxy/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/clusters/redis/BUILD b/source/extensions/clusters/redis/BUILD index 7608fa092f9a..c27b2bc5eaab 100644 --- a/source/extensions/clusters/redis/BUILD +++ b/source/extensions/clusters/redis/BUILD @@ -66,6 +66,6 @@ envoy_cc_library( "//source/extensions/filters/network/redis_proxy:config_interface", "//source/extensions/transport_sockets/raw_buffer:config", "//source/server:transport_socket_config_lib", - "@envoy_api//envoy/config/cluster/redis:redis_cluster_cc", + "@envoy_api//envoy/config/cluster/redis:pkg_cc_proto", ], ) diff --git a/source/extensions/common/dynamic_forward_proxy/BUILD b/source/extensions/common/dynamic_forward_proxy/BUILD index 0b3ddf4492b3..56f351d4f236 100644 --- a/source/extensions/common/dynamic_forward_proxy/BUILD +++ b/source/extensions/common/dynamic_forward_proxy/BUILD @@ -15,7 +15,7 @@ envoy_cc_library( "//include/envoy/event:dispatcher_interface", "//include/envoy/singleton:manager_interface", "//include/envoy/thread_local:thread_local_interface", - "@envoy_api//envoy/config/common/dynamic_forward_proxy/v2alpha:dns_cache_cc", + "@envoy_api//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/common/tap/BUILD b/source/extensions/common/tap/BUILD index 92093202cadf..62841113af4a 100644 --- a/source/extensions/common/tap/BUILD +++ b/source/extensions/common/tap/BUILD @@ -14,8 +14,8 @@ envoy_cc_library( deps = [ ":tap_matcher", "//include/envoy/http:header_map_interface", - "@envoy_api//envoy/data/tap/v2alpha:wrapper_cc", - "@envoy_api//envoy/service/tap/v2alpha:common_cc", + "@envoy_api//envoy/data/tap/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/service/tap/v2alpha:pkg_cc_proto", ], ) @@ -36,7 +36,7 @@ envoy_cc_library( hdrs = ["tap_matcher.h"], deps = [ "//source/common/http:header_utility_lib", - "@envoy_api//envoy/service/tap/v2alpha:common_cc", + "@envoy_api//envoy/service/tap/v2alpha:pkg_cc_proto", ], ) @@ -49,7 +49,7 @@ envoy_cc_library( "//include/envoy/server:admin_interface", "//include/envoy/singleton:manager_interface", "//source/common/buffer:buffer_lib", - "@envoy_api//envoy/admin/v2alpha:tap_cc", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", ], ) @@ -60,6 +60,6 @@ envoy_cc_library( deps = [ "//include/envoy/thread_local:thread_local_interface", "//source/extensions/common/tap:admin", - "@envoy_api//envoy/config/common/tap/v2alpha:common_cc", + "@envoy_api//envoy/config/common/tap/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/common/ext_authz/BUILD b/source/extensions/filters/common/ext_authz/BUILD index 61b2abade1cb..ca34b4274c7b 100644 --- a/source/extensions/filters/common/ext_authz/BUILD +++ b/source/extensions/filters/common/ext_authz/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( deps = [ "//include/envoy/http:codes_interface", "//source/common/tracing:http_tracer_lib", - "@envoy_api//envoy/service/auth/v2:external_auth_cc", + "@envoy_api//envoy/service/auth/v2:pkg_cc_proto", ], ) @@ -47,7 +47,7 @@ envoy_cc_library( # removed unless v2alpha is fully deprecated, otherwise linker will drop the object file # associated with v2alpha/external_auth.pb.cc causing FindMessageTypeByName() to always return # nullptr when looking up for envoy.service.auth.v2alpha.Authorization.Check. - "@envoy_api//envoy/service/auth/v2alpha:external_auth_cc", + "@envoy_api//envoy/service/auth/v2alpha:pkg_cc_proto", ], ) @@ -64,7 +64,7 @@ envoy_cc_library( "//source/common/http:async_client_lib", "//source/common/http:codes_lib", "//source/common/tracing:http_tracer_lib", - "@envoy_api//envoy/config/filter/http/ext_authz/v2:ext_authz_cc", + "@envoy_api//envoy/config/filter/http/ext_authz/v2:pkg_cc_proto", ], ) @@ -78,6 +78,6 @@ envoy_cc_library( "//include/envoy/http:filter_interface", "//include/envoy/upstream:cluster_manager_interface", "//source/common/grpc:async_client_lib", - "@envoy_api//envoy/service/auth/v2:external_auth_cc", + "@envoy_api//envoy/service/auth/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/common/fault/BUILD b/source/extensions/filters/common/fault/BUILD index a9d887673c5a..d36e361b46e0 100644 --- a/source/extensions/filters/common/fault/BUILD +++ b/source/extensions/filters/common/fault/BUILD @@ -16,6 +16,6 @@ envoy_cc_library( "//include/envoy/http:header_map_interface", "//source/common/http:headers_lib", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/config/filter/fault/v2:fault_cc", + "@envoy_api//envoy/config/filter/fault/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/common/ratelimit/BUILD b/source/extensions/filters/common/ratelimit/BUILD index 9d39e1980093..08668a695ed3 100644 --- a/source/extensions/filters/common/ratelimit/BUILD +++ b/source/extensions/filters/common/ratelimit/BUILD @@ -25,9 +25,9 @@ envoy_cc_library( "//source/common/grpc:typed_async_client_lib", "//source/common/http:headers_lib", "//source/common/tracing:http_tracer_lib", - "@envoy_api//envoy/api/v2/ratelimit:ratelimit_cc", - "@envoy_api//envoy/config/ratelimit/v2:rls_cc", - "@envoy_api//envoy/service/ratelimit/v2:rls_cc", + "@envoy_api//envoy/api/v2/ratelimit:pkg_cc_proto", + "@envoy_api//envoy/config/ratelimit/v2:pkg_cc_proto", + "@envoy_api//envoy/service/ratelimit/v2:pkg_cc_proto", ], ) @@ -40,7 +40,7 @@ envoy_cc_library( "//include/envoy/singleton:manager_interface", "//include/envoy/tracing:http_tracer_interface", "//source/common/stats:symbol_table_lib", - "@envoy_api//envoy/config/ratelimit/v2:rls_cc", + "@envoy_api//envoy/config/ratelimit/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/common/rbac/BUILD b/source/extensions/filters/common/rbac/BUILD index 94398324482f..3cc3f0e01cf3 100644 --- a/source/extensions/filters/common/rbac/BUILD +++ b/source/extensions/filters/common/rbac/BUILD @@ -16,8 +16,8 @@ envoy_cc_library( ":engine_lib", "//include/envoy/stats:stats_macros", "//source/common/singleton:const_singleton", - "@envoy_api//envoy/config/filter/http/rbac/v2:rbac_cc", - "@envoy_api//envoy/config/filter/network/rbac/v2:rbac_cc", + "@envoy_api//envoy/config/filter/http/rbac/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/rbac/v2:pkg_cc_proto", ], ) @@ -34,8 +34,8 @@ envoy_cc_library( "//source/common/http:header_utility_lib", "//source/common/network:cidr_range_lib", "//source/extensions/filters/common/expr:evaluator_lib", - "@envoy_api//envoy/api/v2/core:base_cc", - "@envoy_api//envoy/config/rbac/v2:rbac_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/rbac/v2:pkg_cc_proto", ], ) @@ -56,7 +56,7 @@ envoy_cc_library( deps = [ "//source/extensions/filters/common/rbac:engine_interface", "//source/extensions/filters/common/rbac:matchers_lib", - "@envoy_api//envoy/api/v2/core:base_cc", - "@envoy_api//envoy/config/filter/http/rbac/v2:rbac_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/filter/http/rbac/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/adaptive_concurrency/BUILD b/source/extensions/filters/http/adaptive_concurrency/BUILD index cc73c3ce50d0..2b12b6cdc9d0 100644 --- a/source/extensions/filters/http/adaptive_concurrency/BUILD +++ b/source/extensions/filters/http/adaptive_concurrency/BUILD @@ -21,7 +21,7 @@ envoy_cc_library( "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/adaptive_concurrency/concurrency_controller:concurrency_controller_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", - "@envoy_api//envoy/config/filter/http/adaptive_concurrency/v2alpha:adaptive_concurrency_cc", + "@envoy_api//envoy/config/filter/http/adaptive_concurrency/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/adaptive_concurrency/concurrency_controller/BUILD b/source/extensions/filters/http/adaptive_concurrency/concurrency_controller/BUILD index 604221865c11..139b72f0159c 100644 --- a/source/extensions/filters/http/adaptive_concurrency/concurrency_controller/BUILD +++ b/source/extensions/filters/http/adaptive_concurrency/concurrency_controller/BUILD @@ -28,6 +28,6 @@ envoy_cc_library( "//source/common/runtime:runtime_lib", "//source/common/stats:isolated_store_lib", "//source/common/stats:stats_lib", - "@envoy_api//envoy/config/filter/http/adaptive_concurrency/v2alpha:adaptive_concurrency_cc", + "@envoy_api//envoy/config/filter/http/adaptive_concurrency/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/buffer/BUILD b/source/extensions/filters/http/buffer/BUILD index bebfd70adf19..79f6d192cfc0 100644 --- a/source/extensions/filters/http/buffer/BUILD +++ b/source/extensions/filters/http/buffer/BUILD @@ -28,7 +28,7 @@ envoy_cc_library( "//source/common/http:utility_lib", "//source/common/runtime:runtime_lib", "//source/extensions/filters/http:well_known_names", - "@envoy_api//envoy/config/filter/http/buffer/v2:buffer_cc", + "@envoy_api//envoy/config/filter/http/buffer/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/common/BUILD b/source/extensions/filters/http/common/BUILD index b8c8a46b3b43..c9721a2a482c 100644 --- a/source/extensions/filters/http/common/BUILD +++ b/source/extensions/filters/http/common/BUILD @@ -42,6 +42,6 @@ envoy_cc_library( deps = [ "//include/envoy/upstream:cluster_manager_interface", "//source/common/http:utility_lib", - "@envoy_api//envoy/api/v2/core:http_uri_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/csrf/BUILD b/source/extensions/filters/http/csrf/BUILD index f33294cea8e7..69138fbfb4d3 100644 --- a/source/extensions/filters/http/csrf/BUILD +++ b/source/extensions/filters/http/csrf/BUILD @@ -23,7 +23,7 @@ envoy_cc_library( "//source/common/http:headers_lib", "//source/common/http:utility_lib", "//source/extensions/filters/http:well_known_names", - "@envoy_api//envoy/config/filter/http/csrf/v2:csrf_cc", + "@envoy_api//envoy/config/filter/http/csrf/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/dynamic_forward_proxy/BUILD b/source/extensions/filters/http/dynamic_forward_proxy/BUILD index a11ce93fbdec..2e561ab1a71f 100644 --- a/source/extensions/filters/http/dynamic_forward_proxy/BUILD +++ b/source/extensions/filters/http/dynamic_forward_proxy/BUILD @@ -16,7 +16,7 @@ envoy_cc_library( "//include/envoy/http:filter_interface", "//source/extensions/common/dynamic_forward_proxy:dns_cache_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", - "@envoy_api//envoy/config/filter/http/dynamic_forward_proxy/v2alpha:dynamic_forward_proxy_cc", + "@envoy_api//envoy/config/filter/http/dynamic_forward_proxy/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/ext_authz/BUILD b/source/extensions/filters/http/ext_authz/BUILD index f5b4e7eacea1..5a9261bffcd9 100644 --- a/source/extensions/filters/http/ext_authz/BUILD +++ b/source/extensions/filters/http/ext_authz/BUILD @@ -28,7 +28,7 @@ envoy_cc_library( "//source/common/router:config_lib", "//source/extensions/filters/common/ext_authz:ext_authz_grpc_lib", "//source/extensions/filters/common/ext_authz:ext_authz_http_lib", - "@envoy_api//envoy/config/filter/http/ext_authz/v2:ext_authz_cc", + "@envoy_api//envoy/config/filter/http/ext_authz/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/fault/BUILD b/source/extensions/filters/http/fault/BUILD index a5b48b5af103..fdf07f6eea45 100644 --- a/source/extensions/filters/http/fault/BUILD +++ b/source/extensions/filters/http/fault/BUILD @@ -33,7 +33,7 @@ envoy_cc_library( "//source/common/http:headers_lib", "//source/common/protobuf:utility_lib", "//source/extensions/filters/common/fault:fault_config_lib", - "@envoy_api//envoy/config/filter/http/fault/v2:fault_cc", + "@envoy_api//envoy/config/filter/http/fault/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/grpc_http1_reverse_bridge/BUILD b/source/extensions/filters/http/grpc_http1_reverse_bridge/BUILD index 4dc282fc3129..5a0077e5ba70 100644 --- a/source/extensions/filters/http/grpc_http1_reverse_bridge/BUILD +++ b/source/extensions/filters/http/grpc_http1_reverse_bridge/BUILD @@ -35,6 +35,6 @@ envoy_cc_library( "//include/envoy/server:filter_config_interface", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", - "@envoy_api//envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1:config_cc", + "@envoy_api//envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/grpc_json_transcoder/BUILD b/source/extensions/filters/http/grpc_json_transcoder/BUILD index 3128edcf4c52..a469f037f1af 100644 --- a/source/extensions/filters/http/grpc_json_transcoder/BUILD +++ b/source/extensions/filters/http/grpc_json_transcoder/BUILD @@ -29,7 +29,7 @@ envoy_cc_library( "//source/common/grpc:common_lib", "//source/common/http:headers_lib", "//source/common/protobuf", - "@envoy_api//envoy/config/filter/http/transcoder/v2:transcoder_cc", + "@envoy_api//envoy/config/filter/http/transcoder/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/gzip/BUILD b/source/extensions/filters/http/gzip/BUILD index 6a1df0f1dd12..32d46f7d1bcd 100644 --- a/source/extensions/filters/http/gzip/BUILD +++ b/source/extensions/filters/http/gzip/BUILD @@ -24,7 +24,7 @@ envoy_cc_library( "//source/common/http:header_map_lib", "//source/common/http:headers_lib", "//source/common/protobuf", - "@envoy_api//envoy/config/filter/http/gzip/v2:gzip_cc", + "@envoy_api//envoy/config/filter/http/gzip/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/header_to_metadata/BUILD b/source/extensions/filters/http/header_to_metadata/BUILD index f0ffbec64f5c..6cce872d79e4 100644 --- a/source/extensions/filters/http/header_to_metadata/BUILD +++ b/source/extensions/filters/http/header_to_metadata/BUILD @@ -19,7 +19,7 @@ envoy_cc_library( "//include/envoy/server:filter_config_interface", "//source/common/common:base64_lib", "//source/extensions/filters/http:well_known_names", - "@envoy_api//envoy/config/filter/http/header_to_metadata/v2:header_to_metadata_cc", + "@envoy_api//envoy/config/filter/http/header_to_metadata/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/health_check/BUILD b/source/extensions/filters/http/health_check/BUILD index 6ecc7f75df0a..2a1272767544 100644 --- a/source/extensions/filters/http/health_check/BUILD +++ b/source/extensions/filters/http/health_check/BUILD @@ -29,7 +29,7 @@ envoy_cc_library( "//source/common/http:headers_lib", "//source/common/http:utility_lib", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/config/filter/http/health_check/v2:health_check_cc", + "@envoy_api//envoy/config/filter/http/health_check/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/ip_tagging/BUILD b/source/extensions/filters/http/ip_tagging/BUILD index bc88c1313356..f5a28bd708eb 100644 --- a/source/extensions/filters/http/ip_tagging/BUILD +++ b/source/extensions/filters/http/ip_tagging/BUILD @@ -23,7 +23,7 @@ envoy_cc_library( "//source/common/http:headers_lib", "//source/common/network:lc_trie_lib", "//source/common/stats:symbol_table_lib", - "@envoy_api//envoy/config/filter/http/ip_tagging/v2:ip_tagging_cc", + "@envoy_api//envoy/config/filter/http/ip_tagging/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/jwt_authn/BUILD b/source/extensions/filters/http/jwt_authn/BUILD index feede1f772fe..1d6efaca768d 100644 --- a/source/extensions/filters/http/jwt_authn/BUILD +++ b/source/extensions/filters/http/jwt_authn/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( hdrs = ["extractor.h"], deps = [ "//source/common/http:utility_lib", - "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:jwt_authn_cc", + "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:pkg_cc_proto", ], ) @@ -29,7 +29,7 @@ envoy_cc_library( "//source/common/common:minimal_logger_lib", "//source/common/config:datasource_lib", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:jwt_authn_cc", + "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:pkg_cc_proto", ], ) @@ -93,7 +93,7 @@ envoy_cc_library( ":authenticator_lib", ":extractor_lib", "//include/envoy/http:header_map_interface", - "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:jwt_authn_cc", + "@envoy_api//envoy/config/filter/http/jwt_authn/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/original_src/BUILD b/source/extensions/filters/http/original_src/BUILD index 04e89334f85f..30ac140d4963 100644 --- a/source/extensions/filters/http/original_src/BUILD +++ b/source/extensions/filters/http/original_src/BUILD @@ -15,7 +15,7 @@ envoy_cc_library( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "@envoy_api//envoy/config/filter/http/original_src/v2alpha1:original_src_cc", + "@envoy_api//envoy/config/filter/http/original_src/v2alpha1:pkg_cc_proto", ], ) @@ -42,6 +42,6 @@ envoy_cc_library( "//include/envoy/registry", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", - "@envoy_api//envoy/config/filter/http/original_src/v2alpha1:original_src_cc", + "@envoy_api//envoy/config/filter/http/original_src/v2alpha1:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/ratelimit/BUILD b/source/extensions/filters/http/ratelimit/BUILD index 22b8e4bba0b6..3f50347ac7e4 100644 --- a/source/extensions/filters/http/ratelimit/BUILD +++ b/source/extensions/filters/http/ratelimit/BUILD @@ -25,7 +25,7 @@ envoy_cc_library( "//source/common/router:config_lib", "//source/extensions/filters/common/ratelimit:ratelimit_client_interface", "//source/extensions/filters/common/ratelimit:stat_names_lib", - "@envoy_api//envoy/config/filter/http/rate_limit/v2:rate_limit_cc", + "@envoy_api//envoy/config/filter/http/rate_limit/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/rbac/BUILD b/source/extensions/filters/http/rbac/BUILD index f7adc41aa850..a66d14d7f903 100644 --- a/source/extensions/filters/http/rbac/BUILD +++ b/source/extensions/filters/http/rbac/BUILD @@ -31,6 +31,6 @@ envoy_cc_library( "//source/extensions/filters/common/rbac:engine_lib", "//source/extensions/filters/common/rbac:utility_lib", "//source/extensions/filters/http:well_known_names", - "@envoy_api//envoy/config/filter/http/rbac/v2:rbac_cc", + "@envoy_api//envoy/config/filter/http/rbac/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/squash/BUILD b/source/extensions/filters/http/squash/BUILD index ab986ca18443..d43135443a44 100644 --- a/source/extensions/filters/http/squash/BUILD +++ b/source/extensions/filters/http/squash/BUILD @@ -27,7 +27,7 @@ envoy_cc_library( "//source/common/http:message_lib", "//source/common/http:utility_lib", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/config/filter/http/squash/v2:squash_cc", + "@envoy_api//envoy/config/filter/http/squash/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/tap/BUILD b/source/extensions/filters/http/tap/BUILD index 0581a9f7d2c6..1766624a9cef 100644 --- a/source/extensions/filters/http/tap/BUILD +++ b/source/extensions/filters/http/tap/BUILD @@ -18,7 +18,7 @@ envoy_cc_library( "//include/envoy/buffer:buffer_interface", "//include/envoy/http:header_map_interface", "//source/extensions/common/tap:tap_interface", - "@envoy_api//envoy/service/tap/v2alpha:common_cc", + "@envoy_api//envoy/service/tap/v2alpha:pkg_cc_proto", ], ) @@ -29,7 +29,7 @@ envoy_cc_library( deps = [ ":tap_config_interface", "//source/extensions/common/tap:tap_config_base", - "@envoy_api//envoy/data/tap/v2alpha:http_cc", + "@envoy_api//envoy/data/tap/v2alpha:pkg_cc_proto", ], ) @@ -42,7 +42,7 @@ envoy_cc_library( "//include/envoy/access_log:access_log_interface", "//include/envoy/http:filter_interface", "//source/extensions/common/tap:extension_config_base", - "@envoy_api//envoy/config/filter/http/tap/v2alpha:tap_cc", + "@envoy_api//envoy/config/filter/http/tap/v2alpha:pkg_cc_proto", ], ) @@ -56,6 +56,6 @@ envoy_cc_library( "//include/envoy/registry", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", - "@envoy_api//envoy/config/filter/http/tap/v2alpha:tap_cc", + "@envoy_api//envoy/config/filter/http/tap/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/listener/original_src/BUILD b/source/extensions/filters/listener/original_src/BUILD index e6a9eb6a3f03..863d2010f930 100644 --- a/source/extensions/filters/listener/original_src/BUILD +++ b/source/extensions/filters/listener/original_src/BUILD @@ -15,7 +15,7 @@ envoy_cc_library( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "@envoy_api//envoy/config/filter/listener/original_src/v2alpha1:original_src_cc", + "@envoy_api//envoy/config/filter/listener/original_src/v2alpha1:pkg_cc_proto", ], ) @@ -45,6 +45,6 @@ envoy_cc_library( "//include/envoy/registry", "//include/envoy/server:filter_config_interface", "//source/extensions/filters/listener:well_known_names", - "@envoy_api//envoy/config/filter/listener/original_src/v2alpha1:original_src_cc", + "@envoy_api//envoy/config/filter/listener/original_src/v2alpha1:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/client_ssl_auth/BUILD b/source/extensions/filters/network/client_ssl_auth/BUILD index 3a99d2418231..a334034b8a4e 100644 --- a/source/extensions/filters/network/client_ssl_auth/BUILD +++ b/source/extensions/filters/network/client_ssl_auth/BUILD @@ -32,7 +32,7 @@ envoy_cc_library( "//source/common/json:json_loader_lib", "//source/common/network:cidr_range_lib", "//source/common/network:utility_lib", - "@envoy_api//envoy/config/filter/network/client_ssl_auth/v2:client_ssl_auth_cc", + "@envoy_api//envoy/config/filter/network/client_ssl_auth/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/common/redis/BUILD b/source/extensions/filters/network/common/redis/BUILD index ae2702107c4a..b50d4ebfa9f8 100644 --- a/source/extensions/filters/network/common/redis/BUILD +++ b/source/extensions/filters/network/common/redis/BUILD @@ -69,7 +69,7 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/common/upstream:load_balancer_lib", "//source/common/upstream:upstream_lib", - "@envoy_api//envoy/config/filter/network/redis_proxy/v2:redis_proxy_cc", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/dubbo_proxy/BUILD b/source/extensions/filters/network/dubbo_proxy/BUILD index 9ac6ff1e40d7..27805df27a8d 100644 --- a/source/extensions/filters/network/dubbo_proxy/BUILD +++ b/source/extensions/filters/network/dubbo_proxy/BUILD @@ -118,7 +118,7 @@ envoy_cc_library( "//source/extensions/filters/network/dubbo_proxy/router:config", "//source/extensions/filters/network/dubbo_proxy/router:route_matcher", "//source/extensions/filters/network/dubbo_proxy/router:router_lib", - "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:dubbo_proxy_cc", + "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:pkg_cc_proto", ], ) @@ -225,6 +225,6 @@ envoy_cc_library( "//source/common/stream_info:stream_info_lib", "//source/extensions/filters/network/dubbo_proxy/filters:filter_interface", "//source/extensions/filters/network/dubbo_proxy/router:router_interface", - "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:dubbo_proxy_cc", + "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/dubbo_proxy/router/BUILD b/source/extensions/filters/network/dubbo_proxy/router/BUILD index 0256ac5cdb31..3c2aa4501c18 100644 --- a/source/extensions/filters/network/dubbo_proxy/router/BUILD +++ b/source/extensions/filters/network/dubbo_proxy/router/BUILD @@ -26,7 +26,7 @@ envoy_cc_library( "//source/common/config:utility_lib", "//source/common/singleton:const_singleton", "//source/extensions/filters/network/dubbo_proxy:metadata_lib", - "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:dubbo_proxy_cc", + "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:pkg_cc_proto", ], ) @@ -44,7 +44,7 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/extensions/filters/network/dubbo_proxy:metadata_lib", "//source/extensions/filters/network/dubbo_proxy:serializer_interface", - "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:dubbo_proxy_cc", + "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:pkg_cc_proto", ], ) @@ -58,7 +58,7 @@ envoy_cc_library( "//source/extensions/filters/network/dubbo_proxy/filters:factory_base_lib", "//source/extensions/filters/network/dubbo_proxy/filters:filter_config_interface", "//source/extensions/filters/network/dubbo_proxy/filters:well_known_names", - "@envoy_api//envoy/config/filter/dubbo/router/v2alpha1:router_cc", + "@envoy_api//envoy/config/filter/dubbo/router/v2alpha1:pkg_cc_proto", ], ) @@ -80,6 +80,6 @@ envoy_cc_library( "//source/extensions/filters/network/dubbo_proxy:protocol_interface", "//source/extensions/filters/network/dubbo_proxy:serializer_interface", "//source/extensions/filters/network/dubbo_proxy/filters:filter_interface", - "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:dubbo_proxy_cc", + "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/ext_authz/BUILD b/source/extensions/filters/network/ext_authz/BUILD index f0e866d13307..082925e49861 100644 --- a/source/extensions/filters/network/ext_authz/BUILD +++ b/source/extensions/filters/network/ext_authz/BUILD @@ -25,7 +25,7 @@ envoy_cc_library( "//source/common/tracing:http_tracer_lib", "//source/extensions/filters/common/ext_authz:ext_authz_grpc_lib", "//source/extensions/filters/common/ext_authz:ext_authz_interface", - "@envoy_api//envoy/config/filter/network/ext_authz/v2:ext_authz_cc", + "@envoy_api//envoy/config/filter/network/ext_authz/v2:pkg_cc_proto", ], ) @@ -39,6 +39,6 @@ envoy_cc_library( "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", "//source/extensions/filters/network/ext_authz", - "@envoy_api//envoy/config/filter/network/ext_authz/v2:ext_authz_cc", + "@envoy_api//envoy/config/filter/network/ext_authz/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/http_connection_manager/BUILD b/source/extensions/filters/network/http_connection_manager/BUILD index fbe72b257b15..24acebc01cde 100644 --- a/source/extensions/filters/network/http_connection_manager/BUILD +++ b/source/extensions/filters/network/http_connection_manager/BUILD @@ -40,6 +40,6 @@ envoy_cc_library( "//source/common/router:scoped_rds_lib", "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", - "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:http_connection_manager_cc", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/mongo_proxy/BUILD b/source/extensions/filters/network/mongo_proxy/BUILD index f2be1d6a9774..35a4883283e5 100644 --- a/source/extensions/filters/network/mongo_proxy/BUILD +++ b/source/extensions/filters/network/mongo_proxy/BUILD @@ -78,7 +78,7 @@ envoy_cc_library( "//source/common/singleton:const_singleton", "//source/extensions/filters/common/fault:fault_config_lib", "//source/extensions/filters/network:well_known_names", - "@envoy_api//envoy/config/filter/network/mongo_proxy/v2:mongo_proxy_cc", + "@envoy_api//envoy/config/filter/network/mongo_proxy/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/mysql_proxy/BUILD b/source/extensions/filters/network/mysql_proxy/BUILD index c5f70f2bb7f2..fd44d4726e3c 100644 --- a/source/extensions/filters/network/mysql_proxy/BUILD +++ b/source/extensions/filters/network/mysql_proxy/BUILD @@ -55,6 +55,6 @@ envoy_cc_library( ":proxy_lib", "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", - "@envoy_api//envoy/config/filter/network/mysql_proxy/v1alpha1:mysql_proxy_cc", + "@envoy_api//envoy/config/filter/network/mysql_proxy/v1alpha1:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/ratelimit/BUILD b/source/extensions/filters/network/ratelimit/BUILD index 5def3649b91f..1e8d61946654 100644 --- a/source/extensions/filters/network/ratelimit/BUILD +++ b/source/extensions/filters/network/ratelimit/BUILD @@ -23,7 +23,7 @@ envoy_cc_library( "//include/envoy/stats:stats_macros", "//source/common/tracing:http_tracer_lib", "//source/extensions/filters/common/ratelimit:ratelimit_client_interface", - "@envoy_api//envoy/config/filter/network/rate_limit/v2:rate_limit_cc", + "@envoy_api//envoy/config/filter/network/rate_limit/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/rbac/BUILD b/source/extensions/filters/network/rbac/BUILD index 9124710a48a7..57ce3bb972b8 100644 --- a/source/extensions/filters/network/rbac/BUILD +++ b/source/extensions/filters/network/rbac/BUILD @@ -18,7 +18,7 @@ envoy_cc_library( "//include/envoy/server:filter_config_interface", "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", - "@envoy_api//envoy/config/filter/network/rbac/v2:rbac_cc", + "@envoy_api//envoy/config/filter/network/rbac/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/redis_proxy/BUILD b/source/extensions/filters/network/redis_proxy/BUILD index 7178d82679db..700acf9c616c 100644 --- a/source/extensions/filters/network/redis_proxy/BUILD +++ b/source/extensions/filters/network/redis_proxy/BUILD @@ -27,7 +27,7 @@ envoy_cc_library( "//source/common/config:datasource_lib", "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", - "@envoy_api//envoy/config/filter/network/redis_proxy/v2:redis_proxy_cc", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) @@ -46,7 +46,7 @@ envoy_cc_library( hdrs = ["router.h"], deps = [ ":conn_pool_interface", - "@envoy_api//envoy/config/filter/network/redis_proxy/v2:redis_proxy_cc", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) @@ -88,7 +88,7 @@ envoy_cc_library( "//source/extensions/clusters/redis:redis_cluster_lb", "//source/extensions/filters/network/common/redis:client_lib", "//source/extensions/filters/network/common/redis:utility_lib", - "@envoy_api//envoy/config/filter/network/redis_proxy/v2:redis_proxy_cc", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) @@ -106,7 +106,7 @@ envoy_cc_library( "//source/common/config:datasource_lib", "//source/common/config:utility_lib", "//source/extensions/filters/network/common/redis:codec_interface", - "@envoy_api//envoy/config/filter/network/redis_proxy/v2:redis_proxy_cc", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) @@ -140,6 +140,6 @@ envoy_cc_library( "//source/common/common:to_lower_table_lib", "//source/extensions/filters/network/common/redis:supported_commands_lib", "//source/extensions/filters/network/redis_proxy:conn_pool_lib", - "@envoy_api//envoy/config/filter/network/redis_proxy/v2:redis_proxy_cc", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/thrift_proxy/BUILD b/source/extensions/filters/network/thrift_proxy/BUILD index e6f16abe3a2a..31988a845f78 100644 --- a/source/extensions/filters/network/thrift_proxy/BUILD +++ b/source/extensions/filters/network/thrift_proxy/BUILD @@ -54,7 +54,7 @@ envoy_cc_library( "//source/extensions/filters/network/thrift_proxy/filters:filter_config_interface", "//source/extensions/filters/network/thrift_proxy/filters:well_known_names", "//source/extensions/filters/network/thrift_proxy/router:router_lib", - "@envoy_api//envoy/config/filter/network/thrift_proxy/v2alpha1:thrift_proxy_cc", + "@envoy_api//envoy/config/filter/network/thrift_proxy/v2alpha1:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD index 1d6128fda8fb..302ebe615b6c 100644 --- a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD +++ b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD @@ -22,7 +22,7 @@ envoy_cc_library( "//source/extensions/filters/network/thrift_proxy:app_exception_lib", "//source/extensions/filters/network/thrift_proxy/filters:filter_interface", "//source/extensions/filters/network/thrift_proxy/router:router_ratelimit_interface", - "@envoy_api//envoy/config/filter/thrift/rate_limit/v2alpha1:rate_limit_cc", + "@envoy_api//envoy/config/filter/thrift/rate_limit/v2alpha1:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/thrift_proxy/router/BUILD b/source/extensions/filters/network/thrift_proxy/router/BUILD index 693a4ce920af..58e44165ced6 100644 --- a/source/extensions/filters/network/thrift_proxy/router/BUILD +++ b/source/extensions/filters/network/thrift_proxy/router/BUILD @@ -18,7 +18,7 @@ envoy_cc_library( "//source/extensions/filters/network/thrift_proxy/filters:factory_base_lib", "//source/extensions/filters/network/thrift_proxy/filters:filter_config_interface", "//source/extensions/filters/network/thrift_proxy/filters:well_known_names", - "@envoy_api//envoy/config/filter/thrift/router/v2alpha1:router_cc", + "@envoy_api//envoy/config/filter/thrift/router/v2alpha1:pkg_cc_proto", ], ) @@ -39,7 +39,7 @@ envoy_cc_library( ":router_interface", "//include/envoy/router:router_ratelimit_interface", "//source/extensions/filters/network/thrift_proxy:metadata_lib", - "@envoy_api//envoy/api/v2/route:route_cc", + "@envoy_api//envoy/api/v2/route:pkg_cc_proto", ], ) @@ -66,7 +66,7 @@ envoy_cc_library( "//source/extensions/filters/network/thrift_proxy:thrift_object_interface", "//source/extensions/filters/network/thrift_proxy:transport_interface", "//source/extensions/filters/network/thrift_proxy/filters:filter_interface", - "@envoy_api//envoy/config/filter/network/thrift_proxy/v2alpha1:thrift_proxy_cc", + "@envoy_api//envoy/config/filter/network/thrift_proxy/v2alpha1:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/zookeeper_proxy/BUILD b/source/extensions/filters/network/zookeeper_proxy/BUILD index 934f23a53032..fdbcdcdfa635 100644 --- a/source/extensions/filters/network/zookeeper_proxy/BUILD +++ b/source/extensions/filters/network/zookeeper_proxy/BUILD @@ -45,6 +45,6 @@ envoy_cc_library( ":proxy_lib", "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", - "@envoy_api//envoy/config/filter/network/zookeeper_proxy/v1alpha1:zookeeper_proxy_cc", + "@envoy_api//envoy/config/filter/network/zookeeper_proxy/v1alpha1:pkg_cc_proto", ], ) diff --git a/source/extensions/grpc_credentials/aws_iam/BUILD b/source/extensions/grpc_credentials/aws_iam/BUILD index 8c8d36fe3b85..53c91f8b67c7 100644 --- a/source/extensions/grpc_credentials/aws_iam/BUILD +++ b/source/extensions/grpc_credentials/aws_iam/BUILD @@ -28,6 +28,6 @@ envoy_cc_library( "//source/extensions/filters/http/common/aws:signer_impl_lib", "//source/extensions/filters/http/common/aws:utility_lib", "//source/extensions/grpc_credentials:well_known_names", - "@envoy_api//envoy/config/grpc_credential/v2alpha:aws_iam_cc", + "@envoy_api//envoy/config/grpc_credential/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/grpc_credentials/file_based_metadata/BUILD b/source/extensions/grpc_credentials/file_based_metadata/BUILD index 30e63efddd0b..d79201a751e3 100644 --- a/source/extensions/grpc_credentials/file_based_metadata/BUILD +++ b/source/extensions/grpc_credentials/file_based_metadata/BUILD @@ -22,6 +22,6 @@ envoy_cc_library( "//source/common/grpc:common_lib", "//source/common/grpc:google_grpc_creds_lib", "//source/extensions/grpc_credentials:well_known_names", - "@envoy_api//envoy/config/grpc_credential/v2alpha:file_based_metadata_cc", + "@envoy_api//envoy/config/grpc_credential/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/health_checkers/redis/BUILD b/source/extensions/health_checkers/redis/BUILD index 5c3c7bdffe8b..bc14e64c7c43 100644 --- a/source/extensions/health_checkers/redis/BUILD +++ b/source/extensions/health_checkers/redis/BUILD @@ -19,8 +19,8 @@ envoy_cc_library( "//source/extensions/filters/network/common/redis:client_lib", "//source/extensions/filters/network/redis_proxy:config", "//source/extensions/filters/network/redis_proxy:conn_pool_lib", - "@envoy_api//envoy/api/v2/core:health_check_cc", - "@envoy_api//envoy/config/health_checker/redis/v2:redis_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/health_checker/redis/v2:pkg_cc_proto", ], ) @@ -44,7 +44,7 @@ envoy_cc_library( deps = [ "//source/common/protobuf", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/api/v2/core:health_check_cc", - "@envoy_api//envoy/config/health_checker/redis/v2:redis_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/config/health_checker/redis/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/quic_listeners/quiche/BUILD b/source/extensions/quic_listeners/quiche/BUILD index d0e569e3d93d..63f9046607ea 100644 --- a/source/extensions/quic_listeners/quiche/BUILD +++ b/source/extensions/quic_listeners/quiche/BUILD @@ -223,7 +223,7 @@ envoy_cc_library( "//source/common/network:listener_lib", "//source/common/protobuf:utility_lib", "//source/server:connection_handler_lib", - "@envoy_api//envoy/api/v2/listener:quic_config_cc", + "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", ], ) @@ -264,6 +264,6 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/extensions/transport_sockets:well_known_names", "//source/extensions/transport_sockets/tls:context_config_lib", - "@envoy_api//envoy/api/v2/auth:cert_cc", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", ], ) diff --git a/source/extensions/resource_monitors/fixed_heap/BUILD b/source/extensions/resource_monitors/fixed_heap/BUILD index f9042c54305e..c9f6699e0275 100644 --- a/source/extensions/resource_monitors/fixed_heap/BUILD +++ b/source/extensions/resource_monitors/fixed_heap/BUILD @@ -16,7 +16,7 @@ envoy_cc_library( "//include/envoy/server:resource_monitor_config_interface", "//source/common/common:assert_lib", "//source/common/memory:stats_lib", - "@envoy_api//envoy/config/resource_monitor/fixed_heap/v2alpha:fixed_heap_cc", + "@envoy_api//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/resource_monitors/injected_resource/BUILD b/source/extensions/resource_monitors/injected_resource/BUILD index c1e4036ce3eb..61df503b2dbd 100644 --- a/source/extensions/resource_monitors/injected_resource/BUILD +++ b/source/extensions/resource_monitors/injected_resource/BUILD @@ -17,7 +17,7 @@ envoy_cc_library( "//include/envoy/filesystem:filesystem_interface", "//include/envoy/server:resource_monitor_config_interface", "//source/common/common:assert_lib", - "@envoy_api//envoy/config/resource_monitor/injected_resource/v2alpha:injected_resource_cc", + "@envoy_api//envoy/config/resource_monitor/injected_resource/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/retry/priority/previous_priorities/BUILD b/source/extensions/retry/priority/previous_priorities/BUILD index 9f83cb15f02f..8c9cad99cbd2 100644 --- a/source/extensions/retry/priority/previous_priorities/BUILD +++ b/source/extensions/retry/priority/previous_priorities/BUILD @@ -28,6 +28,6 @@ envoy_cc_library( "//include/envoy/upstream:retry_interface", "//source/common/protobuf", "//source/extensions/retry/priority:well_known_names", - "@envoy_api//envoy/config/retry/previous_priorities:previous_priorities_cc", + "@envoy_api//envoy/config/retry/previous_priorities:pkg_cc_proto", ], ) diff --git a/source/extensions/stat_sinks/dog_statsd/BUILD b/source/extensions/stat_sinks/dog_statsd/BUILD index 83273b1afe42..07d7b4ab317b 100644 --- a/source/extensions/stat_sinks/dog_statsd/BUILD +++ b/source/extensions/stat_sinks/dog_statsd/BUILD @@ -22,6 +22,6 @@ envoy_cc_library( "//source/extensions/stat_sinks:well_known_names", "//source/extensions/stat_sinks/common/statsd:statsd_lib", "//source/server:configuration_lib", - "@envoy_api//envoy/config/metrics/v2:stats_cc", + "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/stat_sinks/hystrix/BUILD b/source/extensions/stat_sinks/hystrix/BUILD index df8273422675..541ad06838af 100644 --- a/source/extensions/stat_sinks/hystrix/BUILD +++ b/source/extensions/stat_sinks/hystrix/BUILD @@ -21,7 +21,7 @@ envoy_cc_library( "//source/extensions/stat_sinks:well_known_names", "//source/extensions/stat_sinks/hystrix:hystrix_lib", "//source/server:configuration_lib", - "@envoy_api//envoy/config/metrics/v2:stats_cc", + "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/stat_sinks/metrics_service/BUILD b/source/extensions/stat_sinks/metrics_service/BUILD index 91cd5dcf50e7..bc7562f11b7f 100644 --- a/source/extensions/stat_sinks/metrics_service/BUILD +++ b/source/extensions/stat_sinks/metrics_service/BUILD @@ -21,7 +21,7 @@ envoy_cc_library( "//include/envoy/upstream:cluster_manager_interface", "//source/common/common:assert_lib", "//source/common/grpc:async_client_lib", - "@envoy_api//envoy/service/metrics/v2:metrics_service_cc", + "@envoy_api//envoy/service/metrics/v2:pkg_cc_proto", ], ) @@ -32,7 +32,7 @@ envoy_cc_library( deps = [ "//source/common/common:assert_lib", "//source/common/protobuf", - "@envoy_api//envoy/service/metrics/v2:metrics_service_cc", + "@envoy_api//envoy/service/metrics/v2:pkg_cc_proto", ], ) @@ -47,7 +47,7 @@ envoy_cc_library( "//source/extensions/stat_sinks/metrics_service:metrics_proto_descriptors_lib", "//source/extensions/stat_sinks/metrics_service:metrics_service_grpc_lib", "//source/server:configuration_lib", - "@envoy_api//envoy/config/metrics/v2:stats_cc", - "@envoy_api//envoy/service/metrics/v2:metrics_service_cc", + "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", + "@envoy_api//envoy/service/metrics/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/stat_sinks/statsd/BUILD b/source/extensions/stat_sinks/statsd/BUILD index 23ea5f1470ad..af47dfef1a27 100644 --- a/source/extensions/stat_sinks/statsd/BUILD +++ b/source/extensions/stat_sinks/statsd/BUILD @@ -21,6 +21,6 @@ envoy_cc_library( "//source/extensions/stat_sinks:well_known_names", "//source/extensions/stat_sinks/common/statsd:statsd_lib", "//source/server:configuration_lib", - "@envoy_api//envoy/config/metrics/v2:stats_cc", + "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/tracers/opencensus/BUILD b/source/extensions/tracers/opencensus/BUILD index 0e7c9085fcab..83fedbab27b6 100644 --- a/source/extensions/tracers/opencensus/BUILD +++ b/source/extensions/tracers/opencensus/BUILD @@ -40,6 +40,6 @@ envoy_cc_library( deps = [ "//source/common/config:utility_lib", "//source/common/tracing:http_tracer_lib", - "@envoy_api//envoy/config/trace/v2:trace_cc", + "@envoy_api//envoy/config/trace/v2:pkg_cc_proto", ], ) diff --git a/source/extensions/tracers/zipkin/BUILD b/source/extensions/tracers/zipkin/BUILD index 652496900174..d2795d5472d0 100644 --- a/source/extensions/tracers/zipkin/BUILD +++ b/source/extensions/tracers/zipkin/BUILD @@ -57,7 +57,7 @@ envoy_cc_library( "//source/common/singleton:const_singleton", "//source/common/tracing:http_tracer_lib", "//source/extensions/tracers:well_known_names", - "@com_github_openzipkin_zipkinapi//:zipkin_cc", + "@com_github_openzipkin_zipkinapi//:zipkin_cc_proto", ], ) diff --git a/source/extensions/transport_sockets/alts/BUILD b/source/extensions/transport_sockets/alts/BUILD index a13af2b2c3ea..e860bd929975 100644 --- a/source/extensions/transport_sockets/alts/BUILD +++ b/source/extensions/transport_sockets/alts/BUILD @@ -40,7 +40,7 @@ envoy_cc_library( "//include/envoy/server:transport_socket_config_interface", "//source/common/grpc:google_grpc_context_lib", "//source/extensions/transport_sockets:well_known_names", - "@envoy_api//envoy/config/transport_socket/alts/v2alpha:alts_cc", + "@envoy_api//envoy/config/transport_socket/alts/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/transport_sockets/tap/BUILD b/source/extensions/transport_sockets/tap/BUILD index 0d387997e1eb..aa8864271687 100644 --- a/source/extensions/transport_sockets/tap/BUILD +++ b/source/extensions/transport_sockets/tap/BUILD @@ -27,7 +27,7 @@ envoy_cc_library( ":tap_config_interface", "//source/common/network:utility_lib", "//source/extensions/common/tap:tap_config_base", - "@envoy_api//envoy/data/tap/v2alpha:wrapper_cc", + "@envoy_api//envoy/data/tap/v2alpha:pkg_cc_proto", ], ) @@ -40,7 +40,7 @@ envoy_cc_library( "//include/envoy/network:transport_socket_interface", "//source/common/buffer:buffer_lib", "//source/extensions/common/tap:extension_config_base", - "@envoy_api//envoy/config/transport_socket/tap/v2alpha:tap_cc", + "@envoy_api//envoy/config/transport_socket/tap/v2alpha:pkg_cc_proto", ], ) @@ -57,6 +57,6 @@ envoy_cc_library( "//source/common/config:utility_lib", "//source/common/protobuf:utility_lib", "//source/extensions/transport_sockets:well_known_names", - "@envoy_api//envoy/config/transport_socket/tap/v2alpha:tap_cc", + "@envoy_api//envoy/config/transport_socket/tap/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/transport_sockets/tls/BUILD b/source/extensions/transport_sockets/tls/BUILD index 3345a9d87439..cdc81bb51608 100644 --- a/source/extensions/transport_sockets/tls/BUILD +++ b/source/extensions/transport_sockets/tls/BUILD @@ -69,7 +69,7 @@ envoy_cc_library( "//source/common/secret:sds_api_lib", "//source/common/ssl:certificate_validation_context_config_impl_lib", "//source/common/ssl:tls_certificate_config_impl_lib", - "@envoy_api//envoy/api/v2/auth:cert_cc", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", ], ) @@ -103,7 +103,7 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/common/stats:symbol_table_lib", "//source/extensions/transport_sockets/tls/private_key:private_key_manager_lib", - "@envoy_api//envoy/admin/v2alpha:certs_cc", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/transport_sockets/tls/private_key/BUILD b/source/extensions/transport_sockets/tls/private_key/BUILD index 2c181249b5d8..1c0283a84ab8 100644 --- a/source/extensions/transport_sockets/tls/private_key/BUILD +++ b/source/extensions/transport_sockets/tls/private_key/BUILD @@ -21,6 +21,6 @@ envoy_cc_library( "//include/envoy/registry", "//include/envoy/ssl/private_key:private_key_config_interface", "//include/envoy/ssl/private_key:private_key_interface", - "@envoy_api//envoy/api/v2/auth:cert_cc", + "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", ], ) diff --git a/source/server/BUILD b/source/server/BUILD index c99c7eeca205..2810fedb9080 100644 --- a/source/server/BUILD +++ b/source/server/BUILD @@ -48,8 +48,8 @@ envoy_cc_library( "//source/common/network:utility_lib", "//source/common/protobuf:utility_lib", "//source/common/tracing:http_tracer_lib", - "@envoy_api//envoy/api/v2:lds_cc", - "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -124,7 +124,7 @@ envoy_cc_library( srcs = envoy_select_hot_restart(["hot_restarting_base.cc"]), hdrs = envoy_select_hot_restart(["hot_restarting_base.h"]), deps = [ - ":hot_restart_cc", + ":hot_restart_cc_proto", "//include/envoy/api:os_sys_calls_interface", "//include/envoy/event:dispatcher_interface", "//include/envoy/event:file_event_interface", @@ -218,7 +218,7 @@ envoy_cc_library( "//source/common/common:version_lib", "//source/common/protobuf:utility_lib", "//source/common/stats:stats_lib", - "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -234,7 +234,7 @@ envoy_cc_library( "//source/common/config:utility_lib", "//source/common/stats:symbol_table_lib", "//source/server:resource_monitor_config_lib", - "@envoy_api//envoy/config/overload/v2alpha:overload_cc", + "@envoy_api//envoy/config/overload/v2alpha:pkg_cc_proto", ], ) @@ -252,7 +252,7 @@ envoy_cc_library( "//source/common/config:utility_lib", "//source/common/init:target_lib", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/api/v2:lds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -282,8 +282,8 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/extensions/filters/listener:well_known_names", "//source/extensions/transport_sockets:well_known_names", - "@envoy_api//envoy/admin/v2alpha:config_dump_cc", - "@envoy_api//envoy/api/v2:lds_cc", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -316,15 +316,9 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/config:protobuf_link_hacks", "//source/common/protobuf", - "@envoy_api//envoy/api/v2:cds_cc", - "@envoy_api//envoy/api/v2:eds_cc", - "@envoy_api//envoy/api/v2:lds_cc", - "@envoy_api//envoy/api/v2:rds_cc", - "@envoy_api//envoy/api/v2:srds_cc", - "@envoy_api//envoy/service/discovery/v2:ads_cc", - "@envoy_api//envoy/service/discovery/v2:hds_cc", - "@envoy_api//envoy/service/discovery/v2:rtds_cc", - "@envoy_api//envoy/service/ratelimit/v2:rls_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", + "@envoy_api//envoy/service/ratelimit/v2:pkg_cc_proto", ], ) @@ -392,7 +386,7 @@ envoy_cc_library( "//source/common/upstream:health_discovery_service_lib", "//source/server:overload_manager_lib", "//source/server/http:admin_lib", - "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) diff --git a/source/server/config_validation/BUILD b/source/server/config_validation/BUILD index a649fdd6bbb2..43233ed74665 100644 --- a/source/server/config_validation/BUILD +++ b/source/server/config_validation/BUILD @@ -107,6 +107,6 @@ envoy_cc_library( "//source/server:configuration_lib", "//source/server:server_lib", "//source/server/http:admin_lib", - "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) diff --git a/source/server/http/BUILD b/source/server/http/BUILD index 41bfe83cc8da..2c1168adefec 100644 --- a/source/server/http/BUILD +++ b/source/server/http/BUILD @@ -59,13 +59,7 @@ envoy_cc_library( "//source/common/stats:stats_lib", "//source/common/upstream:host_utility_lib", "//source/extensions/access_loggers/file:file_access_log_lib", - "@envoy_api//envoy/admin/v2alpha:certs_cc", - "@envoy_api//envoy/admin/v2alpha:clusters_cc", - "@envoy_api//envoy/admin/v2alpha:config_dump_cc", - "@envoy_api//envoy/admin/v2alpha:listeners_cc", - "@envoy_api//envoy/admin/v2alpha:memory_cc", - "@envoy_api//envoy/admin/v2alpha:mutex_stats_cc", - "@envoy_api//envoy/admin/v2alpha:server_info_cc", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", ], ) diff --git a/test/common/access_log/BUILD b/test/common/access_log/BUILD index ab2fd26ded18..264a7afa2a33 100644 --- a/test/common/access_log/BUILD +++ b/test/common/access_log/BUILD @@ -23,7 +23,7 @@ envoy_cc_fuzz_test( srcs = ["access_log_formatter_fuzz_test.cc"], corpus = "access_log_formatter_corpus", deps = [ - ":access_log_formatter_fuzz_proto_cc", + ":access_log_formatter_fuzz_proto_cc_proto", "//source/common/access_log:access_log_formatter_lib", "//test/fuzz:utility_lib", ], diff --git a/test/common/buffer/BUILD b/test/common/buffer/BUILD index cd47700c392a..2d698c576820 100644 --- a/test/common/buffer/BUILD +++ b/test/common/buffer/BUILD @@ -31,7 +31,7 @@ envoy_cc_test_library( srcs = ["buffer_fuzz.cc"], hdrs = ["buffer_fuzz.h"], deps = [ - ":buffer_fuzz_proto_cc", + ":buffer_fuzz_proto_cc_proto", "//source/common/buffer:buffer_lib", "//source/common/common:stack_array", "//source/common/memory:stats_lib", diff --git a/test/common/common/BUILD b/test/common/common/BUILD index dd9b768e0ad5..c9024dba5e8d 100644 --- a/test/common/common/BUILD +++ b/test/common/common/BUILD @@ -113,10 +113,8 @@ envoy_cc_test( "//source/common/common:matchers_lib", "//source/common/config:metadata_lib", "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/api/v2/core:base_cc", - "@envoy_api//envoy/type/matcher:metadata_cc", - "@envoy_api//envoy/type/matcher:number_cc", - "@envoy_api//envoy/type/matcher:string_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", + "@envoy_api//envoy/type/matcher:pkg_cc_proto", ], ) diff --git a/test/common/config/BUILD b/test/common/config/BUILD index 81962b76d127..d519f20fc6b4 100644 --- a/test/common/config/BUILD +++ b/test/common/config/BUILD @@ -73,7 +73,7 @@ envoy_cc_test_library( "//test/test_common:environment_lib", "//test/test_common:test_time_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:eds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -95,9 +95,8 @@ envoy_cc_test( "//test/test_common:logging_lib", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:discovery_cc", - "@envoy_api//envoy/api/v2:eds_cc", - "@envoy_api//envoy/service/discovery/v2:ads_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) @@ -119,9 +118,8 @@ envoy_cc_test( "//test/test_common:logging_lib", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:discovery_cc", - "@envoy_api//envoy/api/v2:eds_cc", - "@envoy_api//envoy/service/discovery/v2:ads_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) @@ -160,7 +158,7 @@ envoy_cc_test_library( "//test/mocks/local_info:local_info_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:eds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -204,7 +202,7 @@ envoy_cc_test_library( "//test/mocks/runtime:runtime_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:eds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -223,8 +221,8 @@ envoy_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:eds_cc", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -300,7 +298,7 @@ envoy_cc_test( "//test/test_common:environment_lib", "//test/test_common:logging_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:eds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -311,7 +309,7 @@ envoy_cc_test( "//source/common/config:watch_map_lib", "//test/mocks/config:config_mocks", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:eds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -333,7 +331,7 @@ envoy_cc_test( name = "config_provider_impl_test", srcs = ["config_provider_impl_test.cc"], deps = [ - ":dummy_config_proto_cc", + ":dummy_config_proto_cc_proto", "//source/common/config:config_provider_lib", "//source/common/protobuf:utility_lib", "//test/mocks/server:server_mocks", @@ -351,7 +349,7 @@ envoy_cc_test( "//test/mocks/server:server_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -364,7 +362,7 @@ envoy_cc_test( name = "version_converter_test", srcs = ["version_converter_test.cc"], deps = [ - ":version_converter_proto_cc", + ":version_converter_proto_cc_proto", "//source/common/config:version_converter_lib", "//test/test_common:test_time_lib", "//test/test_common:utility_lib", diff --git a/test/common/grpc/BUILD b/test/common/grpc/BUILD index ed8df64ca6ca..07f457f2a263 100644 --- a/test/common/grpc/BUILD +++ b/test/common/grpc/BUILD @@ -18,7 +18,7 @@ envoy_cc_test( "//test/mocks/http:http_mocks", "//test/mocks/tracing:tracing_mocks", "//test/mocks/upstream:upstream_mocks", - "//test/proto:helloworld_proto_cc", + "//test/proto:helloworld_proto_cc_proto", "//test/test_common:test_time_lib", ], ) @@ -42,7 +42,7 @@ envoy_cc_test( deps = [ "//source/common/buffer:buffer_lib", "//source/common/grpc:codec_lib", - "//test/proto:helloworld_proto_cc", + "//test/proto:helloworld_proto_cc_proto", ], ) @@ -53,7 +53,7 @@ envoy_cc_test( "//source/common/grpc:common_lib", "//source/common/http:headers_lib", "//test/mocks/upstream:upstream_mocks", - "//test/proto:helloworld_proto_cc", + "//test/proto:helloworld_proto_cc_proto", "//test/test_common:utility_lib", ], ) @@ -77,7 +77,7 @@ envoy_cc_test( "//source/common/grpc:common_lib", "//source/common/http:headers_lib", "//test/mocks/upstream:upstream_mocks", - "//test/proto:helloworld_proto_cc", + "//test/proto:helloworld_proto_cc_proto", "//test/test_common:utility_lib", ] + envoy_select_google_grpc(["//source/common/grpc:google_grpc_utils_lib"]), ) @@ -93,7 +93,7 @@ envoy_cc_test( "//source/common/tracing:http_tracer_lib", "//test/mocks/grpc:grpc_mocks", "//test/mocks/tracing:tracing_mocks", - "//test/proto:helloworld_proto_cc", + "//test/proto:helloworld_proto_cc_proto", "//test/test_common:test_time_lib", "//test/test_common:utility_lib", ] + envoy_select_google_grpc(["//source/common/grpc:google_async_client_lib"]), @@ -132,7 +132,7 @@ envoy_cc_test_library( "//test/integration:integration_lib", "//test/mocks/local_info:local_info_mocks", "//test/mocks/server:server_mocks", - "//test/proto:helloworld_proto_cc", + "//test/proto:helloworld_proto_cc_proto", "//test/test_common:global_lib", "//test/test_common:test_time_lib", "//test/test_common:utility_lib", @@ -156,6 +156,6 @@ envoy_cc_test_library( data = ["//test/config/integration/certs"], deps = [ "//test/test_common:environment_lib", - "@envoy_api//envoy/api/v2/core:grpc_service_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/common/http/BUILD b/test/common/http/BUILD index 5c6a91624f31..af21da3858df 100644 --- a/test/common/http/BUILD +++ b/test/common/http/BUILD @@ -70,7 +70,7 @@ envoy_cc_fuzz_test( srcs = ["codec_impl_fuzz_test.cc"], corpus = "codec_impl_corpus", deps = [ - ":codec_impl_fuzz_proto_cc", + ":codec_impl_fuzz_proto_cc_proto", "//source/common/http:header_map_lib", "//source/common/http/http1:codec_lib", "//source/common/http/http2:codec_lib", @@ -143,7 +143,7 @@ envoy_cc_fuzz_test( srcs = ["conn_manager_impl_fuzz_test.cc"], corpus = "conn_manager_impl_corpus", deps = [ - ":conn_manager_impl_fuzz_proto_cc", + ":conn_manager_impl_fuzz_proto_cc_proto", "//source/common/common:empty_string", "//source/common/http:conn_manager_lib", "//source/common/http:context_lib", @@ -162,7 +162,7 @@ envoy_cc_fuzz_test( "//test/mocks/tracing:tracing_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:simulated_time_system_lib", - "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:http_connection_manager_cc", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -271,7 +271,7 @@ envoy_cc_fuzz_test( srcs = ["header_map_impl_fuzz_test.cc"], corpus = "header_map_impl_corpus", deps = [ - ":header_map_impl_fuzz_proto_cc", + ":header_map_impl_fuzz_proto_cc_proto", "//source/common/http:header_map_lib", "//test/fuzz:utility_lib", ], @@ -308,7 +308,7 @@ envoy_cc_fuzz_test( srcs = ["utility_fuzz_test.cc"], corpus = "utility_corpus", deps = [ - ":utility_fuzz_proto_cc", + ":utility_fuzz_proto_cc_proto", "//source/common/http:utility_lib", "//test/fuzz:utility_lib", "//test/test_common:utility_lib", @@ -327,7 +327,7 @@ envoy_cc_test( "//test/mocks/http:http_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2/core:protocol_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/common/protobuf/BUILD b/test/common/protobuf/BUILD index 81c30eb6a241..230f497afc34 100644 --- a/test/common/protobuf/BUILD +++ b/test/common/protobuf/BUILD @@ -29,11 +29,11 @@ envoy_cc_test( "//test/mocks/local_info:local_info_mocks", "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/server:server_mocks", - "//test/proto:deprecated_proto_cc", + "//test/proto:deprecated_proto_cc_proto", "//test/test_common:environment_lib", "//test/test_common:logging_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) diff --git a/test/common/router/BUILD b/test/common/router/BUILD index aa1385416405..3888f3eea324 100644 --- a/test/common/router/BUILD +++ b/test/common/router/BUILD @@ -22,7 +22,7 @@ envoy_cc_test_library( name = "config_impl_test_lib", srcs = ["config_impl_test.cc"], deps = [ - ":route_fuzz_proto_cc", + ":route_fuzz_proto_cc_proto", "//source/common/config:metadata_lib", "//source/common/http:header_map_lib", "//source/common/http:headers_lib", @@ -33,8 +33,8 @@ envoy_cc_test_library( "//test/test_common:environment_lib", "//test/test_common:registry_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:rds_cc", - "@envoy_api//envoy/config/filter/http/router/v2:router_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/http/router/v2:pkg_cc_proto", ], ) @@ -43,7 +43,7 @@ envoy_proto_library( srcs = ["header_parser_fuzz.proto"], deps = [ "//test/fuzz:common_proto", - "@envoy_api//envoy/api/v2/core:base_export", + "@envoy_api//envoy/api/v2/core:pkg", ], ) @@ -52,7 +52,7 @@ envoy_cc_fuzz_test( srcs = ["header_parser_fuzz_test.cc"], corpus = "header_parser_corpus", deps = [ - ":header_parser_fuzz_proto_cc", + ":header_parser_fuzz_proto_cc_proto", "//source/common/http:header_map_lib", "//source/common/router:header_parser_lib", "//test/fuzz:utility_lib", @@ -151,7 +151,7 @@ envoy_proto_library( srcs = ["route_fuzz.proto"], deps = [ "//test/fuzz:common_proto", - "@envoy_api//envoy/api/v2:rds_export", + "@envoy_api//envoy/api/v2:pkg", ], ) @@ -203,7 +203,7 @@ envoy_cc_fuzz_test( srcs = ["route_fuzz_test.cc"], corpus = ":route_corpus", deps = [ - ":route_fuzz_proto_cc", + ":route_fuzz_proto_cc_proto", "//source/common/router:config_lib", "//test/fuzz:utility_lib", "//test/mocks/server:server_mocks", @@ -223,7 +223,7 @@ envoy_cc_test( "//test/mocks/router:router_mocks", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:rds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -276,7 +276,7 @@ envoy_cc_test( "//test/mocks/ssl:ssl_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/filter/http/router/v2:router_cc", + "@envoy_api//envoy/config/filter/http/router/v2:pkg_cc_proto", ], ) diff --git a/test/common/secret/BUILD b/test/common/secret/BUILD index a2e85abcef8f..8d24a834b4d7 100644 --- a/test/common/secret/BUILD +++ b/test/common/secret/BUILD @@ -24,7 +24,7 @@ envoy_cc_test( "//test/test_common:registry_lib", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/grpc_credential/v2alpha:file_based_metadata_cc", + "@envoy_api//envoy/config/grpc_credential/v2alpha:pkg_cc_proto", ], ) @@ -46,6 +46,6 @@ envoy_cc_test( "//test/test_common:environment_lib", "//test/test_common:registry_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/service/discovery/v2:sds_cc", + "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) diff --git a/test/common/stats/BUILD b/test/common/stats/BUILD index 65ed7bf5fd45..aee51b4cae23 100644 --- a/test/common/stats/BUILD +++ b/test/common/stats/BUILD @@ -172,7 +172,7 @@ envoy_cc_test( "//test/mocks/thread_local:thread_local_mocks", "//test/test_common:logging_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/metrics/v2:stats_cc", + "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index c33985798d53..2e29e3075a49 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -22,7 +22,7 @@ envoy_cc_test( "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2/core:config_source_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) @@ -66,7 +66,7 @@ envoy_cc_test( "//test/test_common:simulated_time_system_lib", "//test/test_common:threadsafe_singleton_injector_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:cds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -106,7 +106,7 @@ envoy_cc_test( "//test/mocks/ssl:ssl_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:eds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -197,9 +197,8 @@ envoy_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:eds_cc", - "@envoy_api//envoy/api/v2/endpoint:endpoint_cc", - "@envoy_api//envoy/api/v2/endpoint:load_report_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", ], ) @@ -219,8 +218,8 @@ envoy_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2/endpoint:load_report_cc", - "@envoy_api//envoy/service/discovery/v2:hds_cc", + "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto", + "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) diff --git a/test/config/BUILD b/test/config/BUILD index 4a6302513380..5ac346ec470e 100644 --- a/test/config/BUILD +++ b/test/config/BUILD @@ -29,10 +29,10 @@ envoy_cc_test_library( "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:eds_cc", - "@envoy_api//envoy/config/accesslog/v2:file_cc", - "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc", - "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:http_connection_manager_cc", - "@envoy_api//envoy/config/transport_socket/tap/v2alpha:tap_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/config/accesslog/v2:pkg_cc_proto", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", + "@envoy_api//envoy/config/transport_socket/tap/v2alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/clusters/redis/BUILD b/test/extensions/clusters/redis/BUILD index 25495a9d7d95..67e6e6df8235 100644 --- a/test/extensions/clusters/redis/BUILD +++ b/test/extensions/clusters/redis/BUILD @@ -40,7 +40,7 @@ envoy_extension_cc_test( "//test/mocks/thread_local:thread_local_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/cluster/redis:redis_cluster_cc", + "@envoy_api//envoy/config/cluster/redis:pkg_cc_proto", ], ) @@ -77,7 +77,7 @@ envoy_extension_cc_test( "//test/mocks/thread_local:thread_local_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/cluster/redis:redis_cluster_cc", + "@envoy_api//envoy/config/cluster/redis:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/common/ext_authz/BUILD b/test/extensions/filters/common/ext_authz/BUILD index 11ea6860feba..9690ed599a92 100644 --- a/test/extensions/filters/common/ext_authz/BUILD +++ b/test/extensions/filters/common/ext_authz/BUILD @@ -62,6 +62,6 @@ envoy_cc_mock( "//test/extensions/filters/common/ext_authz:ext_authz_mocks", "//test/mocks/grpc:grpc_mocks", "//test/mocks/upstream:upstream_mocks", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/http/grpc_json_transcoder/BUILD b/test/extensions/filters/http/grpc_json_transcoder/BUILD index 831f8c2fdfc0..e562f4bdda6f 100644 --- a/test/extensions/filters/http/grpc_json_transcoder/BUILD +++ b/test/extensions/filters/http/grpc_json_transcoder/BUILD @@ -23,7 +23,7 @@ envoy_extension_cc_test( "//source/extensions/filters/http/grpc_json_transcoder:json_transcoder_filter_lib", "//test/mocks/http:http_mocks", "//test/mocks/upstream:upstream_mocks", - "//test/proto:bookstore_proto_cc", + "//test/proto:bookstore_proto_cc_proto", "//test/test_common:environment_lib", "//test/test_common:utility_lib", ], @@ -53,7 +53,7 @@ envoy_extension_cc_test( "//source/common/http:header_map_lib", "//source/extensions/filters/http/grpc_json_transcoder:config", "//test/integration:http_integration_lib", - "//test/proto:bookstore_proto_cc", + "//test/proto:bookstore_proto_cc_proto", "//test/test_common:utility_lib", ], ) diff --git a/test/extensions/filters/http/original_src/BUILD b/test/extensions/filters/http/original_src/BUILD index 851df2edd9fe..f0526545aa60 100644 --- a/test/extensions/filters/http/original_src/BUILD +++ b/test/extensions/filters/http/original_src/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( extension_name = "envoy.filters.http.original_src", deps = [ "//source/extensions/filters/http/original_src:config_lib", - "@envoy_api//envoy/config/filter/http/original_src/v2alpha1:original_src_cc", + "@envoy_api//envoy/config/filter/http/original_src/v2alpha1:pkg_cc_proto", ], ) @@ -31,7 +31,7 @@ envoy_extension_cc_test( "//source/extensions/filters/http/original_src:config_lib", "//source/extensions/filters/http/original_src:original_src_lib", "//test/mocks/server:server_mocks", - "@envoy_api//envoy/config/filter/http/original_src/v2alpha1:original_src_cc", + "@envoy_api//envoy/config/filter/http/original_src/v2alpha1:pkg_cc_proto", ], ) @@ -48,6 +48,6 @@ envoy_extension_cc_test( "//test/mocks/network:network_mocks", "//test/test_common:printers_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/filter/http/original_src/v2alpha1:original_src_cc", + "@envoy_api//envoy/config/filter/http/original_src/v2alpha1:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/listener/original_src/BUILD b/test/extensions/filters/listener/original_src/BUILD index 9a43087b8efa..0732355d2dbc 100644 --- a/test/extensions/filters/listener/original_src/BUILD +++ b/test/extensions/filters/listener/original_src/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( extension_name = "envoy.filters.listener.original_src", deps = [ "//source/extensions/filters/listener/original_src:config_lib", - "@envoy_api//envoy/config/filter/listener/original_src/v2alpha1:original_src_cc", + "@envoy_api//envoy/config/filter/listener/original_src/v2alpha1:pkg_cc_proto", ], ) @@ -31,7 +31,7 @@ envoy_extension_cc_test( "//source/extensions/filters/listener/original_src:config_lib", "//source/extensions/filters/listener/original_src:original_src_lib", "//test/mocks/server:server_mocks", - "@envoy_api//envoy/config/filter/listener/original_src/v2alpha1:original_src_cc", + "@envoy_api//envoy/config/filter/listener/original_src/v2alpha1:pkg_cc_proto", ], ) @@ -46,6 +46,6 @@ envoy_extension_cc_test( "//test/mocks/buffer:buffer_mocks", "//test/mocks/network:network_mocks", "//test/test_common:printers_lib", - "@envoy_api//envoy/config/filter/listener/original_src/v2alpha1:original_src_cc", + "@envoy_api//envoy/config/filter/listener/original_src/v2alpha1:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/common/redis/BUILD b/test/extensions/filters/network/common/redis/BUILD index 8b0f46b1600f..7e6890d52f48 100644 --- a/test/extensions/filters/network/common/redis/BUILD +++ b/test/extensions/filters/network/common/redis/BUILD @@ -26,7 +26,7 @@ envoy_cc_test_library( hdrs = ["test_utils.h"], deps = [ "//source/common/protobuf:utility_lib", - "@envoy_api//envoy/config/filter/network/redis_proxy/v2:redis_proxy_cc", + "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/dubbo_proxy/BUILD b/test/extensions/filters/network/dubbo_proxy/BUILD index f59221ca29d9..31a09ff9a1da 100644 --- a/test/extensions/filters/network/dubbo_proxy/BUILD +++ b/test/extensions/filters/network/dubbo_proxy/BUILD @@ -30,7 +30,7 @@ envoy_cc_mock( "//test/mocks/network:network_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:printers_lib", - "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:dubbo_proxy_cc", + "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:pkg_cc_proto", ], ) @@ -92,7 +92,7 @@ envoy_extension_cc_test( "//source/extensions/filters/network/dubbo_proxy/filters:filter_config_interface", "//test/mocks/server:server_mocks", "//test/test_common:registry_lib", - "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:dubbo_proxy_cc", + "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:pkg_cc_proto", ], ) @@ -114,7 +114,7 @@ envoy_extension_cc_test( "//source/extensions/filters/network/dubbo_proxy:metadata_lib", "//source/extensions/filters/network/dubbo_proxy/router:route_matcher", "//test/mocks/server:server_mocks", - "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:dubbo_proxy_cc", + "@envoy_api//envoy/config/filter/network/dubbo_proxy/v2alpha1:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/thrift_proxy/BUILD b/test/extensions/filters/network/thrift_proxy/BUILD index 9b2403f8acd1..638ee9b4afe2 100644 --- a/test/extensions/filters/network/thrift_proxy/BUILD +++ b/test/extensions/filters/network/thrift_proxy/BUILD @@ -56,7 +56,7 @@ envoy_extension_cc_test_library( "//source/common/common:byte_order_lib", "//source/extensions/filters/network/thrift_proxy:thrift_lib", "//test/common/buffer:utility_lib", - "@envoy_api//envoy/config/filter/network/thrift_proxy/v2alpha1:thrift_proxy_cc", + "@envoy_api//envoy/config/filter/network/thrift_proxy/v2alpha1:pkg_cc_proto", ], ) @@ -290,7 +290,7 @@ envoy_extension_cc_test( "//test/mocks/ratelimit:ratelimit_mocks", "//test/mocks/server:server_mocks", "//test/test_common:printers_lib", - "@envoy_api//envoy/config/filter/thrift/rate_limit/v2alpha1:rate_limit_cc", + "@envoy_api//envoy/config/filter/thrift/rate_limit/v2alpha1:pkg_cc_proto", ], ) diff --git a/test/extensions/grpc_credentials/aws_iam/BUILD b/test/extensions/grpc_credentials/aws_iam/BUILD index 54acfea8cbc6..07afc2edd971 100644 --- a/test/extensions/grpc_credentials/aws_iam/BUILD +++ b/test/extensions/grpc_credentials/aws_iam/BUILD @@ -18,6 +18,6 @@ envoy_cc_test( "//source/extensions/grpc_credentials/aws_iam:config", "//test/common/grpc:grpc_client_integration_test_harness_lib", "//test/integration:integration_lib", - "@envoy_api//envoy/config/grpc_credential/v2alpha:aws_iam_cc", + "@envoy_api//envoy/config/grpc_credential/v2alpha:pkg_cc_proto", ] + envoy_select_google_grpc(["//source/common/grpc:google_async_client_lib"]), ) diff --git a/test/extensions/grpc_credentials/file_based_metadata/BUILD b/test/extensions/grpc_credentials/file_based_metadata/BUILD index 72c54caee2ba..74d148c643d1 100644 --- a/test/extensions/grpc_credentials/file_based_metadata/BUILD +++ b/test/extensions/grpc_credentials/file_based_metadata/BUILD @@ -18,6 +18,6 @@ envoy_cc_test( "//source/extensions/grpc_credentials/file_based_metadata:config", "//test/common/grpc:grpc_client_integration_test_harness_lib", "//test/integration:integration_lib", - "@envoy_api//envoy/config/grpc_credential/v2alpha:file_based_metadata_cc", + "@envoy_api//envoy/config/grpc_credential/v2alpha:pkg_cc_proto", ] + envoy_select_google_grpc(["//source/common/grpc:google_async_client_lib"]), ) diff --git a/test/extensions/quic_listeners/quiche/BUILD b/test/extensions/quic_listeners/quiche/BUILD index 74659b582958..418fb2676fe2 100644 --- a/test/extensions/quic_listeners/quiche/BUILD +++ b/test/extensions/quic_listeners/quiche/BUILD @@ -177,6 +177,6 @@ envoy_cc_test( "//source/common/config:utility_lib", "//source/extensions/quic_listeners/quiche:active_quic_listener_config_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2/listener:quic_config_cc", + "@envoy_api//envoy/api/v2/listener:pkg_cc_proto", ], ) diff --git a/test/extensions/resource_monitors/fixed_heap/BUILD b/test/extensions/resource_monitors/fixed_heap/BUILD index 9f2c70e72606..724e9d5e4289 100644 --- a/test/extensions/resource_monitors/fixed_heap/BUILD +++ b/test/extensions/resource_monitors/fixed_heap/BUILD @@ -31,6 +31,6 @@ envoy_extension_cc_test( "//source/extensions/resource_monitors/fixed_heap:config", "//source/server:resource_monitor_config_lib", "//test/mocks/event:event_mocks", - "@envoy_api//envoy/config/resource_monitor/fixed_heap/v2alpha:fixed_heap_cc", + "@envoy_api//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/resource_monitors/injected_resource/BUILD b/test/extensions/resource_monitors/injected_resource/BUILD index 47c1986ce3c6..9df0987dbab3 100644 --- a/test/extensions/resource_monitors/injected_resource/BUILD +++ b/test/extensions/resource_monitors/injected_resource/BUILD @@ -36,6 +36,6 @@ envoy_extension_cc_test( "//source/extensions/resource_monitors/injected_resource:config", "//source/server:resource_monitor_config_lib", "//test/test_common:environment_lib", - "@envoy_api//envoy/config/resource_monitor/injected_resource/v2alpha:injected_resource_cc", + "@envoy_api//envoy/config/resource_monitor/injected_resource/v2alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/stats_sinks/dog_statsd/BUILD b/test/extensions/stats_sinks/dog_statsd/BUILD index e5bde86b99cf..66a5d61b3711 100644 --- a/test/extensions/stats_sinks/dog_statsd/BUILD +++ b/test/extensions/stats_sinks/dog_statsd/BUILD @@ -23,6 +23,6 @@ envoy_extension_cc_test( "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/stats_sinks/metrics_service/BUILD b/test/extensions/stats_sinks/metrics_service/BUILD index d9759e8df43d..76fae1b80eff 100644 --- a/test/extensions/stats_sinks/metrics_service/BUILD +++ b/test/extensions/stats_sinks/metrics_service/BUILD @@ -42,6 +42,6 @@ envoy_extension_cc_test( "//test/common/grpc:grpc_client_integration_lib", "//test/integration:http_integration_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/service/metrics/v2:metrics_service_cc", + "@envoy_api//envoy/service/metrics/v2:pkg_cc_proto", ], ) diff --git a/test/extensions/transport_sockets/alts/BUILD b/test/extensions/transport_sockets/alts/BUILD index d987d2e44a66..8c7cbfa6f27e 100644 --- a/test/extensions/transport_sockets/alts/BUILD +++ b/test/extensions/transport_sockets/alts/BUILD @@ -87,6 +87,6 @@ envoy_extension_cc_test( "//test/mocks/runtime:runtime_mocks", "//test/mocks/secret:secret_mocks", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/transport_socket/alts/v2alpha:alts_cc", + "@envoy_api//envoy/config/transport_socket/alts/v2alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/transport_sockets/tls/integration/BUILD b/test/extensions/transport_sockets/tls/integration/BUILD index 685bc87ae57a..a01895bc2ce5 100644 --- a/test/extensions/transport_sockets/tls/integration/BUILD +++ b/test/extensions/transport_sockets/tls/integration/BUILD @@ -29,7 +29,7 @@ envoy_cc_test( "//test/integration:http_integration_lib", "//test/mocks/secret:secret_mocks", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/transport_socket/tap/v2alpha:tap_cc", - "@envoy_api//envoy/data/tap/v2alpha:transport_cc", + "@envoy_api//envoy/config/transport_socket/tap/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/data/tap/v2alpha:pkg_cc_proto", ], ) diff --git a/test/fuzz/BUILD b/test/fuzz/BUILD index 07273e9d721b..fe0e20bf584a 100644 --- a/test/fuzz/BUILD +++ b/test/fuzz/BUILD @@ -12,7 +12,7 @@ envoy_package() envoy_proto_library( name = "common_proto", srcs = ["common.proto"], - deps = ["@envoy_api//envoy/api/v2/core:base_export"], + deps = ["@envoy_api//envoy/api/v2/core:pkg"], ) envoy_cc_test_library( @@ -48,7 +48,7 @@ envoy_cc_test_library( name = "utility_lib", hdrs = ["utility.h"], deps = [ - ":common_proto_cc", + ":common_proto_cc_proto", "//source/common/common:empty_string", "//source/common/network:utility_lib", "//test/common/stream_info:test_util", diff --git a/test/integration/BUILD b/test/integration/BUILD index 02a8a0101d66..5c7fc94e362e 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -37,12 +37,8 @@ envoy_cc_test_library( "//test/common/grpc:grpc_client_integration_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:cds_cc", - "@envoy_api//envoy/api/v2:discovery_cc", - "@envoy_api//envoy/api/v2:eds_cc", - "@envoy_api//envoy/api/v2:lds_cc", - "@envoy_api//envoy/api/v2:rds_cc", - "@envoy_api//envoy/service/discovery/v2:ads_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) @@ -58,12 +54,8 @@ envoy_cc_test( "//test/common/grpc:grpc_client_integration_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:cds_cc", - "@envoy_api//envoy/api/v2:discovery_cc", - "@envoy_api//envoy/api/v2:eds_cc", - "@envoy_api//envoy/api/v2:lds_cc", - "@envoy_api//envoy/api/v2:rds_cc", - "@envoy_api//envoy/service/discovery/v2:ads_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) @@ -74,15 +66,14 @@ py_binary( python_version = "PY3", visibility = ["//visibility:public"], deps = [ - ":capture_fuzz_proto_py", - "@envoy_api//envoy/data/tap/v2alpha:transport_py", + ":capture_fuzz_proto_py_proto", + "@envoy_api//envoy/data/tap/v2alpha:pkg_py_proto", ], ) envoy_proto_library( name = "capture_fuzz_proto", srcs = [":capture_fuzz.proto"], - require_py = 1, ) envoy_cc_test( @@ -101,8 +92,7 @@ envoy_cc_test( "//test/mocks/server:server_mocks", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:cds_cc", - "@envoy_api//envoy/api/v2:discovery_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -115,7 +105,7 @@ envoy_cc_test( "//test/config:utility_lib", "//test/integration/filters:eds_ready_filter_config_lib", "//test/test_common:network_utility_lib", - "@envoy_api//envoy/api/v2:eds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -131,7 +121,7 @@ envoy_cc_test( "filter_manager_integration_test.h", ], deps = [ - ":filter_manager_integration_proto_cc", + ":filter_manager_integration_proto_cc_proto", ":http_integration_lib", ":integration_lib", "//source/extensions/filters/network/common:factory_base_lib", @@ -164,7 +154,7 @@ envoy_cc_test( "//test/config:utility_lib", "//test/integration/clusters:custom_static_cluster", "//test/test_common:network_utility_lib", - "@envoy_api//envoy/api/v2:eds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -184,8 +174,7 @@ envoy_cc_test( "//test/mocks/server:server_mocks", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:discovery_cc", - "@envoy_api//envoy/api/v2:rds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -223,8 +212,8 @@ envoy_cc_test( ":http_integration_lib", "//source/common/protobuf", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/filter/http/router/v2:router_cc", - "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:http_connection_manager_cc", + "@envoy_api//envoy/config/filter/http/router/v2:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", ], ) @@ -322,8 +311,8 @@ envoy_cc_test( "//source/common/stats:stats_matcher_lib", "//source/extensions/filters/http/buffer:config", "//source/extensions/filters/http/health_check:config", - "@envoy_api//envoy/admin/v2alpha:config_dump_cc", - "@envoy_api//envoy/config/metrics/v2:stats_cc", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) @@ -571,8 +560,8 @@ envoy_cc_test( "//test/common/stats:stat_test_utility_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc", - "@envoy_api//envoy/config/metrics/v2:stats_cc", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", ], ) @@ -585,7 +574,7 @@ envoy_cc_test( "//test/config:utility_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:eds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -606,8 +595,8 @@ envoy_cc_test( "//test/common/upstream:utility_lib", "//test/config:utility_lib", "//test/test_common:network_utility_lib", - "@envoy_api//envoy/api/v2:eds_cc", - "@envoy_api//envoy/service/discovery/v2:hds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", + "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) @@ -654,7 +643,7 @@ envoy_cc_test( "//source/common/grpc:common_lib", "//source/extensions/filters/http/ratelimit:config", "//test/common/grpc:grpc_client_integration_lib", - "@envoy_api//envoy/service/ratelimit/v2:rls_cc", + "@envoy_api//envoy/service/ratelimit/v2:pkg_cc_proto", ], ) @@ -664,7 +653,7 @@ envoy_cc_test( deps = [ ":http_integration_lib", "//test/common/grpc:grpc_client_integration_lib", - "@envoy_api//envoy/service/discovery/v2:rtds_cc", + "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) @@ -836,7 +825,7 @@ envoy_cc_test_library( srcs = ["h1_fuzz.cc"], hdrs = ["h1_fuzz.h"], deps = [ - ":capture_fuzz_proto_cc", + ":capture_fuzz_proto_cc_proto", ":http_integration_lib", "//source/common/common:assert_lib", "//source/common/common:logger_lib", diff --git a/test/integration/clusters/BUILD b/test/integration/clusters/BUILD index b091fb0a81e8..0447bc03403c 100644 --- a/test/integration/clusters/BUILD +++ b/test/integration/clusters/BUILD @@ -16,7 +16,7 @@ envoy_cc_test_library( "custom_static_cluster.h", ], deps = [ - ":cluster_factory_config_proto_cc", + ":cluster_factory_config_proto_cc_proto", "//include/envoy/api:api_interface", "//include/envoy/http:codec_interface", "//include/envoy/upstream:cluster_factory_interface", diff --git a/test/mocks/config/BUILD b/test/mocks/config/BUILD index 69698c7dc732..c9bc1a0a8d46 100644 --- a/test/mocks/config/BUILD +++ b/test/mocks/config/BUILD @@ -20,9 +20,6 @@ envoy_cc_mock( "//source/common/config:resources_lib", "//source/common/protobuf:utility_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:cds_cc", - "@envoy_api//envoy/api/v2:eds_cc", - "@envoy_api//envoy/api/v2:lds_cc", - "@envoy_api//envoy/api/v2:rds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) diff --git a/test/mocks/network/BUILD b/test/mocks/network/BUILD index deb550922321..68e3aff2c76a 100644 --- a/test/mocks/network/BUILD +++ b/test/mocks/network/BUILD @@ -39,6 +39,6 @@ envoy_cc_mock( "//test/mocks/event:event_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:printers_lib", - "@envoy_api//envoy/api/v2/core:base_cc", + "@envoy_api//envoy/api/v2/core:pkg_cc_proto", ], ) diff --git a/test/mocks/server/BUILD b/test/mocks/server/BUILD index 695f49be6c23..f58bf23389ac 100644 --- a/test/mocks/server/BUILD +++ b/test/mocks/server/BUILD @@ -46,6 +46,6 @@ envoy_cc_mock( "//test/mocks/tracing:tracing_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:test_time_lib", - "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) diff --git a/test/proto/BUILD b/test/proto/BUILD index 71f551469cdf..d2aa8efa6249 100644 --- a/test/proto/BUILD +++ b/test/proto/BUILD @@ -31,7 +31,7 @@ envoy_proto_descriptor( name = "bookstore_proto_descriptor", srcs = [ "bookstore.proto", - # JSON transcoder doesn't link against ":helloworld_proto_cc", so we can add it to the + # JSON transcoder doesn't link against ":helloworld_proto_cc_proto", so we can add it to the # descriptor and test that we can actually transcode types not linked into the test binary. "helloworld.proto", ], diff --git a/test/server/BUILD b/test/server/BUILD index 84a3b4684d54..48fa39379369 100644 --- a/test/server/BUILD +++ b/test/server/BUILD @@ -128,7 +128,7 @@ envoy_cc_test( "//test/test_common:logging_lib", "//test/test_common:threadsafe_singleton_injector_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -162,7 +162,7 @@ envoy_cc_test( "//test/mocks/server:server_mocks", "//test/test_common:environment_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:lds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) @@ -343,7 +343,7 @@ envoy_cc_test_library( deps = [ "//source/common/protobuf:utility_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:lds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) diff --git a/test/server/http/BUILD b/test/server/http/BUILD index 20df4a917b1b..c6789966d89e 100644 --- a/test/server/http/BUILD +++ b/test/server/http/BUILD @@ -29,7 +29,7 @@ envoy_cc_test( "//test/test_common:logging_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/admin/v2alpha:memory_cc", + "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto", ], ) diff --git a/test/test_common/BUILD b/test/test_common/BUILD index e1bb1467dc19..a17d778f6d56 100644 --- a/test/test_common/BUILD +++ b/test/test_common/BUILD @@ -112,8 +112,8 @@ envoy_cc_test_library( "//source/common/stats:fake_symbol_table_lib", "//source/common/stats:stats_lib", "//test/mocks/stats:stats_mocks", - "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc", - "@envoy_api//envoy/service/discovery/v2:rtds_cc", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", + "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto", ], ) diff --git a/test/tools/router_check/BUILD b/test/tools/router_check/BUILD index c4a1a2facf4b..f16509afef78 100644 --- a/test/tools/router_check/BUILD +++ b/test/tools/router_check/BUILD @@ -27,7 +27,7 @@ envoy_cc_test_library( copts = ["-DHAVE_LONG_LONG"], external_deps = ["tclap"], deps = [ - ":validation_proto_cc", + ":validation_proto_cc_proto", "//source/common/config:rds_json_lib", "//source/common/event:dispatcher_lib", "//source/common/http:header_map_lib", @@ -45,5 +45,5 @@ envoy_cc_test_library( envoy_proto_library( name = "validation_proto", srcs = ["validation.proto"], - deps = ["@envoy_api//envoy/api/v2/core:base_export"], + deps = ["@envoy_api//envoy/api/v2/core:pkg"], ) diff --git a/test/tools/schema_validator/BUILD b/test/tools/schema_validator/BUILD index 14526b6cb6ff..e55b8df0be28 100644 --- a/test/tools/schema_validator/BUILD +++ b/test/tools/schema_validator/BUILD @@ -29,6 +29,6 @@ envoy_cc_test_library( "//source/common/protobuf:utility_lib", "//source/common/stats:isolated_store_lib", "//test/test_common:utility_lib", - "@envoy_api//envoy/api/v2:rds_cc", + "@envoy_api//envoy/api/v2:pkg_cc_proto", ], ) diff --git a/tools/BUILD b/tools/BUILD index d5268089978b..e3f44a5f9646 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -34,6 +34,6 @@ envoy_cc_binary( "//source/common/protobuf:message_validator_lib", "//source/common/protobuf:utility_lib", "//source/common/stats:isolated_store_lib", - "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc", + "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ] + envoy_cc_platform_dep("//source/exe:platform_impl_lib"), )