From f2f64fb59fa8cbbe556ad2354c2be1e0808423da Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Tue, 20 Aug 2019 19:26:51 -0700 Subject: [PATCH 01/16] test Signed-off-by: Kuat Yessenov --- api/bazel/api_build_system.bzl | 37 ++++++++++++++++++++++++++++++++++ api/envoy/api/v2/core/BUILD | 13 +++++++++++- api/envoy/type/BUILD | 8 +++++++- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/api/bazel/api_build_system.bzl b/api/bazel/api_build_system.bzl index d9a3e2d943e6..86e1ee80e8cf 100644 --- a/api/bazel/api_build_system.bzl +++ b/api/bazel/api_build_system.bzl @@ -40,6 +40,43 @@ def api_py_proto_library(name, srcs = [], deps = [], external_py_proto_deps = [] visibility = ["//visibility:public"], ) +def api_proto_package(name, srcs = [], deps = [], visibility = ["//visibility:private"]): + native.proto_library( + name = name, + srcs = srcs, + deps = deps + [ + "@com_google_protobuf//:any_proto", + "@com_google_protobuf//:descriptor_proto", + "@com_google_protobuf//:duration_proto", + "@com_google_protobuf//:empty_proto", + "@com_google_protobuf//:struct_proto", + "@com_google_protobuf//:timestamp_proto", + "@com_google_protobuf//:wrappers_proto", + "@com_google_googleapis//google/api:http_proto", + "@com_google_googleapis//google/api:annotations_proto", + "@com_google_googleapis//google/rpc:status_proto", + "@com_github_gogo_protobuf//:gogo_proto", + "@com_envoyproxy_protoc_gen_validate//validate:validate_proto", + ], + visibility = visibility, + ) + go_proto_library( + name = _Suffix(name, _GO_PROTO_SUFFIX), + importpath = _Suffix(_GO_IMPORTPATH_PREFIX, name), + proto = name, + visibility = ["//visibility:public"], + deps = [_Suffix(dep, _GO_PROTO_SUFFIX) for dep in deps] + [ + "@com_github_gogo_protobuf//:gogo_proto_go", + "@io_bazel_rules_go//proto/wkt:any_go_proto", + "@io_bazel_rules_go//proto/wkt:duration_go_proto", + "@io_bazel_rules_go//proto/wkt:struct_go_proto", + "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", + "@io_bazel_rules_go//proto/wkt:wrappers_go_proto", + "@com_envoyproxy_protoc_gen_validate//validate:go_default_library", + "@com_google_googleapis//google/rpc:status_go_proto", + ], + ) + # This defines googleapis py_proto_library. The repository does not provide its definition and requires # overriding it in the consuming project (see https://github.com/grpc/grpc/issues/19255 for more details). def py_proto_library(name, deps = []): diff --git a/api/envoy/api/v2/core/BUILD b/api/envoy/api/v2/core/BUILD index b3d2be2301f1..c06a33689c8a 100644 --- a/api/envoy/api/v2/core/BUILD +++ b/api/envoy/api/v2/core/BUILD @@ -1,4 +1,4 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 @@ -16,6 +16,17 @@ package_group( ], ) +api_proto_package( + name = "core", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/type:type", + ], + visibility = [ + ":friends", + ], +) + api_proto_library_internal( name = "address", srcs = ["address.proto"], diff --git a/api/envoy/type/BUILD b/api/envoy/type/BUILD index 97f0fd424f36..af95439b2068 100644 --- a/api/envoy/type/BUILD +++ b/api/envoy/type/BUILD @@ -1,7 +1,13 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "type", + srcs = glob(["*.proto"]), + visibility = ["//visibility:public"], +) + api_proto_library_internal( name = "http_status", srcs = ["http_status.proto"], From 9936e8372896ee9c14aa8b423ca16cf36f9b1bc7 Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Wed, 21 Aug 2019 19:20:07 -0700 Subject: [PATCH 02/16] initial work Signed-off-by: Kuat Yessenov --- api/bazel/api_build_system.bzl | 11 ++- api/envoy/admin/v2alpha/BUILD | 15 +++- api/envoy/api/v2/BUILD | 88 ++++--------------- api/envoy/api/v2/auth/BUILD | 19 ++-- api/envoy/api/v2/auth/cert.proto | 1 - api/envoy/api/v2/cluster/BUILD | 28 ++---- .../api/v2/cluster/circuit_breaker.proto | 1 - api/envoy/api/v2/core/BUILD | 56 +----------- api/envoy/api/v2/core/base.proto | 1 - api/envoy/api/v2/discovery.proto | 1 - api/envoy/api/v2/endpoint/BUILD | 33 +++---- api/envoy/api/v2/endpoint/endpoint.proto | 1 - api/envoy/api/v2/listener/BUILD | 21 +++-- api/envoy/api/v2/listener/listener.proto | 1 - api/envoy/api/v2/ratelimit/BUILD | 12 +-- api/envoy/api/v2/ratelimit/ratelimit.proto | 1 - api/envoy/api/v2/route/BUILD | 21 +++-- api/envoy/api/v2/route/route.proto | 1 - api/envoy/data/tap/v2alpha/BUILD | 10 ++- api/envoy/data/tap/v2alpha/transport.proto | 1 - api/envoy/service/tap/v2alpha/BUILD | 14 ++- api/envoy/type/BUILD | 18 +--- api/envoy/type/matcher/BUILD | 37 ++------ api/envoy/type/matcher/metadata.proto | 1 - api/envoy/type/matcher/number.proto | 1 - api/envoy/type/matcher/string.proto | 1 - api/envoy/type/matcher/value.proto | 1 - api/envoy/type/range.proto | 1 - 28 files changed, 126 insertions(+), 271 deletions(-) diff --git a/api/bazel/api_build_system.bzl b/api/bazel/api_build_system.bzl index 86e1ee80e8cf..0c56c7073a07 100644 --- a/api/bazel/api_build_system.bzl +++ b/api/bazel/api_build_system.bzl @@ -40,7 +40,7 @@ def api_py_proto_library(name, srcs = [], deps = [], external_py_proto_deps = [] visibility = ["//visibility:public"], ) -def api_proto_package(name, srcs = [], deps = [], visibility = ["//visibility:private"]): +def api_proto_package(name, srcs = [], deps = [], has_services = False, visibility = ["//visibility:public"]): native.proto_library( name = name, srcs = srcs, @@ -60,12 +60,18 @@ def api_proto_package(name, srcs = [], deps = [], visibility = ["//visibility:pr ], visibility = visibility, ) + + compilers = ["@io_bazel_rules_go//proto:go_proto"] + if has_services: + compilers = ["@io_bazel_rules_go//proto:go_grpc"] + go_proto_library( name = _Suffix(name, _GO_PROTO_SUFFIX), + compilers = compilers, importpath = _Suffix(_GO_IMPORTPATH_PREFIX, name), proto = name, visibility = ["//visibility:public"], - deps = [_Suffix(dep, _GO_PROTO_SUFFIX) for dep in deps] + [ + deps = [_Suffix("//" + Label(dep).package + ":" + Label(dep).name, _GO_PROTO_SUFFIX) for dep in deps] + [ "@com_github_gogo_protobuf//:gogo_proto_go", "@io_bazel_rules_go//proto/wkt:any_go_proto", "@io_bazel_rules_go//proto/wkt:duration_go_proto", @@ -73,6 +79,7 @@ def api_proto_package(name, srcs = [], deps = [], visibility = ["//visibility:pr "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", "@io_bazel_rules_go//proto/wkt:wrappers_go_proto", "@com_envoyproxy_protoc_gen_validate//validate:go_default_library", + "@com_google_googleapis//google/api:annotations_go_proto", "@com_google_googleapis//google/rpc:status_go_proto", ], ) diff --git a/api/envoy/admin/v2alpha/BUILD b/api/envoy/admin/v2alpha/BUILD index aa35aa7c8d7d..033457c60a47 100644 --- a/api/envoy/admin/v2alpha/BUILD +++ b/api/envoy/admin/v2alpha/BUILD @@ -1,7 +1,19 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "v2alpha", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2", + "//envoy/api/v2/auth", + "//envoy/api/v2/core", + "//envoy/config/bootstrap/v2", + "//envoy/type", + ], +) + api_proto_library_internal( name = "config_dump", srcs = ["config_dump.proto"], @@ -13,6 +25,7 @@ api_proto_library_internal( "//envoy/api/v2:srds", "//envoy/api/v2/auth:cert", "//envoy/config/bootstrap/v2:bootstrap", + "//envoy/service/tap/v2alpha", ], ) diff --git a/api/envoy/api/v2/BUILD b/api/envoy/api/v2/BUILD index 48ddb2e13025..676907d85492 100644 --- a/api/envoy/api/v2/BUILD +++ b/api/envoy/api/v2/BUILD @@ -1,4 +1,4 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 @@ -16,6 +16,22 @@ package_group( ], ) +api_proto_package( + name = "v2", + srcs = glob(["*.proto"]), + has_services = True, + deps = [ + "//envoy/api/v2/auth", + "//envoy/api/v2/cluster", + "//envoy/api/v2/core", + "//envoy/api/v2/endpoint:endpoint_protos", + "//envoy/api/v2/listener:listener_protos", + "//envoy/api/v2/ratelimit:ratelimit_protos", + "//envoy/api/v2/route:route_protos", + "//envoy/type", + ], +) + api_proto_library_internal( name = "discovery", srcs = ["discovery.proto"], @@ -23,12 +39,6 @@ api_proto_library_internal( deps = ["//envoy/api/v2/core:base"], ) -api_go_proto_library( - name = "discovery", - proto = ":discovery", - deps = ["//envoy/api/v2/core:base_go_proto"], -) - api_proto_library_internal( name = "eds", srcs = ["eds.proto"], @@ -44,19 +54,6 @@ api_proto_library_internal( ], ) -api_go_grpc_library( - name = "eds", - proto = ":eds", - deps = [ - ":discovery_go_proto", - "//envoy/api/v2/core:address_go_proto", - "//envoy/api/v2/core:base_go_proto", - "//envoy/api/v2/core:health_check_go_proto", - "//envoy/api/v2/endpoint:endpoint_go_proto", - "//envoy/type:percent_go_proto", - ], -) - api_proto_library_internal( name = "cds", srcs = ["cds.proto"], @@ -79,26 +76,6 @@ api_proto_library_internal( ], ) -api_go_grpc_library( - name = "cds", - proto = ":cds", - deps = [ - ":discovery_go_proto", - ":eds_go_grpc", - "//envoy/api/v2/auth:cert_go_proto", - "//envoy/api/v2/cluster:circuit_breaker_go_proto", - "//envoy/api/v2/cluster:filter_go_proto", - "//envoy/api/v2/cluster:outlier_detection_go_proto", - "//envoy/api/v2/core:address_go_proto", - "//envoy/api/v2/core:base_go_proto", - "//envoy/api/v2/core:config_source_go_proto", - "//envoy/api/v2/core:health_check_go_proto", - "//envoy/api/v2/core:protocol_go_proto", - "//envoy/api/v2/endpoint:endpoint_go_proto", - "//envoy/type:percent_go_proto", - ], -) - api_proto_library_internal( name = "lds", srcs = ["lds.proto"], @@ -112,17 +89,6 @@ api_proto_library_internal( ], ) -api_go_grpc_library( - name = "lds", - proto = ":lds", - deps = [ - ":discovery_go_proto", - "//envoy/api/v2/core:address_go_proto", - "//envoy/api/v2/core:base_go_proto", - "//envoy/api/v2/listener:listener_go_proto", - ], -) - api_proto_library_internal( name = "rds", srcs = ["rds.proto"], @@ -136,17 +102,6 @@ api_proto_library_internal( ], ) -api_go_grpc_library( - name = "rds", - proto = ":rds", - deps = [ - ":discovery_go_proto", - "//envoy/api/v2/core:base_go_proto", - "//envoy/api/v2/core:config_source_go_proto", - "//envoy/api/v2/route:route_go_proto", - ], -) - api_proto_library_internal( name = "srds", srcs = ["srds.proto"], @@ -158,12 +113,3 @@ api_proto_library_internal( "//envoy/api/v2/route", ], ) - -api_go_grpc_library( - name = "srds", - proto = ":srds", - deps = [ - ":discovery_go_proto", - "//envoy/api/v2/core:base_go_proto", - ], -) diff --git a/api/envoy/api/v2/auth/BUILD b/api/envoy/api/v2/auth/BUILD index acc28aacff05..1f8a27fa52f6 100644 --- a/api/envoy/api/v2/auth/BUILD +++ b/api/envoy/api/v2/auth/BUILD @@ -1,4 +1,4 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 @@ -15,6 +15,14 @@ package_group( ], ) +api_proto_package( + name = "auth", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + ], +) + api_proto_library_internal( name = "cert", srcs = ["cert.proto"], @@ -24,12 +32,3 @@ api_proto_library_internal( "//envoy/api/v2/core:config_source", ], ) - -api_go_proto_library( - name = "cert", - proto = ":cert", - deps = [ - "//envoy/api/v2/core:base_go_proto", - "//envoy/api/v2/core:config_source_go_proto", - ], -) diff --git a/api/envoy/api/v2/auth/cert.proto b/api/envoy/api/v2/auth/cert.proto index 526caf292829..a667e1a3e649 100644 --- a/api/envoy/api/v2/auth/cert.proto +++ b/api/envoy/api/v2/auth/cert.proto @@ -5,7 +5,6 @@ package envoy.api.v2.auth; option java_outer_classname = "CertProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v2.auth"; -option go_package = "auth"; import "envoy/api/v2/core/base.proto"; import "envoy/api/v2/core/config_source.proto"; diff --git a/api/envoy/api/v2/cluster/BUILD b/api/envoy/api/v2/cluster/BUILD index 5589905d859b..df3001b2cb66 100644 --- a/api/envoy/api/v2/cluster/BUILD +++ b/api/envoy/api/v2/cluster/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "cluster", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + ], +) + api_proto_library_internal( name = "circuit_breaker", srcs = ["circuit_breaker.proto"], @@ -13,14 +21,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "circuit_breaker", - proto = ":circuit_breaker", - deps = [ - "//envoy/api/v2/core:base_go_proto", - ], -) - api_proto_library_internal( name = "outlier_detection", srcs = ["outlier_detection.proto"], @@ -29,11 +29,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "outlier_detection", - proto = ":outlier_detection", -) - api_proto_library_internal( name = "filter", srcs = ["filter.proto"], @@ -41,8 +36,3 @@ api_proto_library_internal( "//envoy/api/v2:__pkg__", ], ) - -api_go_proto_library( - name = "filter", - proto = ":filter", -) diff --git a/api/envoy/api/v2/cluster/circuit_breaker.proto b/api/envoy/api/v2/cluster/circuit_breaker.proto index bc2bcf2548d2..5ae8cc3d1a01 100644 --- a/api/envoy/api/v2/cluster/circuit_breaker.proto +++ b/api/envoy/api/v2/cluster/circuit_breaker.proto @@ -5,7 +5,6 @@ package envoy.api.v2.cluster; option java_outer_classname = "CircuitBreakerProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v2.cluster"; -option go_package = "cluster"; option csharp_namespace = "Envoy.Api.V2.ClusterNS"; option ruby_package = "Envoy.Api.V2.ClusterNS"; diff --git a/api/envoy/api/v2/core/BUILD b/api/envoy/api/v2/core/BUILD index c06a33689c8a..4ecc4f08b033 100644 --- a/api/envoy/api/v2/core/BUILD +++ b/api/envoy/api/v2/core/BUILD @@ -1,4 +1,4 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 @@ -20,10 +20,7 @@ api_proto_package( name = "core", srcs = glob(["*.proto"]), deps = [ - "//envoy/type:type", - ], - visibility = [ - ":friends", + "//envoy/type", ], ) @@ -36,12 +33,6 @@ api_proto_library_internal( deps = [":base"], ) -api_go_proto_library( - name = "address", - proto = ":address", - deps = [":base_go_proto"], -) - api_proto_library_internal( name = "base", srcs = ["base.proto"], @@ -54,15 +45,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "base", - proto = ":base", - deps = [ - ":http_uri_go_proto", - "//envoy/type:percent_go_proto", - ], -) - api_proto_library_internal( name = "health_check", srcs = ["health_check.proto"], @@ -75,15 +57,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "health_check", - proto = ":health_check", - deps = [ - ":base_go_proto", - "//envoy/type:range_go_proto", - ], -) - api_proto_library_internal( name = "config_source", srcs = ["config_source.proto"], @@ -96,20 +69,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "config_source", - proto = ":config_source", - deps = [ - ":base_go_proto", - ":grpc_service_go_proto", - ], -) - -api_go_proto_library( - name = "http_uri", - proto = ":http_uri", -) - api_proto_library_internal( name = "http_uri", srcs = ["http_uri.proto"], @@ -127,12 +86,6 @@ api_proto_library_internal( deps = [":base"], ) -api_go_proto_library( - name = "grpc_service", - proto = ":grpc_service", - deps = [":base_go_proto"], -) - api_proto_library_internal( name = "protocol", srcs = ["protocol.proto"], @@ -140,8 +93,3 @@ api_proto_library_internal( ":friends", ], ) - -api_go_proto_library( - name = "protocol", - proto = ":protocol", -) diff --git a/api/envoy/api/v2/core/base.proto b/api/envoy/api/v2/core/base.proto index 2553fe04de27..0f73b83af03f 100644 --- a/api/envoy/api/v2/core/base.proto +++ b/api/envoy/api/v2/core/base.proto @@ -5,7 +5,6 @@ package envoy.api.v2.core; option java_outer_classname = "BaseProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v2.core"; -option go_package = "core"; import "envoy/api/v2/core/http_uri.proto"; diff --git a/api/envoy/api/v2/discovery.proto b/api/envoy/api/v2/discovery.proto index a3072a817aa4..5328e515bcbb 100644 --- a/api/envoy/api/v2/discovery.proto +++ b/api/envoy/api/v2/discovery.proto @@ -5,7 +5,6 @@ package envoy.api.v2; option java_outer_classname = "DiscoveryProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v2"; -option go_package = "v2"; import "envoy/api/v2/core/base.proto"; diff --git a/api/envoy/api/v2/endpoint/BUILD b/api/envoy/api/v2/endpoint/BUILD index 0dead0f57033..1866de2ba984 100644 --- a/api/envoy/api/v2/endpoint/BUILD +++ b/api/envoy/api/v2/endpoint/BUILD @@ -1,7 +1,16 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "endpoint_protos", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/auth", + "//envoy/api/v2/core", + ], +) + api_proto_library_internal( name = "endpoint", srcs = ["endpoint.proto"], @@ -16,19 +25,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "endpoint", - proto = ":endpoint", - deps = [ - "//envoy/api/v2/auth:cert_go_proto", - "//envoy/api/v2/core:address_go_proto", - "//envoy/api/v2/core:base_go_proto", - "//envoy/api/v2/core:config_source_go_proto", - "//envoy/api/v2/core:health_check_go_proto", - "//envoy/api/v2/core:protocol_go_proto", - ], -) - api_proto_library_internal( name = "load_report", srcs = ["load_report.proto"], @@ -38,12 +34,3 @@ api_proto_library_internal( "//envoy/api/v2/core:base", ], ) - -api_go_proto_library( - name = "load_report", - proto = ":load_report", - deps = [ - "//envoy/api/v2/core:address_go_proto", - "//envoy/api/v2/core:base_go_proto", - ], -) diff --git a/api/envoy/api/v2/endpoint/endpoint.proto b/api/envoy/api/v2/endpoint/endpoint.proto index 7abb7ea5f3c9..6327af00ac99 100644 --- a/api/envoy/api/v2/endpoint/endpoint.proto +++ b/api/envoy/api/v2/endpoint/endpoint.proto @@ -5,7 +5,6 @@ package envoy.api.v2.endpoint; option java_outer_classname = "EndpointProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v2.endpoint"; -option go_package = "endpoint"; import "envoy/api/v2/core/address.proto"; import "envoy/api/v2/core/base.proto"; diff --git a/api/envoy/api/v2/listener/BUILD b/api/envoy/api/v2/listener/BUILD index 9eb0c0ec982f..2cec3aba6fd7 100644 --- a/api/envoy/api/v2/listener/BUILD +++ b/api/envoy/api/v2/listener/BUILD @@ -1,7 +1,16 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "listener_protos", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/auth", + "//envoy/api/v2/core", + ], +) + api_proto_library_internal( name = "listener", srcs = ["listener.proto"], @@ -12,13 +21,3 @@ api_proto_library_internal( "//envoy/api/v2/core:base", ], ) - -api_go_proto_library( - name = "listener", - proto = ":listener", - deps = [ - "//envoy/api/v2/auth:cert_go_proto", - "//envoy/api/v2/core:address_go_proto", - "//envoy/api/v2/core:base_go_proto", - ], -) diff --git a/api/envoy/api/v2/listener/listener.proto b/api/envoy/api/v2/listener/listener.proto index 77f753501fdd..068c6936c48a 100644 --- a/api/envoy/api/v2/listener/listener.proto +++ b/api/envoy/api/v2/listener/listener.proto @@ -5,7 +5,6 @@ package envoy.api.v2.listener; option java_outer_classname = "ListenerProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v2.listener"; -option go_package = "listener"; option csharp_namespace = "Envoy.Api.V2.ListenerNS"; option ruby_package = "Envoy::Api::V2::ListenerNS"; diff --git a/api/envoy/api/v2/ratelimit/BUILD b/api/envoy/api/v2/ratelimit/BUILD index 5f2a9201463d..c5c907b1239d 100644 --- a/api/envoy/api/v2/ratelimit/BUILD +++ b/api/envoy/api/v2/ratelimit/BUILD @@ -1,14 +1,14 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "ratelimit_protos", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "ratelimit", srcs = ["ratelimit.proto"], visibility = ["//envoy/api/v2:friends"], ) - -api_go_proto_library( - name = "ratelimit", - proto = ":ratelimit", -) diff --git a/api/envoy/api/v2/ratelimit/ratelimit.proto b/api/envoy/api/v2/ratelimit/ratelimit.proto index 8ebec7182257..6f4cd6258283 100644 --- a/api/envoy/api/v2/ratelimit/ratelimit.proto +++ b/api/envoy/api/v2/ratelimit/ratelimit.proto @@ -5,7 +5,6 @@ package envoy.api.v2.ratelimit; option java_outer_classname = "RatelimitProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v2.ratelimit"; -option go_package = "ratelimit"; import "validate/validate.proto"; diff --git a/api/envoy/api/v2/route/BUILD b/api/envoy/api/v2/route/BUILD index 2fec56ae389b..899962c3ce5b 100644 --- a/api/envoy/api/v2/route/BUILD +++ b/api/envoy/api/v2/route/BUILD @@ -1,7 +1,16 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "route_protos", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + "//envoy/type", + ], +) + api_proto_library_internal( name = "route", srcs = ["route.proto"], @@ -12,13 +21,3 @@ api_proto_library_internal( "//envoy/type:range", ], ) - -api_go_proto_library( - name = "route", - proto = ":route", - deps = [ - "//envoy/api/v2/core:base_go_proto", - "//envoy/type:percent_go_proto", - "//envoy/type:range_go_proto", - ], -) diff --git a/api/envoy/api/v2/route/route.proto b/api/envoy/api/v2/route/route.proto index 93d021ddb216..54e0d1c5d2c1 100644 --- a/api/envoy/api/v2/route/route.proto +++ b/api/envoy/api/v2/route/route.proto @@ -5,7 +5,6 @@ package envoy.api.v2.route; option java_outer_classname = "RouteProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v2.route"; -option go_package = "route"; option java_generic_services = true; import "envoy/api/v2/core/base.proto"; diff --git a/api/envoy/data/tap/v2alpha/BUILD b/api/envoy/data/tap/v2alpha/BUILD index 1b373eee86df..1caddf6232c0 100644 --- a/api/envoy/data/tap/v2alpha/BUILD +++ b/api/envoy/data/tap/v2alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "v2alpha_protos", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + ], +) + api_proto_library_internal( name = "common", srcs = ["common.proto"], diff --git a/api/envoy/data/tap/v2alpha/transport.proto b/api/envoy/data/tap/v2alpha/transport.proto index 3b8c244b9bae..c3a3d8b8eb86 100644 --- a/api/envoy/data/tap/v2alpha/transport.proto +++ b/api/envoy/data/tap/v2alpha/transport.proto @@ -9,7 +9,6 @@ package envoy.data.tap.v2alpha; option java_outer_classname = "TransportProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.data.tap.v2alpha"; -option go_package = "v2"; import "envoy/api/v2/core/address.proto"; import "envoy/data/tap/v2alpha/common.proto"; diff --git a/api/envoy/service/tap/v2alpha/BUILD b/api/envoy/service/tap/v2alpha/BUILD index 63d11e80a755..c75232a7858f 100644 --- a/api/envoy/service/tap/v2alpha/BUILD +++ b/api/envoy/service/tap/v2alpha/BUILD @@ -1,7 +1,19 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "v2alpha", + srcs = glob(["*.proto"]), + has_services = True, + deps = [ + "//envoy/api/v2", + "//envoy/api/v2/core", + "//envoy/api/v2/route:route_protos", + "//envoy/data/tap/v2alpha:v2alpha_protos", + ], +) + api_proto_library_internal( name = "common", srcs = ["common.proto"], diff --git a/api/envoy/type/BUILD b/api/envoy/type/BUILD index af95439b2068..737371f862be 100644 --- a/api/envoy/type/BUILD +++ b/api/envoy/type/BUILD @@ -1,11 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal", "api_proto_package") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( name = "type", srcs = glob(["*.proto"]), - visibility = ["//visibility:public"], ) api_proto_library_internal( @@ -14,29 +13,14 @@ api_proto_library_internal( visibility = ["//visibility:public"], ) -api_go_proto_library( - name = "http_status", - proto = ":http_status", -) - api_proto_library_internal( name = "percent", srcs = ["percent.proto"], visibility = ["//visibility:public"], ) -api_go_proto_library( - name = "percent", - proto = ":percent", -) - api_proto_library_internal( name = "range", srcs = ["range.proto"], visibility = ["//visibility:public"], ) - -api_go_proto_library( - name = "range", - proto = ":range", -) diff --git a/api/envoy/type/matcher/BUILD b/api/envoy/type/matcher/BUILD index ec4aa09b6c63..1432392f7bbc 100644 --- a/api/envoy/type/matcher/BUILD +++ b/api/envoy/type/matcher/BUILD @@ -1,7 +1,13 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "matcher", + srcs = glob(["*.proto"]), + deps = ["//envoy/type"], +) + api_proto_library_internal( name = "metadata", srcs = ["metadata.proto"], @@ -11,14 +17,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "metadata", - proto = ":metadata", - deps = [ - ":value_go_proto", - ], -) - api_proto_library_internal( name = "number", srcs = ["number.proto"], @@ -28,25 +26,12 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "number", - proto = ":number", - deps = [ - "//envoy/type:range_go_proto", - ], -) - api_proto_library_internal( name = "string", srcs = ["string.proto"], visibility = ["//visibility:public"], ) -api_go_proto_library( - name = "string", - proto = ":string", -) - api_proto_library_internal( name = "value", srcs = ["value.proto"], @@ -57,11 +42,3 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "value", - proto = ":value", - deps = [ - ":number_go_proto", - ":string_go_proto", - ], -) diff --git a/api/envoy/type/matcher/metadata.proto b/api/envoy/type/matcher/metadata.proto index 08190a9f5d38..56b69eae5968 100644 --- a/api/envoy/type/matcher/metadata.proto +++ b/api/envoy/type/matcher/metadata.proto @@ -5,7 +5,6 @@ package envoy.type.matcher; option java_outer_classname = "MetadataProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.type.matcher"; -option go_package = "matcher"; import "envoy/type/matcher/value.proto"; diff --git a/api/envoy/type/matcher/number.proto b/api/envoy/type/matcher/number.proto index f6c49b3fcdf6..5c8cec7bcbdc 100644 --- a/api/envoy/type/matcher/number.proto +++ b/api/envoy/type/matcher/number.proto @@ -5,7 +5,6 @@ package envoy.type.matcher; option java_outer_classname = "NumberProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.type.matcher"; -option go_package = "matcher"; import "envoy/type/range.proto"; diff --git a/api/envoy/type/matcher/string.proto b/api/envoy/type/matcher/string.proto index 55f2171af53e..3a84812d4850 100644 --- a/api/envoy/type/matcher/string.proto +++ b/api/envoy/type/matcher/string.proto @@ -5,7 +5,6 @@ package envoy.type.matcher; option java_outer_classname = "StringProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.type.matcher"; -option go_package = "matcher"; import "validate/validate.proto"; diff --git a/api/envoy/type/matcher/value.proto b/api/envoy/type/matcher/value.proto index 52f5e5b100b1..7164504366d9 100644 --- a/api/envoy/type/matcher/value.proto +++ b/api/envoy/type/matcher/value.proto @@ -5,7 +5,6 @@ package envoy.type.matcher; option java_outer_classname = "ValueProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.type.matcher"; -option go_package = "matcher"; import "envoy/type/matcher/number.proto"; import "envoy/type/matcher/string.proto"; diff --git a/api/envoy/type/range.proto b/api/envoy/type/range.proto index e64b71e440f3..cc38e8f25f5e 100644 --- a/api/envoy/type/range.proto +++ b/api/envoy/type/range.proto @@ -5,7 +5,6 @@ package envoy.type; option java_outer_classname = "RangeProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.type"; -option go_package = "envoy_type"; import "gogoproto/gogo.proto"; From 0eb97c55652016cb2726f21032f664acc528cc87 Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Wed, 21 Aug 2019 21:37:30 -0700 Subject: [PATCH 03/16] complete Signed-off-by: Kuat Yessenov --- api/bazel/api_build_system.bzl | 100 ++++++++++-------- api/envoy/admin/v2alpha/BUILD | 4 +- api/envoy/config/accesslog/v2/BUILD | 10 +- api/envoy/config/accesslog/v2/als.proto | 1 - api/envoy/config/accesslog/v2/file.proto | 1 - api/envoy/config/bootstrap/v2/BUILD | 34 +++--- api/envoy/config/bootstrap/v2/bootstrap.proto | 1 - .../dynamic_forward_proxy/v2alpha/BUILD | 10 +- .../v2alpha/cluster.proto | 1 - api/envoy/config/cluster/redis/BUILD | 7 +- .../config/cluster/redis/redis_cluster.proto | 1 - .../dynamic_forward_proxy/v2alpha/BUILD | 10 +- api/envoy/config/common/tap/v2alpha/BUILD | 11 +- api/envoy/config/filter/accesslog/v2/BUILD | 22 ++-- .../filter/accesslog/v2/accesslog.proto | 1 - .../config/filter/dubbo/router/v2alpha1/BUILD | 7 +- .../filter/dubbo/router/v2alpha1/router.proto | 1 - api/envoy/config/filter/fault/v2/BUILD | 10 +- api/envoy/config/filter/fault/v2/fault.proto | 1 - .../http/adaptive_concurrency/v2alpha/BUILD | 10 +- .../v2alpha/adaptive_concurrency.proto | 1 - api/envoy/config/filter/http/buffer/v2/BUILD | 7 +- .../config/filter/http/buffer/v2/buffer.proto | 1 - api/envoy/config/filter/http/csrf/v2/BUILD | 11 +- .../config/filter/http/csrf/v2/csrf.proto | 1 - .../http/dynamic_forward_proxy/v2alpha/BUILD | 10 +- .../v2alpha/dynamic_forward_proxy.proto | 1 - .../config/filter/http/ext_authz/v2/BUILD | 12 ++- .../filter/http/ext_authz/v2/ext_authz.proto | 1 - api/envoy/config/filter/http/fault/v2/BUILD | 12 ++- .../config/filter/http/fault/v2/fault.proto | 1 - .../grpc_http1_reverse_bridge/v2alpha1/BUILD | 7 +- .../v2alpha1/config.proto | 1 - api/envoy/config/filter/http/gzip/v2/BUILD | 7 +- .../config/filter/http/gzip/v2/gzip.proto | 1 - .../filter/http/header_to_metadata/v2/BUILD | 8 +- .../v2/header_to_metadata.proto | 1 - .../config/filter/http/health_check/v2/BUILD | 20 ++-- .../http/health_check/v2/health_check.proto | 1 - .../config/filter/http/ip_tagging/v2/BUILD | 10 +- .../http/ip_tagging/v2/ip_tagging.proto | 1 - .../filter/http/jwt_authn/v2alpha/BUILD | 21 ++-- api/envoy/config/filter/http/lua/v2/BUILD | 7 +- api/envoy/config/filter/http/lua/v2/lua.proto | 1 - .../filter/http/original_src/v2alpha1/BUILD | 7 +- .../original_src/v2alpha1/original_src.proto | 2 - .../config/filter/http/rate_limit/v2/BUILD | 10 +- .../http/rate_limit/v2/rate_limit.proto | 1 - api/envoy/config/filter/http/rbac/v2/BUILD | 10 +- .../config/filter/http/rbac/v2/rbac.proto | 1 - api/envoy/config/filter/http/router/v2/BUILD | 16 +-- .../config/filter/http/router/v2/router.proto | 1 - api/envoy/config/filter/http/squash/v2/BUILD | 7 +- .../config/filter/http/squash/v2/squash.proto | 1 - .../config/filter/http/tap/v2alpha/BUILD | 10 +- .../config/filter/http/transcoder/v2/BUILD | 12 +-- .../http/transcoder/v2/transcoder.proto | 1 - .../listener/original_src/v2alpha1/BUILD | 7 +- .../original_src/v2alpha1/original_src.proto | 2 - .../filter/network/client_ssl_auth/v2/BUILD | 10 +- .../client_ssl_auth/v2/client_ssl_auth.proto | 1 - .../filter/network/dubbo_proxy/v2alpha1/BUILD | 13 ++- .../dubbo_proxy/v2alpha1/dubbo_proxy.proto | 3 +- .../network/dubbo_proxy/v2alpha1/route.proto | 1 - .../config/filter/network/ext_authz/v2/BUILD | 10 +- .../network/ext_authz/v2/ext_authz.proto | 1 - .../network/http_connection_manager/v2/BUILD | 27 +++-- .../v2/http_connection_manager.proto | 1 - .../filter/network/mongo_proxy/v2/BUILD | 10 +- .../network/mongo_proxy/v2/mongo_proxy.proto | 1 - .../filter/network/mysql_proxy/v1alpha1/BUILD | 7 +- .../mysql_proxy/v1alpha1/mysql_proxy.proto | 1 - .../config/filter/network/rate_limit/v2/BUILD | 11 +- .../network/rate_limit/v2/rate_limit.proto | 1 - api/envoy/config/filter/network/rbac/v2/BUILD | 10 +- .../config/filter/network/rbac/v2/rbac.proto | 1 - .../filter/network/redis_proxy/v2/BUILD | 11 +- .../network/redis_proxy/v2/redis_proxy.proto | 1 - .../config/filter/network/tcp_proxy/v2/BUILD | 11 +- .../network/tcp_proxy/v2/tcp_proxy.proto | 1 - .../network/thrift_proxy/v2alpha1/BUILD | 11 +- .../network/thrift_proxy/v2alpha1/route.proto | 1 - .../thrift_proxy/v2alpha1/thrift_proxy.proto | 1 - .../network/zookeeper_proxy/v1alpha1/BUILD | 7 +- .../v1alpha1/zookeeper_proxy.proto | 1 - .../filter/thrift/rate_limit/v2alpha1/BUILD | 11 +- .../rate_limit/v2alpha1/rate_limit.proto | 1 - .../filter/thrift/router/v2alpha1/BUILD | 7 +- .../thrift/router/v2alpha1/router.proto | 1 - .../config/grpc_credential/v2alpha/BUILD | 23 ++-- .../grpc_credential/v2alpha/aws_iam.proto | 1 - .../v2alpha/file_based_metadata.proto | 1 - .../config/health_checker/redis/v2/BUILD | 7 +- .../health_checker/redis/v2/redis.proto | 1 - api/envoy/config/metrics/v2/BUILD | 28 ++--- api/envoy/config/metrics/v2/stats.proto | 1 - api/envoy/config/overload/v2alpha/BUILD | 12 +-- .../config/overload/v2alpha/overload.proto | 1 - api/envoy/config/ratelimit/v2/BUILD | 18 ++-- api/envoy/config/ratelimit/v2/rls.proto | 1 - api/envoy/config/rbac/v2/BUILD | 25 +++-- api/envoy/config/rbac/v2/rbac.proto | 1 - .../resource_monitor/fixed_heap/v2alpha/BUILD | 7 +- .../fixed_heap/v2alpha/fixed_heap.proto | 1 - .../injected_resource/v2alpha/BUILD | 7 +- .../v2alpha/injected_resource.proto | 1 - .../config/retry/previous_priorities/BUILD | 10 +- api/envoy/config/trace/v2/BUILD | 20 ++-- api/envoy/config/trace/v2/trace.proto | 1 - .../transport_socket/alts/v2alpha/BUILD | 10 +- .../transport_socket/alts/v2alpha/alts.proto | 1 - .../config/transport_socket/tap/v2alpha/BUILD | 11 +- .../transport_socket/tap/v2alpha/tap.proto | 1 - api/envoy/data/accesslog/v2/BUILD | 19 ++-- api/envoy/data/cluster/v2alpha/BUILD | 7 +- api/envoy/data/core/v2alpha/BUILD | 10 +- api/envoy/data/tap/v2alpha/BUILD | 2 +- api/envoy/service/accesslog/v2/BUILD | 21 ++-- api/envoy/service/accesslog/v2/als.proto | 1 - api/envoy/service/auth/v2/BUILD | 12 ++- api/envoy/service/auth/v2/external_auth.proto | 1 - api/envoy/service/auth/v2alpha/BUILD | 11 +- .../service/auth/v2alpha/external_auth.proto | 2 - api/envoy/service/discovery/v2/BUILD | 47 +++----- api/envoy/service/discovery/v2/ads.proto | 1 - api/envoy/service/load_stats/v2/BUILD | 21 ++-- api/envoy/service/load_stats/v2/lrs.proto | 1 - api/envoy/service/metrics/v2/BUILD | 21 ++-- .../service/metrics/v2/metrics_service.proto | 1 - api/envoy/service/ratelimit/v2/BUILD | 22 ++-- api/envoy/service/ratelimit/v2/rls.proto | 1 - api/envoy/service/tap/v2alpha/BUILD | 4 +- api/envoy/service/trace/v2/BUILD | 21 ++-- .../service/trace/v2/trace_service.proto | 1 - api/envoy/type/matcher/BUILD | 1 - api/test/build/BUILD | 21 ++-- api/test/build/go_build_test.go | 21 ++-- tools/check_format.py | 11 ++ 138 files changed, 684 insertions(+), 436 deletions(-) diff --git a/api/bazel/api_build_system.bzl b/api/bazel/api_build_system.bzl index 0c56c7073a07..83dfb952fe96 100644 --- a/api/bazel/api_build_system.bzl +++ b/api/bazel/api_build_system.bzl @@ -40,50 +40,6 @@ def api_py_proto_library(name, srcs = [], deps = [], external_py_proto_deps = [] visibility = ["//visibility:public"], ) -def api_proto_package(name, srcs = [], deps = [], has_services = False, visibility = ["//visibility:public"]): - native.proto_library( - name = name, - srcs = srcs, - deps = deps + [ - "@com_google_protobuf//:any_proto", - "@com_google_protobuf//:descriptor_proto", - "@com_google_protobuf//:duration_proto", - "@com_google_protobuf//:empty_proto", - "@com_google_protobuf//:struct_proto", - "@com_google_protobuf//:timestamp_proto", - "@com_google_protobuf//:wrappers_proto", - "@com_google_googleapis//google/api:http_proto", - "@com_google_googleapis//google/api:annotations_proto", - "@com_google_googleapis//google/rpc:status_proto", - "@com_github_gogo_protobuf//:gogo_proto", - "@com_envoyproxy_protoc_gen_validate//validate:validate_proto", - ], - visibility = visibility, - ) - - compilers = ["@io_bazel_rules_go//proto:go_proto"] - if has_services: - compilers = ["@io_bazel_rules_go//proto:go_grpc"] - - go_proto_library( - name = _Suffix(name, _GO_PROTO_SUFFIX), - compilers = compilers, - importpath = _Suffix(_GO_IMPORTPATH_PREFIX, name), - proto = name, - visibility = ["//visibility:public"], - deps = [_Suffix("//" + Label(dep).package + ":" + Label(dep).name, _GO_PROTO_SUFFIX) for dep in deps] + [ - "@com_github_gogo_protobuf//:gogo_proto_go", - "@io_bazel_rules_go//proto/wkt:any_go_proto", - "@io_bazel_rules_go//proto/wkt:duration_go_proto", - "@io_bazel_rules_go//proto/wkt:struct_go_proto", - "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", - "@io_bazel_rules_go//proto/wkt:wrappers_go_proto", - "@com_envoyproxy_protoc_gen_validate//validate:go_default_library", - "@com_google_googleapis//google/api:annotations_go_proto", - "@com_google_googleapis//google/rpc:status_go_proto", - ], - ) - # This defines googleapis py_proto_library. The repository does not provide its definition and requires # overriding it in the consuming project (see https://github.com/grpc/grpc/issues/19255 for more details). def py_proto_library(name, deps = []): @@ -224,3 +180,59 @@ def api_go_test(name, size, importpath, srcs = [], deps = []): importpath = importpath, deps = deps, ) + +_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, srcs = [], deps = [], has_services = False, visibility = ["//visibility:public"]): + native.proto_library( + name = name, + srcs = srcs, + deps = deps + [ + "@com_google_protobuf//:any_proto", + "@com_google_protobuf//:descriptor_proto", + "@com_google_protobuf//:duration_proto", + "@com_google_protobuf//:empty_proto", + "@com_google_protobuf//:struct_proto", + "@com_google_protobuf//:timestamp_proto", + "@com_google_protobuf//:wrappers_proto", + "@com_google_googleapis//google/api:http_proto", + "@com_google_googleapis//google/api:annotations_proto", + "@com_google_googleapis//google/rpc:status_proto", + "@com_github_gogo_protobuf//:gogo_proto", + "@com_envoyproxy_protoc_gen_validate//validate:validate_proto", + ], + visibility = visibility, + ) + + compilers = ["@io_bazel_rules_go//proto:go_proto"] + if has_services: + compilers = ["@io_bazel_rules_go//proto:go_grpc"] + + go_proto_library( + name = _Suffix(name, _GO_PROTO_SUFFIX), + compilers = compilers, + importpath = _Suffix(_GO_IMPORTPATH_PREFIX, native.package_name()), + proto = name, + visibility = ["//visibility:public"], + deps = [go_proto_mapping(dep) for dep in deps] + [ + "@com_github_gogo_protobuf//:gogo_proto_go", + "@io_bazel_rules_go//proto/wkt:any_go_proto", + "@io_bazel_rules_go//proto/wkt:duration_go_proto", + "@io_bazel_rules_go//proto/wkt:struct_go_proto", + "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", + "@io_bazel_rules_go//proto/wkt:wrappers_go_proto", + "@com_envoyproxy_protoc_gen_validate//validate:go_default_library", + "@com_google_googleapis//google/api:annotations_go_proto", + "@com_google_googleapis//google/rpc:status_go_proto", + ], + ) diff --git a/api/envoy/admin/v2alpha/BUILD b/api/envoy/admin/v2alpha/BUILD index 033457c60a47..96aece493836 100644 --- a/api/envoy/admin/v2alpha/BUILD +++ b/api/envoy/admin/v2alpha/BUILD @@ -9,7 +9,8 @@ api_proto_package( "//envoy/api/v2", "//envoy/api/v2/auth", "//envoy/api/v2/core", - "//envoy/config/bootstrap/v2", + "//envoy/config/bootstrap/v2:bootstrap_config", + "//envoy/service/tap/v2alpha:tap_service", "//envoy/type", ], ) @@ -25,7 +26,6 @@ api_proto_library_internal( "//envoy/api/v2:srds", "//envoy/api/v2/auth:cert", "//envoy/config/bootstrap/v2:bootstrap", - "//envoy/service/tap/v2alpha", ], ) diff --git a/api/envoy/config/accesslog/v2/BUILD b/api/envoy/config/accesslog/v2/BUILD index d6fd2d358929..c82cf94fd888 100644 --- a/api/envoy/config/accesslog/v2/BUILD +++ b/api/envoy/config/accesslog/v2/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "accesslog_config", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + ], +) + api_proto_library_internal( name = "als", srcs = ["als.proto"], diff --git a/api/envoy/config/accesslog/v2/als.proto b/api/envoy/config/accesslog/v2/als.proto index a7291e4e9780..e95b95172e81 100644 --- a/api/envoy/config/accesslog/v2/als.proto +++ b/api/envoy/config/accesslog/v2/als.proto @@ -5,7 +5,6 @@ package envoy.config.accesslog.v2; option java_outer_classname = "AlsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.accesslog.v2"; -option go_package = "v2"; import "envoy/api/v2/core/grpc_service.proto"; diff --git a/api/envoy/config/accesslog/v2/file.proto b/api/envoy/config/accesslog/v2/file.proto index 48a1841a9614..b88529a3251d 100644 --- a/api/envoy/config/accesslog/v2/file.proto +++ b/api/envoy/config/accesslog/v2/file.proto @@ -5,7 +5,6 @@ package envoy.config.accesslog.v2; option java_outer_classname = "FileProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.accesslog.v2"; -option go_package = "v2"; import "validate/validate.proto"; import "google/protobuf/struct.proto"; diff --git a/api/envoy/config/bootstrap/v2/BUILD b/api/envoy/config/bootstrap/v2/BUILD index 455365ab1e77..15edfbee6f40 100644 --- a/api/envoy/config/bootstrap/v2/BUILD +++ b/api/envoy/config/bootstrap/v2/BUILD @@ -1,7 +1,21 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "bootstrap_config", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2", + "//envoy/api/v2/auth", + "//envoy/api/v2/core", + "//envoy/config/metrics/v2:metrics_config", + "//envoy/config/overload/v2alpha:overload_config", + "//envoy/config/ratelimit/v2:ratelimit_config", + "//envoy/config/trace/v2:trace_config", + ], +) + api_proto_library_internal( name = "bootstrap", srcs = ["bootstrap.proto"], @@ -20,21 +34,3 @@ api_proto_library_internal( "//envoy/config/trace/v2:trace", ], ) - -api_go_proto_library( - name = "bootstrap", - proto = ":bootstrap", - deps = [ - "//envoy/api/v2:cds_go_grpc", - "//envoy/api/v2:lds_go_grpc", - "//envoy/api/v2/auth:cert_go_proto", - "//envoy/api/v2/core:address_go_proto", - "//envoy/api/v2/core:base_go_proto", - "//envoy/api/v2/core:config_source_go_proto", - "//envoy/config/metrics/v2:metrics_service_go_proto", - "//envoy/config/metrics/v2:stats_go_proto", - "//envoy/config/overload/v2alpha:overload_go_proto", - "//envoy/config/ratelimit/v2:rls_go_grpc", - "//envoy/config/trace/v2:trace_go_proto", - ], -) diff --git a/api/envoy/config/bootstrap/v2/bootstrap.proto b/api/envoy/config/bootstrap/v2/bootstrap.proto index 477aeac5a141..e77e3e0a5b42 100644 --- a/api/envoy/config/bootstrap/v2/bootstrap.proto +++ b/api/envoy/config/bootstrap/v2/bootstrap.proto @@ -10,7 +10,6 @@ package envoy.config.bootstrap.v2; option java_outer_classname = "BootstrapProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.bootstrap.v2"; -option go_package = "v2"; import "envoy/api/v2/core/address.proto"; import "envoy/api/v2/core/base.proto"; diff --git a/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD b/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD index b09f5c858ba9..d44e0533b345 100644 --- a/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD +++ b/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "dynamic_forward_proxy_config", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/config/common/dynamic_forward_proxy/v2alpha:dynamic_forward_proxy", + ], +) + api_proto_library_internal( name = "cluster", srcs = ["cluster.proto"], diff --git a/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.proto b/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.proto index d9ae85903264..c6d47807ce50 100644 --- a/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.proto +++ b/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.proto @@ -5,7 +5,6 @@ package envoy.config.cluster.dynamic_forward_proxy.v2alpha; option java_outer_classname = "DynamicForwardProxyClusterProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.cluster.dynamic_forward_proxy.v2alpha"; -option go_package = "v2alpha"; import "envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.proto"; diff --git a/api/envoy/config/cluster/redis/BUILD b/api/envoy/config/cluster/redis/BUILD index 42e2d408e358..5949eed29de1 100644 --- a/api/envoy/config/cluster/redis/BUILD +++ b/api/envoy/config/cluster/redis/BUILD @@ -1,7 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "redis", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "redis_cluster", srcs = ["redis_cluster.proto"], diff --git a/api/envoy/config/cluster/redis/redis_cluster.proto b/api/envoy/config/cluster/redis/redis_cluster.proto index 2644288c40d2..abe2c857532d 100644 --- a/api/envoy/config/cluster/redis/redis_cluster.proto +++ b/api/envoy/config/cluster/redis/redis_cluster.proto @@ -5,7 +5,6 @@ package envoy.config.cluster.redis; option java_outer_classname = "RedisClusterProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.cluster.redis"; -option go_package = "v2"; import "google/protobuf/duration.proto"; diff --git a/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD b/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD index 53095826454d..1bf4b43cbc4a 100644 --- a/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD +++ b/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "dynamic_forward_proxy", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2", + ], +) + api_proto_library_internal( name = "dns_cache", srcs = ["dns_cache.proto"], diff --git a/api/envoy/config/common/tap/v2alpha/BUILD b/api/envoy/config/common/tap/v2alpha/BUILD index 863ba519d128..e5efd6c1b39e 100644 --- a/api/envoy/config/common/tap/v2alpha/BUILD +++ b/api/envoy/config/common/tap/v2alpha/BUILD @@ -1,7 +1,16 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "tap_config", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + "//envoy/service/tap/v2alpha:tap_service", + ], +) + api_proto_library_internal( name = "common", srcs = ["common.proto"], diff --git a/api/envoy/config/filter/accesslog/v2/BUILD b/api/envoy/config/filter/accesslog/v2/BUILD index fdbf376af177..71565ba40153 100644 --- a/api/envoy/config/filter/accesslog/v2/BUILD +++ b/api/envoy/config/filter/accesslog/v2/BUILD @@ -1,7 +1,17 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "accesslog_filter_config", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + "//envoy/api/v2/route:route_protos", + "//envoy/type", + ], +) + api_proto_library_internal( name = "accesslog", srcs = ["accesslog.proto"], @@ -16,13 +26,3 @@ api_proto_library_internal( "//envoy/type:percent", ], ) - -api_go_proto_library( - name = "accesslog", - proto = ":accesslog", - deps = [ - "//envoy/api/v2/core:base_go_proto", - "//envoy/api/v2/route:route_go_proto", - "//envoy/type:percent_go_proto", - ], -) diff --git a/api/envoy/config/filter/accesslog/v2/accesslog.proto b/api/envoy/config/filter/accesslog/v2/accesslog.proto index 66d901c2d413..063e43cc437f 100644 --- a/api/envoy/config/filter/accesslog/v2/accesslog.proto +++ b/api/envoy/config/filter/accesslog/v2/accesslog.proto @@ -5,7 +5,6 @@ package envoy.config.filter.accesslog.v2; option java_outer_classname = "AccesslogProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.accesslog.v2"; -option go_package = "v2"; import "envoy/api/v2/core/base.proto"; import "envoy/api/v2/route/route.proto"; diff --git a/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD b/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD index 51c69c0d5b20..1525b110552c 100644 --- a/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD +++ b/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD @@ -1,7 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "dubbo_router", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "router", srcs = ["router.proto"], diff --git a/api/envoy/config/filter/dubbo/router/v2alpha1/router.proto b/api/envoy/config/filter/dubbo/router/v2alpha1/router.proto index 37a5542a17bb..4e65f14e0ea9 100644 --- a/api/envoy/config/filter/dubbo/router/v2alpha1/router.proto +++ b/api/envoy/config/filter/dubbo/router/v2alpha1/router.proto @@ -5,7 +5,6 @@ package envoy.config.filter.dubbo.router.v2alpha1; option java_outer_classname = "RouterProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.dubbo.router.v2alpha1"; -option go_package = "v2alpha1"; // [#protodoc-title: Router] // Dubbo router :ref:`configuration overview `. diff --git a/api/envoy/config/filter/fault/v2/BUILD b/api/envoy/config/filter/fault/v2/BUILD index 35419a9902b3..76f744a243e5 100644 --- a/api/envoy/config/filter/fault/v2/BUILD +++ b/api/envoy/config/filter/fault/v2/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "fault_config", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/type", + ], +) + api_proto_library_internal( name = "fault", srcs = ["fault.proto"], diff --git a/api/envoy/config/filter/fault/v2/fault.proto b/api/envoy/config/filter/fault/v2/fault.proto index f27f9d446267..2298ecf4a1c0 100644 --- a/api/envoy/config/filter/fault/v2/fault.proto +++ b/api/envoy/config/filter/fault/v2/fault.proto @@ -5,7 +5,6 @@ package envoy.config.filter.fault.v2; option java_outer_classname = "FaultProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.fault.v2"; -option go_package = "v2"; import "envoy/type/percent.proto"; diff --git a/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD b/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD index 948ceec2223d..7914a5b733cb 100644 --- a/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD +++ b/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "http_adaptive_concurrency", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + ], +) + api_proto_library_internal( name = "adaptive_concurrency", srcs = ["adaptive_concurrency.proto"], diff --git a/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.proto b/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.proto index ff19657260e8..303b681471f4 100644 --- a/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.proto +++ b/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.adaptive_concurrency.v2alpha; option java_package = "io.envoyproxy.envoy.config.filter.http.adaptive_concurrency.v2alpha"; option java_outer_classname = "AdaptiveConcurrencyProto"; option java_multiple_files = true; -option go_package = "v2alpha"; message AdaptiveConcurrency { } diff --git a/api/envoy/config/filter/http/buffer/v2/BUILD b/api/envoy/config/filter/http/buffer/v2/BUILD index e59429af9ace..cc48ccdbebb8 100644 --- a/api/envoy/config/filter/http/buffer/v2/BUILD +++ b/api/envoy/config/filter/http/buffer/v2/BUILD @@ -1,7 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "http_buffer", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "buffer", srcs = ["buffer.proto"], diff --git a/api/envoy/config/filter/http/buffer/v2/buffer.proto b/api/envoy/config/filter/http/buffer/v2/buffer.proto index a203d9d98cc2..92780adad69b 100644 --- a/api/envoy/config/filter/http/buffer/v2/buffer.proto +++ b/api/envoy/config/filter/http/buffer/v2/buffer.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.buffer.v2; option java_outer_classname = "BufferProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.buffer.v2"; -option go_package = "v2"; import "google/protobuf/wrappers.proto"; diff --git a/api/envoy/config/filter/http/csrf/v2/BUILD b/api/envoy/config/filter/http/csrf/v2/BUILD index 0d58b1ef6d43..487c8c8e1ff5 100644 --- a/api/envoy/config/filter/http/csrf/v2/BUILD +++ b/api/envoy/config/filter/http/csrf/v2/BUILD @@ -1,7 +1,16 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "http_csrf", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + "//envoy/type/matcher", + ], +) + api_proto_library_internal( name = "csrf", srcs = ["csrf.proto"], diff --git a/api/envoy/config/filter/http/csrf/v2/csrf.proto b/api/envoy/config/filter/http/csrf/v2/csrf.proto index 525ed118a71b..d4c35291e63d 100644 --- a/api/envoy/config/filter/http/csrf/v2/csrf.proto +++ b/api/envoy/config/filter/http/csrf/v2/csrf.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.csrf.v2; option java_outer_classname = "CsrfPolicyProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.csrf.v2"; -option go_package = "v2"; import "envoy/api/v2/core/base.proto"; import "envoy/type/matcher/string.proto"; 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 4fd1d84399fa..a0d187f0ff95 100644 --- a/api/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD +++ b/api/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "http_dynamic_forward_proxy", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/config/common/dynamic_forward_proxy/v2alpha:dynamic_forward_proxy", + ], +) + api_proto_library_internal( name = "dynamic_forward_proxy", srcs = ["dynamic_forward_proxy.proto"], diff --git a/api/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.proto b/api/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.proto index 631363a6d95e..c315ddb46515 100644 --- a/api/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.proto +++ b/api/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.dynamic_forward_proxy.v2alpha; option java_outer_classname = "DynamicForwardProxyProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.dynamic_forward_proxy.v2alpha"; -option go_package = "v2alpha"; import "envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.proto"; diff --git a/api/envoy/config/filter/http/ext_authz/v2/BUILD b/api/envoy/config/filter/http/ext_authz/v2/BUILD index b1d02437df04..bdb42c2334cd 100644 --- a/api/envoy/config/filter/http/ext_authz/v2/BUILD +++ b/api/envoy/config/filter/http/ext_authz/v2/BUILD @@ -1,7 +1,17 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "http_ext_authz", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + "//envoy/type", + "//envoy/type/matcher", + ], +) + api_proto_library_internal( name = "ext_authz", srcs = ["ext_authz.proto"], diff --git a/api/envoy/config/filter/http/ext_authz/v2/ext_authz.proto b/api/envoy/config/filter/http/ext_authz/v2/ext_authz.proto index de105eff3c80..e2922348b6a7 100644 --- a/api/envoy/config/filter/http/ext_authz/v2/ext_authz.proto +++ b/api/envoy/config/filter/http/ext_authz/v2/ext_authz.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.ext_authz.v2; option java_outer_classname = "ExtAuthzProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.ext_authz.v2"; -option go_package = "v2"; import "envoy/api/v2/core/base.proto"; import "envoy/api/v2/core/grpc_service.proto"; diff --git a/api/envoy/config/filter/http/fault/v2/BUILD b/api/envoy/config/filter/http/fault/v2/BUILD index e561e88196b9..533be3f707f1 100644 --- a/api/envoy/config/filter/http/fault/v2/BUILD +++ b/api/envoy/config/filter/http/fault/v2/BUILD @@ -1,7 +1,17 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "http_fault", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/route:route_protos", + "//envoy/config/filter/fault/v2:fault_config", + "//envoy/type", + ], +) + api_proto_library_internal( name = "fault", srcs = ["fault.proto"], diff --git a/api/envoy/config/filter/http/fault/v2/fault.proto b/api/envoy/config/filter/http/fault/v2/fault.proto index 51ee24ac91a8..8256690837fc 100644 --- a/api/envoy/config/filter/http/fault/v2/fault.proto +++ b/api/envoy/config/filter/http/fault/v2/fault.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.fault.v2; option java_outer_classname = "FaultProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.fault.v2"; -option go_package = "v2"; import "envoy/api/v2/route/route.proto"; import "envoy/config/filter/fault/v2/fault.proto"; 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 7c1deb713c34..fa8486fa35de 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,7 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "grpc_http1_reverse_bridge", + srcs = glob(["*.proto"]), +) + api_proto_library( name = "config", srcs = ["config.proto"], diff --git a/api/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.proto b/api/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.proto index 0c33b6d077a1..b3b1fde5e1a2 100644 --- a/api/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.proto +++ b/api/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.grpc_http1_reverse_bridge.v2alpha1; option java_outer_classname = "ConfigProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.grpc_http1_reverse_bridge.v2alpha1"; -option go_package = "v2"; import "validate/validate.proto"; diff --git a/api/envoy/config/filter/http/gzip/v2/BUILD b/api/envoy/config/filter/http/gzip/v2/BUILD index e34d73c51c21..b2f1246b1e73 100644 --- a/api/envoy/config/filter/http/gzip/v2/BUILD +++ b/api/envoy/config/filter/http/gzip/v2/BUILD @@ -1,7 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "http_gzip", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "gzip", srcs = ["gzip.proto"], diff --git a/api/envoy/config/filter/http/gzip/v2/gzip.proto b/api/envoy/config/filter/http/gzip/v2/gzip.proto index fb6b8878e652..ec512c495dc8 100644 --- a/api/envoy/config/filter/http/gzip/v2/gzip.proto +++ b/api/envoy/config/filter/http/gzip/v2/gzip.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.gzip.v2; option java_outer_classname = "GzipProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.gzip.v2"; -option go_package = "v2"; import "google/protobuf/wrappers.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 3f8503acbe65..1e9762580229 100644 --- a/api/envoy/config/filter/http/header_to_metadata/v2/BUILD +++ b/api/envoy/config/filter/http/header_to_metadata/v2/BUILD @@ -1,9 +1,13 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "http_header_to_metadata", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "header_to_metadata", srcs = ["header_to_metadata.proto"], - deps = [], ) diff --git a/api/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto b/api/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto index 5e70bbfce46f..345c5225edf1 100644 --- a/api/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto +++ b/api/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.header_to_metadata.v2; option java_outer_classname = "HeaderToMetadataProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.header_to_metadata.v2"; -option go_package = "v2"; import "validate/validate.proto"; diff --git a/api/envoy/config/filter/http/health_check/v2/BUILD b/api/envoy/config/filter/http/health_check/v2/BUILD index 9dc0af2df16f..f4f4877cb446 100644 --- a/api/envoy/config/filter/http/health_check/v2/BUILD +++ b/api/envoy/config/filter/http/health_check/v2/BUILD @@ -1,21 +1,21 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 -api_proto_library_internal( - name = "health_check", - srcs = ["health_check.proto"], +api_proto_package( + name = "http_health_check", + srcs = glob(["*.proto"]), deps = [ - "//envoy/api/v2/route", - "//envoy/type:percent", + "//envoy/api/v2/route:route_protos", + "//envoy/type", ], ) -api_go_proto_library( +api_proto_library_internal( name = "health_check", - proto = ":health_check", + srcs = ["health_check.proto"], deps = [ - "//envoy/api/v2/route:route_go_proto", - "//envoy/type:percent_go_proto", + "//envoy/api/v2/route", + "//envoy/type:percent", ], ) diff --git a/api/envoy/config/filter/http/health_check/v2/health_check.proto b/api/envoy/config/filter/http/health_check/v2/health_check.proto index bc8433732d72..2aa6d4191596 100644 --- a/api/envoy/config/filter/http/health_check/v2/health_check.proto +++ b/api/envoy/config/filter/http/health_check/v2/health_check.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.health_check.v2; option java_outer_classname = "HealthCheckProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.health_check.v2"; -option go_package = "v2"; import "google/protobuf/duration.proto"; import "google/protobuf/wrappers.proto"; diff --git a/api/envoy/config/filter/http/ip_tagging/v2/BUILD b/api/envoy/config/filter/http/ip_tagging/v2/BUILD index 4c7001972e25..c2f610eedebe 100644 --- a/api/envoy/config/filter/http/ip_tagging/v2/BUILD +++ b/api/envoy/config/filter/http/ip_tagging/v2/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "http_ip_tagging", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + ], +) + api_proto_library_internal( name = "ip_tagging", srcs = ["ip_tagging.proto"], diff --git a/api/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto b/api/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto index 4f5da60150f3..92ec469c62ad 100644 --- a/api/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto +++ b/api/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.ip_tagging.v2; option java_outer_classname = "IpTaggingProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.ip_tagging.v2"; -option go_package = "v2"; import "envoy/api/v2/core/address.proto"; diff --git a/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD b/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD index e48aa582676c..837087066208 100644 --- a/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD +++ b/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD @@ -1,6 +1,15 @@ licenses(["notice"]) # Apache 2 -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") + +api_proto_package( + name = "http_jwt_authn", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + "//envoy/api/v2/route:route_protos", + ], +) api_proto_library_internal( name = "jwt_authn", @@ -11,13 +20,3 @@ api_proto_library_internal( "//envoy/api/v2/route", ], ) - -api_go_proto_library( - name = "jwt_authn", - proto = ":jwt_authn", - deps = [ - "//envoy/api/v2/core:base_go_proto", - "//envoy/api/v2/core:http_uri_go_proto", - "//envoy/api/v2/route:route_go_proto", - ], -) diff --git a/api/envoy/config/filter/http/lua/v2/BUILD b/api/envoy/config/filter/http/lua/v2/BUILD index 6daf0c82f174..4bed0ea650b8 100644 --- a/api/envoy/config/filter/http/lua/v2/BUILD +++ b/api/envoy/config/filter/http/lua/v2/BUILD @@ -1,7 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "http_lua", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "lua", srcs = ["lua.proto"], diff --git a/api/envoy/config/filter/http/lua/v2/lua.proto b/api/envoy/config/filter/http/lua/v2/lua.proto index f29bcdbe89ef..6fc7fabc6be3 100644 --- a/api/envoy/config/filter/http/lua/v2/lua.proto +++ b/api/envoy/config/filter/http/lua/v2/lua.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.lua.v2; option java_outer_classname = "LuaProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.lua.v2"; -option go_package = "v2"; import "validate/validate.proto"; diff --git a/api/envoy/config/filter/http/original_src/v2alpha1/BUILD b/api/envoy/config/filter/http/original_src/v2alpha1/BUILD index e064545b21cd..434d8f6d0fe0 100644 --- a/api/envoy/config/filter/http/original_src/v2alpha1/BUILD +++ b/api/envoy/config/filter/http/original_src/v2alpha1/BUILD @@ -1,7 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "http_original_src", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "original_src", srcs = ["original_src.proto"], diff --git a/api/envoy/config/filter/http/original_src/v2alpha1/original_src.proto b/api/envoy/config/filter/http/original_src/v2alpha1/original_src.proto index 32f37a8c48f0..5c09b860fc5c 100644 --- a/api/envoy/config/filter/http/original_src/v2alpha1/original_src.proto +++ b/api/envoy/config/filter/http/original_src/v2alpha1/original_src.proto @@ -6,8 +6,6 @@ option java_outer_classname = "OriginalSrcProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.original_src.v2alpha1"; -option go_package = "v2alpha1"; - import "validate/validate.proto"; // [#protodoc-title: Original Src Filter] diff --git a/api/envoy/config/filter/http/rate_limit/v2/BUILD b/api/envoy/config/filter/http/rate_limit/v2/BUILD index d8fb8e72ffec..8007faa57d4a 100644 --- a/api/envoy/config/filter/http/rate_limit/v2/BUILD +++ b/api/envoy/config/filter/http/rate_limit/v2/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "http_rate_limit", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/config/ratelimit/v2:ratelimit_config", + ], +) + api_proto_library_internal( name = "rate_limit", srcs = ["rate_limit.proto"], diff --git a/api/envoy/config/filter/http/rate_limit/v2/rate_limit.proto b/api/envoy/config/filter/http/rate_limit/v2/rate_limit.proto index 9d93e4a255bd..1ad3c4c36d01 100644 --- a/api/envoy/config/filter/http/rate_limit/v2/rate_limit.proto +++ b/api/envoy/config/filter/http/rate_limit/v2/rate_limit.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.rate_limit.v2; option java_outer_classname = "RateLimitProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.rate_limit.v2"; -option go_package = "v2"; import "envoy/config/ratelimit/v2/rls.proto"; diff --git a/api/envoy/config/filter/http/rbac/v2/BUILD b/api/envoy/config/filter/http/rbac/v2/BUILD index 6182fe26748a..d9f63268a634 100644 --- a/api/envoy/config/filter/http/rbac/v2/BUILD +++ b/api/envoy/config/filter/http/rbac/v2/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "http_rbac", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/config/rbac/v2:rbac_config", + ], +) + api_proto_library_internal( name = "rbac", srcs = ["rbac.proto"], diff --git a/api/envoy/config/filter/http/rbac/v2/rbac.proto b/api/envoy/config/filter/http/rbac/v2/rbac.proto index 0a75d9590fa5..611cdc6ccbed 100644 --- a/api/envoy/config/filter/http/rbac/v2/rbac.proto +++ b/api/envoy/config/filter/http/rbac/v2/rbac.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.rbac.v2; option java_outer_classname = "RbacProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.rbac.v2"; -option go_package = "v2"; import "envoy/config/rbac/v2/rbac.proto"; diff --git a/api/envoy/config/filter/http/router/v2/BUILD b/api/envoy/config/filter/http/router/v2/BUILD index 7a80299a2cf7..e8fde77e2240 100644 --- a/api/envoy/config/filter/http/router/v2/BUILD +++ b/api/envoy/config/filter/http/router/v2/BUILD @@ -1,15 +1,17 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "http_router", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/config/filter/accesslog/v2:accesslog_filter_config", + ], +) + api_proto_library_internal( name = "router", srcs = ["router.proto"], deps = ["//envoy/config/filter/accesslog/v2:accesslog"], ) - -api_go_proto_library( - name = "router", - proto = ":router", - deps = ["//envoy/config/filter/accesslog/v2:accesslog_go_proto"], -) diff --git a/api/envoy/config/filter/http/router/v2/router.proto b/api/envoy/config/filter/http/router/v2/router.proto index e77675673357..fd0cadec9631 100644 --- a/api/envoy/config/filter/http/router/v2/router.proto +++ b/api/envoy/config/filter/http/router/v2/router.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.router.v2; option java_outer_classname = "RouterProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.router.v2"; -option go_package = "v2"; import "envoy/config/filter/accesslog/v2/accesslog.proto"; diff --git a/api/envoy/config/filter/http/squash/v2/BUILD b/api/envoy/config/filter/http/squash/v2/BUILD index 86bd4e8cfb65..bbeb52c409e8 100644 --- a/api/envoy/config/filter/http/squash/v2/BUILD +++ b/api/envoy/config/filter/http/squash/v2/BUILD @@ -1,7 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "http_squash", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "squash", srcs = ["squash.proto"], diff --git a/api/envoy/config/filter/http/squash/v2/squash.proto b/api/envoy/config/filter/http/squash/v2/squash.proto index 006af4380d41..2f3a2e21cdd2 100644 --- a/api/envoy/config/filter/http/squash/v2/squash.proto +++ b/api/envoy/config/filter/http/squash/v2/squash.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.squash.v2; option java_outer_classname = "SquashProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.squash.v2"; -option go_package = "v2"; import "google/protobuf/duration.proto"; import "google/protobuf/struct.proto"; diff --git a/api/envoy/config/filter/http/tap/v2alpha/BUILD b/api/envoy/config/filter/http/tap/v2alpha/BUILD index f84625a7da73..b5cec6e27023 100644 --- a/api/envoy/config/filter/http/tap/v2alpha/BUILD +++ b/api/envoy/config/filter/http/tap/v2alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "http_tap", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/config/common/tap/v2alpha:tap_config", + ], +) + api_proto_library_internal( name = "tap", srcs = ["tap.proto"], diff --git a/api/envoy/config/filter/http/transcoder/v2/BUILD b/api/envoy/config/filter/http/transcoder/v2/BUILD index c1a845bcd96e..39bb9d3214dc 100644 --- a/api/envoy/config/filter/http/transcoder/v2/BUILD +++ b/api/envoy/config/filter/http/transcoder/v2/BUILD @@ -1,13 +1,13 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 -api_proto_library_internal( - name = "transcoder", - srcs = ["transcoder.proto"], +api_proto_package( + name = "http_transcoder", + srcs = glob(["*.proto"]), ) -api_go_proto_library( +api_proto_library_internal( name = "transcoder", - proto = ":transcoder", + srcs = ["transcoder.proto"], ) diff --git a/api/envoy/config/filter/http/transcoder/v2/transcoder.proto b/api/envoy/config/filter/http/transcoder/v2/transcoder.proto index 14f54124508d..85f837fa794f 100644 --- a/api/envoy/config/filter/http/transcoder/v2/transcoder.proto +++ b/api/envoy/config/filter/http/transcoder/v2/transcoder.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.transcoder.v2; option java_outer_classname = "TranscoderProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.transcoder.v2"; -option go_package = "v2"; import "validate/validate.proto"; diff --git a/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD b/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD index e064545b21cd..dc45e22fe0cf 100644 --- a/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD +++ b/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD @@ -1,7 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "listener_original_src", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "original_src", srcs = ["original_src.proto"], diff --git a/api/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto b/api/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto index aa38e1d3df0a..11f55a787fdf 100644 --- a/api/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto +++ b/api/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto @@ -6,8 +6,6 @@ option java_outer_classname = "OriginalSrcProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.listener.original_src.v2alpha1"; -option go_package = "v2alpha1"; - import "validate/validate.proto"; // [#protodoc-title: Original Src Filter] 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 dad2d7fea262..d4f8d05c1e30 100644 --- a/api/envoy/config/filter/network/client_ssl_auth/v2/BUILD +++ b/api/envoy/config/filter/network/client_ssl_auth/v2/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "network_client_ssl_auth", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + ], +) + api_proto_library_internal( name = "client_ssl_auth", srcs = ["client_ssl_auth.proto"], diff --git a/api/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto b/api/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto index fe0a6a3800b8..6add30a59552 100644 --- a/api/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto +++ b/api/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.client_ssl_auth.v2; option java_outer_classname = "ClientSslAuthProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.client_ssl_auth.v2"; -option go_package = "v2"; import "envoy/api/v2/core/address.proto"; import "google/protobuf/duration.proto"; diff --git a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD index e3e83a704684..c72dcc03e625 100644 --- a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD +++ b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD @@ -1,7 +1,18 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "network_dubbo", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + "//envoy/api/v2/route:route_protos", + "//envoy/type", + "//envoy/type/matcher", + ], +) + api_proto_library_internal( name = "dubbo_proxy", srcs = [ diff --git a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto index 5b0995ba0022..e9834b704ed3 100644 --- a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto +++ b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.dubbo_proxy.v2alpha1; option java_outer_classname = "DubboProxyProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.dubbo_proxy.v2alpha1"; -option go_package = "v2"; import "envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto"; @@ -58,4 +57,4 @@ message DubboFilter { // Filter specific configuration which depends on the filter being // instantiated. See the supported filters for further documentation. google.protobuf.Any config = 2; -} \ No newline at end of file +} diff --git a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto index 39f16e1a9342..c852a7cf5e53 100644 --- a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto +++ b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.dubbo_proxy.v2alpha1; option java_outer_classname = "RouteProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.dubbo_proxy.v2alpha1"; -option go_package = "v2"; import "envoy/api/v2/route/route.proto"; import "envoy/type/matcher/string.proto"; diff --git a/api/envoy/config/filter/network/ext_authz/v2/BUILD b/api/envoy/config/filter/network/ext_authz/v2/BUILD index 96184437fa54..7844fed17afd 100644 --- a/api/envoy/config/filter/network/ext_authz/v2/BUILD +++ b/api/envoy/config/filter/network/ext_authz/v2/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "network_ext_authz", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + ], +) + api_proto_library_internal( name = "ext_authz", srcs = ["ext_authz.proto"], diff --git a/api/envoy/config/filter/network/ext_authz/v2/ext_authz.proto b/api/envoy/config/filter/network/ext_authz/v2/ext_authz.proto index f9a2f351f79e..8d0a6c6ca246 100644 --- a/api/envoy/config/filter/network/ext_authz/v2/ext_authz.proto +++ b/api/envoy/config/filter/network/ext_authz/v2/ext_authz.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.ext_authz.v2; option java_outer_classname = "ExtAuthzProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.ext_authz.v2"; -option go_package = "v2"; import "envoy/api/v2/core/grpc_service.proto"; 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 95d3811f426a..df623f187a2b 100644 --- a/api/envoy/config/filter/network/http_connection_manager/v2/BUILD +++ b/api/envoy/config/filter/network/http_connection_manager/v2/BUILD @@ -1,7 +1,18 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "network_hcm", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2", + "//envoy/api/v2/core", + "//envoy/config/filter/accesslog/v2:accesslog_filter_config", + "//envoy/type", + ], +) + api_proto_library_internal( name = "http_connection_manager", srcs = ["http_connection_manager.proto"], @@ -15,17 +26,3 @@ api_proto_library_internal( "//envoy/type:percent", ], ) - -api_go_proto_library( - name = "http_connection_manager", - proto = ":http_connection_manager", - deps = [ - "//envoy/api/v2:rds_go_grpc", - "//envoy/api/v2:srds_go_grpc", - "//envoy/api/v2/core:base_go_proto", - "//envoy/api/v2/core:config_source_go_proto", - "//envoy/api/v2/core:protocol_go_proto", - "//envoy/config/filter/accesslog/v2:accesslog_go_proto", - "//envoy/type:percent_go_proto", - ], -) diff --git a/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto b/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto index 4d662fc2c524..c52c8bee2319 100644 --- a/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto +++ b/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.http_connection_manager.v2; option java_outer_classname = "HttpConnectionManagerProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.http_connection_manager.v2"; -option go_package = "v2"; import "envoy/api/v2/core/config_source.proto"; import "envoy/api/v2/core/protocol.proto"; diff --git a/api/envoy/config/filter/network/mongo_proxy/v2/BUILD b/api/envoy/config/filter/network/mongo_proxy/v2/BUILD index 5535f010179d..732f350013d8 100644 --- a/api/envoy/config/filter/network/mongo_proxy/v2/BUILD +++ b/api/envoy/config/filter/network/mongo_proxy/v2/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "network_mongo_proxy", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/config/filter/fault/v2:fault_config", + ], +) + api_proto_library_internal( name = "mongo_proxy", srcs = ["mongo_proxy.proto"], diff --git a/api/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto b/api/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto index 0d3d67bf6654..46ef44c96b94 100644 --- a/api/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto +++ b/api/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.mongo_proxy.v2; option java_outer_classname = "MongoProxyProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.mongo_proxy.v2"; -option go_package = "v2"; import "envoy/config/filter/fault/v2/fault.proto"; diff --git a/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD b/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD index fde664838c93..9dd7a8e63820 100644 --- a/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD +++ b/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD @@ -1,7 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "network_mysql_proxy", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "mysql_proxy", srcs = ["mysql_proxy.proto"], diff --git a/api/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.proto b/api/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.proto index e4246c9314aa..dee014556360 100644 --- a/api/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.proto +++ b/api/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.mysql_proxy.v1alpha1; option java_outer_classname = "MysqlProxyProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.mysql_proxy.v1alpha1"; -option go_package = "v1alpha1"; import "validate/validate.proto"; diff --git a/api/envoy/config/filter/network/rate_limit/v2/BUILD b/api/envoy/config/filter/network/rate_limit/v2/BUILD index 08d5db95b117..459c4e8e0ee6 100644 --- a/api/envoy/config/filter/network/rate_limit/v2/BUILD +++ b/api/envoy/config/filter/network/rate_limit/v2/BUILD @@ -1,7 +1,16 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "network_rate_limit", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/ratelimit:ratelimit_protos", + "//envoy/config/ratelimit/v2:ratelimit_config", + ], +) + api_proto_library_internal( name = "rate_limit", srcs = ["rate_limit.proto"], diff --git a/api/envoy/config/filter/network/rate_limit/v2/rate_limit.proto b/api/envoy/config/filter/network/rate_limit/v2/rate_limit.proto index 6a1b795580c8..9a8f2f02146d 100644 --- a/api/envoy/config/filter/network/rate_limit/v2/rate_limit.proto +++ b/api/envoy/config/filter/network/rate_limit/v2/rate_limit.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.rate_limit.v2; option java_outer_classname = "RateLimitProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.rate_limit.v2"; -option go_package = "v2"; import "envoy/api/v2/ratelimit/ratelimit.proto"; import "envoy/config/ratelimit/v2/rls.proto"; diff --git a/api/envoy/config/filter/network/rbac/v2/BUILD b/api/envoy/config/filter/network/rbac/v2/BUILD index 6182fe26748a..566523132999 100644 --- a/api/envoy/config/filter/network/rbac/v2/BUILD +++ b/api/envoy/config/filter/network/rbac/v2/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "network_rbac", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/config/rbac/v2:rbac_config", + ], +) + api_proto_library_internal( name = "rbac", srcs = ["rbac.proto"], diff --git a/api/envoy/config/filter/network/rbac/v2/rbac.proto b/api/envoy/config/filter/network/rbac/v2/rbac.proto index aea17f725ff4..c6c6fac41c57 100644 --- a/api/envoy/config/filter/network/rbac/v2/rbac.proto +++ b/api/envoy/config/filter/network/rbac/v2/rbac.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.rbac.v2; option java_outer_classname = "RbacProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.rbac.v2"; -option go_package = "v2"; import "envoy/config/rbac/v2/rbac.proto"; diff --git a/api/envoy/config/filter/network/redis_proxy/v2/BUILD b/api/envoy/config/filter/network/redis_proxy/v2/BUILD index 16cff613b38d..4ee53e87971f 100644 --- a/api/envoy/config/filter/network/redis_proxy/v2/BUILD +++ b/api/envoy/config/filter/network/redis_proxy/v2/BUILD @@ -1,7 +1,16 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "network_redis_proxy", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + "//envoy/type", + ], +) + api_proto_library_internal( name = "redis_proxy", srcs = ["redis_proxy.proto"], diff --git a/api/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto b/api/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto index 175e564dec3f..656cedf75025 100644 --- a/api/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto +++ b/api/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.redis_proxy.v2; option java_outer_classname = "RedisProxyProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.redis_proxy.v2"; -option go_package = "v2"; import "envoy/api/v2/core/base.proto"; diff --git a/api/envoy/config/filter/network/tcp_proxy/v2/BUILD b/api/envoy/config/filter/network/tcp_proxy/v2/BUILD index d77d910aceb2..74f0fe783e1b 100644 --- a/api/envoy/config/filter/network/tcp_proxy/v2/BUILD +++ b/api/envoy/config/filter/network/tcp_proxy/v2/BUILD @@ -1,7 +1,16 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "network_tcp_proxy", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + "//envoy/config/filter/accesslog/v2:accesslog_filter_config", + ], +) + api_proto_library_internal( name = "tcp_proxy", srcs = ["tcp_proxy.proto"], diff --git a/api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto b/api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto index 62874fe1d45d..376c980fb244 100644 --- a/api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto +++ b/api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.tcp_proxy.v2; option java_outer_classname = "TcpProxyProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.tcp_proxy.v2"; -option go_package = "v2"; import "envoy/config/filter/accesslog/v2/accesslog.proto"; import "envoy/api/v2/core/address.proto"; diff --git a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD index f758f7f580f5..457c9d7fce2c 100644 --- a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD +++ b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD @@ -1,7 +1,16 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "network_thrift_proxy", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + "//envoy/api/v2/route:route_protos", + ], +) + api_proto_library_internal( name = "thrift_proxy", srcs = [ diff --git a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto index dcd83f2f1a2a..5d230d4474cc 100644 --- a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto +++ b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.thrift_proxy.v2alpha1; option java_outer_classname = "RouteProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v2alpha1"; -option go_package = "v2"; import "envoy/api/v2/core/base.proto"; import "envoy/api/v2/route/route.proto"; diff --git a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto index 0be6c337037f..4cfe538798a2 100644 --- a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto +++ b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.thrift_proxy.v2alpha1; option java_outer_classname = "ThriftProxyProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v2alpha1"; -option go_package = "v2"; import "envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto"; diff --git a/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD b/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD index 8719f5083f12..348f919646e9 100644 --- a/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD +++ b/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD @@ -1,7 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "network_zookeeper_proxy", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "zookeeper_proxy", srcs = ["zookeeper_proxy.proto"], diff --git a/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.proto b/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.proto index 6a8afdd12ec0..72d09810ff0f 100644 --- a/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.proto +++ b/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.zookeeper_proxy.v1alpha1; option java_outer_classname = "ZookeeperProxyProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.zookeeper_proxy.v1alpha1"; -option go_package = "v1alpha1"; import "validate/validate.proto"; import "google/protobuf/wrappers.proto"; diff --git a/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD b/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD index 08d5db95b117..8ca1edfc82b4 100644 --- a/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD +++ b/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD @@ -1,7 +1,16 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "thrift_rate_limit", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/ratelimit:ratelimit_protos", + "//envoy/config/ratelimit/v2:ratelimit_config", + ], +) + api_proto_library_internal( name = "rate_limit", srcs = ["rate_limit.proto"], diff --git a/api/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto b/api/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto index 15a50d553f9b..743bdc7256b7 100644 --- a/api/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto +++ b/api/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto @@ -5,7 +5,6 @@ package envoy.config.filter.thrift.rate_limit.v2alpha1; option java_outer_classname = "RateLimitProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.thrift.rate_limit.v2alpha1"; -option go_package = "v2alpha1"; import "envoy/config/ratelimit/v2/rls.proto"; diff --git a/api/envoy/config/filter/thrift/router/v2alpha1/BUILD b/api/envoy/config/filter/thrift/router/v2alpha1/BUILD index 51c69c0d5b20..9f804da5fa8c 100644 --- a/api/envoy/config/filter/thrift/router/v2alpha1/BUILD +++ b/api/envoy/config/filter/thrift/router/v2alpha1/BUILD @@ -1,7 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "thrift_router", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "router", srcs = ["router.proto"], diff --git a/api/envoy/config/filter/thrift/router/v2alpha1/router.proto b/api/envoy/config/filter/thrift/router/v2alpha1/router.proto index c515752c2a00..9c9383caf33f 100644 --- a/api/envoy/config/filter/thrift/router/v2alpha1/router.proto +++ b/api/envoy/config/filter/thrift/router/v2alpha1/router.proto @@ -5,7 +5,6 @@ package envoy.config.filter.thrift.router.v2alpha1; option java_outer_classname = "RouterProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.thrift.router.v2alpha1"; -option go_package = "v2alpha1"; // [#protodoc-title: Router] // Thrift router :ref:`configuration overview `. diff --git a/api/envoy/config/grpc_credential/v2alpha/BUILD b/api/envoy/config/grpc_credential/v2alpha/BUILD index f299179ecb00..81d046a1dc6a 100644 --- a/api/envoy/config/grpc_credential/v2alpha/BUILD +++ b/api/envoy/config/grpc_credential/v2alpha/BUILD @@ -1,6 +1,14 @@ licenses(["notice"]) # Apache 2 -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") + +api_proto_package( + name = "grpc_credential_config", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + ], +) api_proto_library_internal( name = "file_based_metadata", @@ -8,20 +16,7 @@ api_proto_library_internal( deps = ["//envoy/api/v2/core:base"], ) -api_go_proto_library( - name = "file_based_metadata", - proto = ":file_based_metadata", - deps = [ - "//envoy/api/v2/core:base_go_proto", - ], -) - api_proto_library_internal( name = "aws_iam", srcs = ["aws_iam.proto"], ) - -api_go_proto_library( - name = "aws_iam", - proto = ":aws_iam", -) diff --git a/api/envoy/config/grpc_credential/v2alpha/aws_iam.proto b/api/envoy/config/grpc_credential/v2alpha/aws_iam.proto index 3689b80611f5..e7a7bf94cce6 100644 --- a/api/envoy/config/grpc_credential/v2alpha/aws_iam.proto +++ b/api/envoy/config/grpc_credential/v2alpha/aws_iam.proto @@ -8,7 +8,6 @@ package envoy.config.grpc_credential.v2alpha; option java_outer_classname = "AwsIamProto"; option java_package = "io.envoyproxy.envoy.config.grpc_credential.v2alpha"; option java_multiple_files = true; -option go_package = "v2alpha"; import "validate/validate.proto"; diff --git a/api/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto b/api/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto index c91c50e39a55..1746492fe261 100644 --- a/api/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto +++ b/api/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto @@ -8,7 +8,6 @@ package envoy.config.grpc_credential.v2alpha; option java_outer_classname = "FileBasedMetadataProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.grpc_credential.v2alpha"; -option go_package = "v2alpha"; import "envoy/api/v2/core/base.proto"; diff --git a/api/envoy/config/health_checker/redis/v2/BUILD b/api/envoy/config/health_checker/redis/v2/BUILD index 239d1f224fc6..ecfdfb4c0dc8 100644 --- a/api/envoy/config/health_checker/redis/v2/BUILD +++ b/api/envoy/config/health_checker/redis/v2/BUILD @@ -1,7 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "redis_health_checker_config", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "redis", srcs = ["redis.proto"], diff --git a/api/envoy/config/health_checker/redis/v2/redis.proto b/api/envoy/config/health_checker/redis/v2/redis.proto index 130454b5d406..8ab2de269a5f 100644 --- a/api/envoy/config/health_checker/redis/v2/redis.proto +++ b/api/envoy/config/health_checker/redis/v2/redis.proto @@ -5,7 +5,6 @@ package envoy.config.health_checker.redis.v2; option java_outer_classname = "RedisProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2"; -option go_package = "v2"; // [#protodoc-title: Redis] // Redis health checker :ref:`configuration overview `. diff --git a/api/envoy/config/metrics/v2/BUILD b/api/envoy/config/metrics/v2/BUILD index 157b09c4d814..4661217309fb 100644 --- a/api/envoy/config/metrics/v2/BUILD +++ b/api/envoy/config/metrics/v2/BUILD @@ -1,7 +1,16 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "metrics_config", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + "//envoy/type/matcher", + ], +) + api_proto_library_internal( name = "metrics_service", srcs = ["metrics_service.proto"], @@ -13,14 +22,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "metrics_service", - proto = ":metrics_service", - deps = [ - "//envoy/api/v2/core:grpc_service_go_proto", - ], -) - api_proto_library_internal( name = "stats", srcs = ["stats.proto"], @@ -32,12 +33,3 @@ api_proto_library_internal( "//envoy/type/matcher:string", ], ) - -api_go_proto_library( - name = "stats", - proto = ":stats", - deps = [ - "//envoy/api/v2/core:address_go_proto", - "//envoy/type/matcher:string_go_proto", - ], -) diff --git a/api/envoy/config/metrics/v2/stats.proto b/api/envoy/config/metrics/v2/stats.proto index 08172180b545..fea8b9b0f878 100644 --- a/api/envoy/config/metrics/v2/stats.proto +++ b/api/envoy/config/metrics/v2/stats.proto @@ -8,7 +8,6 @@ package envoy.config.metrics.v2; option java_outer_classname = "StatsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.metrics.v2"; -option go_package = "v2"; import "envoy/api/v2/core/address.proto"; import "envoy/type/matcher/string.proto"; diff --git a/api/envoy/config/overload/v2alpha/BUILD b/api/envoy/config/overload/v2alpha/BUILD index bfffb5639ca7..56418cd9ee5b 100644 --- a/api/envoy/config/overload/v2alpha/BUILD +++ b/api/envoy/config/overload/v2alpha/BUILD @@ -1,14 +1,14 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "overload_config", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "overload", srcs = ["overload.proto"], visibility = ["//visibility:public"], ) - -api_go_proto_library( - name = "overload", - proto = ":overload", -) diff --git a/api/envoy/config/overload/v2alpha/overload.proto b/api/envoy/config/overload/v2alpha/overload.proto index efdba5a09a72..e32764675cb5 100644 --- a/api/envoy/config/overload/v2alpha/overload.proto +++ b/api/envoy/config/overload/v2alpha/overload.proto @@ -5,7 +5,6 @@ package envoy.config.overload.v2alpha; option java_outer_classname = "OverloadProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.overload.v2alpha"; -option go_package = "v2alpha"; import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; diff --git a/api/envoy/config/ratelimit/v2/BUILD b/api/envoy/config/ratelimit/v2/BUILD index be3fc1c212bb..eef8462d958d 100644 --- a/api/envoy/config/ratelimit/v2/BUILD +++ b/api/envoy/config/ratelimit/v2/BUILD @@ -1,20 +1,20 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 -api_proto_library_internal( - name = "rls", - srcs = ["rls.proto"], - visibility = ["//visibility:public"], +api_proto_package( + name = "ratelimit_config", + srcs = glob(["*.proto"]), deps = [ - "//envoy/api/v2/core:grpc_service", + "//envoy/api/v2/core", ], ) -api_go_grpc_library( +api_proto_library_internal( name = "rls", - proto = ":rls", + srcs = ["rls.proto"], + visibility = ["//visibility:public"], deps = [ - "//envoy/api/v2/core:grpc_service_go_proto", + "//envoy/api/v2/core:grpc_service", ], ) diff --git a/api/envoy/config/ratelimit/v2/rls.proto b/api/envoy/config/ratelimit/v2/rls.proto index 8f039b44efeb..55577d4ab013 100644 --- a/api/envoy/config/ratelimit/v2/rls.proto +++ b/api/envoy/config/ratelimit/v2/rls.proto @@ -5,7 +5,6 @@ package envoy.config.ratelimit.v2; option java_outer_classname = "RlsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.ratelimit.v2"; -option go_package = "v2"; import "envoy/api/v2/core/grpc_service.proto"; diff --git a/api/envoy/config/rbac/v2/BUILD b/api/envoy/config/rbac/v2/BUILD index fac50eb66f9b..2fa4370c1d64 100644 --- a/api/envoy/config/rbac/v2/BUILD +++ b/api/envoy/config/rbac/v2/BUILD @@ -1,6 +1,17 @@ licenses(["notice"]) # Apache 2 -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") + +api_proto_package( + name = "rbac_config", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + "//envoy/api/v2/route:route_protos", + "//envoy/type/matcher", + "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto", + ], +) api_proto_library_internal( name = "rbac", @@ -22,15 +33,3 @@ api_proto_library_internal( "//envoy/type/matcher:string", ], ) - -api_go_proto_library( - name = "rbac", - proto = ":rbac", - deps = [ - "//envoy/api/v2/core:address_go_proto", - "//envoy/api/v2/route:route_go_proto", - "//envoy/type/matcher:metadata_go_proto", - "//envoy/type/matcher:string_go_proto", - "@com_google_googleapis//google/api/expr/v1alpha1:cel_go_proto", - ], -) diff --git a/api/envoy/config/rbac/v2/rbac.proto b/api/envoy/config/rbac/v2/rbac.proto index 15554e561df4..34a062be535b 100644 --- a/api/envoy/config/rbac/v2/rbac.proto +++ b/api/envoy/config/rbac/v2/rbac.proto @@ -14,7 +14,6 @@ package envoy.config.rbac.v2; option java_outer_classname = "RbacProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.rbac.v2"; -option go_package = "v2"; option (gogoproto.stable_marshaler_all) = true; diff --git a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD index 363d90f11808..ff0ef2dc7fee 100644 --- a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD +++ b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD @@ -1,7 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "fixed_heap_protos", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "fixed_heap", srcs = ["fixed_heap.proto"], diff --git a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto index f7efe0b5643a..110123e3c332 100644 --- a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto +++ b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto @@ -5,7 +5,6 @@ package envoy.config.resource_monitor.fixed_heap.v2alpha; option java_outer_classname = "FixedHeapProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v2alpha"; -option go_package = "v2alpha"; import "validate/validate.proto"; diff --git a/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD b/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD index 10abf09e9ef8..aa31760c0902 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD +++ b/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD @@ -1,7 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "injected_resource_protos", + srcs = glob(["*.proto"]), +) + api_proto_library_internal( name = "injected_resource", srcs = ["injected_resource.proto"], diff --git a/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto b/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto index cab704a4b64a..64c984fa0cb3 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto +++ b/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto @@ -5,7 +5,6 @@ package envoy.config.resource_monitor.injected_resource.v2alpha; option java_outer_classname = "InjectedResourceProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v2alpha"; -option go_package = "v2alpha"; import "validate/validate.proto"; diff --git a/api/envoy/config/retry/previous_priorities/BUILD b/api/envoy/config/retry/previous_priorities/BUILD index 13a694af37d2..fc08594ca74e 100644 --- a/api/envoy/config/retry/previous_priorities/BUILD +++ b/api/envoy/config/retry/previous_priorities/BUILD @@ -1,6 +1,14 @@ licenses(["notice"]) # Apache 2 -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") + +api_proto_package( + name = "previous_priorities_protos", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + ], +) api_proto_library_internal( name = "previous_priorities", diff --git a/api/envoy/config/trace/v2/BUILD b/api/envoy/config/trace/v2/BUILD index b00f63dafb45..8dec038965e7 100644 --- a/api/envoy/config/trace/v2/BUILD +++ b/api/envoy/config/trace/v2/BUILD @@ -1,7 +1,16 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "trace_config", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto", + ], +) + api_proto_library_internal( name = "trace", srcs = ["trace.proto"], @@ -13,12 +22,3 @@ api_proto_library_internal( "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto", ], ) - -api_go_proto_library( - name = "trace", - proto = ":trace", - deps = [ - "//envoy/api/v2/core:grpc_service_go_proto", - "@opencensus_proto//opencensus/proto/trace/v1:trace_and_config_proto_go", - ], -) diff --git a/api/envoy/config/trace/v2/trace.proto b/api/envoy/config/trace/v2/trace.proto index e4e4dec64e95..3c7a37576e18 100644 --- a/api/envoy/config/trace/v2/trace.proto +++ b/api/envoy/config/trace/v2/trace.proto @@ -8,7 +8,6 @@ package envoy.config.trace.v2; option java_outer_classname = "TraceProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.trace.v2"; -option go_package = "v2"; import "envoy/api/v2/core/grpc_service.proto"; import "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 6cb181f202d2..dda210b7d58b 100644 --- a/api/envoy/config/transport_socket/alts/v2alpha/BUILD +++ b/api/envoy/config/transport_socket/alts/v2alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "alts_config", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + ], +) + api_proto_library( name = "alts", srcs = ["alts.proto"], diff --git a/api/envoy/config/transport_socket/alts/v2alpha/alts.proto b/api/envoy/config/transport_socket/alts/v2alpha/alts.proto index f5a9db64c0e4..ec294af17426 100644 --- a/api/envoy/config/transport_socket/alts/v2alpha/alts.proto +++ b/api/envoy/config/transport_socket/alts/v2alpha/alts.proto @@ -5,7 +5,6 @@ package envoy.config.transport_socket.alts.v2alpha; option java_outer_classname = "AltsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.transport_socket.alts.v2alpha"; -option go_package = "v2"; // [#protodoc-title: ALTS] diff --git a/api/envoy/config/transport_socket/tap/v2alpha/BUILD b/api/envoy/config/transport_socket/tap/v2alpha/BUILD index 75810cd0c269..7e7bf60811e8 100644 --- a/api/envoy/config/transport_socket/tap/v2alpha/BUILD +++ b/api/envoy/config/transport_socket/tap/v2alpha/BUILD @@ -1,7 +1,16 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "tap_transport_socket", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + "//envoy/config/common/tap/v2alpha:tap_config", + ], +) + api_proto_library_internal( name = "tap", srcs = ["tap.proto"], diff --git a/api/envoy/config/transport_socket/tap/v2alpha/tap.proto b/api/envoy/config/transport_socket/tap/v2alpha/tap.proto index 84918699ef97..e68b40dae530 100644 --- a/api/envoy/config/transport_socket/tap/v2alpha/tap.proto +++ b/api/envoy/config/transport_socket/tap/v2alpha/tap.proto @@ -5,7 +5,6 @@ package envoy.config.transport_socket.tap.v2alpha; option java_outer_classname = "TapProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.transport_socket.tap.v2alpha"; -option go_package = "v2"; // [#protodoc-title: Tap] diff --git a/api/envoy/data/accesslog/v2/BUILD b/api/envoy/data/accesslog/v2/BUILD index d3ade88e922f..86a68c39053f 100644 --- a/api/envoy/data/accesslog/v2/BUILD +++ b/api/envoy/data/accesslog/v2/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "accesslog_data", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + ], +) + api_proto_library_internal( name = "accesslog", srcs = ["accesslog.proto"], @@ -13,12 +21,3 @@ api_proto_library_internal( "//envoy/api/v2/core:base", ], ) - -api_go_proto_library( - name = "accesslog", - proto = ":accesslog", - deps = [ - "//envoy/api/v2/core:address_go_proto", - "//envoy/api/v2/core:base_go_proto", - ], -) diff --git a/api/envoy/data/cluster/v2alpha/BUILD b/api/envoy/data/cluster/v2alpha/BUILD index 00edd8294b6f..06e1e7acf72f 100644 --- a/api/envoy/data/cluster/v2alpha/BUILD +++ b/api/envoy/data/cluster/v2alpha/BUILD @@ -1,7 +1,12 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "cluster_data", + srcs = glob(["*.proto"]), +) + api_proto_library( name = "outlier_detection_event", srcs = ["outlier_detection_event.proto"], diff --git a/api/envoy/data/core/v2alpha/BUILD b/api/envoy/data/core/v2alpha/BUILD index 8320031d8466..a18ce72f0764 100644 --- a/api/envoy/data/core/v2alpha/BUILD +++ b/api/envoy/data/core/v2alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "network_health_check_event", + srcs = glob(["*.proto"]), + deps = [ + "//envoy/api/v2/core", + ], +) + api_proto_library( name = "health_check_event", srcs = ["health_check_event.proto"], diff --git a/api/envoy/data/tap/v2alpha/BUILD b/api/envoy/data/tap/v2alpha/BUILD index 1caddf6232c0..697b0cd9876b 100644 --- a/api/envoy/data/tap/v2alpha/BUILD +++ b/api/envoy/data/tap/v2alpha/BUILD @@ -3,7 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "v2alpha_protos", + name = "tap_data", srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", diff --git a/api/envoy/service/accesslog/v2/BUILD b/api/envoy/service/accesslog/v2/BUILD index 1dad9447048d..3ded941e26e6 100644 --- a/api/envoy/service/accesslog/v2/BUILD +++ b/api/envoy/service/accesslog/v2/BUILD @@ -1,7 +1,17 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "accesslog_service", + srcs = glob(["*.proto"]), + has_services = True, + deps = [ + "//envoy/api/v2/core", + "//envoy/data/accesslog/v2:accesslog_data", + ], +) + api_proto_library_internal( name = "als", srcs = ["als.proto"], @@ -12,12 +22,3 @@ api_proto_library_internal( "//envoy/data/accesslog/v2:accesslog", ], ) - -api_go_grpc_library( - name = "als", - proto = ":als", - deps = [ - "//envoy/api/v2/core:base_go_proto", - "//envoy/data/accesslog/v2:accesslog_go_proto", - ], -) diff --git a/api/envoy/service/accesslog/v2/als.proto b/api/envoy/service/accesslog/v2/als.proto index 1ee6ccd0094c..407a6810f43f 100644 --- a/api/envoy/service/accesslog/v2/als.proto +++ b/api/envoy/service/accesslog/v2/als.proto @@ -5,7 +5,6 @@ package envoy.service.accesslog.v2; option java_outer_classname = "AlsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.accesslog.v2"; -option go_package = "v2"; option java_generic_services = true; import "envoy/api/v2/core/base.proto"; diff --git a/api/envoy/service/auth/v2/BUILD b/api/envoy/service/auth/v2/BUILD index 57041668ddc8..6e1d6aa324b5 100644 --- a/api/envoy/service/auth/v2/BUILD +++ b/api/envoy/service/auth/v2/BUILD @@ -1,7 +1,17 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "external_auth_service", + srcs = glob(["*.proto"]), + has_services = True, + deps = [ + "//envoy/api/v2/core", + "//envoy/type", + ], +) + api_proto_library_internal( name = "attribute_context", srcs = [ diff --git a/api/envoy/service/auth/v2/external_auth.proto b/api/envoy/service/auth/v2/external_auth.proto index 0f723c98e46c..8a3d4f1a629e 100644 --- a/api/envoy/service/auth/v2/external_auth.proto +++ b/api/envoy/service/auth/v2/external_auth.proto @@ -5,7 +5,6 @@ package envoy.service.auth.v2; option java_outer_classname = "ExternalAuthProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.auth.v2"; -option go_package = "v2"; option java_generic_services = true; import "envoy/api/v2/core/base.proto"; diff --git a/api/envoy/service/auth/v2alpha/BUILD b/api/envoy/service/auth/v2alpha/BUILD index 1d9873a5ffa4..d1a6a5423d65 100644 --- a/api/envoy/service/auth/v2alpha/BUILD +++ b/api/envoy/service/auth/v2alpha/BUILD @@ -1,7 +1,16 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "external_auth_v2alpha", + srcs = glob(["*.proto"]), + has_services = True, + deps = [ + "//envoy/service/auth/v2:external_auth_service", + ], +) + api_proto_library_internal( name = "external_auth", srcs = [ diff --git a/api/envoy/service/auth/v2alpha/external_auth.proto b/api/envoy/service/auth/v2alpha/external_auth.proto index bdf0d2e4853d..85e9c12c6afb 100644 --- a/api/envoy/service/auth/v2alpha/external_auth.proto +++ b/api/envoy/service/auth/v2alpha/external_auth.proto @@ -2,8 +2,6 @@ syntax = "proto3"; package envoy.service.auth.v2alpha; -option go_package = "v2alpha"; - option java_multiple_files = true; option java_generic_services = true; option java_outer_classname = "CertsProto"; diff --git a/api/envoy/service/discovery/v2/BUILD b/api/envoy/service/discovery/v2/BUILD index a9c2efd02fb9..3f01a2790ed9 100644 --- a/api/envoy/service/discovery/v2/BUILD +++ b/api/envoy/service/discovery/v2/BUILD @@ -1,21 +1,24 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 -api_proto_library_internal( - name = "ads", - srcs = ["ads.proto"], - has_services = 1, +api_proto_package( + name = "discovery_service", + srcs = glob(["*.proto"]), + has_services = True, deps = [ - "//envoy/api/v2:discovery", + "//envoy/api/v2", + "//envoy/api/v2/core", + "//envoy/api/v2/endpoint:endpoint_protos", ], ) -api_go_grpc_library( +api_proto_library_internal( name = "ads", - proto = ":ads", + srcs = ["ads.proto"], + has_services = 1, deps = [ - "//envoy/api/v2:discovery_go_proto", + "//envoy/api/v2:discovery", ], ) @@ -30,16 +33,6 @@ api_proto_library_internal( ], ) -api_go_grpc_library( - name = "hds", - proto = ":hds", - deps = [ - "//envoy/api/v2/core:base_go_proto", - "//envoy/api/v2/core:health_check_go_proto", - "//envoy/api/v2/endpoint:endpoint_go_proto", - ], -) - api_proto_library_internal( name = "sds", srcs = ["sds.proto"], @@ -49,14 +42,6 @@ api_proto_library_internal( ], ) -api_go_grpc_library( - name = "sds", - proto = ":sds", - deps = [ - "//envoy/api/v2:discovery_go_proto", - ], -) - api_proto_library_internal( name = "rtds", srcs = ["rtds.proto"], @@ -65,11 +50,3 @@ api_proto_library_internal( "//envoy/api/v2:discovery", ], ) - -api_go_grpc_library( - name = "rtds", - proto = ":rtds", - deps = [ - "//envoy/api/v2:discovery_go_proto", - ], -) diff --git a/api/envoy/service/discovery/v2/ads.proto b/api/envoy/service/discovery/v2/ads.proto index 6a9d044ab4bd..45a7407f0c44 100644 --- a/api/envoy/service/discovery/v2/ads.proto +++ b/api/envoy/service/discovery/v2/ads.proto @@ -5,7 +5,6 @@ package envoy.service.discovery.v2; option java_outer_classname = "AdsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.discovery.v2"; -option go_package = "v2"; option java_generic_services = true; import "envoy/api/v2/discovery.proto"; diff --git a/api/envoy/service/load_stats/v2/BUILD b/api/envoy/service/load_stats/v2/BUILD index f126ebcb1d44..e0fd2e410188 100644 --- a/api/envoy/service/load_stats/v2/BUILD +++ b/api/envoy/service/load_stats/v2/BUILD @@ -1,7 +1,17 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "load_stats_service", + srcs = glob(["*.proto"]), + has_services = True, + deps = [ + "//envoy/api/v2/core", + "//envoy/api/v2/endpoint:endpoint_protos", + ], +) + api_proto_library_internal( name = "lrs", srcs = ["lrs.proto"], @@ -11,12 +21,3 @@ api_proto_library_internal( "//envoy/api/v2/endpoint:load_report", ], ) - -api_go_grpc_library( - name = "lrs", - proto = ":lrs", - deps = [ - "//envoy/api/v2/core:base_go_proto", - "//envoy/api/v2/endpoint:load_report_go_proto", - ], -) diff --git a/api/envoy/service/load_stats/v2/lrs.proto b/api/envoy/service/load_stats/v2/lrs.proto index 2fe95f3b6a90..d7029db0b5ea 100644 --- a/api/envoy/service/load_stats/v2/lrs.proto +++ b/api/envoy/service/load_stats/v2/lrs.proto @@ -5,7 +5,6 @@ package envoy.service.load_stats.v2; option java_outer_classname = "LrsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.load_stats.v2"; -option go_package = "v2"; option java_generic_services = true; import "envoy/api/v2/core/base.proto"; diff --git a/api/envoy/service/metrics/v2/BUILD b/api/envoy/service/metrics/v2/BUILD index 7f3921ced629..c2996d909534 100644 --- a/api/envoy/service/metrics/v2/BUILD +++ b/api/envoy/service/metrics/v2/BUILD @@ -1,7 +1,17 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "metrics_service_protos", + srcs = glob(["*.proto"]), + has_services = True, + deps = [ + "//envoy/api/v2/core", + "@prometheus_metrics_model//:client_model", + ], +) + api_proto_library_internal( name = "metrics_service", srcs = ["metrics_service.proto"], @@ -13,12 +23,3 @@ api_proto_library_internal( "@prometheus_metrics_model//:client_model", ], ) - -api_go_grpc_library( - name = "metrics_service", - proto = ":metrics_service", - deps = [ - "//envoy/api/v2/core:base_go_proto", - "@prometheus_metrics_model//:client_model_go_proto", - ], -) diff --git a/api/envoy/service/metrics/v2/metrics_service.proto b/api/envoy/service/metrics/v2/metrics_service.proto index b70be3bdd9a1..10745ba665c0 100644 --- a/api/envoy/service/metrics/v2/metrics_service.proto +++ b/api/envoy/service/metrics/v2/metrics_service.proto @@ -5,7 +5,6 @@ package envoy.service.metrics.v2; option java_outer_classname = "MetricsServiceProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.metrics.v2"; -option go_package = "v2"; option java_generic_services = true; import "envoy/api/v2/core/base.proto"; diff --git a/api/envoy/service/ratelimit/v2/BUILD b/api/envoy/service/ratelimit/v2/BUILD index 24278fbebc1f..10445d797fb4 100644 --- a/api/envoy/service/ratelimit/v2/BUILD +++ b/api/envoy/service/ratelimit/v2/BUILD @@ -1,7 +1,17 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "ratelimit_service", + srcs = glob(["*.proto"]), + has_services = True, + deps = [ + "//envoy/api/v2/core", + "//envoy/api/v2/ratelimit:ratelimit_protos", + ], +) + api_proto_library_internal( name = "rls", srcs = ["rls.proto"], @@ -12,13 +22,3 @@ api_proto_library_internal( "//envoy/api/v2/ratelimit", ], ) - -api_go_grpc_library( - name = "rls", - proto = ":rls", - deps = [ - "//envoy/api/v2/core:base_go_proto", - "//envoy/api/v2/core:grpc_service_go_proto", - "//envoy/api/v2/ratelimit:ratelimit_go_proto", - ], -) diff --git a/api/envoy/service/ratelimit/v2/rls.proto b/api/envoy/service/ratelimit/v2/rls.proto index 18b6b678e908..328bb547d630 100644 --- a/api/envoy/service/ratelimit/v2/rls.proto +++ b/api/envoy/service/ratelimit/v2/rls.proto @@ -5,7 +5,6 @@ package envoy.service.ratelimit.v2; option java_outer_classname = "RlsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.ratelimit.v2"; -option go_package = "v2"; import "envoy/api/v2/core/base.proto"; import "envoy/api/v2/ratelimit/ratelimit.proto"; diff --git a/api/envoy/service/tap/v2alpha/BUILD b/api/envoy/service/tap/v2alpha/BUILD index c75232a7858f..168040d39111 100644 --- a/api/envoy/service/tap/v2alpha/BUILD +++ b/api/envoy/service/tap/v2alpha/BUILD @@ -3,14 +3,14 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "v2alpha", + name = "tap_service", srcs = glob(["*.proto"]), has_services = True, deps = [ "//envoy/api/v2", "//envoy/api/v2/core", "//envoy/api/v2/route:route_protos", - "//envoy/data/tap/v2alpha:v2alpha_protos", + "//envoy/data/tap/v2alpha:tap_data", ], ) diff --git a/api/envoy/service/trace/v2/BUILD b/api/envoy/service/trace/v2/BUILD index 2b3367f0af45..5c4136310bfa 100644 --- a/api/envoy/service/trace/v2/BUILD +++ b/api/envoy/service/trace/v2/BUILD @@ -1,7 +1,17 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + name = "trace_service_protos", + srcs = glob(["*.proto"]), + 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"], @@ -12,12 +22,3 @@ api_proto_library_internal( "@opencensus_proto//opencensus/proto/trace/v1:trace_proto", ], ) - -api_go_grpc_library( - name = "trace_service", - proto = ":trace_service", - deps = [ - "//envoy/api/v2/core:base_go_proto", - "@opencensus_proto//opencensus/proto/trace/v1:trace_proto_go", - ], -) diff --git a/api/envoy/service/trace/v2/trace_service.proto b/api/envoy/service/trace/v2/trace_service.proto index ec87b3560651..92b8489f2108 100644 --- a/api/envoy/service/trace/v2/trace_service.proto +++ b/api/envoy/service/trace/v2/trace_service.proto @@ -7,7 +7,6 @@ package envoy.service.trace.v2; option java_outer_classname = "TraceServiceProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.trace.v2"; -option go_package = "v2"; option java_generic_services = true; import "envoy/api/v2/core/base.proto"; diff --git a/api/envoy/type/matcher/BUILD b/api/envoy/type/matcher/BUILD index 1432392f7bbc..a496a78c4cf2 100644 --- a/api/envoy/type/matcher/BUILD +++ b/api/envoy/type/matcher/BUILD @@ -41,4 +41,3 @@ api_proto_library_internal( ":string", ], ) - diff --git a/api/test/build/BUILD b/api/test/build/BUILD index ab1e8640a97d..cbcc9d677eb7 100644 --- a/api/test/build/BUILD +++ b/api/test/build/BUILD @@ -25,18 +25,13 @@ api_go_test( srcs = ["go_build_test.go"], importpath = "go_build_test", deps = [ - "//envoy/api/v2:cds_go_grpc", - "//envoy/api/v2:eds_go_grpc", - "//envoy/api/v2:lds_go_grpc", - "//envoy/api/v2:rds_go_grpc", - "//envoy/api/v2/auth:cert_go_proto", - "//envoy/config/bootstrap/v2:bootstrap_go_proto", - "//envoy/service/accesslog/v2:als_go_grpc", - "//envoy/service/discovery/v2:ads_go_grpc", - "//envoy/service/discovery/v2:hds_go_grpc", - "//envoy/service/discovery/v2:sds_go_grpc", - "//envoy/service/metrics/v2:metrics_service_go_grpc", - "//envoy/service/ratelimit/v2:rls_go_grpc", - "//envoy/service/trace/v2:trace_service_go_grpc", + "//envoy/api/v2:v2_go_proto", + "//envoy/api/v2/auth:auth_go_proto", + "//envoy/config/bootstrap/v2:bootstrap_config_go_proto", + "//envoy/service/accesslog/v2:accesslog_service_go_proto", + "//envoy/service/discovery/v2:discovery_service_go_proto", + "//envoy/service/metrics/v2:metrics_service_protos_go_proto", + "//envoy/service/ratelimit/v2:ratelimit_service_go_proto", + "//envoy/service/trace/v2:trace_service_protos_go_proto", ], ) diff --git a/api/test/build/go_build_test.go b/api/test/build/go_build_test.go index 911d3ef39655..c5c15becff35 100644 --- a/api/test/build/go_build_test.go +++ b/api/test/build/go_build_test.go @@ -3,19 +3,14 @@ package go_build_test import ( "testing" - _ "github.com/envoyproxy/data-plane-api/api/ads" - _ "github.com/envoyproxy/data-plane-api/api/als" - _ "github.com/envoyproxy/data-plane-api/api/bootstrap" - _ "github.com/envoyproxy/data-plane-api/api/cds" - _ "github.com/envoyproxy/data-plane-api/api/cert" - _ "github.com/envoyproxy/data-plane-api/api/eds" - _ "github.com/envoyproxy/data-plane-api/api/hds" - _ "github.com/envoyproxy/data-plane-api/api/lds" - _ "github.com/envoyproxy/data-plane-api/api/metrics_service" - _ "github.com/envoyproxy/data-plane-api/api/rds" - _ "github.com/envoyproxy/data-plane-api/api/rls" - _ "github.com/envoyproxy/data-plane-api/api/sds" - _ "github.com/envoyproxy/data-plane-api/api/trace_service" + _ "github.com/envoyproxy/data-plane-api/api/envoy/api/v2" + _ "github.com/envoyproxy/data-plane-api/api/envoy/api/v2/auth" + _ "github.com/envoyproxy/data-plane-api/api/envoy/config/bootstrap/v2" + _ "github.com/envoyproxy/data-plane-api/api/envoy/service/accesslog/v2" + _ "github.com/envoyproxy/data-plane-api/api/envoy/service/discovery/v2" + _ "github.com/envoyproxy/data-plane-api/api/envoy/service/metrics/v2" + _ "github.com/envoyproxy/data-plane-api/api/envoy/service/ratelimit/v2" + _ "github.com/envoyproxy/data-plane-api/api/envoy/service/trace/v2" ) func TestNoop(t *testing.T) { diff --git a/tools/check_format.py b/tools/check_format.py index 67292cea223b..a3948f365e25 100755 --- a/tools/check_format.py +++ b/tools/check_format.py @@ -626,6 +626,17 @@ def checkBuildPath(file_path): command = "%s %s | diff %s -" % (ENVOY_BUILD_FIXER_PATH, file_path, file_path) error_messages += executeCommand(command, "envoy_build_fixer check failed", file_path) + if isBuildFile(file_path) and file_path.startswith(args.api_prefix + "envoy"): + found = False + finput = fileinput.input(file_path) + for line in finput: + if "api_proto_package(" in line: + found = True + break + finput.close() + if not found: + error_messages += ["API build file does not provide api_proto_package()"] + command = "%s -mode=diff %s" % (BUILDIFIER_PATH, file_path) error_messages += executeCommand(command, "buildifier check failed", file_path) error_messages += checkFileContents(file_path, checkBuildLine) From 6595e0a9fee88a7e8ede6d84ad909b5049921204 Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Thu, 22 Aug 2019 08:14:49 -0700 Subject: [PATCH 04/16] add gen validate Signed-off-by: Kuat Yessenov --- api/bazel/BUILD | 12 ++++++++++++ api/bazel/api_build_system.bzl | 16 +++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/api/bazel/BUILD b/api/bazel/BUILD index e69de29bb2d1..4b582bb8be3f 100644 --- a/api/bazel/BUILD +++ b/api/bazel/BUILD @@ -0,0 +1,12 @@ +load("@io_bazel_rules_go//proto:compiler.bzl", "go_proto_compiler") + +licenses(["notice"]) # Apache 2 + +go_proto_compiler( + name = "pgv_plugin_go", + options = ["lang=go"], + plugin = "@com_envoyproxy_protoc_gen_validate//:protoc-gen-validate", + suffix = ".pb.validate.go", + valid_archive = False, + visibility = ["//visibility:public"], +) diff --git a/api/bazel/api_build_system.bzl b/api/bazel/api_build_system.bzl index 83dfb952fe96..40a4af7faf18 100644 --- a/api/bazel/api_build_system.bzl +++ b/api/bazel/api_build_system.bzl @@ -1,6 +1,7 @@ load("@com_google_protobuf//:protobuf.bzl", _py_proto_library = "py_proto_library") load("@com_envoyproxy_protoc_gen_validate//bazel:pgv_proto_library.bzl", "pgv_cc_proto_library") load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library", "go_proto_library") +load("@io_bazel_rules_go//proto:compiler.bzl", "go_proto_compiler") load("@io_bazel_rules_go//go:def.bzl", "go_test") _PY_SUFFIX = "_py" @@ -214,9 +215,9 @@ def api_proto_package(name, srcs = [], deps = [], has_services = False, visibili visibility = visibility, ) - compilers = ["@io_bazel_rules_go//proto:go_proto"] + compilers = ["@io_bazel_rules_go//proto:go_proto", "//bazel:pgv_plugin_go"] if has_services: - compilers = ["@io_bazel_rules_go//proto:go_grpc"] + compilers = ["@io_bazel_rules_go//proto:go_grpc", "//bazel:pgv_plugin_go"] go_proto_library( name = _Suffix(name, _GO_PROTO_SUFFIX), @@ -226,11 +227,12 @@ def api_proto_package(name, srcs = [], deps = [], has_services = False, visibili visibility = ["//visibility:public"], deps = [go_proto_mapping(dep) for dep in deps] + [ "@com_github_gogo_protobuf//:gogo_proto_go", - "@io_bazel_rules_go//proto/wkt:any_go_proto", - "@io_bazel_rules_go//proto/wkt:duration_go_proto", - "@io_bazel_rules_go//proto/wkt:struct_go_proto", - "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", - "@io_bazel_rules_go//proto/wkt:wrappers_go_proto", + "@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", + "@com_github_golang_protobuf//ptypes/struct:go_default_library", + "@com_github_golang_protobuf//ptypes/timestamp:go_default_library", + "@com_github_golang_protobuf//ptypes/wrappers:go_default_library", "@com_envoyproxy_protoc_gen_validate//validate:go_default_library", "@com_google_googleapis//google/api:annotations_go_proto", "@com_google_googleapis//google/rpc:status_go_proto", From f05900dec4e53b0cea49712ee9299cbb12232404 Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Thu, 22 Aug 2019 18:23:28 -0700 Subject: [PATCH 05/16] simplify Signed-off-by: Kuat Yessenov --- api/bazel/api_build_system.bzl | 5 ++++- api/envoy/admin/v2alpha/BUILD | 1 - api/envoy/api/v2/BUILD | 1 - api/envoy/api/v2/auth/BUILD | 1 - api/envoy/api/v2/cluster/BUILD | 1 - api/envoy/api/v2/core/BUILD | 1 - api/envoy/api/v2/endpoint/BUILD | 1 - api/envoy/api/v2/listener/BUILD | 1 - api/envoy/api/v2/ratelimit/BUILD | 1 - api/envoy/api/v2/route/BUILD | 1 - api/envoy/config/accesslog/v2/BUILD | 1 - api/envoy/config/bootstrap/v2/BUILD | 1 - api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD | 1 - api/envoy/config/cluster/redis/BUILD | 1 - api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD | 1 - api/envoy/config/common/tap/v2alpha/BUILD | 1 - api/envoy/config/filter/accesslog/v2/BUILD | 1 - api/envoy/config/filter/dubbo/router/v2alpha1/BUILD | 1 - api/envoy/config/filter/fault/v2/BUILD | 1 - .../config/filter/http/adaptive_concurrency/v2alpha/BUILD | 1 - api/envoy/config/filter/http/buffer/v2/BUILD | 1 - api/envoy/config/filter/http/csrf/v2/BUILD | 1 - .../config/filter/http/dynamic_forward_proxy/v2alpha/BUILD | 1 - api/envoy/config/filter/http/ext_authz/v2/BUILD | 1 - api/envoy/config/filter/http/fault/v2/BUILD | 1 - .../filter/http/grpc_http1_reverse_bridge/v2alpha1/BUILD | 1 - api/envoy/config/filter/http/gzip/v2/BUILD | 1 - api/envoy/config/filter/http/header_to_metadata/v2/BUILD | 1 - api/envoy/config/filter/http/health_check/v2/BUILD | 1 - api/envoy/config/filter/http/ip_tagging/v2/BUILD | 1 - api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD | 1 - api/envoy/config/filter/http/lua/v2/BUILD | 1 - api/envoy/config/filter/http/original_src/v2alpha1/BUILD | 1 - api/envoy/config/filter/http/rate_limit/v2/BUILD | 1 - api/envoy/config/filter/http/rbac/v2/BUILD | 1 - api/envoy/config/filter/http/router/v2/BUILD | 1 - api/envoy/config/filter/http/squash/v2/BUILD | 1 - api/envoy/config/filter/http/tap/v2alpha/BUILD | 1 - api/envoy/config/filter/http/transcoder/v2/BUILD | 1 - api/envoy/config/filter/listener/original_src/v2alpha1/BUILD | 1 - api/envoy/config/filter/network/client_ssl_auth/v2/BUILD | 1 - api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD | 1 - api/envoy/config/filter/network/ext_authz/v2/BUILD | 1 - .../config/filter/network/http_connection_manager/v2/BUILD | 1 - api/envoy/config/filter/network/mongo_proxy/v2/BUILD | 1 - api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD | 1 - api/envoy/config/filter/network/rate_limit/v2/BUILD | 1 - api/envoy/config/filter/network/rbac/v2/BUILD | 1 - api/envoy/config/filter/network/redis_proxy/v2/BUILD | 1 - api/envoy/config/filter/network/tcp_proxy/v2/BUILD | 1 - api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD | 1 - .../config/filter/network/zookeeper_proxy/v1alpha1/BUILD | 1 - api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD | 1 - api/envoy/config/filter/thrift/router/v2alpha1/BUILD | 1 - api/envoy/config/grpc_credential/v2alpha/BUILD | 1 - api/envoy/config/health_checker/redis/v2/BUILD | 1 - api/envoy/config/metrics/v2/BUILD | 1 - api/envoy/config/overload/v2alpha/BUILD | 1 - api/envoy/config/ratelimit/v2/BUILD | 1 - api/envoy/config/rbac/v2/BUILD | 1 - api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD | 1 - .../config/resource_monitor/injected_resource/v2alpha/BUILD | 1 - api/envoy/config/retry/previous_priorities/BUILD | 1 - api/envoy/config/trace/v2/BUILD | 1 - api/envoy/config/transport_socket/alts/v2alpha/BUILD | 1 - api/envoy/config/transport_socket/tap/v2alpha/BUILD | 1 - api/envoy/data/accesslog/v2/BUILD | 1 - api/envoy/data/cluster/v2alpha/BUILD | 1 - api/envoy/data/core/v2alpha/BUILD | 1 - api/envoy/data/tap/v2alpha/BUILD | 1 - api/envoy/service/accesslog/v2/BUILD | 1 - api/envoy/service/auth/v2/BUILD | 1 - api/envoy/service/auth/v2alpha/BUILD | 1 - api/envoy/service/discovery/v2/BUILD | 1 - api/envoy/service/load_stats/v2/BUILD | 1 - api/envoy/service/metrics/v2/BUILD | 1 - api/envoy/service/ratelimit/v2/BUILD | 1 - api/envoy/service/tap/v2alpha/BUILD | 1 - api/envoy/service/trace/v2/BUILD | 1 - api/envoy/type/BUILD | 1 - api/envoy/type/matcher/BUILD | 1 - 81 files changed, 4 insertions(+), 81 deletions(-) diff --git a/api/bazel/api_build_system.bzl b/api/bazel/api_build_system.bzl index 40a4af7faf18..636c5e66bde8 100644 --- a/api/bazel/api_build_system.bzl +++ b/api/bazel/api_build_system.bzl @@ -194,7 +194,10 @@ def go_proto_mapping(dep): return _Suffix("@" + Label(dep).workspace_name + "//" + Label(dep).package + ":" + Label(dep).name, _GO_PROTO_SUFFIX) return mapped -def api_proto_package(name, srcs = [], deps = [], has_services = False, visibility = ["//visibility:public"]): +def api_proto_package(name = "pkg", srcs = [], deps = [], has_services = False, visibility = ["//visibility:public"]): + if srcs == []: + srcs = native.glob(["*.proto"]) + native.proto_library( name = name, srcs = srcs, diff --git a/api/envoy/admin/v2alpha/BUILD b/api/envoy/admin/v2alpha/BUILD index 96aece493836..8d3109c8c818 100644 --- a/api/envoy/admin/v2alpha/BUILD +++ b/api/envoy/admin/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "v2alpha", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2", "//envoy/api/v2/auth", diff --git a/api/envoy/api/v2/BUILD b/api/envoy/api/v2/BUILD index 676907d85492..64029148b7e2 100644 --- a/api/envoy/api/v2/BUILD +++ b/api/envoy/api/v2/BUILD @@ -18,7 +18,6 @@ package_group( api_proto_package( name = "v2", - srcs = glob(["*.proto"]), has_services = True, deps = [ "//envoy/api/v2/auth", diff --git a/api/envoy/api/v2/auth/BUILD b/api/envoy/api/v2/auth/BUILD index 1f8a27fa52f6..bb3951fb95aa 100644 --- a/api/envoy/api/v2/auth/BUILD +++ b/api/envoy/api/v2/auth/BUILD @@ -17,7 +17,6 @@ package_group( api_proto_package( name = "auth", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/api/v2/cluster/BUILD b/api/envoy/api/v2/cluster/BUILD index df3001b2cb66..baf9a4bfdeb7 100644 --- a/api/envoy/api/v2/cluster/BUILD +++ b/api/envoy/api/v2/cluster/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "cluster", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/api/v2/core/BUILD b/api/envoy/api/v2/core/BUILD index 4ecc4f08b033..01234d07b198 100644 --- a/api/envoy/api/v2/core/BUILD +++ b/api/envoy/api/v2/core/BUILD @@ -18,7 +18,6 @@ package_group( api_proto_package( name = "core", - srcs = glob(["*.proto"]), deps = [ "//envoy/type", ], diff --git a/api/envoy/api/v2/endpoint/BUILD b/api/envoy/api/v2/endpoint/BUILD index 1866de2ba984..b3f1115ab857 100644 --- a/api/envoy/api/v2/endpoint/BUILD +++ b/api/envoy/api/v2/endpoint/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "endpoint_protos", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/auth", "//envoy/api/v2/core", diff --git a/api/envoy/api/v2/listener/BUILD b/api/envoy/api/v2/listener/BUILD index 2cec3aba6fd7..b1bf36801ece 100644 --- a/api/envoy/api/v2/listener/BUILD +++ b/api/envoy/api/v2/listener/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "listener_protos", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/auth", "//envoy/api/v2/core", diff --git a/api/envoy/api/v2/ratelimit/BUILD b/api/envoy/api/v2/ratelimit/BUILD index c5c907b1239d..1489bac161dd 100644 --- a/api/envoy/api/v2/ratelimit/BUILD +++ b/api/envoy/api/v2/ratelimit/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "ratelimit_protos", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/api/v2/route/BUILD b/api/envoy/api/v2/route/BUILD index 899962c3ce5b..588804aa18b8 100644 --- a/api/envoy/api/v2/route/BUILD +++ b/api/envoy/api/v2/route/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "route_protos", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", "//envoy/type", diff --git a/api/envoy/config/accesslog/v2/BUILD b/api/envoy/config/accesslog/v2/BUILD index c82cf94fd888..1fe6f7fafc24 100644 --- a/api/envoy/config/accesslog/v2/BUILD +++ b/api/envoy/config/accesslog/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "accesslog_config", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/config/bootstrap/v2/BUILD b/api/envoy/config/bootstrap/v2/BUILD index 15edfbee6f40..ab3e1739f5aa 100644 --- a/api/envoy/config/bootstrap/v2/BUILD +++ b/api/envoy/config/bootstrap/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "bootstrap_config", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2", "//envoy/api/v2/auth", diff --git a/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD b/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD index d44e0533b345..7ce85ad1d29a 100644 --- a/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD +++ b/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "dynamic_forward_proxy_config", - srcs = glob(["*.proto"]), deps = [ "//envoy/config/common/dynamic_forward_proxy/v2alpha:dynamic_forward_proxy", ], diff --git a/api/envoy/config/cluster/redis/BUILD b/api/envoy/config/cluster/redis/BUILD index 5949eed29de1..c03364d947c2 100644 --- a/api/envoy/config/cluster/redis/BUILD +++ b/api/envoy/config/cluster/redis/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "redis", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD b/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD index 1bf4b43cbc4a..ee12847f2af5 100644 --- a/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD +++ b/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "dynamic_forward_proxy", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2", ], diff --git a/api/envoy/config/common/tap/v2alpha/BUILD b/api/envoy/config/common/tap/v2alpha/BUILD index e5efd6c1b39e..521a51a146a6 100644 --- a/api/envoy/config/common/tap/v2alpha/BUILD +++ b/api/envoy/config/common/tap/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "tap_config", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", "//envoy/service/tap/v2alpha:tap_service", diff --git a/api/envoy/config/filter/accesslog/v2/BUILD b/api/envoy/config/filter/accesslog/v2/BUILD index 71565ba40153..e9b9fcb81c46 100644 --- a/api/envoy/config/filter/accesslog/v2/BUILD +++ b/api/envoy/config/filter/accesslog/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "accesslog_filter_config", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", "//envoy/api/v2/route:route_protos", diff --git a/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD b/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD index 1525b110552c..478a2611a53b 100644 --- a/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD +++ b/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "dubbo_router", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/config/filter/fault/v2/BUILD b/api/envoy/config/filter/fault/v2/BUILD index 76f744a243e5..072f9cdb90bf 100644 --- a/api/envoy/config/filter/fault/v2/BUILD +++ b/api/envoy/config/filter/fault/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "fault_config", - srcs = glob(["*.proto"]), deps = [ "//envoy/type", ], diff --git a/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD b/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD index 7914a5b733cb..df5e7fadc24b 100644 --- a/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD +++ b/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_adaptive_concurrency", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/config/filter/http/buffer/v2/BUILD b/api/envoy/config/filter/http/buffer/v2/BUILD index cc48ccdbebb8..e49a38361e92 100644 --- a/api/envoy/config/filter/http/buffer/v2/BUILD +++ b/api/envoy/config/filter/http/buffer/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_buffer", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/csrf/v2/BUILD b/api/envoy/config/filter/http/csrf/v2/BUILD index 487c8c8e1ff5..ffd404501551 100644 --- a/api/envoy/config/filter/http/csrf/v2/BUILD +++ b/api/envoy/config/filter/http/csrf/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_csrf", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", "//envoy/type/matcher", 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 a0d187f0ff95..60c6b7341a0e 100644 --- a/api/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD +++ b/api/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_dynamic_forward_proxy", - srcs = glob(["*.proto"]), deps = [ "//envoy/config/common/dynamic_forward_proxy/v2alpha:dynamic_forward_proxy", ], diff --git a/api/envoy/config/filter/http/ext_authz/v2/BUILD b/api/envoy/config/filter/http/ext_authz/v2/BUILD index bdb42c2334cd..75c38e54d24b 100644 --- a/api/envoy/config/filter/http/ext_authz/v2/BUILD +++ b/api/envoy/config/filter/http/ext_authz/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_ext_authz", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", "//envoy/type", diff --git a/api/envoy/config/filter/http/fault/v2/BUILD b/api/envoy/config/filter/http/fault/v2/BUILD index 533be3f707f1..78261cee3dff 100644 --- a/api/envoy/config/filter/http/fault/v2/BUILD +++ b/api/envoy/config/filter/http/fault/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_fault", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/route:route_protos", "//envoy/config/filter/fault/v2:fault_config", 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 fa8486fa35de..700d2a865633 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 @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "grpc_http1_reverse_bridge", - srcs = glob(["*.proto"]), ) api_proto_library( diff --git a/api/envoy/config/filter/http/gzip/v2/BUILD b/api/envoy/config/filter/http/gzip/v2/BUILD index b2f1246b1e73..8b102055e4bb 100644 --- a/api/envoy/config/filter/http/gzip/v2/BUILD +++ b/api/envoy/config/filter/http/gzip/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_gzip", - srcs = glob(["*.proto"]), ) api_proto_library_internal( 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 1e9762580229..92722298c02e 100644 --- a/api/envoy/config/filter/http/header_to_metadata/v2/BUILD +++ b/api/envoy/config/filter/http/header_to_metadata/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_header_to_metadata", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/health_check/v2/BUILD b/api/envoy/config/filter/http/health_check/v2/BUILD index f4f4877cb446..35ab9270c620 100644 --- a/api/envoy/config/filter/http/health_check/v2/BUILD +++ b/api/envoy/config/filter/http/health_check/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_health_check", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/route:route_protos", "//envoy/type", diff --git a/api/envoy/config/filter/http/ip_tagging/v2/BUILD b/api/envoy/config/filter/http/ip_tagging/v2/BUILD index c2f610eedebe..b6cab1804016 100644 --- a/api/envoy/config/filter/http/ip_tagging/v2/BUILD +++ b/api/envoy/config/filter/http/ip_tagging/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_ip_tagging", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD b/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD index 837087066208..72478f233457 100644 --- a/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD +++ b/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD @@ -4,7 +4,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap api_proto_package( name = "http_jwt_authn", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", "//envoy/api/v2/route:route_protos", diff --git a/api/envoy/config/filter/http/lua/v2/BUILD b/api/envoy/config/filter/http/lua/v2/BUILD index 4bed0ea650b8..3cb09215dd09 100644 --- a/api/envoy/config/filter/http/lua/v2/BUILD +++ b/api/envoy/config/filter/http/lua/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_lua", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/original_src/v2alpha1/BUILD b/api/envoy/config/filter/http/original_src/v2alpha1/BUILD index 434d8f6d0fe0..2482ebf4b6c9 100644 --- a/api/envoy/config/filter/http/original_src/v2alpha1/BUILD +++ b/api/envoy/config/filter/http/original_src/v2alpha1/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_original_src", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/rate_limit/v2/BUILD b/api/envoy/config/filter/http/rate_limit/v2/BUILD index 8007faa57d4a..33f843af9aca 100644 --- a/api/envoy/config/filter/http/rate_limit/v2/BUILD +++ b/api/envoy/config/filter/http/rate_limit/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_rate_limit", - srcs = glob(["*.proto"]), deps = [ "//envoy/config/ratelimit/v2:ratelimit_config", ], diff --git a/api/envoy/config/filter/http/rbac/v2/BUILD b/api/envoy/config/filter/http/rbac/v2/BUILD index d9f63268a634..b6536d4be299 100644 --- a/api/envoy/config/filter/http/rbac/v2/BUILD +++ b/api/envoy/config/filter/http/rbac/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_rbac", - srcs = glob(["*.proto"]), deps = [ "//envoy/config/rbac/v2:rbac_config", ], diff --git a/api/envoy/config/filter/http/router/v2/BUILD b/api/envoy/config/filter/http/router/v2/BUILD index e8fde77e2240..71514e6993c7 100644 --- a/api/envoy/config/filter/http/router/v2/BUILD +++ b/api/envoy/config/filter/http/router/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_router", - srcs = glob(["*.proto"]), deps = [ "//envoy/config/filter/accesslog/v2:accesslog_filter_config", ], diff --git a/api/envoy/config/filter/http/squash/v2/BUILD b/api/envoy/config/filter/http/squash/v2/BUILD index bbeb52c409e8..58777b8a4f6b 100644 --- a/api/envoy/config/filter/http/squash/v2/BUILD +++ b/api/envoy/config/filter/http/squash/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_squash", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/tap/v2alpha/BUILD b/api/envoy/config/filter/http/tap/v2alpha/BUILD index b5cec6e27023..7f98b3c2925f 100644 --- a/api/envoy/config/filter/http/tap/v2alpha/BUILD +++ b/api/envoy/config/filter/http/tap/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_tap", - srcs = glob(["*.proto"]), deps = [ "//envoy/config/common/tap/v2alpha:tap_config", ], diff --git a/api/envoy/config/filter/http/transcoder/v2/BUILD b/api/envoy/config/filter/http/transcoder/v2/BUILD index 39bb9d3214dc..3cff2a99e538 100644 --- a/api/envoy/config/filter/http/transcoder/v2/BUILD +++ b/api/envoy/config/filter/http/transcoder/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "http_transcoder", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD b/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD index dc45e22fe0cf..6243a25f856d 100644 --- a/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD +++ b/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "listener_original_src", - srcs = glob(["*.proto"]), ) api_proto_library_internal( 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 d4f8d05c1e30..8aad5d47e782 100644 --- a/api/envoy/config/filter/network/client_ssl_auth/v2/BUILD +++ b/api/envoy/config/filter/network/client_ssl_auth/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "network_client_ssl_auth", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD index c72dcc03e625..6a434f659d4f 100644 --- a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD +++ b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "network_dubbo", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", "//envoy/api/v2/route:route_protos", diff --git a/api/envoy/config/filter/network/ext_authz/v2/BUILD b/api/envoy/config/filter/network/ext_authz/v2/BUILD index 7844fed17afd..e4457f862d81 100644 --- a/api/envoy/config/filter/network/ext_authz/v2/BUILD +++ b/api/envoy/config/filter/network/ext_authz/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "network_ext_authz", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", ], 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 df623f187a2b..6d1fcebf79af 100644 --- a/api/envoy/config/filter/network/http_connection_manager/v2/BUILD +++ b/api/envoy/config/filter/network/http_connection_manager/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "network_hcm", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2", "//envoy/api/v2/core", diff --git a/api/envoy/config/filter/network/mongo_proxy/v2/BUILD b/api/envoy/config/filter/network/mongo_proxy/v2/BUILD index 732f350013d8..1aa5937e9db1 100644 --- a/api/envoy/config/filter/network/mongo_proxy/v2/BUILD +++ b/api/envoy/config/filter/network/mongo_proxy/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "network_mongo_proxy", - srcs = glob(["*.proto"]), deps = [ "//envoy/config/filter/fault/v2:fault_config", ], diff --git a/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD b/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD index 9dd7a8e63820..0618494dca44 100644 --- a/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD +++ b/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "network_mysql_proxy", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/config/filter/network/rate_limit/v2/BUILD b/api/envoy/config/filter/network/rate_limit/v2/BUILD index 459c4e8e0ee6..268b74a974d8 100644 --- a/api/envoy/config/filter/network/rate_limit/v2/BUILD +++ b/api/envoy/config/filter/network/rate_limit/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "network_rate_limit", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/ratelimit:ratelimit_protos", "//envoy/config/ratelimit/v2:ratelimit_config", diff --git a/api/envoy/config/filter/network/rbac/v2/BUILD b/api/envoy/config/filter/network/rbac/v2/BUILD index 566523132999..db523ce7fc8a 100644 --- a/api/envoy/config/filter/network/rbac/v2/BUILD +++ b/api/envoy/config/filter/network/rbac/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "network_rbac", - srcs = glob(["*.proto"]), deps = [ "//envoy/config/rbac/v2:rbac_config", ], diff --git a/api/envoy/config/filter/network/redis_proxy/v2/BUILD b/api/envoy/config/filter/network/redis_proxy/v2/BUILD index 4ee53e87971f..fd83f274299f 100644 --- a/api/envoy/config/filter/network/redis_proxy/v2/BUILD +++ b/api/envoy/config/filter/network/redis_proxy/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "network_redis_proxy", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", "//envoy/type", diff --git a/api/envoy/config/filter/network/tcp_proxy/v2/BUILD b/api/envoy/config/filter/network/tcp_proxy/v2/BUILD index 74f0fe783e1b..b09e65366179 100644 --- a/api/envoy/config/filter/network/tcp_proxy/v2/BUILD +++ b/api/envoy/config/filter/network/tcp_proxy/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "network_tcp_proxy", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", "//envoy/config/filter/accesslog/v2:accesslog_filter_config", diff --git a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD index 457c9d7fce2c..78db6dbbbff5 100644 --- a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD +++ b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "network_thrift_proxy", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", "//envoy/api/v2/route:route_protos", diff --git a/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD b/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD index 348f919646e9..5575d3e53b7d 100644 --- a/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD +++ b/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "network_zookeeper_proxy", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD b/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD index 8ca1edfc82b4..d90769a11d7a 100644 --- a/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD +++ b/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "thrift_rate_limit", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/ratelimit:ratelimit_protos", "//envoy/config/ratelimit/v2:ratelimit_config", diff --git a/api/envoy/config/filter/thrift/router/v2alpha1/BUILD b/api/envoy/config/filter/thrift/router/v2alpha1/BUILD index 9f804da5fa8c..19671227370e 100644 --- a/api/envoy/config/filter/thrift/router/v2alpha1/BUILD +++ b/api/envoy/config/filter/thrift/router/v2alpha1/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "thrift_router", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/config/grpc_credential/v2alpha/BUILD b/api/envoy/config/grpc_credential/v2alpha/BUILD index 81d046a1dc6a..abcb5db58c28 100644 --- a/api/envoy/config/grpc_credential/v2alpha/BUILD +++ b/api/envoy/config/grpc_credential/v2alpha/BUILD @@ -4,7 +4,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap api_proto_package( name = "grpc_credential_config", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/config/health_checker/redis/v2/BUILD b/api/envoy/config/health_checker/redis/v2/BUILD index ecfdfb4c0dc8..07f1e8086332 100644 --- a/api/envoy/config/health_checker/redis/v2/BUILD +++ b/api/envoy/config/health_checker/redis/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "redis_health_checker_config", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/config/metrics/v2/BUILD b/api/envoy/config/metrics/v2/BUILD index 4661217309fb..ca6ab2fc0fea 100644 --- a/api/envoy/config/metrics/v2/BUILD +++ b/api/envoy/config/metrics/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "metrics_config", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", "//envoy/type/matcher", diff --git a/api/envoy/config/overload/v2alpha/BUILD b/api/envoy/config/overload/v2alpha/BUILD index 56418cd9ee5b..5a79b6badf33 100644 --- a/api/envoy/config/overload/v2alpha/BUILD +++ b/api/envoy/config/overload/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "overload_config", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/config/ratelimit/v2/BUILD b/api/envoy/config/ratelimit/v2/BUILD index eef8462d958d..44efcf4b77b2 100644 --- a/api/envoy/config/ratelimit/v2/BUILD +++ b/api/envoy/config/ratelimit/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "ratelimit_config", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/config/rbac/v2/BUILD b/api/envoy/config/rbac/v2/BUILD index 2fa4370c1d64..ccd9353b2787 100644 --- a/api/envoy/config/rbac/v2/BUILD +++ b/api/envoy/config/rbac/v2/BUILD @@ -4,7 +4,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap api_proto_package( name = "rbac_config", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", "//envoy/api/v2/route:route_protos", diff --git a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD index ff0ef2dc7fee..e735ca919acd 100644 --- a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD +++ b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "fixed_heap_protos", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD b/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD index aa31760c0902..50687476d45a 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD +++ b/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "injected_resource_protos", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/config/retry/previous_priorities/BUILD b/api/envoy/config/retry/previous_priorities/BUILD index fc08594ca74e..68cfb46338a5 100644 --- a/api/envoy/config/retry/previous_priorities/BUILD +++ b/api/envoy/config/retry/previous_priorities/BUILD @@ -4,7 +4,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap api_proto_package( name = "previous_priorities_protos", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/config/trace/v2/BUILD b/api/envoy/config/trace/v2/BUILD index 8dec038965e7..ca394c01786e 100644 --- a/api/envoy/config/trace/v2/BUILD +++ b/api/envoy/config/trace/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "trace_config", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", "@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 dda210b7d58b..c1c75b8eb9c7 100644 --- a/api/envoy/config/transport_socket/alts/v2alpha/BUILD +++ b/api/envoy/config/transport_socket/alts/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "alts_config", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/config/transport_socket/tap/v2alpha/BUILD b/api/envoy/config/transport_socket/tap/v2alpha/BUILD index 7e7bf60811e8..816a6ba28801 100644 --- a/api/envoy/config/transport_socket/tap/v2alpha/BUILD +++ b/api/envoy/config/transport_socket/tap/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "tap_transport_socket", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", "//envoy/config/common/tap/v2alpha:tap_config", diff --git a/api/envoy/data/accesslog/v2/BUILD b/api/envoy/data/accesslog/v2/BUILD index 86a68c39053f..c07b77c4aa08 100644 --- a/api/envoy/data/accesslog/v2/BUILD +++ b/api/envoy/data/accesslog/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "accesslog_data", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/data/cluster/v2alpha/BUILD b/api/envoy/data/cluster/v2alpha/BUILD index 06e1e7acf72f..3d24e452f86a 100644 --- a/api/envoy/data/cluster/v2alpha/BUILD +++ b/api/envoy/data/cluster/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "cluster_data", - srcs = glob(["*.proto"]), ) api_proto_library( diff --git a/api/envoy/data/core/v2alpha/BUILD b/api/envoy/data/core/v2alpha/BUILD index a18ce72f0764..1fc6e4e78b04 100644 --- a/api/envoy/data/core/v2alpha/BUILD +++ b/api/envoy/data/core/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "network_health_check_event", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/data/tap/v2alpha/BUILD b/api/envoy/data/tap/v2alpha/BUILD index 697b0cd9876b..cfcab12c7e8c 100644 --- a/api/envoy/data/tap/v2alpha/BUILD +++ b/api/envoy/data/tap/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "tap_data", - srcs = glob(["*.proto"]), deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/service/accesslog/v2/BUILD b/api/envoy/service/accesslog/v2/BUILD index 3ded941e26e6..5a981a27a0f8 100644 --- a/api/envoy/service/accesslog/v2/BUILD +++ b/api/envoy/service/accesslog/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "accesslog_service", - srcs = glob(["*.proto"]), has_services = True, deps = [ "//envoy/api/v2/core", diff --git a/api/envoy/service/auth/v2/BUILD b/api/envoy/service/auth/v2/BUILD index 6e1d6aa324b5..13365fbdc126 100644 --- a/api/envoy/service/auth/v2/BUILD +++ b/api/envoy/service/auth/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "external_auth_service", - srcs = glob(["*.proto"]), has_services = True, deps = [ "//envoy/api/v2/core", diff --git a/api/envoy/service/auth/v2alpha/BUILD b/api/envoy/service/auth/v2alpha/BUILD index d1a6a5423d65..5a275c73bc6a 100644 --- a/api/envoy/service/auth/v2alpha/BUILD +++ b/api/envoy/service/auth/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "external_auth_v2alpha", - srcs = glob(["*.proto"]), has_services = True, deps = [ "//envoy/service/auth/v2:external_auth_service", diff --git a/api/envoy/service/discovery/v2/BUILD b/api/envoy/service/discovery/v2/BUILD index 3f01a2790ed9..6da9b49c4b33 100644 --- a/api/envoy/service/discovery/v2/BUILD +++ b/api/envoy/service/discovery/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "discovery_service", - srcs = glob(["*.proto"]), has_services = True, deps = [ "//envoy/api/v2", diff --git a/api/envoy/service/load_stats/v2/BUILD b/api/envoy/service/load_stats/v2/BUILD index e0fd2e410188..7db891e376a1 100644 --- a/api/envoy/service/load_stats/v2/BUILD +++ b/api/envoy/service/load_stats/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "load_stats_service", - srcs = glob(["*.proto"]), has_services = True, deps = [ "//envoy/api/v2/core", diff --git a/api/envoy/service/metrics/v2/BUILD b/api/envoy/service/metrics/v2/BUILD index c2996d909534..e5c4ffacc039 100644 --- a/api/envoy/service/metrics/v2/BUILD +++ b/api/envoy/service/metrics/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "metrics_service_protos", - srcs = glob(["*.proto"]), has_services = True, deps = [ "//envoy/api/v2/core", diff --git a/api/envoy/service/ratelimit/v2/BUILD b/api/envoy/service/ratelimit/v2/BUILD index 10445d797fb4..ee1ce0788eb8 100644 --- a/api/envoy/service/ratelimit/v2/BUILD +++ b/api/envoy/service/ratelimit/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "ratelimit_service", - srcs = glob(["*.proto"]), has_services = True, deps = [ "//envoy/api/v2/core", diff --git a/api/envoy/service/tap/v2alpha/BUILD b/api/envoy/service/tap/v2alpha/BUILD index 168040d39111..a0c5ddf28b90 100644 --- a/api/envoy/service/tap/v2alpha/BUILD +++ b/api/envoy/service/tap/v2alpha/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "tap_service", - srcs = glob(["*.proto"]), has_services = True, deps = [ "//envoy/api/v2", diff --git a/api/envoy/service/trace/v2/BUILD b/api/envoy/service/trace/v2/BUILD index 5c4136310bfa..4abb5db16e4e 100644 --- a/api/envoy/service/trace/v2/BUILD +++ b/api/envoy/service/trace/v2/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "trace_service_protos", - srcs = glob(["*.proto"]), has_services = True, deps = [ "//envoy/api/v2/core", diff --git a/api/envoy/type/BUILD b/api/envoy/type/BUILD index 737371f862be..26dd9730d9ea 100644 --- a/api/envoy/type/BUILD +++ b/api/envoy/type/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "type", - srcs = glob(["*.proto"]), ) api_proto_library_internal( diff --git a/api/envoy/type/matcher/BUILD b/api/envoy/type/matcher/BUILD index a496a78c4cf2..b3c458bb7f35 100644 --- a/api/envoy/type/matcher/BUILD +++ b/api/envoy/type/matcher/BUILD @@ -4,7 +4,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( name = "matcher", - srcs = glob(["*.proto"]), deps = ["//envoy/type"], ) From bc04c6133d70f3757eff3f43c8e9eeaa52de3115 Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Fri, 23 Aug 2019 07:51:47 -0700 Subject: [PATCH 06/16] cleanup Signed-off-by: Kuat Yessenov --- api/bazel/api_build_system.bzl | 38 ------------------- api/envoy/admin/v2alpha/BUILD | 5 +-- api/envoy/config/accesslog/v2/BUILD | 1 - api/envoy/config/bootstrap/v2/BUILD | 9 ++--- .../dynamic_forward_proxy/v2alpha/BUILD | 3 +- api/envoy/config/cluster/redis/BUILD | 1 - .../dynamic_forward_proxy/v2alpha/BUILD | 1 - api/envoy/config/common/tap/v2alpha/BUILD | 3 +- api/envoy/config/filter/accesslog/v2/BUILD | 1 - .../config/filter/dubbo/router/v2alpha1/BUILD | 1 - api/envoy/config/filter/fault/v2/BUILD | 1 - .../http/adaptive_concurrency/v2alpha/BUILD | 1 - api/envoy/config/filter/http/buffer/v2/BUILD | 1 - api/envoy/config/filter/http/csrf/v2/BUILD | 1 - .../http/dynamic_forward_proxy/v2alpha/BUILD | 3 +- .../config/filter/http/ext_authz/v2/BUILD | 1 - api/envoy/config/filter/http/fault/v2/BUILD | 3 +- .../grpc_http1_reverse_bridge/v2alpha1/BUILD | 1 - api/envoy/config/filter/http/gzip/v2/BUILD | 1 - .../filter/http/header_to_metadata/v2/BUILD | 1 - .../config/filter/http/health_check/v2/BUILD | 1 - .../config/filter/http/ip_tagging/v2/BUILD | 1 - .../filter/http/jwt_authn/v2alpha/BUILD | 1 - api/envoy/config/filter/http/lua/v2/BUILD | 1 - .../filter/http/original_src/v2alpha1/BUILD | 1 - .../config/filter/http/rate_limit/v2/BUILD | 3 +- api/envoy/config/filter/http/rbac/v2/BUILD | 3 +- api/envoy/config/filter/http/router/v2/BUILD | 3 +- api/envoy/config/filter/http/squash/v2/BUILD | 1 - .../config/filter/http/tap/v2alpha/BUILD | 3 +- .../config/filter/http/transcoder/v2/BUILD | 1 - .../listener/original_src/v2alpha1/BUILD | 1 - .../filter/network/client_ssl_auth/v2/BUILD | 1 - .../filter/network/dubbo_proxy/v2alpha1/BUILD | 1 - .../config/filter/network/ext_authz/v2/BUILD | 1 - .../network/http_connection_manager/v2/BUILD | 3 +- .../filter/network/mongo_proxy/v2/BUILD | 3 +- .../filter/network/mysql_proxy/v1alpha1/BUILD | 1 - .../config/filter/network/rate_limit/v2/BUILD | 3 +- api/envoy/config/filter/network/rbac/v2/BUILD | 3 +- .../filter/network/redis_proxy/v2/BUILD | 1 - .../config/filter/network/tcp_proxy/v2/BUILD | 3 +- .../network/thrift_proxy/v2alpha1/BUILD | 1 - .../network/zookeeper_proxy/v1alpha1/BUILD | 1 - .../filter/thrift/rate_limit/v2alpha1/BUILD | 3 +- .../filter/thrift/router/v2alpha1/BUILD | 1 - .../config/grpc_credential/v2alpha/BUILD | 1 - .../config/health_checker/redis/v2/BUILD | 1 - api/envoy/config/metrics/v2/BUILD | 1 - api/envoy/config/overload/v2alpha/BUILD | 1 - api/envoy/config/ratelimit/v2/BUILD | 1 - api/envoy/config/rbac/v2/BUILD | 1 - .../resource_monitor/fixed_heap/v2alpha/BUILD | 1 - .../injected_resource/v2alpha/BUILD | 1 - .../config/retry/previous_priorities/BUILD | 1 - api/envoy/config/trace/v2/BUILD | 1 - .../transport_socket/alts/v2alpha/BUILD | 1 - .../config/transport_socket/tap/v2alpha/BUILD | 3 +- api/envoy/service/accesslog/v2/BUILD | 1 - api/envoy/service/auth/v2/BUILD | 1 - api/envoy/service/auth/v2alpha/BUILD | 3 +- api/envoy/service/discovery/v2/BUILD | 1 - api/envoy/service/load_stats/v2/BUILD | 1 - api/envoy/service/metrics/v2/BUILD | 1 - api/envoy/service/ratelimit/v2/BUILD | 1 - api/envoy/service/tap/v2alpha/BUILD | 1 - api/envoy/service/trace/v2/BUILD | 1 - api/test/build/BUILD | 12 +++--- 68 files changed, 28 insertions(+), 132 deletions(-) diff --git a/api/bazel/api_build_system.bzl b/api/bazel/api_build_system.bzl index f770cb7bf662..56c36f38dff4 100644 --- a/api/bazel/api_build_system.bzl +++ b/api/bazel/api_build_system.bzl @@ -8,7 +8,6 @@ _PY_SUFFIX = "_py" _CC_SUFFIX = "_cc" _CC_EXPORT_SUFFIX = "_export_cc" _GO_PROTO_SUFFIX = "_go_proto" -_GO_GRPC_SUFFIX = "_go_grpc" _GO_IMPORTPATH_PREFIX = "github.com/envoyproxy/data-plane-api/api/" def _Suffix(d, suffix): @@ -62,41 +61,6 @@ def py_proto_library(name, deps = []): visibility = ["//visibility:public"], ) -def api_go_proto_library(name, proto, deps = []): - go_proto_library( - name = _Suffix(name, _GO_PROTO_SUFFIX), - importpath = _Suffix(_GO_IMPORTPATH_PREFIX, name), - proto = proto, - visibility = ["//visibility:public"], - deps = deps + [ - "@com_github_gogo_protobuf//:gogo_proto_go", - "@io_bazel_rules_go//proto/wkt:any_go_proto", - "@io_bazel_rules_go//proto/wkt:duration_go_proto", - "@io_bazel_rules_go//proto/wkt:struct_go_proto", - "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", - "@io_bazel_rules_go//proto/wkt:wrappers_go_proto", - "@com_envoyproxy_protoc_gen_validate//validate:go_default_library", - "@com_google_googleapis//google/rpc:status_go_proto", - ], - ) - -def api_go_grpc_library(name, proto, deps = []): - go_grpc_library( - name = _Suffix(name, _GO_GRPC_SUFFIX), - importpath = _Suffix(_GO_IMPORTPATH_PREFIX, name), - proto = proto, - visibility = ["//visibility:public"], - deps = deps + [ - "@com_github_gogo_protobuf//:gogo_proto_go", - "@io_bazel_rules_go//proto/wkt:any_go_proto", - "@io_bazel_rules_go//proto/wkt:duration_go_proto", - "@io_bazel_rules_go//proto/wkt:struct_go_proto", - "@io_bazel_rules_go//proto/wkt:wrappers_go_proto", - "@com_envoyproxy_protoc_gen_validate//validate:go_default_library", - "@com_google_googleapis//google/api:annotations_go_proto", - ], - ) - # 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. @@ -109,8 +73,6 @@ def api_proto_library_internal(visibility = ["//visibility:private"], **kwargs): # TODO(htuch): has_services is currently ignored but will in future support # gRPC stub generation. -# TODO(htuch): Automatically generate go_proto_library and go_grpc_library -# from api_proto_library. def api_proto_library( name, visibility = ["//visibility:private"], diff --git a/api/envoy/admin/v2alpha/BUILD b/api/envoy/admin/v2alpha/BUILD index 8d3109c8c818..850eb0515865 100644 --- a/api/envoy/admin/v2alpha/BUILD +++ b/api/envoy/admin/v2alpha/BUILD @@ -3,13 +3,12 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "v2alpha", deps = [ "//envoy/api/v2", "//envoy/api/v2/auth", "//envoy/api/v2/core", - "//envoy/config/bootstrap/v2:bootstrap_config", - "//envoy/service/tap/v2alpha:tap_service", + "//envoy/config/bootstrap/v2:pkg", + "//envoy/service/tap/v2alpha:pkg", "//envoy/type", ], ) diff --git a/api/envoy/config/accesslog/v2/BUILD b/api/envoy/config/accesslog/v2/BUILD index 1fe6f7fafc24..795491e7d68e 100644 --- a/api/envoy/config/accesslog/v2/BUILD +++ b/api/envoy/config/accesslog/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "accesslog_config", deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/config/bootstrap/v2/BUILD b/api/envoy/config/bootstrap/v2/BUILD index ab3e1739f5aa..1f3a79104b60 100644 --- a/api/envoy/config/bootstrap/v2/BUILD +++ b/api/envoy/config/bootstrap/v2/BUILD @@ -3,15 +3,14 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "bootstrap_config", deps = [ "//envoy/api/v2", "//envoy/api/v2/auth", "//envoy/api/v2/core", - "//envoy/config/metrics/v2:metrics_config", - "//envoy/config/overload/v2alpha:overload_config", - "//envoy/config/ratelimit/v2:ratelimit_config", - "//envoy/config/trace/v2:trace_config", + "//envoy/config/metrics/v2:pkg", + "//envoy/config/overload/v2alpha:pkg", + "//envoy/config/ratelimit/v2:pkg", + "//envoy/config/trace/v2:pkg", ], ) diff --git a/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD b/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD index 7ce85ad1d29a..6167b9b333ca 100644 --- a/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD +++ b/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD @@ -3,9 +3,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "dynamic_forward_proxy_config", deps = [ - "//envoy/config/common/dynamic_forward_proxy/v2alpha:dynamic_forward_proxy", + "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg", ], ) diff --git a/api/envoy/config/cluster/redis/BUILD b/api/envoy/config/cluster/redis/BUILD index c03364d947c2..d78e8913b020 100644 --- a/api/envoy/config/cluster/redis/BUILD +++ b/api/envoy/config/cluster/redis/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "redis", ) api_proto_library_internal( diff --git a/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD b/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD index ee12847f2af5..c25406c07556 100644 --- a/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD +++ b/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "dynamic_forward_proxy", deps = [ "//envoy/api/v2", ], diff --git a/api/envoy/config/common/tap/v2alpha/BUILD b/api/envoy/config/common/tap/v2alpha/BUILD index 521a51a146a6..898773297b51 100644 --- a/api/envoy/config/common/tap/v2alpha/BUILD +++ b/api/envoy/config/common/tap/v2alpha/BUILD @@ -3,10 +3,9 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "tap_config", deps = [ "//envoy/api/v2/core", - "//envoy/service/tap/v2alpha:tap_service", + "//envoy/service/tap/v2alpha:pkg", ], ) diff --git a/api/envoy/config/filter/accesslog/v2/BUILD b/api/envoy/config/filter/accesslog/v2/BUILD index e9b9fcb81c46..98852f021d54 100644 --- a/api/envoy/config/filter/accesslog/v2/BUILD +++ b/api/envoy/config/filter/accesslog/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "accesslog_filter_config", deps = [ "//envoy/api/v2/core", "//envoy/api/v2/route:route_protos", diff --git a/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD b/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD index 478a2611a53b..604d3635b3d5 100644 --- a/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD +++ b/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "dubbo_router", ) api_proto_library_internal( diff --git a/api/envoy/config/filter/fault/v2/BUILD b/api/envoy/config/filter/fault/v2/BUILD index 072f9cdb90bf..836f4f0a7891 100644 --- a/api/envoy/config/filter/fault/v2/BUILD +++ b/api/envoy/config/filter/fault/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "fault_config", deps = [ "//envoy/type", ], diff --git a/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD b/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD index df5e7fadc24b..df502f24f644 100644 --- a/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD +++ b/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_adaptive_concurrency", deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/config/filter/http/buffer/v2/BUILD b/api/envoy/config/filter/http/buffer/v2/BUILD index e49a38361e92..860760785ed0 100644 --- a/api/envoy/config/filter/http/buffer/v2/BUILD +++ b/api/envoy/config/filter/http/buffer/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_buffer", ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/csrf/v2/BUILD b/api/envoy/config/filter/http/csrf/v2/BUILD index ffd404501551..af3a87b07c05 100644 --- a/api/envoy/config/filter/http/csrf/v2/BUILD +++ b/api/envoy/config/filter/http/csrf/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_csrf", deps = [ "//envoy/api/v2/core", "//envoy/type/matcher", 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 60c6b7341a0e..da20b9161032 100644 --- a/api/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD +++ b/api/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD @@ -3,9 +3,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_dynamic_forward_proxy", deps = [ - "//envoy/config/common/dynamic_forward_proxy/v2alpha:dynamic_forward_proxy", + "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg", ], ) diff --git a/api/envoy/config/filter/http/ext_authz/v2/BUILD b/api/envoy/config/filter/http/ext_authz/v2/BUILD index 75c38e54d24b..10187f48bd2c 100644 --- a/api/envoy/config/filter/http/ext_authz/v2/BUILD +++ b/api/envoy/config/filter/http/ext_authz/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_ext_authz", deps = [ "//envoy/api/v2/core", "//envoy/type", diff --git a/api/envoy/config/filter/http/fault/v2/BUILD b/api/envoy/config/filter/http/fault/v2/BUILD index 78261cee3dff..7ad4841bc51a 100644 --- a/api/envoy/config/filter/http/fault/v2/BUILD +++ b/api/envoy/config/filter/http/fault/v2/BUILD @@ -3,10 +3,9 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_fault", deps = [ "//envoy/api/v2/route:route_protos", - "//envoy/config/filter/fault/v2:fault_config", + "//envoy/config/filter/fault/v2:pkg", "//envoy/type", ], ) 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 700d2a865633..93e576dacdbf 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 @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_p licenses(["notice"]) # Apache 2 api_proto_package( - name = "grpc_http1_reverse_bridge", ) api_proto_library( diff --git a/api/envoy/config/filter/http/gzip/v2/BUILD b/api/envoy/config/filter/http/gzip/v2/BUILD index 8b102055e4bb..7217a4592f2e 100644 --- a/api/envoy/config/filter/http/gzip/v2/BUILD +++ b/api/envoy/config/filter/http/gzip/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_gzip", ) api_proto_library_internal( 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 92722298c02e..a48ea9c89a97 100644 --- a/api/envoy/config/filter/http/header_to_metadata/v2/BUILD +++ b/api/envoy/config/filter/http/header_to_metadata/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_header_to_metadata", ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/health_check/v2/BUILD b/api/envoy/config/filter/http/health_check/v2/BUILD index 35ab9270c620..262e61049882 100644 --- a/api/envoy/config/filter/http/health_check/v2/BUILD +++ b/api/envoy/config/filter/http/health_check/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_health_check", deps = [ "//envoy/api/v2/route:route_protos", "//envoy/type", diff --git a/api/envoy/config/filter/http/ip_tagging/v2/BUILD b/api/envoy/config/filter/http/ip_tagging/v2/BUILD index b6cab1804016..9b3d8cce792c 100644 --- a/api/envoy/config/filter/http/ip_tagging/v2/BUILD +++ b/api/envoy/config/filter/http/ip_tagging/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_ip_tagging", deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD b/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD index 72478f233457..4c7b805dda73 100644 --- a/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD +++ b/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD @@ -3,7 +3,6 @@ licenses(["notice"]) # Apache 2 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") api_proto_package( - name = "http_jwt_authn", deps = [ "//envoy/api/v2/core", "//envoy/api/v2/route:route_protos", diff --git a/api/envoy/config/filter/http/lua/v2/BUILD b/api/envoy/config/filter/http/lua/v2/BUILD index 3cb09215dd09..111de7f34b2c 100644 --- a/api/envoy/config/filter/http/lua/v2/BUILD +++ b/api/envoy/config/filter/http/lua/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_lua", ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/original_src/v2alpha1/BUILD b/api/envoy/config/filter/http/original_src/v2alpha1/BUILD index 2482ebf4b6c9..f80da6c03d30 100644 --- a/api/envoy/config/filter/http/original_src/v2alpha1/BUILD +++ b/api/envoy/config/filter/http/original_src/v2alpha1/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_original_src", ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/rate_limit/v2/BUILD b/api/envoy/config/filter/http/rate_limit/v2/BUILD index 33f843af9aca..247210657a51 100644 --- a/api/envoy/config/filter/http/rate_limit/v2/BUILD +++ b/api/envoy/config/filter/http/rate_limit/v2/BUILD @@ -3,9 +3,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_rate_limit", deps = [ - "//envoy/config/ratelimit/v2:ratelimit_config", + "//envoy/config/ratelimit/v2:pkg", ], ) diff --git a/api/envoy/config/filter/http/rbac/v2/BUILD b/api/envoy/config/filter/http/rbac/v2/BUILD index b6536d4be299..a98f57f66535 100644 --- a/api/envoy/config/filter/http/rbac/v2/BUILD +++ b/api/envoy/config/filter/http/rbac/v2/BUILD @@ -3,9 +3,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_rbac", deps = [ - "//envoy/config/rbac/v2:rbac_config", + "//envoy/config/rbac/v2:pkg", ], ) diff --git a/api/envoy/config/filter/http/router/v2/BUILD b/api/envoy/config/filter/http/router/v2/BUILD index 71514e6993c7..c320bd3b19c2 100644 --- a/api/envoy/config/filter/http/router/v2/BUILD +++ b/api/envoy/config/filter/http/router/v2/BUILD @@ -3,9 +3,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_router", deps = [ - "//envoy/config/filter/accesslog/v2:accesslog_filter_config", + "//envoy/config/filter/accesslog/v2:pkg", ], ) diff --git a/api/envoy/config/filter/http/squash/v2/BUILD b/api/envoy/config/filter/http/squash/v2/BUILD index 58777b8a4f6b..f81994415990 100644 --- a/api/envoy/config/filter/http/squash/v2/BUILD +++ b/api/envoy/config/filter/http/squash/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_squash", ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/tap/v2alpha/BUILD b/api/envoy/config/filter/http/tap/v2alpha/BUILD index 7f98b3c2925f..59921ccea383 100644 --- a/api/envoy/config/filter/http/tap/v2alpha/BUILD +++ b/api/envoy/config/filter/http/tap/v2alpha/BUILD @@ -3,9 +3,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_tap", deps = [ - "//envoy/config/common/tap/v2alpha:tap_config", + "//envoy/config/common/tap/v2alpha:pkg", ], ) diff --git a/api/envoy/config/filter/http/transcoder/v2/BUILD b/api/envoy/config/filter/http/transcoder/v2/BUILD index 3cff2a99e538..36254e787e1e 100644 --- a/api/envoy/config/filter/http/transcoder/v2/BUILD +++ b/api/envoy/config/filter/http/transcoder/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "http_transcoder", ) api_proto_library_internal( diff --git a/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD b/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD index 6243a25f856d..f80da6c03d30 100644 --- a/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD +++ b/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "listener_original_src", ) api_proto_library_internal( 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 8aad5d47e782..d7203cf7f511 100644 --- a/api/envoy/config/filter/network/client_ssl_auth/v2/BUILD +++ b/api/envoy/config/filter/network/client_ssl_auth/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "network_client_ssl_auth", deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD index 6a434f659d4f..977804db5b25 100644 --- a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD +++ b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "network_dubbo", deps = [ "//envoy/api/v2/core", "//envoy/api/v2/route:route_protos", diff --git a/api/envoy/config/filter/network/ext_authz/v2/BUILD b/api/envoy/config/filter/network/ext_authz/v2/BUILD index e4457f862d81..f54040882f41 100644 --- a/api/envoy/config/filter/network/ext_authz/v2/BUILD +++ b/api/envoy/config/filter/network/ext_authz/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "network_ext_authz", deps = [ "//envoy/api/v2/core", ], 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 6d1fcebf79af..6a090f3a115d 100644 --- a/api/envoy/config/filter/network/http_connection_manager/v2/BUILD +++ b/api/envoy/config/filter/network/http_connection_manager/v2/BUILD @@ -3,11 +3,10 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "network_hcm", deps = [ "//envoy/api/v2", "//envoy/api/v2/core", - "//envoy/config/filter/accesslog/v2:accesslog_filter_config", + "//envoy/config/filter/accesslog/v2:pkg", "//envoy/type", ], ) diff --git a/api/envoy/config/filter/network/mongo_proxy/v2/BUILD b/api/envoy/config/filter/network/mongo_proxy/v2/BUILD index 1aa5937e9db1..91678ff0702c 100644 --- a/api/envoy/config/filter/network/mongo_proxy/v2/BUILD +++ b/api/envoy/config/filter/network/mongo_proxy/v2/BUILD @@ -3,9 +3,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "network_mongo_proxy", deps = [ - "//envoy/config/filter/fault/v2:fault_config", + "//envoy/config/filter/fault/v2:pkg", ], ) diff --git a/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD b/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD index 0618494dca44..9d6d6f126654 100644 --- a/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD +++ b/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "network_mysql_proxy", ) api_proto_library_internal( diff --git a/api/envoy/config/filter/network/rate_limit/v2/BUILD b/api/envoy/config/filter/network/rate_limit/v2/BUILD index 268b74a974d8..6c39626faafa 100644 --- a/api/envoy/config/filter/network/rate_limit/v2/BUILD +++ b/api/envoy/config/filter/network/rate_limit/v2/BUILD @@ -3,10 +3,9 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "network_rate_limit", deps = [ "//envoy/api/v2/ratelimit:ratelimit_protos", - "//envoy/config/ratelimit/v2:ratelimit_config", + "//envoy/config/ratelimit/v2:pkg", ], ) diff --git a/api/envoy/config/filter/network/rbac/v2/BUILD b/api/envoy/config/filter/network/rbac/v2/BUILD index db523ce7fc8a..a98f57f66535 100644 --- a/api/envoy/config/filter/network/rbac/v2/BUILD +++ b/api/envoy/config/filter/network/rbac/v2/BUILD @@ -3,9 +3,8 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "network_rbac", deps = [ - "//envoy/config/rbac/v2:rbac_config", + "//envoy/config/rbac/v2:pkg", ], ) diff --git a/api/envoy/config/filter/network/redis_proxy/v2/BUILD b/api/envoy/config/filter/network/redis_proxy/v2/BUILD index fd83f274299f..d23450a55d1e 100644 --- a/api/envoy/config/filter/network/redis_proxy/v2/BUILD +++ b/api/envoy/config/filter/network/redis_proxy/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "network_redis_proxy", deps = [ "//envoy/api/v2/core", "//envoy/type", diff --git a/api/envoy/config/filter/network/tcp_proxy/v2/BUILD b/api/envoy/config/filter/network/tcp_proxy/v2/BUILD index b09e65366179..a0cc067086cc 100644 --- a/api/envoy/config/filter/network/tcp_proxy/v2/BUILD +++ b/api/envoy/config/filter/network/tcp_proxy/v2/BUILD @@ -3,10 +3,9 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "network_tcp_proxy", deps = [ "//envoy/api/v2/core", - "//envoy/config/filter/accesslog/v2:accesslog_filter_config", + "//envoy/config/filter/accesslog/v2:pkg", ], ) diff --git a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD index 78db6dbbbff5..40e3ea85d271 100644 --- a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD +++ b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "network_thrift_proxy", deps = [ "//envoy/api/v2/core", "//envoy/api/v2/route:route_protos", diff --git a/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD b/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD index 5575d3e53b7d..b860e6290caa 100644 --- a/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD +++ b/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "network_zookeeper_proxy", ) api_proto_library_internal( diff --git a/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD b/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD index d90769a11d7a..6c39626faafa 100644 --- a/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD +++ b/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD @@ -3,10 +3,9 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "thrift_rate_limit", deps = [ "//envoy/api/v2/ratelimit:ratelimit_protos", - "//envoy/config/ratelimit/v2:ratelimit_config", + "//envoy/config/ratelimit/v2:pkg", ], ) diff --git a/api/envoy/config/filter/thrift/router/v2alpha1/BUILD b/api/envoy/config/filter/thrift/router/v2alpha1/BUILD index 19671227370e..604d3635b3d5 100644 --- a/api/envoy/config/filter/thrift/router/v2alpha1/BUILD +++ b/api/envoy/config/filter/thrift/router/v2alpha1/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "thrift_router", ) api_proto_library_internal( diff --git a/api/envoy/config/grpc_credential/v2alpha/BUILD b/api/envoy/config/grpc_credential/v2alpha/BUILD index abcb5db58c28..f739c00a677a 100644 --- a/api/envoy/config/grpc_credential/v2alpha/BUILD +++ b/api/envoy/config/grpc_credential/v2alpha/BUILD @@ -3,7 +3,6 @@ licenses(["notice"]) # Apache 2 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") api_proto_package( - name = "grpc_credential_config", deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/config/health_checker/redis/v2/BUILD b/api/envoy/config/health_checker/redis/v2/BUILD index 07f1e8086332..f7b95471d39d 100644 --- a/api/envoy/config/health_checker/redis/v2/BUILD +++ b/api/envoy/config/health_checker/redis/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "redis_health_checker_config", ) api_proto_library_internal( diff --git a/api/envoy/config/metrics/v2/BUILD b/api/envoy/config/metrics/v2/BUILD index ca6ab2fc0fea..13ac8bdd9992 100644 --- a/api/envoy/config/metrics/v2/BUILD +++ b/api/envoy/config/metrics/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "metrics_config", deps = [ "//envoy/api/v2/core", "//envoy/type/matcher", diff --git a/api/envoy/config/overload/v2alpha/BUILD b/api/envoy/config/overload/v2alpha/BUILD index 5a79b6badf33..0d91194cf118 100644 --- a/api/envoy/config/overload/v2alpha/BUILD +++ b/api/envoy/config/overload/v2alpha/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "overload_config", ) api_proto_library_internal( diff --git a/api/envoy/config/ratelimit/v2/BUILD b/api/envoy/config/ratelimit/v2/BUILD index 44efcf4b77b2..8593afea1f07 100644 --- a/api/envoy/config/ratelimit/v2/BUILD +++ b/api/envoy/config/ratelimit/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "ratelimit_config", deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/config/rbac/v2/BUILD b/api/envoy/config/rbac/v2/BUILD index ccd9353b2787..56ce9729cf0c 100644 --- a/api/envoy/config/rbac/v2/BUILD +++ b/api/envoy/config/rbac/v2/BUILD @@ -3,7 +3,6 @@ licenses(["notice"]) # Apache 2 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") api_proto_package( - name = "rbac_config", deps = [ "//envoy/api/v2/core", "//envoy/api/v2/route:route_protos", diff --git a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD index e735ca919acd..f02c38554714 100644 --- a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD +++ b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "fixed_heap_protos", ) api_proto_library_internal( diff --git a/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD b/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD index 50687476d45a..8eeb7db3c0a9 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD +++ b/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "injected_resource_protos", ) api_proto_library_internal( diff --git a/api/envoy/config/retry/previous_priorities/BUILD b/api/envoy/config/retry/previous_priorities/BUILD index 68cfb46338a5..b01b9677535f 100644 --- a/api/envoy/config/retry/previous_priorities/BUILD +++ b/api/envoy/config/retry/previous_priorities/BUILD @@ -3,7 +3,6 @@ licenses(["notice"]) # Apache 2 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") api_proto_package( - name = "previous_priorities_protos", deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/config/trace/v2/BUILD b/api/envoy/config/trace/v2/BUILD index ca394c01786e..f894a5289fd5 100644 --- a/api/envoy/config/trace/v2/BUILD +++ b/api/envoy/config/trace/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "trace_config", deps = [ "//envoy/api/v2/core", "@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 c1c75b8eb9c7..d9e5ece8ba82 100644 --- a/api/envoy/config/transport_socket/alts/v2alpha/BUILD +++ b/api/envoy/config/transport_socket/alts/v2alpha/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_p licenses(["notice"]) # Apache 2 api_proto_package( - name = "alts_config", deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/config/transport_socket/tap/v2alpha/BUILD b/api/envoy/config/transport_socket/tap/v2alpha/BUILD index 816a6ba28801..e18d4fc1c128 100644 --- a/api/envoy/config/transport_socket/tap/v2alpha/BUILD +++ b/api/envoy/config/transport_socket/tap/v2alpha/BUILD @@ -3,10 +3,9 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "tap_transport_socket", deps = [ "//envoy/api/v2/core", - "//envoy/config/common/tap/v2alpha:tap_config", + "//envoy/config/common/tap/v2alpha:pkg", ], ) diff --git a/api/envoy/service/accesslog/v2/BUILD b/api/envoy/service/accesslog/v2/BUILD index 5a981a27a0f8..135460b9c547 100644 --- a/api/envoy/service/accesslog/v2/BUILD +++ b/api/envoy/service/accesslog/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "accesslog_service", has_services = True, deps = [ "//envoy/api/v2/core", diff --git a/api/envoy/service/auth/v2/BUILD b/api/envoy/service/auth/v2/BUILD index 13365fbdc126..91a4eeebbf13 100644 --- a/api/envoy/service/auth/v2/BUILD +++ b/api/envoy/service/auth/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "external_auth_service", has_services = True, deps = [ "//envoy/api/v2/core", diff --git a/api/envoy/service/auth/v2alpha/BUILD b/api/envoy/service/auth/v2alpha/BUILD index 5a275c73bc6a..1940f4f2f885 100644 --- a/api/envoy/service/auth/v2alpha/BUILD +++ b/api/envoy/service/auth/v2alpha/BUILD @@ -3,10 +3,9 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "external_auth_v2alpha", has_services = True, deps = [ - "//envoy/service/auth/v2:external_auth_service", + "//envoy/service/auth/v2:pkg", ], ) diff --git a/api/envoy/service/discovery/v2/BUILD b/api/envoy/service/discovery/v2/BUILD index 6da9b49c4b33..14685e8ff63b 100644 --- a/api/envoy/service/discovery/v2/BUILD +++ b/api/envoy/service/discovery/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "discovery_service", has_services = True, deps = [ "//envoy/api/v2", diff --git a/api/envoy/service/load_stats/v2/BUILD b/api/envoy/service/load_stats/v2/BUILD index 7db891e376a1..d413d86d2a30 100644 --- a/api/envoy/service/load_stats/v2/BUILD +++ b/api/envoy/service/load_stats/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "load_stats_service", has_services = True, deps = [ "//envoy/api/v2/core", diff --git a/api/envoy/service/metrics/v2/BUILD b/api/envoy/service/metrics/v2/BUILD index e5c4ffacc039..091d40e7f8e5 100644 --- a/api/envoy/service/metrics/v2/BUILD +++ b/api/envoy/service/metrics/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "metrics_service_protos", has_services = True, deps = [ "//envoy/api/v2/core", diff --git a/api/envoy/service/ratelimit/v2/BUILD b/api/envoy/service/ratelimit/v2/BUILD index ee1ce0788eb8..6a8761dd7dad 100644 --- a/api/envoy/service/ratelimit/v2/BUILD +++ b/api/envoy/service/ratelimit/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "ratelimit_service", has_services = True, deps = [ "//envoy/api/v2/core", diff --git a/api/envoy/service/tap/v2alpha/BUILD b/api/envoy/service/tap/v2alpha/BUILD index a0c5ddf28b90..06bfd81b194b 100644 --- a/api/envoy/service/tap/v2alpha/BUILD +++ b/api/envoy/service/tap/v2alpha/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "tap_service", has_services = True, deps = [ "//envoy/api/v2", diff --git a/api/envoy/service/trace/v2/BUILD b/api/envoy/service/trace/v2/BUILD index 4abb5db16e4e..cee54d8b34a0 100644 --- a/api/envoy/service/trace/v2/BUILD +++ b/api/envoy/service/trace/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "trace_service_protos", has_services = True, deps = [ "//envoy/api/v2/core", diff --git a/api/test/build/BUILD b/api/test/build/BUILD index 01f156f19e3e..c8390c1fede4 100644 --- a/api/test/build/BUILD +++ b/api/test/build/BUILD @@ -28,11 +28,11 @@ api_go_test( deps = [ "//envoy/api/v2:v2_go_proto", "//envoy/api/v2/auth:auth_go_proto", - "//envoy/config/bootstrap/v2:bootstrap_config_go_proto", - "//envoy/service/accesslog/v2:accesslog_service_go_proto", - "//envoy/service/discovery/v2:discovery_service_go_proto", - "//envoy/service/metrics/v2:metrics_service_protos_go_proto", - "//envoy/service/ratelimit/v2:ratelimit_service_go_proto", - "//envoy/service/trace/v2:trace_service_protos_go_proto", + "//envoy/config/bootstrap/v2:pkg_go_proto", + "//envoy/service/accesslog/v2:pkg_go_proto", + "//envoy/service/discovery/v2:pkg_go_proto", + "//envoy/service/metrics/v2:pkg_go_proto", + "//envoy/service/ratelimit/v2:pkg_go_proto", + "//envoy/service/trace/v2:pkg_go_proto", ], ) From 88e12fcbc4f78924c441eefd77788fb3864964de Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Fri, 23 Aug 2019 08:02:03 -0700 Subject: [PATCH 07/16] format Signed-off-by: Kuat Yessenov --- api/envoy/api/v2/BUILD | 8 ++++---- api/envoy/api/v2/endpoint/BUILD | 1 - api/envoy/api/v2/listener/BUILD | 1 - api/envoy/api/v2/ratelimit/BUILD | 4 +--- api/envoy/api/v2/route/BUILD | 1 - api/envoy/config/filter/accesslog/v2/BUILD | 2 +- api/envoy/config/filter/http/fault/v2/BUILD | 2 +- api/envoy/config/filter/http/health_check/v2/BUILD | 2 +- api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD | 2 +- .../config/filter/network/dubbo_proxy/v2alpha1/BUILD | 2 +- api/envoy/config/filter/network/rate_limit/v2/BUILD | 2 +- .../config/filter/network/thrift_proxy/v2alpha1/BUILD | 2 +- api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD | 2 +- api/envoy/config/rbac/v2/BUILD | 2 +- api/envoy/service/discovery/v2/BUILD | 2 +- api/envoy/service/load_stats/v2/BUILD | 2 +- api/envoy/service/ratelimit/v2/BUILD | 2 +- api/envoy/service/tap/v2alpha/BUILD | 2 +- tools/check_format.py | 4 ++++ 19 files changed, 22 insertions(+), 23 deletions(-) diff --git a/api/envoy/api/v2/BUILD b/api/envoy/api/v2/BUILD index 64029148b7e2..370f4b601c71 100644 --- a/api/envoy/api/v2/BUILD +++ b/api/envoy/api/v2/BUILD @@ -23,10 +23,10 @@ api_proto_package( "//envoy/api/v2/auth", "//envoy/api/v2/cluster", "//envoy/api/v2/core", - "//envoy/api/v2/endpoint:endpoint_protos", - "//envoy/api/v2/listener:listener_protos", - "//envoy/api/v2/ratelimit:ratelimit_protos", - "//envoy/api/v2/route:route_protos", + "//envoy/api/v2/endpoint:pkg", + "//envoy/api/v2/listener:pkg", + "//envoy/api/v2/ratelimit:pkg", + "//envoy/api/v2/route:pkg", "//envoy/type", ], ) diff --git a/api/envoy/api/v2/endpoint/BUILD b/api/envoy/api/v2/endpoint/BUILD index b3f1115ab857..a12db37309ce 100644 --- a/api/envoy/api/v2/endpoint/BUILD +++ b/api/envoy/api/v2/endpoint/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "endpoint_protos", deps = [ "//envoy/api/v2/auth", "//envoy/api/v2/core", diff --git a/api/envoy/api/v2/listener/BUILD b/api/envoy/api/v2/listener/BUILD index b1bf36801ece..29d5fd7b3de5 100644 --- a/api/envoy/api/v2/listener/BUILD +++ b/api/envoy/api/v2/listener/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "listener_protos", deps = [ "//envoy/api/v2/auth", "//envoy/api/v2/core", diff --git a/api/envoy/api/v2/ratelimit/BUILD b/api/envoy/api/v2/ratelimit/BUILD index 1489bac161dd..234a3b20f16b 100644 --- a/api/envoy/api/v2/ratelimit/BUILD +++ b/api/envoy/api/v2/ratelimit/BUILD @@ -2,9 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( - name = "ratelimit_protos", -) +api_proto_package() api_proto_library_internal( name = "ratelimit", diff --git a/api/envoy/api/v2/route/BUILD b/api/envoy/api/v2/route/BUILD index 588804aa18b8..da4f639faa10 100644 --- a/api/envoy/api/v2/route/BUILD +++ b/api/envoy/api/v2/route/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "route_protos", deps = [ "//envoy/api/v2/core", "//envoy/type", diff --git a/api/envoy/config/filter/accesslog/v2/BUILD b/api/envoy/config/filter/accesslog/v2/BUILD index 98852f021d54..d9b740921357 100644 --- a/api/envoy/config/filter/accesslog/v2/BUILD +++ b/api/envoy/config/filter/accesslog/v2/BUILD @@ -5,7 +5,7 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/api/v2/core", - "//envoy/api/v2/route:route_protos", + "//envoy/api/v2/route:pkg", "//envoy/type", ], ) diff --git a/api/envoy/config/filter/http/fault/v2/BUILD b/api/envoy/config/filter/http/fault/v2/BUILD index 7ad4841bc51a..b169a0904860 100644 --- a/api/envoy/config/filter/http/fault/v2/BUILD +++ b/api/envoy/config/filter/http/fault/v2/BUILD @@ -4,7 +4,7 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/route:route_protos", + "//envoy/api/v2/route:pkg", "//envoy/config/filter/fault/v2:pkg", "//envoy/type", ], diff --git a/api/envoy/config/filter/http/health_check/v2/BUILD b/api/envoy/config/filter/http/health_check/v2/BUILD index 262e61049882..8a995f1694af 100644 --- a/api/envoy/config/filter/http/health_check/v2/BUILD +++ b/api/envoy/config/filter/http/health_check/v2/BUILD @@ -4,7 +4,7 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/route:route_protos", + "//envoy/api/v2/route:pkg", "//envoy/type", ], ) diff --git a/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD b/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD index 4c7b805dda73..80b4345f6151 100644 --- a/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD +++ b/api/envoy/config/filter/http/jwt_authn/v2alpha/BUILD @@ -5,7 +5,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap api_proto_package( deps = [ "//envoy/api/v2/core", - "//envoy/api/v2/route:route_protos", + "//envoy/api/v2/route:pkg", ], ) diff --git a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD index 977804db5b25..c6cee209c654 100644 --- a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD +++ b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD @@ -5,7 +5,7 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/api/v2/core", - "//envoy/api/v2/route:route_protos", + "//envoy/api/v2/route:pkg", "//envoy/type", "//envoy/type/matcher", ], diff --git a/api/envoy/config/filter/network/rate_limit/v2/BUILD b/api/envoy/config/filter/network/rate_limit/v2/BUILD index 6c39626faafa..fcdcd0dfa5ef 100644 --- a/api/envoy/config/filter/network/rate_limit/v2/BUILD +++ b/api/envoy/config/filter/network/rate_limit/v2/BUILD @@ -4,7 +4,7 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/ratelimit:ratelimit_protos", + "//envoy/api/v2/ratelimit:pkg", "//envoy/config/ratelimit/v2:pkg", ], ) diff --git a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD index 40e3ea85d271..28a64a0a329e 100644 --- a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD +++ b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD @@ -5,7 +5,7 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/api/v2/core", - "//envoy/api/v2/route:route_protos", + "//envoy/api/v2/route:pkg", ], ) diff --git a/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD b/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD index 6c39626faafa..fcdcd0dfa5ef 100644 --- a/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD +++ b/api/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD @@ -4,7 +4,7 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/ratelimit:ratelimit_protos", + "//envoy/api/v2/ratelimit:pkg", "//envoy/config/ratelimit/v2:pkg", ], ) diff --git a/api/envoy/config/rbac/v2/BUILD b/api/envoy/config/rbac/v2/BUILD index 56ce9729cf0c..18b1bb24f29d 100644 --- a/api/envoy/config/rbac/v2/BUILD +++ b/api/envoy/config/rbac/v2/BUILD @@ -5,7 +5,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap api_proto_package( deps = [ "//envoy/api/v2/core", - "//envoy/api/v2/route:route_protos", + "//envoy/api/v2/route:pkg", "//envoy/type/matcher", "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto", ], diff --git a/api/envoy/service/discovery/v2/BUILD b/api/envoy/service/discovery/v2/BUILD index 14685e8ff63b..13db2701c2a5 100644 --- a/api/envoy/service/discovery/v2/BUILD +++ b/api/envoy/service/discovery/v2/BUILD @@ -7,7 +7,7 @@ api_proto_package( deps = [ "//envoy/api/v2", "//envoy/api/v2/core", - "//envoy/api/v2/endpoint:endpoint_protos", + "//envoy/api/v2/endpoint:pkg", ], ) diff --git a/api/envoy/service/load_stats/v2/BUILD b/api/envoy/service/load_stats/v2/BUILD index d413d86d2a30..af07d8aa101c 100644 --- a/api/envoy/service/load_stats/v2/BUILD +++ b/api/envoy/service/load_stats/v2/BUILD @@ -6,7 +6,7 @@ api_proto_package( has_services = True, deps = [ "//envoy/api/v2/core", - "//envoy/api/v2/endpoint:endpoint_protos", + "//envoy/api/v2/endpoint:pkg", ], ) diff --git a/api/envoy/service/ratelimit/v2/BUILD b/api/envoy/service/ratelimit/v2/BUILD index 6a8761dd7dad..7bc5db7113e7 100644 --- a/api/envoy/service/ratelimit/v2/BUILD +++ b/api/envoy/service/ratelimit/v2/BUILD @@ -6,7 +6,7 @@ api_proto_package( has_services = True, deps = [ "//envoy/api/v2/core", - "//envoy/api/v2/ratelimit:ratelimit_protos", + "//envoy/api/v2/ratelimit:pkg", ], ) diff --git a/api/envoy/service/tap/v2alpha/BUILD b/api/envoy/service/tap/v2alpha/BUILD index 06bfd81b194b..455fa739a893 100644 --- a/api/envoy/service/tap/v2alpha/BUILD +++ b/api/envoy/service/tap/v2alpha/BUILD @@ -7,7 +7,7 @@ api_proto_package( deps = [ "//envoy/api/v2", "//envoy/api/v2/core", - "//envoy/api/v2/route:route_protos", + "//envoy/api/v2/route:pkg", "//envoy/data/tap/v2alpha:tap_data", ], ) diff --git a/tools/check_format.py b/tools/check_format.py index 2f30ee730121..08223de17d67 100755 --- a/tools/check_format.py +++ b/tools/check_format.py @@ -76,6 +76,7 @@ PROTO_OPTION_JAVA_PACKAGE = "option java_package = \"" PROTO_OPTION_JAVA_OUTER_CLASSNAME = "option java_outer_classname = \"" PROTO_OPTION_JAVA_MULTIPLE_FILES = "option java_multiple_files = " +PROTO_OPTION_GO_PACKAGE = "option go_package = \"" # yapf: disable PROTOBUF_TYPE_ERRORS = { @@ -685,6 +686,9 @@ def checkSourcePath(file_path): "Java proto option 'java_outer_classname' not set") error_messages += errorIfNoSubstringFound("\n" + PROTO_OPTION_JAVA_MULTIPLE_FILES, file_path, "Java proto option 'java_multiple_files' not set") + with open(file_path) as f: + if PROTO_OPTION_GO_PACKAGE in f.read(): + error_messages += ["go_package option should not be set in %s" % file_path] return error_messages From 6b8cca1bab11c1c96085d2a2e7f4e5b355254f23 Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Fri, 23 Aug 2019 08:06:14 -0700 Subject: [PATCH 08/16] cleanup Signed-off-by: Kuat Yessenov --- api/envoy/data/accesslog/v2/BUILD | 1 - api/envoy/data/cluster/v2alpha/BUILD | 1 - api/envoy/data/core/v2alpha/BUILD | 1 - api/envoy/data/tap/v2alpha/BUILD | 1 - api/envoy/service/accesslog/v2/BUILD | 2 +- api/envoy/service/tap/v2alpha/BUILD | 2 +- 6 files changed, 2 insertions(+), 6 deletions(-) diff --git a/api/envoy/data/accesslog/v2/BUILD b/api/envoy/data/accesslog/v2/BUILD index c07b77c4aa08..bf16d6aaf443 100644 --- a/api/envoy/data/accesslog/v2/BUILD +++ b/api/envoy/data/accesslog/v2/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "accesslog_data", deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/data/cluster/v2alpha/BUILD b/api/envoy/data/cluster/v2alpha/BUILD index 3d24e452f86a..f152a935bfe9 100644 --- a/api/envoy/data/cluster/v2alpha/BUILD +++ b/api/envoy/data/cluster/v2alpha/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_p licenses(["notice"]) # Apache 2 api_proto_package( - name = "cluster_data", ) api_proto_library( diff --git a/api/envoy/data/core/v2alpha/BUILD b/api/envoy/data/core/v2alpha/BUILD index 1fc6e4e78b04..2cd56d390885 100644 --- a/api/envoy/data/core/v2alpha/BUILD +++ b/api/envoy/data/core/v2alpha/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_p licenses(["notice"]) # Apache 2 api_proto_package( - name = "network_health_check_event", deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/data/tap/v2alpha/BUILD b/api/envoy/data/tap/v2alpha/BUILD index cfcab12c7e8c..60d92ad1322b 100644 --- a/api/envoy/data/tap/v2alpha/BUILD +++ b/api/envoy/data/tap/v2alpha/BUILD @@ -3,7 +3,6 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - name = "tap_data", deps = [ "//envoy/api/v2/core", ], diff --git a/api/envoy/service/accesslog/v2/BUILD b/api/envoy/service/accesslog/v2/BUILD index 135460b9c547..d4f7c300361e 100644 --- a/api/envoy/service/accesslog/v2/BUILD +++ b/api/envoy/service/accesslog/v2/BUILD @@ -6,7 +6,7 @@ api_proto_package( has_services = True, deps = [ "//envoy/api/v2/core", - "//envoy/data/accesslog/v2:accesslog_data", + "//envoy/data/accesslog/v2:pkg", ], ) diff --git a/api/envoy/service/tap/v2alpha/BUILD b/api/envoy/service/tap/v2alpha/BUILD index 455fa739a893..621bf208d495 100644 --- a/api/envoy/service/tap/v2alpha/BUILD +++ b/api/envoy/service/tap/v2alpha/BUILD @@ -8,7 +8,7 @@ api_proto_package( "//envoy/api/v2", "//envoy/api/v2/core", "//envoy/api/v2/route:pkg", - "//envoy/data/tap/v2alpha:tap_data", + "//envoy/data/tap/v2alpha:pkg", ], ) From 090a9f2bf5073ae6d28a6ca4e15e3fe6c0bb0f00 Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Fri, 23 Aug 2019 13:13:43 -0700 Subject: [PATCH 09/16] reformat Signed-off-by: Kuat Yessenov --- api/envoy/config/accesslog/v2/BUILD | 4 +--- api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD | 4 +--- api/envoy/config/cluster/redis/BUILD | 3 +-- api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD | 4 +--- api/envoy/config/filter/dubbo/router/v2alpha1/BUILD | 3 +-- api/envoy/config/filter/fault/v2/BUILD | 4 +--- .../config/filter/http/adaptive_concurrency/v2alpha/BUILD | 4 +--- api/envoy/config/filter/http/buffer/v2/BUILD | 3 +-- .../config/filter/http/dynamic_forward_proxy/v2alpha/BUILD | 4 +--- .../filter/http/grpc_http1_reverse_bridge/v2alpha1/BUILD | 3 +-- api/envoy/config/filter/http/gzip/v2/BUILD | 3 +-- api/envoy/config/filter/http/header_to_metadata/v2/BUILD | 3 +-- api/envoy/config/filter/http/ip_tagging/v2/BUILD | 4 +--- api/envoy/config/filter/http/lua/v2/BUILD | 3 +-- api/envoy/config/filter/http/original_src/v2alpha1/BUILD | 3 +-- api/envoy/config/filter/http/rate_limit/v2/BUILD | 4 +--- api/envoy/config/filter/http/rbac/v2/BUILD | 4 +--- api/envoy/config/filter/http/router/v2/BUILD | 4 +--- api/envoy/config/filter/http/squash/v2/BUILD | 3 +-- api/envoy/config/filter/http/tap/v2alpha/BUILD | 4 +--- api/envoy/config/filter/http/transcoder/v2/BUILD | 3 +-- api/envoy/config/filter/listener/original_src/v2alpha1/BUILD | 3 +-- api/envoy/config/filter/network/client_ssl_auth/v2/BUILD | 4 +--- api/envoy/config/filter/network/ext_authz/v2/BUILD | 4 +--- api/envoy/config/filter/network/mongo_proxy/v2/BUILD | 4 +--- api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD | 3 +-- api/envoy/config/filter/network/rbac/v2/BUILD | 4 +--- .../config/filter/network/zookeeper_proxy/v1alpha1/BUILD | 3 +-- api/envoy/config/filter/thrift/router/v2alpha1/BUILD | 3 +-- api/envoy/config/grpc_credential/v2alpha/BUILD | 4 +--- api/envoy/config/health_checker/redis/v2/BUILD | 3 +-- api/envoy/config/overload/v2alpha/BUILD | 3 +-- api/envoy/config/ratelimit/v2/BUILD | 4 +--- api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD | 3 +-- .../config/resource_monitor/injected_resource/v2alpha/BUILD | 3 +-- api/envoy/config/retry/previous_priorities/BUILD | 4 +--- api/envoy/config/transport_socket/alts/v2alpha/BUILD | 4 +--- api/envoy/data/accesslog/v2/BUILD | 4 +--- api/envoy/data/cluster/v2alpha/BUILD | 3 +-- api/envoy/data/core/v2alpha/BUILD | 4 +--- api/envoy/data/tap/v2alpha/BUILD | 4 +--- 41 files changed, 41 insertions(+), 104 deletions(-) diff --git a/api/envoy/config/accesslog/v2/BUILD b/api/envoy/config/accesslog/v2/BUILD index 795491e7d68e..22c48f795224 100644 --- a/api/envoy/config/accesslog/v2/BUILD +++ b/api/envoy/config/accesslog/v2/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/api/v2/core", - ], + deps = ["//envoy/api/v2/core"], ) api_proto_library_internal( diff --git a/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD b/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD index 6167b9b333ca..669b6745ab74 100644 --- a/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD +++ b/api/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg", - ], + deps = ["//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg"], ) api_proto_library_internal( diff --git a/api/envoy/config/cluster/redis/BUILD b/api/envoy/config/cluster/redis/BUILD index d78e8913b020..760ae606c05d 100644 --- a/api/envoy/config/cluster/redis/BUILD +++ b/api/envoy/config/cluster/redis/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "redis_cluster", diff --git a/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD b/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD index c25406c07556..312ae36b3762 100644 --- a/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD +++ b/api/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/api/v2", - ], + deps = ["//envoy/api/v2"], ) api_proto_library_internal( diff --git a/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD b/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD index 604d3635b3d5..68bd8c126b80 100644 --- a/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD +++ b/api/envoy/config/filter/dubbo/router/v2alpha1/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "router", diff --git a/api/envoy/config/filter/fault/v2/BUILD b/api/envoy/config/filter/fault/v2/BUILD index 836f4f0a7891..78687f4e4da4 100644 --- a/api/envoy/config/filter/fault/v2/BUILD +++ b/api/envoy/config/filter/fault/v2/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/type", - ], + deps = ["//envoy/type"], ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD b/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD index df502f24f644..b58f88c787ba 100644 --- a/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD +++ b/api/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/api/v2/core", - ], + deps = ["//envoy/api/v2/core"], ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/buffer/v2/BUILD b/api/envoy/config/filter/http/buffer/v2/BUILD index 860760785ed0..039ebb63e6d2 100644 --- a/api/envoy/config/filter/http/buffer/v2/BUILD +++ b/api/envoy/config/filter/http/buffer/v2/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "buffer", 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 da20b9161032..15d184377ef7 100644 --- a/api/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD +++ b/api/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg", - ], + deps = ["//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg"], ) api_proto_library_internal( 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 93e576dacdbf..a88ba2443cad 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 @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_p licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library( name = "config", diff --git a/api/envoy/config/filter/http/gzip/v2/BUILD b/api/envoy/config/filter/http/gzip/v2/BUILD index 7217a4592f2e..a3f4b0af2a44 100644 --- a/api/envoy/config/filter/http/gzip/v2/BUILD +++ b/api/envoy/config/filter/http/gzip/v2/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "gzip", 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 a48ea9c89a97..cfd34fcf2b08 100644 --- a/api/envoy/config/filter/http/header_to_metadata/v2/BUILD +++ b/api/envoy/config/filter/http/header_to_metadata/v2/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "header_to_metadata", diff --git a/api/envoy/config/filter/http/ip_tagging/v2/BUILD b/api/envoy/config/filter/http/ip_tagging/v2/BUILD index 9b3d8cce792c..b318ae58f381 100644 --- a/api/envoy/config/filter/http/ip_tagging/v2/BUILD +++ b/api/envoy/config/filter/http/ip_tagging/v2/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/api/v2/core", - ], + deps = ["//envoy/api/v2/core"], ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/lua/v2/BUILD b/api/envoy/config/filter/http/lua/v2/BUILD index 111de7f34b2c..7aaf74617c96 100644 --- a/api/envoy/config/filter/http/lua/v2/BUILD +++ b/api/envoy/config/filter/http/lua/v2/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "lua", diff --git a/api/envoy/config/filter/http/original_src/v2alpha1/BUILD b/api/envoy/config/filter/http/original_src/v2alpha1/BUILD index f80da6c03d30..a7435bb55cfc 100644 --- a/api/envoy/config/filter/http/original_src/v2alpha1/BUILD +++ b/api/envoy/config/filter/http/original_src/v2alpha1/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "original_src", diff --git a/api/envoy/config/filter/http/rate_limit/v2/BUILD b/api/envoy/config/filter/http/rate_limit/v2/BUILD index 247210657a51..4a6d451da981 100644 --- a/api/envoy/config/filter/http/rate_limit/v2/BUILD +++ b/api/envoy/config/filter/http/rate_limit/v2/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/ratelimit/v2:pkg", - ], + deps = ["//envoy/config/ratelimit/v2:pkg"], ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/rbac/v2/BUILD b/api/envoy/config/filter/http/rbac/v2/BUILD index a98f57f66535..ca9aa2ca410c 100644 --- a/api/envoy/config/filter/http/rbac/v2/BUILD +++ b/api/envoy/config/filter/http/rbac/v2/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/rbac/v2:pkg", - ], + deps = ["//envoy/config/rbac/v2:pkg"], ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/router/v2/BUILD b/api/envoy/config/filter/http/router/v2/BUILD index c320bd3b19c2..9ddaf54b2845 100644 --- a/api/envoy/config/filter/http/router/v2/BUILD +++ b/api/envoy/config/filter/http/router/v2/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/filter/accesslog/v2:pkg", - ], + deps = ["//envoy/config/filter/accesslog/v2:pkg"], ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/squash/v2/BUILD b/api/envoy/config/filter/http/squash/v2/BUILD index f81994415990..2a0c1c8e30fa 100644 --- a/api/envoy/config/filter/http/squash/v2/BUILD +++ b/api/envoy/config/filter/http/squash/v2/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "squash", diff --git a/api/envoy/config/filter/http/tap/v2alpha/BUILD b/api/envoy/config/filter/http/tap/v2alpha/BUILD index 59921ccea383..0949dad0c6ac 100644 --- a/api/envoy/config/filter/http/tap/v2alpha/BUILD +++ b/api/envoy/config/filter/http/tap/v2alpha/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/common/tap/v2alpha:pkg", - ], + deps = ["//envoy/config/common/tap/v2alpha:pkg"], ) api_proto_library_internal( diff --git a/api/envoy/config/filter/http/transcoder/v2/BUILD b/api/envoy/config/filter/http/transcoder/v2/BUILD index 36254e787e1e..33a99a23a061 100644 --- a/api/envoy/config/filter/http/transcoder/v2/BUILD +++ b/api/envoy/config/filter/http/transcoder/v2/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "transcoder", diff --git a/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD b/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD index f80da6c03d30..a7435bb55cfc 100644 --- a/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD +++ b/api/envoy/config/filter/listener/original_src/v2alpha1/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "original_src", 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 d7203cf7f511..96b5e9d0d47c 100644 --- a/api/envoy/config/filter/network/client_ssl_auth/v2/BUILD +++ b/api/envoy/config/filter/network/client_ssl_auth/v2/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/api/v2/core", - ], + deps = ["//envoy/api/v2/core"], ) api_proto_library_internal( diff --git a/api/envoy/config/filter/network/ext_authz/v2/BUILD b/api/envoy/config/filter/network/ext_authz/v2/BUILD index f54040882f41..3bdae60659a1 100644 --- a/api/envoy/config/filter/network/ext_authz/v2/BUILD +++ b/api/envoy/config/filter/network/ext_authz/v2/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/api/v2/core", - ], + deps = ["//envoy/api/v2/core"], ) api_proto_library_internal( diff --git a/api/envoy/config/filter/network/mongo_proxy/v2/BUILD b/api/envoy/config/filter/network/mongo_proxy/v2/BUILD index 91678ff0702c..59bad30ed94d 100644 --- a/api/envoy/config/filter/network/mongo_proxy/v2/BUILD +++ b/api/envoy/config/filter/network/mongo_proxy/v2/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/filter/fault/v2:pkg", - ], + deps = ["//envoy/config/filter/fault/v2:pkg"], ) api_proto_library_internal( diff --git a/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD b/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD index 9d6d6f126654..7f7da3af9276 100644 --- a/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD +++ b/api/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "mysql_proxy", diff --git a/api/envoy/config/filter/network/rbac/v2/BUILD b/api/envoy/config/filter/network/rbac/v2/BUILD index a98f57f66535..ca9aa2ca410c 100644 --- a/api/envoy/config/filter/network/rbac/v2/BUILD +++ b/api/envoy/config/filter/network/rbac/v2/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/rbac/v2:pkg", - ], + deps = ["//envoy/config/rbac/v2:pkg"], ) api_proto_library_internal( diff --git a/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD b/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD index b860e6290caa..02594c24b8ae 100644 --- a/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD +++ b/api/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "zookeeper_proxy", diff --git a/api/envoy/config/filter/thrift/router/v2alpha1/BUILD b/api/envoy/config/filter/thrift/router/v2alpha1/BUILD index 604d3635b3d5..68bd8c126b80 100644 --- a/api/envoy/config/filter/thrift/router/v2alpha1/BUILD +++ b/api/envoy/config/filter/thrift/router/v2alpha1/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "router", diff --git a/api/envoy/config/grpc_credential/v2alpha/BUILD b/api/envoy/config/grpc_credential/v2alpha/BUILD index f739c00a677a..484aa5680d12 100644 --- a/api/envoy/config/grpc_credential/v2alpha/BUILD +++ b/api/envoy/config/grpc_credential/v2alpha/BUILD @@ -3,9 +3,7 @@ licenses(["notice"]) # Apache 2 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") api_proto_package( - deps = [ - "//envoy/api/v2/core", - ], + deps = ["//envoy/api/v2/core"], ) api_proto_library_internal( diff --git a/api/envoy/config/health_checker/redis/v2/BUILD b/api/envoy/config/health_checker/redis/v2/BUILD index f7b95471d39d..f7b289b08f69 100644 --- a/api/envoy/config/health_checker/redis/v2/BUILD +++ b/api/envoy/config/health_checker/redis/v2/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "redis", diff --git a/api/envoy/config/overload/v2alpha/BUILD b/api/envoy/config/overload/v2alpha/BUILD index 0d91194cf118..e247848d07a9 100644 --- a/api/envoy/config/overload/v2alpha/BUILD +++ b/api/envoy/config/overload/v2alpha/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "overload", diff --git a/api/envoy/config/ratelimit/v2/BUILD b/api/envoy/config/ratelimit/v2/BUILD index 8593afea1f07..432f4b9592d3 100644 --- a/api/envoy/config/ratelimit/v2/BUILD +++ b/api/envoy/config/ratelimit/v2/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/api/v2/core", - ], + deps = ["//envoy/api/v2/core"], ) api_proto_library_internal( diff --git a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD index f02c38554714..a5003e219c8a 100644 --- a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD +++ b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "fixed_heap", diff --git a/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD b/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD index 8eeb7db3c0a9..3a1764216b00 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD +++ b/api/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library_internal( name = "injected_resource", diff --git a/api/envoy/config/retry/previous_priorities/BUILD b/api/envoy/config/retry/previous_priorities/BUILD index b01b9677535f..8140346d4747 100644 --- a/api/envoy/config/retry/previous_priorities/BUILD +++ b/api/envoy/config/retry/previous_priorities/BUILD @@ -3,9 +3,7 @@ licenses(["notice"]) # Apache 2 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") api_proto_package( - deps = [ - "//envoy/api/v2/core", - ], + deps = ["//envoy/api/v2/core"], ) api_proto_library_internal( diff --git a/api/envoy/config/transport_socket/alts/v2alpha/BUILD b/api/envoy/config/transport_socket/alts/v2alpha/BUILD index d9e5ece8ba82..eb247ae14b04 100644 --- a/api/envoy/config/transport_socket/alts/v2alpha/BUILD +++ b/api/envoy/config/transport_socket/alts/v2alpha/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_p licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/api/v2/core", - ], + deps = ["//envoy/api/v2/core"], ) api_proto_library( diff --git a/api/envoy/data/accesslog/v2/BUILD b/api/envoy/data/accesslog/v2/BUILD index bf16d6aaf443..22c4c45ee847 100644 --- a/api/envoy/data/accesslog/v2/BUILD +++ b/api/envoy/data/accesslog/v2/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/api/v2/core", - ], + deps = ["//envoy/api/v2/core"], ) api_proto_library_internal( diff --git a/api/envoy/data/cluster/v2alpha/BUILD b/api/envoy/data/cluster/v2alpha/BUILD index f152a935bfe9..4d921f4d97ac 100644 --- a/api/envoy/data/cluster/v2alpha/BUILD +++ b/api/envoy/data/cluster/v2alpha/BUILD @@ -2,8 +2,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_p licenses(["notice"]) # Apache 2 -api_proto_package( -) +api_proto_package() api_proto_library( name = "outlier_detection_event", diff --git a/api/envoy/data/core/v2alpha/BUILD b/api/envoy/data/core/v2alpha/BUILD index 2cd56d390885..331032348388 100644 --- a/api/envoy/data/core/v2alpha/BUILD +++ b/api/envoy/data/core/v2alpha/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_p licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/api/v2/core", - ], + deps = ["//envoy/api/v2/core"], ) api_proto_library( diff --git a/api/envoy/data/tap/v2alpha/BUILD b/api/envoy/data/tap/v2alpha/BUILD index 60d92ad1322b..bf108c4792a1 100644 --- a/api/envoy/data/tap/v2alpha/BUILD +++ b/api/envoy/data/tap/v2alpha/BUILD @@ -3,9 +3,7 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "ap licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/api/v2/core", - ], + deps = ["//envoy/api/v2/core"], ) api_proto_library_internal( From 1b5a13ae8ed209f0caa661bd93db84ec433e0b45 Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Fri, 23 Aug 2019 13:20:46 -0700 Subject: [PATCH 10/16] add test Signed-off-by: Kuat Yessenov --- tools/check_format_test_helper.py | 1 + tools/testdata/check_format/api/go_package.proto | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 tools/testdata/check_format/api/go_package.proto diff --git a/tools/check_format_test_helper.py b/tools/check_format_test_helper.py index 7309a4bcaff1..868945cde2dd 100755 --- a/tools/check_format_test_helper.py +++ b/tools/check_format_test_helper.py @@ -236,6 +236,7 @@ def checkFileExpectingOK(filename): errors += checkAndFixError("bad_envoy_build_sys_ref.BUILD", "Superfluous '@envoy//' prefix") errors += checkAndFixError("proto_format.proto", "clang-format check failed") errors += checkAndFixError("api/java_options.proto", "Java proto option") + errors += checkFileExpectingError("api/go_package.proto", "go_package option should not be set") errors += checkAndFixError( "cpp_std.cc", "term absl::make_unique< should be replaced with standard library term std::make_unique<") diff --git a/tools/testdata/check_format/api/go_package.proto b/tools/testdata/check_format/api/go_package.proto new file mode 100644 index 000000000000..b32347b6e46f --- /dev/null +++ b/tools/testdata/check_format/api/go_package.proto @@ -0,0 +1,5 @@ +option go_package = "foo"; +option java_package = "io.envoyproxy.envoy.foo"; +option java_outer_classname = "JavaOptionsProto"; +option java_multiple_files = true; +package envoy.foo; From c03e6d742b2c838bbb82481d93ed44790c080c60 Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Fri, 23 Aug 2019 13:30:12 -0700 Subject: [PATCH 11/16] pull out common protos Signed-off-by: Kuat Yessenov --- api/bazel/api_build_system.bzl | 45 +++++++++++++--------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/api/bazel/api_build_system.bzl b/api/bazel/api_build_system.bzl index 56c36f38dff4..b048c711a6aa 100644 --- a/api/bazel/api_build_system.bzl +++ b/api/bazel/api_build_system.bzl @@ -10,6 +10,21 @@ _CC_EXPORT_SUFFIX = "_export_cc" _GO_PROTO_SUFFIX = "_go_proto" _GO_IMPORTPATH_PREFIX = "github.com/envoyproxy/data-plane-api/api/" +_COMMON_PROTO_DEPS = [ + "@com_google_protobuf//:any_proto", + "@com_google_protobuf//:descriptor_proto", + "@com_google_protobuf//:duration_proto", + "@com_google_protobuf//:empty_proto", + "@com_google_protobuf//:struct_proto", + "@com_google_protobuf//:timestamp_proto", + "@com_google_protobuf//:wrappers_proto", + "@com_google_googleapis//google/api:http_proto", + "@com_google_googleapis//google/api:annotations_proto", + "@com_google_googleapis//google/rpc:status_proto", + "@com_github_gogo_protobuf//:gogo_proto", + "@com_envoyproxy_protoc_gen_validate//validate:validate_proto", +] + def _Suffix(d, suffix): return d + suffix @@ -87,20 +102,7 @@ def api_proto_library( native.proto_library( name = name, srcs = srcs, - deps = deps + external_proto_deps + [ - "@com_google_protobuf//:any_proto", - "@com_google_protobuf//:descriptor_proto", - "@com_google_protobuf//:duration_proto", - "@com_google_protobuf//:empty_proto", - "@com_google_protobuf//:struct_proto", - "@com_google_protobuf//:timestamp_proto", - "@com_google_protobuf//:wrappers_proto", - "@com_google_googleapis//google/api:http_proto", - "@com_google_googleapis//google/api:annotations_proto", - "@com_google_googleapis//google/rpc:status_proto", - "@com_github_gogo_protobuf//:gogo_proto", - "@com_envoyproxy_protoc_gen_validate//validate:validate_proto", - ], + deps = deps + external_proto_deps + COMMON_PROTO_DEPS, visibility = visibility, ) pgv_cc_proto_library( @@ -164,20 +166,7 @@ def api_proto_package(name = "pkg", srcs = [], deps = [], has_services = False, native.proto_library( name = name, srcs = srcs, - deps = deps + [ - "@com_google_protobuf//:any_proto", - "@com_google_protobuf//:descriptor_proto", - "@com_google_protobuf//:duration_proto", - "@com_google_protobuf//:empty_proto", - "@com_google_protobuf//:struct_proto", - "@com_google_protobuf//:timestamp_proto", - "@com_google_protobuf//:wrappers_proto", - "@com_google_googleapis//google/api:http_proto", - "@com_google_googleapis//google/api:annotations_proto", - "@com_google_googleapis//google/rpc:status_proto", - "@com_github_gogo_protobuf//:gogo_proto", - "@com_envoyproxy_protoc_gen_validate//validate:validate_proto", - ], + deps = deps + COMMON_PROTO_DEPS, visibility = visibility, ) From 8e8661c8b2e2a19fc3cebac3eb9225b30513b01b Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Fri, 23 Aug 2019 13:35:30 -0700 Subject: [PATCH 12/16] merge fix Signed-off-by: Kuat Yessenov --- api/bazel/api_build_system.bzl | 4 ++-- api/envoy/type/matcher/regex.proto | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/api/bazel/api_build_system.bzl b/api/bazel/api_build_system.bzl index b048c711a6aa..c2f105b21a88 100644 --- a/api/bazel/api_build_system.bzl +++ b/api/bazel/api_build_system.bzl @@ -102,7 +102,7 @@ def api_proto_library( native.proto_library( name = name, srcs = srcs, - deps = deps + external_proto_deps + COMMON_PROTO_DEPS, + deps = deps + external_proto_deps + _COMMON_PROTO_DEPS, visibility = visibility, ) pgv_cc_proto_library( @@ -166,7 +166,7 @@ def api_proto_package(name = "pkg", srcs = [], deps = [], has_services = False, native.proto_library( name = name, srcs = srcs, - deps = deps + COMMON_PROTO_DEPS, + deps = deps + _COMMON_PROTO_DEPS, visibility = visibility, ) diff --git a/api/envoy/type/matcher/regex.proto b/api/envoy/type/matcher/regex.proto index b3b7194441eb..e88c2d321a0c 100644 --- a/api/envoy/type/matcher/regex.proto +++ b/api/envoy/type/matcher/regex.proto @@ -5,7 +5,6 @@ package envoy.type.matcher; option java_outer_classname = "StringProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.type.matcher"; -option go_package = "matcher"; import "google/protobuf/wrappers.proto"; import "validate/validate.proto"; From 4387af19999ef05d2b14947b10176a044c54c356 Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Fri, 23 Aug 2019 13:36:18 -0700 Subject: [PATCH 13/16] merge fix Signed-off-by: Kuat Yessenov --- api/bazel/api_build_system.bzl | 1 - 1 file changed, 1 deletion(-) diff --git a/api/bazel/api_build_system.bzl b/api/bazel/api_build_system.bzl index c2f105b21a88..0ad60bf84a32 100644 --- a/api/bazel/api_build_system.bzl +++ b/api/bazel/api_build_system.bzl @@ -1,7 +1,6 @@ load("@com_google_protobuf//:protobuf.bzl", _py_proto_library = "py_proto_library") load("@com_envoyproxy_protoc_gen_validate//bazel:pgv_proto_library.bzl", "pgv_cc_proto_library") load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library", "go_proto_library") -load("@io_bazel_rules_go//proto:compiler.bzl", "go_proto_compiler") load("@io_bazel_rules_go//go:def.bzl", "go_test") _PY_SUFFIX = "_py" From f5c33204816be630c210e3bd66bf2e377e20175e Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Tue, 3 Sep 2019 14:45:56 -0700 Subject: [PATCH 14/16] migrate to v3alpha Signed-off-by: Kuat Yessenov --- api/envoy/admin/v3alpha/BUILD | 13 ++- .../api/v2/listener/udp_listener_config.proto | 1 - api/envoy/api/v3alpha/BUILD | 88 ++++--------------- api/envoy/api/v3alpha/auth/BUILD | 18 ++-- api/envoy/api/v3alpha/auth/cert.proto | 1 - api/envoy/api/v3alpha/cluster/BUILD | 27 ++---- .../api/v3alpha/cluster/circuit_breaker.proto | 1 - api/envoy/api/v3alpha/core/BUILD | 58 ++---------- api/envoy/api/v3alpha/core/base.proto | 1 - api/envoy/api/v3alpha/discovery.proto | 1 - api/envoy/api/v3alpha/endpoint/BUILD | 31 ++----- api/envoy/api/v3alpha/endpoint/endpoint.proto | 1 - api/envoy/api/v3alpha/listener/BUILD | 27 ++---- api/envoy/api/v3alpha/listener/listener.proto | 1 - .../listener/udp_listener_config.proto | 1 - api/envoy/api/v3alpha/ratelimit/BUILD | 9 +- .../api/v3alpha/ratelimit/ratelimit.proto | 1 - api/envoy/api/v3alpha/route/BUILD | 22 ++--- api/envoy/api/v3alpha/route/route.proto | 1 - api/envoy/config/accesslog/v3alpha/BUILD | 12 ++- api/envoy/config/accesslog/v3alpha/als.proto | 1 - api/envoy/config/accesslog/v3alpha/file.proto | 1 - api/envoy/config/bootstrap/v3alpha/BUILD | 32 +++---- .../config/bootstrap/v3alpha/bootstrap.proto | 1 - .../dynamic_forward_proxy/v3alpha/BUILD | 6 +- .../v3alpha/cluster.proto | 1 - .../dynamic_forward_proxy/v3alpha/BUILD | 6 +- api/envoy/config/common/tap/v3alpha/BUILD | 9 +- .../config/filter/accesslog/v3alpha/BUILD | 20 ++--- .../filter/accesslog/v3alpha/accesslog.proto | 1 - api/envoy/config/filter/fault/v3alpha/BUILD | 6 +- .../config/filter/fault/v3alpha/fault.proto | 1 - .../http/adaptive_concurrency/v3alpha/BUILD | 6 +- .../v3alpha/adaptive_concurrency.proto | 1 - .../config/filter/http/buffer/v3alpha/BUILD | 4 +- .../filter/http/buffer/v3alpha/buffer.proto | 1 - .../config/filter/http/csrf/v3alpha/BUILD | 9 +- .../filter/http/csrf/v3alpha/csrf.proto | 1 - .../http/dynamic_forward_proxy/v3alpha/BUILD | 6 +- .../v3alpha/dynamic_forward_proxy.proto | 1 - .../filter/http/ext_authz/v3alpha/BUILD | 10 ++- .../http/ext_authz/v3alpha/ext_authz.proto | 1 - .../config/filter/http/fault/v3alpha/BUILD | 10 ++- .../filter/http/fault/v3alpha/fault.proto | 1 - .../config/filter/http/gzip/v3alpha/BUILD | 4 +- .../filter/http/gzip/v3alpha/gzip.proto | 1 - .../http/header_to_metadata/v3alpha/BUILD | 5 +- .../v3alpha/header_to_metadata.proto | 1 - .../filter/http/health_check/v3alpha/BUILD | 18 ++-- .../health_check/v3alpha/health_check.proto | 1 - .../filter/http/ip_tagging/v3alpha/BUILD | 6 +- .../http/ip_tagging/v3alpha/ip_tagging.proto | 1 - .../filter/http/jwt_authn/v3alpha/BUILD | 19 ++-- .../config/filter/http/lua/v3alpha/BUILD | 4 +- .../config/filter/http/lua/v3alpha/lua.proto | 1 - .../filter/http/rate_limit/v3alpha/BUILD | 6 +- .../http/rate_limit/v3alpha/rate_limit.proto | 1 - .../config/filter/http/rbac/v3alpha/BUILD | 6 +- .../filter/http/rbac/v3alpha/rbac.proto | 1 - .../config/filter/http/router/v3alpha/BUILD | 12 ++- .../filter/http/router/v3alpha/router.proto | 1 - .../config/filter/http/squash/v3alpha/BUILD | 4 +- .../filter/http/squash/v3alpha/squash.proto | 1 - .../config/filter/http/tap/v3alpha/BUILD | 6 +- .../filter/http/transcoder/v3alpha/BUILD | 9 +- .../http/transcoder/v3alpha/transcoder.proto | 1 - .../network/client_ssl_auth/v3alpha/BUILD | 6 +- .../v3alpha/client_ssl_auth.proto | 1 - .../filter/network/ext_authz/v3alpha/BUILD | 6 +- .../network/ext_authz/v3alpha/ext_authz.proto | 1 - .../http_connection_manager/v3alpha/BUILD | 25 +++--- .../v3alpha/http_connection_manager.proto | 1 - .../filter/network/mongo_proxy/v3alpha/BUILD | 6 +- .../mongo_proxy/v3alpha/mongo_proxy.proto | 1 - .../filter/network/rate_limit/v3alpha/BUILD | 9 +- .../rate_limit/v3alpha/rate_limit.proto | 1 - .../config/filter/network/rbac/v3alpha/BUILD | 6 +- .../filter/network/rbac/v3alpha/rbac.proto | 1 - .../filter/network/redis_proxy/v3alpha/BUILD | 9 +- .../redis_proxy/v3alpha/redis_proxy.proto | 1 - .../filter/network/tcp_proxy/v3alpha/BUILD | 19 ++-- .../network/tcp_proxy/v3alpha/tcp_proxy.proto | 1 - .../config/grpc_credential/v3alpha/BUILD | 19 ++-- .../grpc_credential/v3alpha/aws_iam.proto | 1 - .../v3alpha/file_based_metadata.proto | 1 - .../config/health_checker/redis/v3alpha/BUILD | 4 +- .../health_checker/redis/v3alpha/redis.proto | 1 - api/envoy/config/metrics/v3alpha/BUILD | 26 ++---- api/envoy/config/metrics/v3alpha/stats.proto | 1 - api/envoy/config/overload/v3alpha/BUILD | 9 +- .../config/overload/v3alpha/overload.proto | 1 - api/envoy/config/ratelimit/v3alpha/BUILD | 14 ++- api/envoy/config/ratelimit/v3alpha/rls.proto | 1 - api/envoy/config/rbac/v3alpha/BUILD | 23 +++-- api/envoy/config/rbac/v3alpha/rbac.proto | 1 - .../resource_monitor/fixed_heap/v3alpha/BUILD | 4 +- .../fixed_heap/v3alpha/fixed_heap.proto | 1 - .../injected_resource/v3alpha/BUILD | 4 +- .../v3alpha/injected_resource.proto | 1 - api/envoy/config/trace/v3alpha/BUILD | 18 ++-- api/envoy/config/trace/v3alpha/trace.proto | 1 - .../transport_socket/alts/v3alpha/BUILD | 6 +- .../transport_socket/alts/v3alpha/alts.proto | 1 - .../config/transport_socket/tap/v3alpha/BUILD | 9 +- .../transport_socket/tap/v3alpha/tap.proto | 1 - api/envoy/data/accesslog/v3alpha/BUILD | 15 ++-- api/envoy/data/cluster/v3alpha/BUILD | 4 +- api/envoy/data/core/v3alpha/BUILD | 6 +- api/envoy/data/tap/v3alpha/BUILD | 6 +- api/envoy/data/tap/v3alpha/transport.proto | 1 - api/envoy/service/accesslog/v3alpha/BUILD | 19 ++-- api/envoy/service/accesslog/v3alpha/als.proto | 1 - api/envoy/service/auth/v3alpha/BUILD | 10 ++- .../service/auth/v3alpha/external_auth.proto | 1 - api/envoy/service/discovery/v3alpha/BUILD | 45 +++------- api/envoy/service/discovery/v3alpha/ads.proto | 1 - api/envoy/service/load_stats/v3alpha/BUILD | 19 ++-- .../service/load_stats/v3alpha/lrs.proto | 1 - api/envoy/service/metrics/v3alpha/BUILD | 19 ++-- .../metrics/v3alpha/metrics_service.proto | 1 - api/envoy/service/ratelimit/v3alpha/BUILD | 20 ++--- api/envoy/service/ratelimit/v3alpha/rls.proto | 1 - api/envoy/service/tap/v3alpha/BUILD | 12 ++- api/envoy/service/trace/v3alpha/BUILD | 19 ++-- .../service/trace/v3alpha/trace_service.proto | 1 - 125 files changed, 433 insertions(+), 571 deletions(-) diff --git a/api/envoy/admin/v3alpha/BUILD b/api/envoy/admin/v3alpha/BUILD index 71b0790b69a9..9849282084a6 100644 --- a/api/envoy/admin/v3alpha/BUILD +++ b/api/envoy/admin/v3alpha/BUILD @@ -1,7 +1,18 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + deps = [ + "//envoy/api/v3alpha", + "//envoy/api/v3alpha/auth", + "//envoy/api/v3alpha/core", + "//envoy/config/bootstrap/v3alpha:pkg", + "//envoy/service/tap/v3alpha:pkg", + "//envoy/type", + ], +) + api_proto_library_internal( name = "config_dump", srcs = ["config_dump.proto"], diff --git a/api/envoy/api/v2/listener/udp_listener_config.proto b/api/envoy/api/v2/listener/udp_listener_config.proto index f75383bab232..28d8233f5ff0 100644 --- a/api/envoy/api/v2/listener/udp_listener_config.proto +++ b/api/envoy/api/v2/listener/udp_listener_config.proto @@ -5,7 +5,6 @@ package envoy.api.v2.listener; option java_outer_classname = "UdpListenerConfigProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v2.listener"; -option go_package = "listener"; option csharp_namespace = "Envoy.Api.V2.ListenerNS"; option ruby_package = "Envoy::Api::V2::ListenerNS"; diff --git a/api/envoy/api/v3alpha/BUILD b/api/envoy/api/v3alpha/BUILD index 0e2892e87e69..e61a715ab9de 100644 --- a/api/envoy/api/v3alpha/BUILD +++ b/api/envoy/api/v3alpha/BUILD @@ -1,4 +1,4 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 @@ -16,6 +16,21 @@ package_group( ], ) +api_proto_package( + name = "v3alpha", + has_services = True, + deps = [ + "//envoy/api/v3alpha/auth", + "//envoy/api/v3alpha/cluster", + "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/endpoint:pkg", + "//envoy/api/v3alpha/listener:pkg", + "//envoy/api/v3alpha/ratelimit:pkg", + "//envoy/api/v3alpha/route:pkg", + "//envoy/type", + ], +) + api_proto_library_internal( name = "discovery", srcs = ["discovery.proto"], @@ -23,12 +38,6 @@ api_proto_library_internal( deps = ["//envoy/api/v3alpha/core:base"], ) -api_go_proto_library( - name = "discovery", - proto = ":discovery", - deps = ["//envoy/api/v3alpha/core:base_go_proto"], -) - api_proto_library_internal( name = "eds", srcs = ["eds.proto"], @@ -44,19 +53,6 @@ api_proto_library_internal( ], ) -api_go_grpc_library( - name = "eds", - proto = ":eds", - deps = [ - ":discovery_go_proto", - "//envoy/api/v3alpha/core:address_go_proto", - "//envoy/api/v3alpha/core:base_go_proto", - "//envoy/api/v3alpha/core:health_check_go_proto", - "//envoy/api/v3alpha/endpoint:endpoint_go_proto", - "//envoy/type:percent_go_proto", - ], -) - api_proto_library_internal( name = "cds", srcs = ["cds.proto"], @@ -79,26 +75,6 @@ api_proto_library_internal( ], ) -api_go_grpc_library( - name = "cds", - proto = ":cds", - deps = [ - ":discovery_go_proto", - ":eds_go_grpc", - "//envoy/api/v3alpha/auth:cert_go_proto", - "//envoy/api/v3alpha/cluster:circuit_breaker_go_proto", - "//envoy/api/v3alpha/cluster:filter_go_proto", - "//envoy/api/v3alpha/cluster:outlier_detection_go_proto", - "//envoy/api/v3alpha/core:address_go_proto", - "//envoy/api/v3alpha/core:base_go_proto", - "//envoy/api/v3alpha/core:config_source_go_proto", - "//envoy/api/v3alpha/core:health_check_go_proto", - "//envoy/api/v3alpha/core:protocol_go_proto", - "//envoy/api/v3alpha/endpoint:endpoint_go_proto", - "//envoy/type:percent_go_proto", - ], -) - api_proto_library_internal( name = "lds", srcs = ["lds.proto"], @@ -113,18 +89,6 @@ api_proto_library_internal( ], ) -api_go_grpc_library( - name = "lds", - proto = ":lds", - deps = [ - ":discovery_go_proto", - "//envoy/api/v3alpha/core:address_go_proto", - "//envoy/api/v3alpha/core:base_go_proto", - "//envoy/api/v3alpha/listener:listener_go_proto", - "//envoy/api/v3alpha/listener:udp_listener_config_go_proto", - ], -) - api_proto_library_internal( name = "rds", srcs = ["rds.proto"], @@ -138,17 +102,6 @@ api_proto_library_internal( ], ) -api_go_grpc_library( - name = "rds", - proto = ":rds", - deps = [ - ":discovery_go_proto", - "//envoy/api/v3alpha/core:base_go_proto", - "//envoy/api/v3alpha/core:config_source_go_proto", - "//envoy/api/v3alpha/route:route_go_proto", - ], -) - api_proto_library_internal( name = "srds", srcs = ["srds.proto"], @@ -160,12 +113,3 @@ api_proto_library_internal( "//envoy/api/v3alpha/route", ], ) - -api_go_grpc_library( - name = "srds", - proto = ":srds", - deps = [ - ":discovery_go_proto", - "//envoy/api/v3alpha/core:base_go_proto", - ], -) diff --git a/api/envoy/api/v3alpha/auth/BUILD b/api/envoy/api/v3alpha/auth/BUILD index f206a35f97f2..6c47aff6e2a3 100644 --- a/api/envoy/api/v3alpha/auth/BUILD +++ b/api/envoy/api/v3alpha/auth/BUILD @@ -1,4 +1,4 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 @@ -15,6 +15,13 @@ package_group( ], ) +api_proto_package( + name = "auth", + deps = [ + "//envoy/api/v3alpha/core", + ], +) + api_proto_library_internal( name = "cert", srcs = ["cert.proto"], @@ -24,12 +31,3 @@ api_proto_library_internal( "//envoy/api/v3alpha/core:config_source", ], ) - -api_go_proto_library( - name = "cert", - proto = ":cert", - deps = [ - "//envoy/api/v3alpha/core:base_go_proto", - "//envoy/api/v3alpha/core:config_source_go_proto", - ], -) diff --git a/api/envoy/api/v3alpha/auth/cert.proto b/api/envoy/api/v3alpha/auth/cert.proto index 925453074ac1..2be82a1c0496 100644 --- a/api/envoy/api/v3alpha/auth/cert.proto +++ b/api/envoy/api/v3alpha/auth/cert.proto @@ -5,7 +5,6 @@ package envoy.api.v3alpha.auth; option java_outer_classname = "CertProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v3alpha.auth"; -option go_package = "auth"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/api/v3alpha/core/config_source.proto"; diff --git a/api/envoy/api/v3alpha/cluster/BUILD b/api/envoy/api/v3alpha/cluster/BUILD index 942701221a37..ef01624057e0 100644 --- a/api/envoy/api/v3alpha/cluster/BUILD +++ b/api/envoy/api/v3alpha/cluster/BUILD @@ -1,7 +1,14 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], @@ -13,14 +20,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "circuit_breaker", - proto = ":circuit_breaker", - deps = [ - "//envoy/api/v3alpha/core:base_go_proto", - ], -) - api_proto_library_internal( name = "outlier_detection", srcs = ["outlier_detection.proto"], @@ -29,11 +28,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "outlier_detection", - proto = ":outlier_detection", -) - api_proto_library_internal( name = "filter", srcs = ["filter.proto"], @@ -41,8 +35,3 @@ api_proto_library_internal( "//envoy/api/v3alpha:__pkg__", ], ) - -api_go_proto_library( - name = "filter", - proto = ":filter", -) diff --git a/api/envoy/api/v3alpha/cluster/circuit_breaker.proto b/api/envoy/api/v3alpha/cluster/circuit_breaker.proto index 39f4f77c5ddd..8a70008e49f5 100644 --- a/api/envoy/api/v3alpha/cluster/circuit_breaker.proto +++ b/api/envoy/api/v3alpha/cluster/circuit_breaker.proto @@ -5,7 +5,6 @@ package envoy.api.v3alpha.cluster; option java_outer_classname = "CircuitBreakerProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v3alpha.cluster"; -option go_package = "cluster"; option csharp_namespace = "Envoy.Api.V2.ClusterNS"; option ruby_package = "Envoy.Api.V2.ClusterNS"; diff --git a/api/envoy/api/v3alpha/core/BUILD b/api/envoy/api/v3alpha/core/BUILD index cfc6bd83ca78..871c9fe0e838 100644 --- a/api/envoy/api/v3alpha/core/BUILD +++ b/api/envoy/api/v3alpha/core/BUILD @@ -1,4 +1,4 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 @@ -16,6 +16,13 @@ package_group( ], ) +api_proto_package( + name = "core", + deps = [ + "//envoy/type", + ], +) + api_proto_library_internal( name = "address", srcs = ["address.proto"], @@ -25,12 +32,6 @@ api_proto_library_internal( deps = [":base"], ) -api_go_proto_library( - name = "address", - proto = ":address", - deps = [":base_go_proto"], -) - api_proto_library_internal( name = "base", srcs = ["base.proto"], @@ -43,15 +44,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "base", - proto = ":base", - deps = [ - ":http_uri_go_proto", - "//envoy/type:percent_go_proto", - ], -) - api_proto_library_internal( name = "health_check", srcs = ["health_check.proto"], @@ -64,15 +56,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "health_check", - proto = ":health_check", - deps = [ - ":base_go_proto", - "//envoy/type:range_go_proto", - ], -) - api_proto_library_internal( name = "config_source", srcs = ["config_source.proto"], @@ -85,20 +68,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "config_source", - proto = ":config_source", - deps = [ - ":base_go_proto", - ":grpc_service_go_proto", - ], -) - -api_go_proto_library( - name = "http_uri", - proto = ":http_uri", -) - api_proto_library_internal( name = "http_uri", srcs = ["http_uri.proto"], @@ -116,12 +85,6 @@ api_proto_library_internal( deps = [":base"], ) -api_go_proto_library( - name = "grpc_service", - proto = ":grpc_service", - deps = [":base_go_proto"], -) - api_proto_library_internal( name = "protocol", srcs = ["protocol.proto"], @@ -129,8 +92,3 @@ api_proto_library_internal( ":friends", ], ) - -api_go_proto_library( - name = "protocol", - proto = ":protocol", -) diff --git a/api/envoy/api/v3alpha/core/base.proto b/api/envoy/api/v3alpha/core/base.proto index 0661d99ec546..cf39df887bce 100644 --- a/api/envoy/api/v3alpha/core/base.proto +++ b/api/envoy/api/v3alpha/core/base.proto @@ -5,7 +5,6 @@ package envoy.api.v3alpha.core; option java_outer_classname = "BaseProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v3alpha.core"; -option go_package = "core"; import "envoy/api/v3alpha/core/http_uri.proto"; diff --git a/api/envoy/api/v3alpha/discovery.proto b/api/envoy/api/v3alpha/discovery.proto index 87433f0dca27..105b99888141 100644 --- a/api/envoy/api/v3alpha/discovery.proto +++ b/api/envoy/api/v3alpha/discovery.proto @@ -5,7 +5,6 @@ package envoy.api.v3alpha; option java_outer_classname = "DiscoveryProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/api/envoy/api/v3alpha/endpoint/BUILD b/api/envoy/api/v3alpha/endpoint/BUILD index 1630438b13f6..733560514dbd 100644 --- a/api/envoy/api/v3alpha/endpoint/BUILD +++ b/api/envoy/api/v3alpha/endpoint/BUILD @@ -1,7 +1,14 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], @@ -16,19 +23,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "endpoint", - proto = ":endpoint", - deps = [ - "//envoy/api/v3alpha/auth:cert_go_proto", - "//envoy/api/v3alpha/core:address_go_proto", - "//envoy/api/v3alpha/core:base_go_proto", - "//envoy/api/v3alpha/core:config_source_go_proto", - "//envoy/api/v3alpha/core:health_check_go_proto", - "//envoy/api/v3alpha/core:protocol_go_proto", - ], -) - api_proto_library_internal( name = "load_report", srcs = ["load_report.proto"], @@ -38,12 +32,3 @@ api_proto_library_internal( "//envoy/api/v3alpha/core:base", ], ) - -api_go_proto_library( - name = "load_report", - proto = ":load_report", - deps = [ - "//envoy/api/v3alpha/core:address_go_proto", - "//envoy/api/v3alpha/core:base_go_proto", - ], -) diff --git a/api/envoy/api/v3alpha/endpoint/endpoint.proto b/api/envoy/api/v3alpha/endpoint/endpoint.proto index 4bb1b57e8710..15357cdbac8b 100644 --- a/api/envoy/api/v3alpha/endpoint/endpoint.proto +++ b/api/envoy/api/v3alpha/endpoint/endpoint.proto @@ -5,7 +5,6 @@ package envoy.api.v3alpha.endpoint; option java_outer_classname = "EndpointProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v3alpha.endpoint"; -option go_package = "endpoint"; import "envoy/api/v3alpha/core/address.proto"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/api/envoy/api/v3alpha/listener/BUILD b/api/envoy/api/v3alpha/listener/BUILD index 693ead54dde0..3ee071ca5c03 100644 --- a/api/envoy/api/v3alpha/listener/BUILD +++ b/api/envoy/api/v3alpha/listener/BUILD @@ -1,7 +1,14 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + deps = [ + "//envoy/api/v3alpha/auth", + "//envoy/api/v3alpha/core", + ], +) + api_proto_library_internal( name = "listener", srcs = ["listener.proto"], @@ -13,16 +20,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "listener", - proto = ":listener", - deps = [ - "//envoy/api/v3alpha/auth:cert_go_proto", - "//envoy/api/v3alpha/core:address_go_proto", - "//envoy/api/v3alpha/core:base_go_proto", - ], -) - api_proto_library_internal( name = "udp_listener_config", srcs = ["udp_listener_config.proto"], @@ -31,11 +28,3 @@ api_proto_library_internal( "//envoy/api/v3alpha/core:base", ], ) - -api_go_proto_library( - name = "udp_listener_config", - proto = ":udp_listener_config", - deps = [ - "//envoy/api/v3alpha/core:base_go_proto", - ], -) diff --git a/api/envoy/api/v3alpha/listener/listener.proto b/api/envoy/api/v3alpha/listener/listener.proto index 2aa7146a822c..dc44c1454c02 100644 --- a/api/envoy/api/v3alpha/listener/listener.proto +++ b/api/envoy/api/v3alpha/listener/listener.proto @@ -5,7 +5,6 @@ package envoy.api.v3alpha.listener; option java_outer_classname = "ListenerProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v3alpha.listener"; -option go_package = "listener"; option csharp_namespace = "Envoy.Api.V2.ListenerNS"; option ruby_package = "Envoy::Api::V2::ListenerNS"; diff --git a/api/envoy/api/v3alpha/listener/udp_listener_config.proto b/api/envoy/api/v3alpha/listener/udp_listener_config.proto index 763a08a93ad3..532028da9f73 100644 --- a/api/envoy/api/v3alpha/listener/udp_listener_config.proto +++ b/api/envoy/api/v3alpha/listener/udp_listener_config.proto @@ -5,7 +5,6 @@ package envoy.api.v3alpha.listener; option java_outer_classname = "UdpListenerConfigProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v3alpha.listener"; -option go_package = "listener"; option csharp_namespace = "Envoy.Api.V2.ListenerNS"; option ruby_package = "Envoy::Api::V2::ListenerNS"; diff --git a/api/envoy/api/v3alpha/ratelimit/BUILD b/api/envoy/api/v3alpha/ratelimit/BUILD index b08c1fc029a0..a99624b1c421 100644 --- a/api/envoy/api/v3alpha/ratelimit/BUILD +++ b/api/envoy/api/v3alpha/ratelimit/BUILD @@ -1,14 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package() + api_proto_library_internal( name = "ratelimit", srcs = ["ratelimit.proto"], visibility = ["//envoy/api/v3alpha:friends"], ) - -api_go_proto_library( - name = "ratelimit", - proto = ":ratelimit", -) diff --git a/api/envoy/api/v3alpha/ratelimit/ratelimit.proto b/api/envoy/api/v3alpha/ratelimit/ratelimit.proto index c10bfef83b98..9f2b67818a02 100644 --- a/api/envoy/api/v3alpha/ratelimit/ratelimit.proto +++ b/api/envoy/api/v3alpha/ratelimit/ratelimit.proto @@ -5,7 +5,6 @@ package envoy.api.v3alpha.ratelimit; option java_outer_classname = "RatelimitProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v3alpha.ratelimit"; -option go_package = "ratelimit"; import "validate/validate.proto"; diff --git a/api/envoy/api/v3alpha/route/BUILD b/api/envoy/api/v3alpha/route/BUILD index 0b660893c5d4..cbed3ec01f4b 100644 --- a/api/envoy/api/v3alpha/route/BUILD +++ b/api/envoy/api/v3alpha/route/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], @@ -14,15 +22,3 @@ api_proto_library_internal( "//envoy/type/matcher:string", ], ) - -api_go_proto_library( - name = "route", - proto = ":route", - deps = [ - "//envoy/api/v3alpha/core:base_go_proto", - "//envoy/type:percent_go_proto", - "//envoy/type:range_go_proto", - "//envoy/type/matcher:regex_go_proto", - "//envoy/type/matcher:string_go_proto", - ], -) diff --git a/api/envoy/api/v3alpha/route/route.proto b/api/envoy/api/v3alpha/route/route.proto index 963d94f1b022..e69e116b9b63 100644 --- a/api/envoy/api/v3alpha/route/route.proto +++ b/api/envoy/api/v3alpha/route/route.proto @@ -5,7 +5,6 @@ package envoy.api.v3alpha.route; option java_outer_classname = "RouteProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v3alpha.route"; -option go_package = "route"; option java_generic_services = true; import "envoy/api/v3alpha/core/base.proto"; diff --git a/api/envoy/config/accesslog/v3alpha/BUILD b/api/envoy/config/accesslog/v3alpha/BUILD index 4f5da73ee424..8409598da650 100644 --- a/api/envoy/config/accesslog/v3alpha/BUILD +++ b/api/envoy/config/accesslog/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + deps = ["//envoy/api/v3alpha/core"], +) + api_proto_library_internal( name = "als", srcs = ["als.proto"], @@ -14,9 +18,3 @@ api_proto_library_internal( name = "file", srcs = ["file.proto"], ) - -api_go_proto_library( - name = "als", - proto = ":als", - deps = ["//envoy/api/v3alpha/core:grpc_service_go_proto"], -) diff --git a/api/envoy/config/accesslog/v3alpha/als.proto b/api/envoy/config/accesslog/v3alpha/als.proto index a194d1449e4b..07ec724d10ef 100644 --- a/api/envoy/config/accesslog/v3alpha/als.proto +++ b/api/envoy/config/accesslog/v3alpha/als.proto @@ -5,7 +5,6 @@ package envoy.config.accesslog.v3alpha; option java_outer_classname = "AlsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.accesslog.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/core/grpc_service.proto"; diff --git a/api/envoy/config/accesslog/v3alpha/file.proto b/api/envoy/config/accesslog/v3alpha/file.proto index b07658bc9275..2f32da7bb64f 100644 --- a/api/envoy/config/accesslog/v3alpha/file.proto +++ b/api/envoy/config/accesslog/v3alpha/file.proto @@ -5,7 +5,6 @@ package envoy.config.accesslog.v3alpha; option java_outer_classname = "FileProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.accesslog.v3alpha"; -option go_package = "v2"; import "validate/validate.proto"; import "google/protobuf/struct.proto"; diff --git a/api/envoy/config/bootstrap/v3alpha/BUILD b/api/envoy/config/bootstrap/v3alpha/BUILD index d148021c741a..c88b982492ce 100644 --- a/api/envoy/config/bootstrap/v3alpha/BUILD +++ b/api/envoy/config/bootstrap/v3alpha/BUILD @@ -1,7 +1,19 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + deps = [ + "//envoy/api/v3alpha", + "//envoy/api/v3alpha/auth", + "//envoy/api/v3alpha/core", + "//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"], @@ -20,21 +32,3 @@ api_proto_library_internal( "//envoy/config/trace/v3alpha:trace", ], ) - -api_go_proto_library( - name = "bootstrap", - proto = ":bootstrap", - deps = [ - "//envoy/api/v3alpha:cds_go_grpc", - "//envoy/api/v3alpha:lds_go_grpc", - "//envoy/api/v3alpha/auth:cert_go_proto", - "//envoy/api/v3alpha/core:address_go_proto", - "//envoy/api/v3alpha/core:base_go_proto", - "//envoy/api/v3alpha/core:config_source_go_proto", - "//envoy/config/metrics/v3alpha:metrics_service_go_proto", - "//envoy/config/metrics/v3alpha:stats_go_proto", - "//envoy/config/overload/v3alpha:overload_go_proto", - "//envoy/config/ratelimit/v3alpha:rls_go_grpc", - "//envoy/config/trace/v3alpha:trace_go_proto", - ], -) diff --git a/api/envoy/config/bootstrap/v3alpha/bootstrap.proto b/api/envoy/config/bootstrap/v3alpha/bootstrap.proto index 57157a4ae3f3..0bf18ffa360d 100644 --- a/api/envoy/config/bootstrap/v3alpha/bootstrap.proto +++ b/api/envoy/config/bootstrap/v3alpha/bootstrap.proto @@ -10,7 +10,6 @@ package envoy.config.bootstrap.v3alpha; option java_outer_classname = "BootstrapProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.bootstrap.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/core/address.proto"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/api/envoy/config/cluster/dynamic_forward_proxy/v3alpha/BUILD b/api/envoy/config/cluster/dynamic_forward_proxy/v3alpha/BUILD index 50d0aa2354eb..3c1d737802cb 100644 --- a/api/envoy/config/cluster/dynamic_forward_proxy/v3alpha/BUILD +++ b/api/envoy/config/cluster/dynamic_forward_proxy/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], diff --git a/api/envoy/config/cluster/dynamic_forward_proxy/v3alpha/cluster.proto b/api/envoy/config/cluster/dynamic_forward_proxy/v3alpha/cluster.proto index baed68d3b1ac..6bc7bdd4c551 100644 --- a/api/envoy/config/cluster/dynamic_forward_proxy/v3alpha/cluster.proto +++ b/api/envoy/config/cluster/dynamic_forward_proxy/v3alpha/cluster.proto @@ -5,7 +5,6 @@ package envoy.config.cluster.dynamic_forward_proxy.v3alpha; option java_outer_classname = "DynamicForwardProxyClusterProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.cluster.dynamic_forward_proxy.v3alpha"; -option go_package = "v2alpha"; import "envoy/config/common/dynamic_forward_proxy/v3alpha/dns_cache.proto"; diff --git a/api/envoy/config/common/dynamic_forward_proxy/v3alpha/BUILD b/api/envoy/config/common/dynamic_forward_proxy/v3alpha/BUILD index bdd23e86de9f..e1853725da14 100644 --- a/api/envoy/config/common/dynamic_forward_proxy/v3alpha/BUILD +++ b/api/envoy/config/common/dynamic_forward_proxy/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], diff --git a/api/envoy/config/common/tap/v3alpha/BUILD b/api/envoy/config/common/tap/v3alpha/BUILD index 673a602800af..55147b12ba3d 100644 --- a/api/envoy/config/common/tap/v3alpha/BUILD +++ b/api/envoy/config/common/tap/v3alpha/BUILD @@ -1,7 +1,14 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + deps = [ + "//envoy/api/v3alpha/core", + "//envoy/service/tap/v3alpha:pkg", + ], +) + api_proto_library_internal( name = "common", srcs = ["common.proto"], diff --git a/api/envoy/config/filter/accesslog/v3alpha/BUILD b/api/envoy/config/filter/accesslog/v3alpha/BUILD index 3f241bc5e10b..454a1ab4a135 100644 --- a/api/envoy/config/filter/accesslog/v3alpha/BUILD +++ b/api/envoy/config/filter/accesslog/v3alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + deps = [ + "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/route:pkg", + "//envoy/type", + ], +) + api_proto_library_internal( name = "accesslog", srcs = ["accesslog.proto"], @@ -16,13 +24,3 @@ api_proto_library_internal( "//envoy/type:percent", ], ) - -api_go_proto_library( - name = "accesslog", - proto = ":accesslog", - deps = [ - "//envoy/api/v3alpha/core:base_go_proto", - "//envoy/api/v3alpha/route:route_go_proto", - "//envoy/type:percent_go_proto", - ], -) diff --git a/api/envoy/config/filter/accesslog/v3alpha/accesslog.proto b/api/envoy/config/filter/accesslog/v3alpha/accesslog.proto index 381e7bdf9a87..b7beef0bd974 100644 --- a/api/envoy/config/filter/accesslog/v3alpha/accesslog.proto +++ b/api/envoy/config/filter/accesslog/v3alpha/accesslog.proto @@ -5,7 +5,6 @@ package envoy.config.filter.accesslog.v3alpha; option java_outer_classname = "AccesslogProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.accesslog.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/api/v3alpha/route/route.proto"; diff --git a/api/envoy/config/filter/fault/v3alpha/BUILD b/api/envoy/config/filter/fault/v3alpha/BUILD index 22e3bec56ca3..61bc8dc6bc5e 100644 --- a/api/envoy/config/filter/fault/v3alpha/BUILD +++ b/api/envoy/config/filter/fault/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + deps = ["//envoy/type"], +) + api_proto_library_internal( name = "fault", srcs = ["fault.proto"], diff --git a/api/envoy/config/filter/fault/v3alpha/fault.proto b/api/envoy/config/filter/fault/v3alpha/fault.proto index b54a063e7665..054eb8470f3a 100644 --- a/api/envoy/config/filter/fault/v3alpha/fault.proto +++ b/api/envoy/config/filter/fault/v3alpha/fault.proto @@ -5,7 +5,6 @@ package envoy.config.filter.fault.v3alpha; option java_outer_classname = "FaultProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.fault.v3alpha"; -option go_package = "v2"; import "envoy/type/percent.proto"; diff --git a/api/envoy/config/filter/http/adaptive_concurrency/v3alpha/BUILD b/api/envoy/config/filter/http/adaptive_concurrency/v3alpha/BUILD index aa2b0634739c..f9813a6a0829 100644 --- a/api/envoy/config/filter/http/adaptive_concurrency/v3alpha/BUILD +++ b/api/envoy/config/filter/http/adaptive_concurrency/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + deps = ["//envoy/api/v3alpha/core"], +) + api_proto_library_internal( name = "adaptive_concurrency", srcs = ["adaptive_concurrency.proto"], diff --git a/api/envoy/config/filter/http/adaptive_concurrency/v3alpha/adaptive_concurrency.proto b/api/envoy/config/filter/http/adaptive_concurrency/v3alpha/adaptive_concurrency.proto index 17bac55800ce..3d57196f9db7 100644 --- a/api/envoy/config/filter/http/adaptive_concurrency/v3alpha/adaptive_concurrency.proto +++ b/api/envoy/config/filter/http/adaptive_concurrency/v3alpha/adaptive_concurrency.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.adaptive_concurrency.v3alpha; option java_package = "io.envoyproxy.envoy.config.filter.http.adaptive_concurrency.v3alpha"; option java_outer_classname = "AdaptiveConcurrencyProto"; option java_multiple_files = true; -option go_package = "v2alpha"; message AdaptiveConcurrency { } diff --git a/api/envoy/config/filter/http/buffer/v3alpha/BUILD b/api/envoy/config/filter/http/buffer/v3alpha/BUILD index e59429af9ace..039ebb63e6d2 100644 --- a/api/envoy/config/filter/http/buffer/v3alpha/BUILD +++ b/api/envoy/config/filter/http/buffer/v3alpha/BUILD @@ -1,7 +1,9 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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/buffer.proto b/api/envoy/config/filter/http/buffer/v3alpha/buffer.proto index a948493b2450..25530c5a58b4 100644 --- a/api/envoy/config/filter/http/buffer/v3alpha/buffer.proto +++ b/api/envoy/config/filter/http/buffer/v3alpha/buffer.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.buffer.v3alpha; option java_outer_classname = "BufferProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.buffer.v3alpha"; -option go_package = "v2"; import "google/protobuf/wrappers.proto"; diff --git a/api/envoy/config/filter/http/csrf/v3alpha/BUILD b/api/envoy/config/filter/http/csrf/v3alpha/BUILD index b5da684c54b4..676559830c1f 100644 --- a/api/envoy/config/filter/http/csrf/v3alpha/BUILD +++ b/api/envoy/config/filter/http/csrf/v3alpha/BUILD @@ -1,7 +1,14 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], diff --git a/api/envoy/config/filter/http/csrf/v3alpha/csrf.proto b/api/envoy/config/filter/http/csrf/v3alpha/csrf.proto index 5eaa14c567d7..8fe68d5ea2ef 100644 --- a/api/envoy/config/filter/http/csrf/v3alpha/csrf.proto +++ b/api/envoy/config/filter/http/csrf/v3alpha/csrf.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.csrf.v3alpha; option java_outer_classname = "CsrfPolicyProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.csrf.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/type/matcher/string.proto"; 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 f09166ba8129..c06227674a08 100644 --- a/api/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/BUILD +++ b/api/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], diff --git a/api/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/dynamic_forward_proxy.proto b/api/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/dynamic_forward_proxy.proto index 0fab44d63db5..f60aaae89e2e 100644 --- a/api/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/dynamic_forward_proxy.proto +++ b/api/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/dynamic_forward_proxy.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.dynamic_forward_proxy.v3alpha; option java_outer_classname = "DynamicForwardProxyProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.dynamic_forward_proxy.v3alpha"; -option go_package = "v2alpha"; import "envoy/config/common/dynamic_forward_proxy/v3alpha/dns_cache.proto"; diff --git a/api/envoy/config/filter/http/ext_authz/v3alpha/BUILD b/api/envoy/config/filter/http/ext_authz/v3alpha/BUILD index 39f9e44bb382..cb0d25a3eebf 100644 --- a/api/envoy/config/filter/http/ext_authz/v3alpha/BUILD +++ b/api/envoy/config/filter/http/ext_authz/v3alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], diff --git a/api/envoy/config/filter/http/ext_authz/v3alpha/ext_authz.proto b/api/envoy/config/filter/http/ext_authz/v3alpha/ext_authz.proto index af6f3c4866e5..8cc48e36ffb0 100644 --- a/api/envoy/config/filter/http/ext_authz/v3alpha/ext_authz.proto +++ b/api/envoy/config/filter/http/ext_authz/v3alpha/ext_authz.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.ext_authz.v3alpha; option java_outer_classname = "ExtAuthzProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.ext_authz.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/api/v3alpha/core/grpc_service.proto"; diff --git a/api/envoy/config/filter/http/fault/v3alpha/BUILD b/api/envoy/config/filter/http/fault/v3alpha/BUILD index 1fd5632c088d..508e2d3c92d2 100644 --- a/api/envoy/config/filter/http/fault/v3alpha/BUILD +++ b/api/envoy/config/filter/http/fault/v3alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +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"], diff --git a/api/envoy/config/filter/http/fault/v3alpha/fault.proto b/api/envoy/config/filter/http/fault/v3alpha/fault.proto index f654ec17f617..2189e4a4c131 100644 --- a/api/envoy/config/filter/http/fault/v3alpha/fault.proto +++ b/api/envoy/config/filter/http/fault/v3alpha/fault.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.fault.v3alpha; option java_outer_classname = "FaultProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.fault.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/route/route.proto"; import "envoy/config/filter/fault/v3alpha/fault.proto"; diff --git a/api/envoy/config/filter/http/gzip/v3alpha/BUILD b/api/envoy/config/filter/http/gzip/v3alpha/BUILD index e34d73c51c21..a3f4b0af2a44 100644 --- a/api/envoy/config/filter/http/gzip/v3alpha/BUILD +++ b/api/envoy/config/filter/http/gzip/v3alpha/BUILD @@ -1,7 +1,9 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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/gzip.proto b/api/envoy/config/filter/http/gzip/v3alpha/gzip.proto index 5b5c6d6d1df7..d7afb89116c2 100644 --- a/api/envoy/config/filter/http/gzip/v3alpha/gzip.proto +++ b/api/envoy/config/filter/http/gzip/v3alpha/gzip.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.gzip.v3alpha; option java_outer_classname = "GzipProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.gzip.v3alpha"; -option go_package = "v2"; import "google/protobuf/wrappers.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 3f8503acbe65..cfd34fcf2b08 100644 --- a/api/envoy/config/filter/http/header_to_metadata/v3alpha/BUILD +++ b/api/envoy/config/filter/http/header_to_metadata/v3alpha/BUILD @@ -1,9 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package() + api_proto_library_internal( name = "header_to_metadata", srcs = ["header_to_metadata.proto"], - deps = [], ) diff --git a/api/envoy/config/filter/http/header_to_metadata/v3alpha/header_to_metadata.proto b/api/envoy/config/filter/http/header_to_metadata/v3alpha/header_to_metadata.proto index 927574a5a721..c3811a00577a 100644 --- a/api/envoy/config/filter/http/header_to_metadata/v3alpha/header_to_metadata.proto +++ b/api/envoy/config/filter/http/header_to_metadata/v3alpha/header_to_metadata.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.header_to_metadata.v3alpha; option java_outer_classname = "HeaderToMetadataProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.header_to_metadata.v3alpha"; -option go_package = "v2"; import "validate/validate.proto"; diff --git a/api/envoy/config/filter/http/health_check/v3alpha/BUILD b/api/envoy/config/filter/http/health_check/v3alpha/BUILD index 89e6eb3af702..b583685750da 100644 --- a/api/envoy/config/filter/http/health_check/v3alpha/BUILD +++ b/api/envoy/config/filter/http/health_check/v3alpha/BUILD @@ -1,21 +1,19 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 -api_proto_library_internal( - name = "health_check", - srcs = ["health_check.proto"], +api_proto_package( deps = [ - "//envoy/api/v3alpha/route", - "//envoy/type:percent", + "//envoy/api/v3alpha/route:pkg", + "//envoy/type", ], ) -api_go_proto_library( +api_proto_library_internal( name = "health_check", - proto = ":health_check", + srcs = ["health_check.proto"], deps = [ - "//envoy/api/v3alpha/route:route_go_proto", - "//envoy/type:percent_go_proto", + "//envoy/api/v3alpha/route", + "//envoy/type:percent", ], ) diff --git a/api/envoy/config/filter/http/health_check/v3alpha/health_check.proto b/api/envoy/config/filter/http/health_check/v3alpha/health_check.proto index 31fcdfffaa80..ecbb8e507851 100644 --- a/api/envoy/config/filter/http/health_check/v3alpha/health_check.proto +++ b/api/envoy/config/filter/http/health_check/v3alpha/health_check.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.health_check.v3alpha; option java_outer_classname = "HealthCheckProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.health_check.v3alpha"; -option go_package = "v2"; import "google/protobuf/duration.proto"; import "google/protobuf/wrappers.proto"; diff --git a/api/envoy/config/filter/http/ip_tagging/v3alpha/BUILD b/api/envoy/config/filter/http/ip_tagging/v3alpha/BUILD index 5b34fcd9c458..a05f0fd96bb0 100644 --- a/api/envoy/config/filter/http/ip_tagging/v3alpha/BUILD +++ b/api/envoy/config/filter/http/ip_tagging/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], diff --git a/api/envoy/config/filter/http/ip_tagging/v3alpha/ip_tagging.proto b/api/envoy/config/filter/http/ip_tagging/v3alpha/ip_tagging.proto index e305800a5fc8..de7871d9e701 100644 --- a/api/envoy/config/filter/http/ip_tagging/v3alpha/ip_tagging.proto +++ b/api/envoy/config/filter/http/ip_tagging/v3alpha/ip_tagging.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.ip_tagging.v3alpha; option java_outer_classname = "IpTaggingProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.ip_tagging.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/core/address.proto"; diff --git a/api/envoy/config/filter/http/jwt_authn/v3alpha/BUILD b/api/envoy/config/filter/http/jwt_authn/v3alpha/BUILD index 2970da93f467..ea5d0d17b16a 100644 --- a/api/envoy/config/filter/http/jwt_authn/v3alpha/BUILD +++ b/api/envoy/config/filter/http/jwt_authn/v3alpha/BUILD @@ -1,6 +1,13 @@ licenses(["notice"]) # Apache 2 -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") + +api_proto_package( + deps = [ + "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/route:pkg", + ], +) api_proto_library_internal( name = "jwt_authn", @@ -11,13 +18,3 @@ api_proto_library_internal( "//envoy/api/v3alpha/route", ], ) - -api_go_proto_library( - name = "jwt_authn", - proto = ":jwt_authn", - deps = [ - "//envoy/api/v3alpha/core:base_go_proto", - "//envoy/api/v3alpha/core:http_uri_go_proto", - "//envoy/api/v3alpha/route:route_go_proto", - ], -) diff --git a/api/envoy/config/filter/http/lua/v3alpha/BUILD b/api/envoy/config/filter/http/lua/v3alpha/BUILD index 6daf0c82f174..7aaf74617c96 100644 --- a/api/envoy/config/filter/http/lua/v3alpha/BUILD +++ b/api/envoy/config/filter/http/lua/v3alpha/BUILD @@ -1,7 +1,9 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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/lua.proto b/api/envoy/config/filter/http/lua/v3alpha/lua.proto index ff586ca2429e..934a592678a4 100644 --- a/api/envoy/config/filter/http/lua/v3alpha/lua.proto +++ b/api/envoy/config/filter/http/lua/v3alpha/lua.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.lua.v3alpha; option java_outer_classname = "LuaProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.lua.v3alpha"; -option go_package = "v2"; import "validate/validate.proto"; diff --git a/api/envoy/config/filter/http/rate_limit/v3alpha/BUILD b/api/envoy/config/filter/http/rate_limit/v3alpha/BUILD index e131d3a92263..7060f7e9ce38 100644 --- a/api/envoy/config/filter/http/rate_limit/v3alpha/BUILD +++ b/api/envoy/config/filter/http/rate_limit/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], diff --git a/api/envoy/config/filter/http/rate_limit/v3alpha/rate_limit.proto b/api/envoy/config/filter/http/rate_limit/v3alpha/rate_limit.proto index 69e8d389bc4b..427d22a6c1c6 100644 --- a/api/envoy/config/filter/http/rate_limit/v3alpha/rate_limit.proto +++ b/api/envoy/config/filter/http/rate_limit/v3alpha/rate_limit.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.rate_limit.v3alpha; option java_outer_classname = "RateLimitProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.rate_limit.v3alpha"; -option go_package = "v2"; import "envoy/config/ratelimit/v3alpha/rls.proto"; diff --git a/api/envoy/config/filter/http/rbac/v3alpha/BUILD b/api/envoy/config/filter/http/rbac/v3alpha/BUILD index a6ee42cf7893..1e4d51b50453 100644 --- a/api/envoy/config/filter/http/rbac/v3alpha/BUILD +++ b/api/envoy/config/filter/http/rbac/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], diff --git a/api/envoy/config/filter/http/rbac/v3alpha/rbac.proto b/api/envoy/config/filter/http/rbac/v3alpha/rbac.proto index 8ec8989652aa..47160ffa9e3c 100644 --- a/api/envoy/config/filter/http/rbac/v3alpha/rbac.proto +++ b/api/envoy/config/filter/http/rbac/v3alpha/rbac.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.rbac.v3alpha; option java_outer_classname = "RbacProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.rbac.v3alpha"; -option go_package = "v2"; import "envoy/config/rbac/v3alpha/rbac.proto"; diff --git a/api/envoy/config/filter/http/router/v3alpha/BUILD b/api/envoy/config/filter/http/router/v3alpha/BUILD index f0b6c100d445..d68a0ac2c2ee 100644 --- a/api/envoy/config/filter/http/router/v3alpha/BUILD +++ b/api/envoy/config/filter/http/router/v3alpha/BUILD @@ -1,15 +1,13 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], ) - -api_go_proto_library( - name = "router", - proto = ":router", - deps = ["//envoy/config/filter/accesslog/v3alpha:accesslog_go_proto"], -) diff --git a/api/envoy/config/filter/http/router/v3alpha/router.proto b/api/envoy/config/filter/http/router/v3alpha/router.proto index 92efe315c6ff..a4ceae7dc1f7 100644 --- a/api/envoy/config/filter/http/router/v3alpha/router.proto +++ b/api/envoy/config/filter/http/router/v3alpha/router.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.router.v3alpha; option java_outer_classname = "RouterProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.router.v3alpha"; -option go_package = "v2"; import "envoy/config/filter/accesslog/v3alpha/accesslog.proto"; diff --git a/api/envoy/config/filter/http/squash/v3alpha/BUILD b/api/envoy/config/filter/http/squash/v3alpha/BUILD index 86bd4e8cfb65..2a0c1c8e30fa 100644 --- a/api/envoy/config/filter/http/squash/v3alpha/BUILD +++ b/api/envoy/config/filter/http/squash/v3alpha/BUILD @@ -1,7 +1,9 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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/squash.proto b/api/envoy/config/filter/http/squash/v3alpha/squash.proto index 43a62af98c1c..24236def872c 100644 --- a/api/envoy/config/filter/http/squash/v3alpha/squash.proto +++ b/api/envoy/config/filter/http/squash/v3alpha/squash.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.squash.v3alpha; option java_outer_classname = "SquashProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.squash.v3alpha"; -option go_package = "v2"; import "google/protobuf/duration.proto"; import "google/protobuf/struct.proto"; diff --git a/api/envoy/config/filter/http/tap/v3alpha/BUILD b/api/envoy/config/filter/http/tap/v3alpha/BUILD index a2af23059be6..0535cfbc21ae 100644 --- a/api/envoy/config/filter/http/tap/v3alpha/BUILD +++ b/api/envoy/config/filter/http/tap/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], diff --git a/api/envoy/config/filter/http/transcoder/v3alpha/BUILD b/api/envoy/config/filter/http/transcoder/v3alpha/BUILD index c1a845bcd96e..33a99a23a061 100644 --- a/api/envoy/config/filter/http/transcoder/v3alpha/BUILD +++ b/api/envoy/config/filter/http/transcoder/v3alpha/BUILD @@ -1,13 +1,10 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package() + api_proto_library_internal( name = "transcoder", srcs = ["transcoder.proto"], ) - -api_go_proto_library( - name = "transcoder", - proto = ":transcoder", -) diff --git a/api/envoy/config/filter/http/transcoder/v3alpha/transcoder.proto b/api/envoy/config/filter/http/transcoder/v3alpha/transcoder.proto index 078ac52473ac..630ad245a8a6 100644 --- a/api/envoy/config/filter/http/transcoder/v3alpha/transcoder.proto +++ b/api/envoy/config/filter/http/transcoder/v3alpha/transcoder.proto @@ -5,7 +5,6 @@ package envoy.config.filter.http.transcoder.v3alpha; option java_outer_classname = "TranscoderProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.http.transcoder.v3alpha"; -option go_package = "v2"; import "validate/validate.proto"; 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 bece14103bbe..540d8b4aa1a4 100644 --- a/api/envoy/config/filter/network/client_ssl_auth/v3alpha/BUILD +++ b/api/envoy/config/filter/network/client_ssl_auth/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], diff --git a/api/envoy/config/filter/network/client_ssl_auth/v3alpha/client_ssl_auth.proto b/api/envoy/config/filter/network/client_ssl_auth/v3alpha/client_ssl_auth.proto index a0ea3bf0bfaa..821d63494742 100644 --- a/api/envoy/config/filter/network/client_ssl_auth/v3alpha/client_ssl_auth.proto +++ b/api/envoy/config/filter/network/client_ssl_auth/v3alpha/client_ssl_auth.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.client_ssl_auth.v3alpha; option java_outer_classname = "ClientSslAuthProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.client_ssl_auth.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/core/address.proto"; import "google/protobuf/duration.proto"; diff --git a/api/envoy/config/filter/network/ext_authz/v3alpha/BUILD b/api/envoy/config/filter/network/ext_authz/v3alpha/BUILD index 839724af13b4..58aa28906331 100644 --- a/api/envoy/config/filter/network/ext_authz/v3alpha/BUILD +++ b/api/envoy/config/filter/network/ext_authz/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], diff --git a/api/envoy/config/filter/network/ext_authz/v3alpha/ext_authz.proto b/api/envoy/config/filter/network/ext_authz/v3alpha/ext_authz.proto index 99c0c7239753..c53b509fee79 100644 --- a/api/envoy/config/filter/network/ext_authz/v3alpha/ext_authz.proto +++ b/api/envoy/config/filter/network/ext_authz/v3alpha/ext_authz.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.ext_authz.v3alpha; option java_outer_classname = "ExtAuthzProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.ext_authz.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/core/grpc_service.proto"; 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 300b3c8e671a..57e0528c2ea6 100644 --- a/api/envoy/config/filter/network/http_connection_manager/v3alpha/BUILD +++ b/api/envoy/config/filter/network/http_connection_manager/v3alpha/BUILD @@ -1,7 +1,16 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + deps = [ + "//envoy/api/v3alpha", + "//envoy/api/v3alpha/core", + "//envoy/config/filter/accesslog/v3alpha:pkg", + "//envoy/type", + ], +) + api_proto_library_internal( name = "http_connection_manager", srcs = ["http_connection_manager.proto"], @@ -15,17 +24,3 @@ api_proto_library_internal( "//envoy/type:percent", ], ) - -api_go_proto_library( - name = "http_connection_manager", - proto = ":http_connection_manager", - deps = [ - "//envoy/api/v3alpha:rds_go_grpc", - "//envoy/api/v3alpha:srds_go_grpc", - "//envoy/api/v3alpha/core:base_go_proto", - "//envoy/api/v3alpha/core:config_source_go_proto", - "//envoy/api/v3alpha/core:protocol_go_proto", - "//envoy/config/filter/accesslog/v3alpha:accesslog_go_proto", - "//envoy/type:percent_go_proto", - ], -) diff --git a/api/envoy/config/filter/network/http_connection_manager/v3alpha/http_connection_manager.proto b/api/envoy/config/filter/network/http_connection_manager/v3alpha/http_connection_manager.proto index 57e529b2164a..4102c7016f2d 100644 --- a/api/envoy/config/filter/network/http_connection_manager/v3alpha/http_connection_manager.proto +++ b/api/envoy/config/filter/network/http_connection_manager/v3alpha/http_connection_manager.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.http_connection_manager.v3alpha; option java_outer_classname = "HttpConnectionManagerProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.http_connection_manager.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/core/config_source.proto"; import "envoy/api/v3alpha/core/protocol.proto"; diff --git a/api/envoy/config/filter/network/mongo_proxy/v3alpha/BUILD b/api/envoy/config/filter/network/mongo_proxy/v3alpha/BUILD index a2c09e709030..67dca3bb139a 100644 --- a/api/envoy/config/filter/network/mongo_proxy/v3alpha/BUILD +++ b/api/envoy/config/filter/network/mongo_proxy/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], diff --git a/api/envoy/config/filter/network/mongo_proxy/v3alpha/mongo_proxy.proto b/api/envoy/config/filter/network/mongo_proxy/v3alpha/mongo_proxy.proto index 9149b433e372..780483ccb4c8 100644 --- a/api/envoy/config/filter/network/mongo_proxy/v3alpha/mongo_proxy.proto +++ b/api/envoy/config/filter/network/mongo_proxy/v3alpha/mongo_proxy.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.mongo_proxy.v3alpha; option java_outer_classname = "MongoProxyProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.mongo_proxy.v3alpha"; -option go_package = "v2"; import "envoy/config/filter/fault/v3alpha/fault.proto"; diff --git a/api/envoy/config/filter/network/rate_limit/v3alpha/BUILD b/api/envoy/config/filter/network/rate_limit/v3alpha/BUILD index 9dc17266721c..a13183b9eb75 100644 --- a/api/envoy/config/filter/network/rate_limit/v3alpha/BUILD +++ b/api/envoy/config/filter/network/rate_limit/v3alpha/BUILD @@ -1,7 +1,14 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + deps = [ + "//envoy/api/v3alpha/ratelimit:pkg", + "//envoy/config/ratelimit/v3alpha:pkg", + ], +) + api_proto_library_internal( name = "rate_limit", srcs = ["rate_limit.proto"], diff --git a/api/envoy/config/filter/network/rate_limit/v3alpha/rate_limit.proto b/api/envoy/config/filter/network/rate_limit/v3alpha/rate_limit.proto index a0edc98e561d..60e2d27aff6b 100644 --- a/api/envoy/config/filter/network/rate_limit/v3alpha/rate_limit.proto +++ b/api/envoy/config/filter/network/rate_limit/v3alpha/rate_limit.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.rate_limit.v3alpha; option java_outer_classname = "RateLimitProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.rate_limit.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/ratelimit/ratelimit.proto"; import "envoy/config/ratelimit/v3alpha/rls.proto"; diff --git a/api/envoy/config/filter/network/rbac/v3alpha/BUILD b/api/envoy/config/filter/network/rbac/v3alpha/BUILD index a6ee42cf7893..1e4d51b50453 100644 --- a/api/envoy/config/filter/network/rbac/v3alpha/BUILD +++ b/api/envoy/config/filter/network/rbac/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], diff --git a/api/envoy/config/filter/network/rbac/v3alpha/rbac.proto b/api/envoy/config/filter/network/rbac/v3alpha/rbac.proto index 5c2114cd6063..5faa5f5c087c 100644 --- a/api/envoy/config/filter/network/rbac/v3alpha/rbac.proto +++ b/api/envoy/config/filter/network/rbac/v3alpha/rbac.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.rbac.v3alpha; option java_outer_classname = "RbacProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.rbac.v3alpha"; -option go_package = "v2"; import "envoy/config/rbac/v3alpha/rbac.proto"; diff --git a/api/envoy/config/filter/network/redis_proxy/v3alpha/BUILD b/api/envoy/config/filter/network/redis_proxy/v3alpha/BUILD index ef7cc5683f0c..4db47e3bb664 100644 --- a/api/envoy/config/filter/network/redis_proxy/v3alpha/BUILD +++ b/api/envoy/config/filter/network/redis_proxy/v3alpha/BUILD @@ -1,7 +1,14 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], diff --git a/api/envoy/config/filter/network/redis_proxy/v3alpha/redis_proxy.proto b/api/envoy/config/filter/network/redis_proxy/v3alpha/redis_proxy.proto index 1bda0ab7c466..a690451f7947 100644 --- a/api/envoy/config/filter/network/redis_proxy/v3alpha/redis_proxy.proto +++ b/api/envoy/config/filter/network/redis_proxy/v3alpha/redis_proxy.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.redis_proxy.v3alpha; option java_outer_classname = "RedisProxyProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.redis_proxy.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/api/envoy/config/filter/network/tcp_proxy/v3alpha/BUILD b/api/envoy/config/filter/network/tcp_proxy/v3alpha/BUILD index a9ea8de3bf1e..305e06bc8bfb 100644 --- a/api/envoy/config/filter/network/tcp_proxy/v3alpha/BUILD +++ b/api/envoy/config/filter/network/tcp_proxy/v3alpha/BUILD @@ -1,7 +1,14 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + deps = [ + "//envoy/api/v3alpha/core", + "//envoy/config/filter/accesslog/v3alpha:pkg", + ], +) + api_proto_library_internal( name = "tcp_proxy", srcs = ["tcp_proxy.proto"], @@ -11,13 +18,3 @@ api_proto_library_internal( "//envoy/config/filter/accesslog/v3alpha:accesslog", ], ) - -api_go_proto_library( - name = "tcp_proxy", - proto = ":tcp_proxy", - deps = [ - "//envoy/api/v3alpha/core:address_go_proto", - "//envoy/api/v3alpha/core:base_go_proto", - "//envoy/config/filter/accesslog/v3alpha:accesslog_go_proto", - ], -) diff --git a/api/envoy/config/filter/network/tcp_proxy/v3alpha/tcp_proxy.proto b/api/envoy/config/filter/network/tcp_proxy/v3alpha/tcp_proxy.proto index f2597a3ab361..4e04d7b352d1 100644 --- a/api/envoy/config/filter/network/tcp_proxy/v3alpha/tcp_proxy.proto +++ b/api/envoy/config/filter/network/tcp_proxy/v3alpha/tcp_proxy.proto @@ -5,7 +5,6 @@ package envoy.config.filter.network.tcp_proxy.v3alpha; option java_outer_classname = "TcpProxyProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.filter.network.tcp_proxy.v3alpha"; -option go_package = "v2"; import "envoy/config/filter/accesslog/v3alpha/accesslog.proto"; import "envoy/api/v3alpha/core/address.proto"; diff --git a/api/envoy/config/grpc_credential/v3alpha/BUILD b/api/envoy/config/grpc_credential/v3alpha/BUILD index 2f6736732881..7c327f91f031 100644 --- a/api/envoy/config/grpc_credential/v3alpha/BUILD +++ b/api/envoy/config/grpc_credential/v3alpha/BUILD @@ -1,6 +1,10 @@ licenses(["notice"]) # Apache 2 -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") + +api_proto_package( + deps = ["//envoy/api/v3alpha/core"], +) api_proto_library_internal( name = "file_based_metadata", @@ -8,20 +12,7 @@ api_proto_library_internal( deps = ["//envoy/api/v3alpha/core:base"], ) -api_go_proto_library( - name = "file_based_metadata", - proto = ":file_based_metadata", - deps = [ - "//envoy/api/v3alpha/core:base_go_proto", - ], -) - api_proto_library_internal( name = "aws_iam", srcs = ["aws_iam.proto"], ) - -api_go_proto_library( - name = "aws_iam", - proto = ":aws_iam", -) diff --git a/api/envoy/config/grpc_credential/v3alpha/aws_iam.proto b/api/envoy/config/grpc_credential/v3alpha/aws_iam.proto index 33921db6d69a..29c9cf140a00 100644 --- a/api/envoy/config/grpc_credential/v3alpha/aws_iam.proto +++ b/api/envoy/config/grpc_credential/v3alpha/aws_iam.proto @@ -8,7 +8,6 @@ package envoy.config.grpc_credential.v3alpha; option java_outer_classname = "AwsIamProto"; option java_package = "io.envoyproxy.envoy.config.grpc_credential.v3alpha"; option java_multiple_files = true; -option go_package = "v2alpha"; import "validate/validate.proto"; diff --git a/api/envoy/config/grpc_credential/v3alpha/file_based_metadata.proto b/api/envoy/config/grpc_credential/v3alpha/file_based_metadata.proto index 2886921b3415..9bab390cc833 100644 --- a/api/envoy/config/grpc_credential/v3alpha/file_based_metadata.proto +++ b/api/envoy/config/grpc_credential/v3alpha/file_based_metadata.proto @@ -8,7 +8,6 @@ package envoy.config.grpc_credential.v3alpha; option java_outer_classname = "FileBasedMetadataProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.grpc_credential.v3alpha"; -option go_package = "v2alpha"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/api/envoy/config/health_checker/redis/v3alpha/BUILD b/api/envoy/config/health_checker/redis/v3alpha/BUILD index 239d1f224fc6..f7b289b08f69 100644 --- a/api/envoy/config/health_checker/redis/v3alpha/BUILD +++ b/api/envoy/config/health_checker/redis/v3alpha/BUILD @@ -1,7 +1,9 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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/redis.proto b/api/envoy/config/health_checker/redis/v3alpha/redis.proto index 234da40d56ba..1409e9545f41 100644 --- a/api/envoy/config/health_checker/redis/v3alpha/redis.proto +++ b/api/envoy/config/health_checker/redis/v3alpha/redis.proto @@ -5,7 +5,6 @@ package envoy.config.health_checker.redis.v3alpha; option java_outer_classname = "RedisProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v3alpha"; -option go_package = "v2"; // [#protodoc-title: Redis] // Redis health checker :ref:`configuration overview `. diff --git a/api/envoy/config/metrics/v3alpha/BUILD b/api/envoy/config/metrics/v3alpha/BUILD index 39d0b79654d0..399ec444208d 100644 --- a/api/envoy/config/metrics/v3alpha/BUILD +++ b/api/envoy/config/metrics/v3alpha/BUILD @@ -1,7 +1,14 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], @@ -13,14 +20,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "metrics_service", - proto = ":metrics_service", - deps = [ - "//envoy/api/v3alpha/core:grpc_service_go_proto", - ], -) - api_proto_library_internal( name = "stats", srcs = ["stats.proto"], @@ -32,12 +31,3 @@ api_proto_library_internal( "//envoy/type/matcher:string", ], ) - -api_go_proto_library( - name = "stats", - proto = ":stats", - deps = [ - "//envoy/api/v3alpha/core:address_go_proto", - "//envoy/type/matcher:string_go_proto", - ], -) diff --git a/api/envoy/config/metrics/v3alpha/stats.proto b/api/envoy/config/metrics/v3alpha/stats.proto index 91324ed0ef61..afa4468b3444 100644 --- a/api/envoy/config/metrics/v3alpha/stats.proto +++ b/api/envoy/config/metrics/v3alpha/stats.proto @@ -8,7 +8,6 @@ package envoy.config.metrics.v3alpha; option java_outer_classname = "StatsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.metrics.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/core/address.proto"; import "envoy/type/matcher/string.proto"; diff --git a/api/envoy/config/overload/v3alpha/BUILD b/api/envoy/config/overload/v3alpha/BUILD index bfffb5639ca7..e247848d07a9 100644 --- a/api/envoy/config/overload/v3alpha/BUILD +++ b/api/envoy/config/overload/v3alpha/BUILD @@ -1,14 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package() + api_proto_library_internal( name = "overload", srcs = ["overload.proto"], visibility = ["//visibility:public"], ) - -api_go_proto_library( - name = "overload", - proto = ":overload", -) diff --git a/api/envoy/config/overload/v3alpha/overload.proto b/api/envoy/config/overload/v3alpha/overload.proto index 474c7677002b..857b510e665a 100644 --- a/api/envoy/config/overload/v3alpha/overload.proto +++ b/api/envoy/config/overload/v3alpha/overload.proto @@ -5,7 +5,6 @@ package envoy.config.overload.v3alpha; option java_outer_classname = "OverloadProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.overload.v3alpha"; -option go_package = "v2alpha"; import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; diff --git a/api/envoy/config/ratelimit/v3alpha/BUILD b/api/envoy/config/ratelimit/v3alpha/BUILD index 571a768dde4b..1d009164ba64 100644 --- a/api/envoy/config/ratelimit/v3alpha/BUILD +++ b/api/envoy/config/ratelimit/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + deps = ["//envoy/api/v3alpha/core"], +) + api_proto_library_internal( name = "rls", srcs = ["rls.proto"], @@ -10,11 +14,3 @@ api_proto_library_internal( "//envoy/api/v3alpha/core:grpc_service", ], ) - -api_go_grpc_library( - name = "rls", - proto = ":rls", - deps = [ - "//envoy/api/v3alpha/core:grpc_service_go_proto", - ], -) diff --git a/api/envoy/config/ratelimit/v3alpha/rls.proto b/api/envoy/config/ratelimit/v3alpha/rls.proto index 67ac6479cd23..16d5a4ad7712 100644 --- a/api/envoy/config/ratelimit/v3alpha/rls.proto +++ b/api/envoy/config/ratelimit/v3alpha/rls.proto @@ -5,7 +5,6 @@ package envoy.config.ratelimit.v3alpha; option java_outer_classname = "RlsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.ratelimit.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/core/grpc_service.proto"; diff --git a/api/envoy/config/rbac/v3alpha/BUILD b/api/envoy/config/rbac/v3alpha/BUILD index 89f98c97d481..60200f034ea1 100644 --- a/api/envoy/config/rbac/v3alpha/BUILD +++ b/api/envoy/config/rbac/v3alpha/BUILD @@ -1,6 +1,15 @@ licenses(["notice"]) # Apache 2 -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") + +api_proto_package( + deps = [ + "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/route:pkg", + "//envoy/type/matcher", + "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto", + ], +) api_proto_library_internal( name = "rbac", @@ -22,15 +31,3 @@ api_proto_library_internal( "//envoy/type/matcher:string", ], ) - -api_go_proto_library( - name = "rbac", - proto = ":rbac", - deps = [ - "//envoy/api/v3alpha/core:address_go_proto", - "//envoy/api/v3alpha/route:route_go_proto", - "//envoy/type/matcher:metadata_go_proto", - "//envoy/type/matcher:string_go_proto", - "@com_google_googleapis//google/api/expr/v1alpha1:cel_go_proto", - ], -) diff --git a/api/envoy/config/rbac/v3alpha/rbac.proto b/api/envoy/config/rbac/v3alpha/rbac.proto index d299c384da90..9087e745690d 100644 --- a/api/envoy/config/rbac/v3alpha/rbac.proto +++ b/api/envoy/config/rbac/v3alpha/rbac.proto @@ -14,7 +14,6 @@ package envoy.config.rbac.v3alpha; option java_outer_classname = "RbacProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.rbac.v3alpha"; -option go_package = "v2"; option (gogoproto.stable_marshaler_all) = true; diff --git a/api/envoy/config/resource_monitor/fixed_heap/v3alpha/BUILD b/api/envoy/config/resource_monitor/fixed_heap/v3alpha/BUILD index 363d90f11808..a5003e219c8a 100644 --- a/api/envoy/config/resource_monitor/fixed_heap/v3alpha/BUILD +++ b/api/envoy/config/resource_monitor/fixed_heap/v3alpha/BUILD @@ -1,7 +1,9 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package() + api_proto_library_internal( name = "fixed_heap", srcs = ["fixed_heap.proto"], diff --git a/api/envoy/config/resource_monitor/fixed_heap/v3alpha/fixed_heap.proto b/api/envoy/config/resource_monitor/fixed_heap/v3alpha/fixed_heap.proto index 2bc1baf85243..bc84ee992452 100644 --- a/api/envoy/config/resource_monitor/fixed_heap/v3alpha/fixed_heap.proto +++ b/api/envoy/config/resource_monitor/fixed_heap/v3alpha/fixed_heap.proto @@ -5,7 +5,6 @@ package envoy.config.resource_monitor.fixed_heap.v3alpha; option java_outer_classname = "FixedHeapProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v3alpha"; -option go_package = "v2alpha"; import "validate/validate.proto"; diff --git a/api/envoy/config/resource_monitor/injected_resource/v3alpha/BUILD b/api/envoy/config/resource_monitor/injected_resource/v3alpha/BUILD index 10abf09e9ef8..3a1764216b00 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v3alpha/BUILD +++ b/api/envoy/config/resource_monitor/injected_resource/v3alpha/BUILD @@ -1,7 +1,9 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package() + api_proto_library_internal( name = "injected_resource", srcs = ["injected_resource.proto"], diff --git a/api/envoy/config/resource_monitor/injected_resource/v3alpha/injected_resource.proto b/api/envoy/config/resource_monitor/injected_resource/v3alpha/injected_resource.proto index f5b41ef165c8..555e15323f46 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v3alpha/injected_resource.proto +++ b/api/envoy/config/resource_monitor/injected_resource/v3alpha/injected_resource.proto @@ -5,7 +5,6 @@ package envoy.config.resource_monitor.injected_resource.v3alpha; option java_outer_classname = "InjectedResourceProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v3alpha"; -option go_package = "v2alpha"; import "validate/validate.proto"; diff --git a/api/envoy/config/trace/v3alpha/BUILD b/api/envoy/config/trace/v3alpha/BUILD index 72056b3ad4b6..97014ca68f6f 100644 --- a/api/envoy/config/trace/v3alpha/BUILD +++ b/api/envoy/config/trace/v3alpha/BUILD @@ -1,7 +1,14 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], @@ -13,12 +20,3 @@ api_proto_library_internal( "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto", ], ) - -api_go_proto_library( - name = "trace", - proto = ":trace", - deps = [ - "//envoy/api/v3alpha/core:grpc_service_go_proto", - "@opencensus_proto//opencensus/proto/trace/v1:trace_and_config_proto_go", - ], -) diff --git a/api/envoy/config/trace/v3alpha/trace.proto b/api/envoy/config/trace/v3alpha/trace.proto index 2771c1b40f28..f98f1f708962 100644 --- a/api/envoy/config/trace/v3alpha/trace.proto +++ b/api/envoy/config/trace/v3alpha/trace.proto @@ -8,7 +8,6 @@ package envoy.config.trace.v3alpha; option java_outer_classname = "TraceProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.trace.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/core/grpc_service.proto"; import "opencensus/proto/trace/v1/trace_config.proto"; diff --git a/api/envoy/config/transport_socket/alts/v3alpha/BUILD b/api/envoy/config/transport_socket/alts/v3alpha/BUILD index 7ffc03097000..4e6642283e3a 100644 --- a/api/envoy/config/transport_socket/alts/v3alpha/BUILD +++ b/api/envoy/config/transport_socket/alts/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + deps = ["//envoy/api/v3alpha/core"], +) + api_proto_library( name = "alts", srcs = ["alts.proto"], diff --git a/api/envoy/config/transport_socket/alts/v3alpha/alts.proto b/api/envoy/config/transport_socket/alts/v3alpha/alts.proto index 22684b862614..adec43c25cb8 100644 --- a/api/envoy/config/transport_socket/alts/v3alpha/alts.proto +++ b/api/envoy/config/transport_socket/alts/v3alpha/alts.proto @@ -5,7 +5,6 @@ package envoy.config.transport_socket.alts.v3alpha; option java_outer_classname = "AltsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.transport_socket.alts.v3alpha"; -option go_package = "v2"; // [#protodoc-title: ALTS] diff --git a/api/envoy/config/transport_socket/tap/v3alpha/BUILD b/api/envoy/config/transport_socket/tap/v3alpha/BUILD index 8056ad6f17bb..0f24cca4c1a1 100644 --- a/api/envoy/config/transport_socket/tap/v3alpha/BUILD +++ b/api/envoy/config/transport_socket/tap/v3alpha/BUILD @@ -1,7 +1,14 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + deps = [ + "//envoy/api/v3alpha/core", + "//envoy/config/common/tap/v3alpha:pkg", + ], +) + api_proto_library_internal( name = "tap", srcs = ["tap.proto"], diff --git a/api/envoy/config/transport_socket/tap/v3alpha/tap.proto b/api/envoy/config/transport_socket/tap/v3alpha/tap.proto index 1cca6814c803..21625e17ef9c 100644 --- a/api/envoy/config/transport_socket/tap/v3alpha/tap.proto +++ b/api/envoy/config/transport_socket/tap/v3alpha/tap.proto @@ -5,7 +5,6 @@ package envoy.config.transport_socket.tap.v3alpha; option java_outer_classname = "TapProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.config.transport_socket.tap.v3alpha"; -option go_package = "v2"; // [#protodoc-title: Tap] diff --git a/api/envoy/data/accesslog/v3alpha/BUILD b/api/envoy/data/accesslog/v3alpha/BUILD index 30157958e7fe..e1fafc00343b 100644 --- a/api/envoy/data/accesslog/v3alpha/BUILD +++ b/api/envoy/data/accesslog/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + deps = ["//envoy/api/v3alpha/core"], +) + api_proto_library_internal( name = "accesslog", srcs = ["accesslog.proto"], @@ -13,12 +17,3 @@ api_proto_library_internal( "//envoy/api/v3alpha/core:base", ], ) - -api_go_proto_library( - name = "accesslog", - proto = ":accesslog", - deps = [ - "//envoy/api/v3alpha/core:address_go_proto", - "//envoy/api/v3alpha/core:base_go_proto", - ], -) diff --git a/api/envoy/data/cluster/v3alpha/BUILD b/api/envoy/data/cluster/v3alpha/BUILD index 00edd8294b6f..4d921f4d97ac 100644 --- a/api/envoy/data/cluster/v3alpha/BUILD +++ b/api/envoy/data/cluster/v3alpha/BUILD @@ -1,7 +1,9 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package() + api_proto_library( name = "outlier_detection_event", srcs = ["outlier_detection_event.proto"], diff --git a/api/envoy/data/core/v3alpha/BUILD b/api/envoy/data/core/v3alpha/BUILD index 9e82e3eb1731..6c44f3e4d79e 100644 --- a/api/envoy/data/core/v3alpha/BUILD +++ b/api/envoy/data/core/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "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"], diff --git a/api/envoy/data/tap/v3alpha/BUILD b/api/envoy/data/tap/v3alpha/BUILD index ab9be74ce98a..33d151e333a9 100644 --- a/api/envoy/data/tap/v3alpha/BUILD +++ b/api/envoy/data/tap/v3alpha/BUILD @@ -1,7 +1,11 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + deps = ["//envoy/api/v3alpha/core"], +) + api_proto_library_internal( name = "common", srcs = ["common.proto"], diff --git a/api/envoy/data/tap/v3alpha/transport.proto b/api/envoy/data/tap/v3alpha/transport.proto index 3dfb0c6478ba..e35f036f5d82 100644 --- a/api/envoy/data/tap/v3alpha/transport.proto +++ b/api/envoy/data/tap/v3alpha/transport.proto @@ -9,7 +9,6 @@ package envoy.data.tap.v3alpha; option java_outer_classname = "TransportProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.data.tap.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/core/address.proto"; import "envoy/data/tap/v3alpha/common.proto"; diff --git a/api/envoy/service/accesslog/v3alpha/BUILD b/api/envoy/service/accesslog/v3alpha/BUILD index 1a8eab975b56..0bb8716b82ab 100644 --- a/api/envoy/service/accesslog/v3alpha/BUILD +++ b/api/envoy/service/accesslog/v3alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + has_services = True, + deps = [ + "//envoy/api/v3alpha/core", + "//envoy/data/accesslog/v3alpha:pkg", + ], +) + api_proto_library_internal( name = "als", srcs = ["als.proto"], @@ -12,12 +20,3 @@ api_proto_library_internal( "//envoy/data/accesslog/v3alpha:accesslog", ], ) - -api_go_grpc_library( - name = "als", - proto = ":als", - deps = [ - "//envoy/api/v3alpha/core:base_go_proto", - "//envoy/data/accesslog/v3alpha:accesslog_go_proto", - ], -) diff --git a/api/envoy/service/accesslog/v3alpha/als.proto b/api/envoy/service/accesslog/v3alpha/als.proto index 092d4d17696c..ad05b823d1e5 100644 --- a/api/envoy/service/accesslog/v3alpha/als.proto +++ b/api/envoy/service/accesslog/v3alpha/als.proto @@ -5,7 +5,6 @@ package envoy.service.accesslog.v3alpha; option java_outer_classname = "AlsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.accesslog.v3alpha"; -option go_package = "v2"; option java_generic_services = true; import "envoy/api/v3alpha/core/base.proto"; diff --git a/api/envoy/service/auth/v3alpha/BUILD b/api/envoy/service/auth/v3alpha/BUILD index 6a335f88f949..f6a70cb5b9bd 100644 --- a/api/envoy/service/auth/v3alpha/BUILD +++ b/api/envoy/service/auth/v3alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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 = [ diff --git a/api/envoy/service/auth/v3alpha/external_auth.proto b/api/envoy/service/auth/v3alpha/external_auth.proto index 4b7e459a4436..0130040c1409 100644 --- a/api/envoy/service/auth/v3alpha/external_auth.proto +++ b/api/envoy/service/auth/v3alpha/external_auth.proto @@ -5,7 +5,6 @@ package envoy.service.auth.v3alpha; option java_outer_classname = "ExternalAuthProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.auth.v3alpha"; -option go_package = "v2"; option java_generic_services = true; import "envoy/api/v3alpha/core/base.proto"; diff --git a/api/envoy/service/discovery/v3alpha/BUILD b/api/envoy/service/discovery/v3alpha/BUILD index d34955c1cb5a..138186e6ea05 100644 --- a/api/envoy/service/discovery/v3alpha/BUILD +++ b/api/envoy/service/discovery/v3alpha/BUILD @@ -1,21 +1,22 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 -api_proto_library_internal( - name = "ads", - srcs = ["ads.proto"], - has_services = 1, +api_proto_package( + has_services = True, deps = [ - "//envoy/api/v3alpha:discovery", + "//envoy/api/v3alpha", + "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/endpoint:pkg", ], ) -api_go_grpc_library( +api_proto_library_internal( name = "ads", - proto = ":ads", + srcs = ["ads.proto"], + has_services = 1, deps = [ - "//envoy/api/v3alpha:discovery_go_proto", + "//envoy/api/v3alpha:discovery", ], ) @@ -30,16 +31,6 @@ api_proto_library_internal( ], ) -api_go_grpc_library( - name = "hds", - proto = ":hds", - deps = [ - "//envoy/api/v3alpha/core:base_go_proto", - "//envoy/api/v3alpha/core:health_check_go_proto", - "//envoy/api/v3alpha/endpoint:endpoint_go_proto", - ], -) - api_proto_library_internal( name = "sds", srcs = ["sds.proto"], @@ -49,14 +40,6 @@ api_proto_library_internal( ], ) -api_go_grpc_library( - name = "sds", - proto = ":sds", - deps = [ - "//envoy/api/v3alpha:discovery_go_proto", - ], -) - api_proto_library_internal( name = "rtds", srcs = ["rtds.proto"], @@ -65,11 +48,3 @@ api_proto_library_internal( "//envoy/api/v3alpha:discovery", ], ) - -api_go_grpc_library( - name = "rtds", - proto = ":rtds", - deps = [ - "//envoy/api/v3alpha:discovery_go_proto", - ], -) diff --git a/api/envoy/service/discovery/v3alpha/ads.proto b/api/envoy/service/discovery/v3alpha/ads.proto index d6b7897ba7a1..251c51301a16 100644 --- a/api/envoy/service/discovery/v3alpha/ads.proto +++ b/api/envoy/service/discovery/v3alpha/ads.proto @@ -5,7 +5,6 @@ package envoy.service.discovery.v3alpha; option java_outer_classname = "AdsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.discovery.v3alpha"; -option go_package = "v2"; option java_generic_services = true; import "envoy/api/v3alpha/discovery.proto"; diff --git a/api/envoy/service/load_stats/v3alpha/BUILD b/api/envoy/service/load_stats/v3alpha/BUILD index 42c7ce8438da..bc4ff2642c6d 100644 --- a/api/envoy/service/load_stats/v3alpha/BUILD +++ b/api/envoy/service/load_stats/v3alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + has_services = True, + deps = [ + "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/endpoint:pkg", + ], +) + api_proto_library_internal( name = "lrs", srcs = ["lrs.proto"], @@ -11,12 +19,3 @@ api_proto_library_internal( "//envoy/api/v3alpha/endpoint:load_report", ], ) - -api_go_grpc_library( - name = "lrs", - proto = ":lrs", - deps = [ - "//envoy/api/v3alpha/core:base_go_proto", - "//envoy/api/v3alpha/endpoint:load_report_go_proto", - ], -) diff --git a/api/envoy/service/load_stats/v3alpha/lrs.proto b/api/envoy/service/load_stats/v3alpha/lrs.proto index 81058ed574a7..ec8adedbf2a8 100644 --- a/api/envoy/service/load_stats/v3alpha/lrs.proto +++ b/api/envoy/service/load_stats/v3alpha/lrs.proto @@ -5,7 +5,6 @@ package envoy.service.load_stats.v3alpha; option java_outer_classname = "LrsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.load_stats.v3alpha"; -option go_package = "v2"; option java_generic_services = true; import "envoy/api/v3alpha/core/base.proto"; diff --git a/api/envoy/service/metrics/v3alpha/BUILD b/api/envoy/service/metrics/v3alpha/BUILD index 1f1bb553cd82..6053aac4f1be 100644 --- a/api/envoy/service/metrics/v3alpha/BUILD +++ b/api/envoy/service/metrics/v3alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], @@ -13,12 +21,3 @@ api_proto_library_internal( "@prometheus_metrics_model//:client_model", ], ) - -api_go_grpc_library( - name = "metrics_service", - proto = ":metrics_service", - deps = [ - "//envoy/api/v3alpha/core:base_go_proto", - "@prometheus_metrics_model//:client_model_go_proto", - ], -) diff --git a/api/envoy/service/metrics/v3alpha/metrics_service.proto b/api/envoy/service/metrics/v3alpha/metrics_service.proto index 9a5306553b18..bcf1caa28a2d 100644 --- a/api/envoy/service/metrics/v3alpha/metrics_service.proto +++ b/api/envoy/service/metrics/v3alpha/metrics_service.proto @@ -5,7 +5,6 @@ package envoy.service.metrics.v3alpha; option java_outer_classname = "MetricsServiceProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.metrics.v3alpha"; -option go_package = "v2"; option java_generic_services = true; import "envoy/api/v3alpha/core/base.proto"; diff --git a/api/envoy/service/ratelimit/v3alpha/BUILD b/api/envoy/service/ratelimit/v3alpha/BUILD index 19954c5bfcc9..965458beaec6 100644 --- a/api/envoy/service/ratelimit/v3alpha/BUILD +++ b/api/envoy/service/ratelimit/v3alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + has_services = True, + deps = [ + "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/ratelimit:pkg", + ], +) + api_proto_library_internal( name = "rls", srcs = ["rls.proto"], @@ -12,13 +20,3 @@ api_proto_library_internal( "//envoy/api/v3alpha/ratelimit", ], ) - -api_go_grpc_library( - name = "rls", - proto = ":rls", - deps = [ - "//envoy/api/v3alpha/core:base_go_proto", - "//envoy/api/v3alpha/core:grpc_service_go_proto", - "//envoy/api/v3alpha/ratelimit:ratelimit_go_proto", - ], -) diff --git a/api/envoy/service/ratelimit/v3alpha/rls.proto b/api/envoy/service/ratelimit/v3alpha/rls.proto index 7bbd2e3ec183..57a3ee98de94 100644 --- a/api/envoy/service/ratelimit/v3alpha/rls.proto +++ b/api/envoy/service/ratelimit/v3alpha/rls.proto @@ -5,7 +5,6 @@ package envoy.service.ratelimit.v3alpha; option java_outer_classname = "RlsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.ratelimit.v3alpha"; -option go_package = "v2"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/api/v3alpha/ratelimit/ratelimit.proto"; diff --git a/api/envoy/service/tap/v3alpha/BUILD b/api/envoy/service/tap/v3alpha/BUILD index a90b2d819297..005ef96b61a0 100644 --- a/api/envoy/service/tap/v3alpha/BUILD +++ b/api/envoy/service/tap/v3alpha/BUILD @@ -1,7 +1,17 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "api_proto_package") licenses(["notice"]) # Apache 2 +api_proto_package( + has_services = True, + deps = [ + "//envoy/api/v3alpha", + "//envoy/api/v3alpha/core", + "//envoy/api/v3alpha/route:pkg", + "//envoy/data/tap/v3alpha:pkg", + ], +) + api_proto_library_internal( name = "common", srcs = ["common.proto"], diff --git a/api/envoy/service/trace/v3alpha/BUILD b/api/envoy/service/trace/v3alpha/BUILD index 815d0c4c93cc..fbfafec678de 100644 --- a/api/envoy/service/trace/v3alpha/BUILD +++ b/api/envoy/service/trace/v3alpha/BUILD @@ -1,7 +1,15 @@ -load("@envoy_api//bazel:api_build_system.bzl", "api_go_grpc_library", "api_proto_library_internal") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library_internal", "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"], @@ -12,12 +20,3 @@ api_proto_library_internal( "@opencensus_proto//opencensus/proto/trace/v1:trace_proto", ], ) - -api_go_grpc_library( - name = "trace_service", - proto = ":trace_service", - deps = [ - "//envoy/api/v3alpha/core:base_go_proto", - "@opencensus_proto//opencensus/proto/trace/v1:trace_proto_go", - ], -) diff --git a/api/envoy/service/trace/v3alpha/trace_service.proto b/api/envoy/service/trace/v3alpha/trace_service.proto index 521139a084e5..b6559800cd39 100644 --- a/api/envoy/service/trace/v3alpha/trace_service.proto +++ b/api/envoy/service/trace/v3alpha/trace_service.proto @@ -7,7 +7,6 @@ package envoy.service.trace.v3alpha; option java_outer_classname = "TraceServiceProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.trace.v3alpha"; -option go_package = "v2"; option java_generic_services = true; import "envoy/api/v3alpha/core/base.proto"; From 09da24b0d17d5e4240e6c774fc71fc970c19efc0 Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Tue, 3 Sep 2019 14:48:57 -0700 Subject: [PATCH 15/16] go proto library Signed-off-by: Kuat Yessenov --- api/bazel/repositories.bzl | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/api/bazel/repositories.bzl b/api/bazel/repositories.bzl index 7af054b20f4f..106ff67e3477 100644 --- a/api/bazel/repositories.bzl +++ b/api/bazel/repositories.bzl @@ -161,8 +161,7 @@ filegroup( ZIPKINAPI_BUILD_CONTENT = """ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_go_proto_library") -load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library") api_proto_library( name = "zipkin", @@ -172,9 +171,4 @@ api_proto_library( ], visibility = ["//visibility:public"], ) - -api_go_proto_library( - name = "zipkin", - proto = ":zipkin", -) """ From 33f658511d429d3c60d9482b00bec2d7b5be1a95 Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Tue, 3 Sep 2019 14:50:32 -0700 Subject: [PATCH 16/16] use standard go proto library Signed-off-by: Kuat Yessenov --- api/bazel/repositories.bzl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/api/bazel/repositories.bzl b/api/bazel/repositories.bzl index 106ff67e3477..b992717d273a 100644 --- a/api/bazel/repositories.bzl +++ b/api/bazel/repositories.bzl @@ -162,6 +162,7 @@ filegroup( ZIPKINAPI_BUILD_CONTENT = """ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library") +load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") api_proto_library( name = "zipkin", @@ -171,4 +172,10 @@ api_proto_library( ], visibility = ["//visibility:public"], ) + +go_proto_library( + name = "zipkin_go_proto", + proto = ":zipkin", + visibility = ["//visibility:public"], +) """