From 1bc3be0790ede14349d8b8ffcf1ce3330ed2b124 Mon Sep 17 00:00:00 2001 From: "data-plane-api(CircleCI)" Date: Wed, 4 Sep 2019 03:13:13 +0000 Subject: [PATCH] api: organize go_proto_libraries (#8003) Fixes #7982 Defines a package level proto library and its associated internal go_proto_library. Deletes all existing api_go_proto_library, api_go_grpc_library, and go_package annotations in protos (they are not required and pollute the sources). I deliberately avoided touching anything under udpa since it's being moved to another repository. Risk Level: low Testing: build completes Signed-off-by: Kuat Yessenov Mirrored from https://github.com/envoyproxy/envoy @ d504fde0ffd97017d1ddff8caa9a3b46bba9ae48 --- bazel/BUILD | 12 ++ bazel/api_build_system.bzl | 115 ++++++++++-------- bazel/repositories.bzl | 7 +- envoy/admin/v2alpha/BUILD | 13 +- envoy/admin/v3alpha/BUILD | 13 +- envoy/api/v2/BUILD | 88 +++----------- envoy/api/v2/auth/BUILD | 18 ++- envoy/api/v2/auth/cert.proto | 1 - envoy/api/v2/cluster/BUILD | 27 ++-- envoy/api/v2/cluster/circuit_breaker.proto | 1 - envoy/api/v2/core/BUILD | 58 ++------- envoy/api/v2/core/base.proto | 1 - envoy/api/v2/discovery.proto | 1 - envoy/api/v2/endpoint/BUILD | 31 ++--- envoy/api/v2/endpoint/endpoint.proto | 1 - envoy/api/v2/listener/BUILD | 27 ++-- envoy/api/v2/listener/listener.proto | 1 - .../api/v2/listener/udp_listener_config.proto | 1 - envoy/api/v2/ratelimit/BUILD | 9 +- envoy/api/v2/ratelimit/ratelimit.proto | 1 - envoy/api/v2/route/BUILD | 22 ++-- envoy/api/v2/route/route.proto | 1 - envoy/api/v3alpha/BUILD | 88 +++----------- envoy/api/v3alpha/auth/BUILD | 18 ++- envoy/api/v3alpha/auth/cert.proto | 1 - envoy/api/v3alpha/cluster/BUILD | 27 ++-- .../api/v3alpha/cluster/circuit_breaker.proto | 1 - envoy/api/v3alpha/core/BUILD | 58 ++------- envoy/api/v3alpha/core/base.proto | 1 - envoy/api/v3alpha/discovery.proto | 1 - envoy/api/v3alpha/endpoint/BUILD | 31 ++--- envoy/api/v3alpha/endpoint/endpoint.proto | 1 - envoy/api/v3alpha/listener/BUILD | 27 ++-- envoy/api/v3alpha/listener/listener.proto | 1 - .../listener/udp_listener_config.proto | 1 - envoy/api/v3alpha/ratelimit/BUILD | 9 +- envoy/api/v3alpha/ratelimit/ratelimit.proto | 1 - envoy/api/v3alpha/route/BUILD | 22 ++-- envoy/api/v3alpha/route/route.proto | 1 - envoy/config/accesslog/v2/BUILD | 12 +- envoy/config/accesslog/v2/als.proto | 1 - envoy/config/accesslog/v2/file.proto | 1 - envoy/config/accesslog/v3alpha/BUILD | 12 +- envoy/config/accesslog/v3alpha/als.proto | 1 - envoy/config/accesslog/v3alpha/file.proto | 1 - envoy/config/bootstrap/v2/BUILD | 32 ++--- envoy/config/bootstrap/v2/bootstrap.proto | 1 - envoy/config/bootstrap/v3alpha/BUILD | 32 ++--- .../config/bootstrap/v3alpha/bootstrap.proto | 1 - .../dynamic_forward_proxy/v2alpha/BUILD | 6 +- .../v2alpha/cluster.proto | 1 - .../dynamic_forward_proxy/v3alpha/BUILD | 6 +- .../v3alpha/cluster.proto | 1 - envoy/config/cluster/redis/BUILD | 4 +- .../config/cluster/redis/redis_cluster.proto | 1 - .../dynamic_forward_proxy/v2alpha/BUILD | 6 +- .../dynamic_forward_proxy/v3alpha/BUILD | 6 +- envoy/config/common/tap/v2alpha/BUILD | 9 +- envoy/config/common/tap/v3alpha/BUILD | 9 +- envoy/config/filter/accesslog/v2/BUILD | 20 ++- .../filter/accesslog/v2/accesslog.proto | 1 - envoy/config/filter/accesslog/v3alpha/BUILD | 20 ++- .../filter/accesslog/v3alpha/accesslog.proto | 1 - .../config/filter/dubbo/router/v2alpha1/BUILD | 4 +- .../filter/dubbo/router/v2alpha1/router.proto | 1 - envoy/config/filter/fault/v2/BUILD | 6 +- envoy/config/filter/fault/v2/fault.proto | 1 - envoy/config/filter/fault/v3alpha/BUILD | 6 +- envoy/config/filter/fault/v3alpha/fault.proto | 1 - .../http/adaptive_concurrency/v2alpha/BUILD | 6 +- .../v2alpha/adaptive_concurrency.proto | 1 - .../http/adaptive_concurrency/v3alpha/BUILD | 6 +- .../v3alpha/adaptive_concurrency.proto | 1 - envoy/config/filter/http/buffer/v2/BUILD | 4 +- .../config/filter/http/buffer/v2/buffer.proto | 1 - envoy/config/filter/http/buffer/v3alpha/BUILD | 4 +- .../filter/http/buffer/v3alpha/buffer.proto | 1 - envoy/config/filter/http/csrf/v2/BUILD | 9 +- envoy/config/filter/http/csrf/v2/csrf.proto | 1 - envoy/config/filter/http/csrf/v3alpha/BUILD | 9 +- .../filter/http/csrf/v3alpha/csrf.proto | 1 - .../http/dynamic_forward_proxy/v2alpha/BUILD | 6 +- .../v2alpha/dynamic_forward_proxy.proto | 1 - .../http/dynamic_forward_proxy/v3alpha/BUILD | 6 +- .../v3alpha/dynamic_forward_proxy.proto | 1 - envoy/config/filter/http/ext_authz/v2/BUILD | 10 +- .../filter/http/ext_authz/v2/ext_authz.proto | 1 - .../filter/http/ext_authz/v3alpha/BUILD | 10 +- .../http/ext_authz/v3alpha/ext_authz.proto | 1 - envoy/config/filter/http/fault/v2/BUILD | 10 +- envoy/config/filter/http/fault/v2/fault.proto | 1 - envoy/config/filter/http/fault/v3alpha/BUILD | 10 +- .../filter/http/fault/v3alpha/fault.proto | 1 - .../grpc_http1_reverse_bridge/v2alpha1/BUILD | 4 +- .../v2alpha1/config.proto | 1 - envoy/config/filter/http/gzip/v2/BUILD | 4 +- envoy/config/filter/http/gzip/v2/gzip.proto | 1 - envoy/config/filter/http/gzip/v3alpha/BUILD | 4 +- .../filter/http/gzip/v3alpha/gzip.proto | 1 - .../filter/http/header_to_metadata/v2/BUILD | 5 +- .../v2/header_to_metadata.proto | 1 - .../http/header_to_metadata/v3alpha/BUILD | 5 +- .../v3alpha/header_to_metadata.proto | 1 - .../config/filter/http/health_check/v2/BUILD | 18 ++- .../http/health_check/v2/health_check.proto | 1 - .../filter/http/health_check/v3alpha/BUILD | 18 ++- .../health_check/v3alpha/health_check.proto | 1 - envoy/config/filter/http/ip_tagging/v2/BUILD | 6 +- .../http/ip_tagging/v2/ip_tagging.proto | 1 - .../filter/http/ip_tagging/v3alpha/BUILD | 6 +- .../http/ip_tagging/v3alpha/ip_tagging.proto | 1 - .../filter/http/jwt_authn/v2alpha/BUILD | 19 ++- .../filter/http/jwt_authn/v3alpha/BUILD | 19 ++- envoy/config/filter/http/lua/v2/BUILD | 4 +- envoy/config/filter/http/lua/v2/lua.proto | 1 - envoy/config/filter/http/lua/v3alpha/BUILD | 4 +- .../config/filter/http/lua/v3alpha/lua.proto | 1 - .../filter/http/original_src/v2alpha1/BUILD | 4 +- .../original_src/v2alpha1/original_src.proto | 2 - envoy/config/filter/http/rate_limit/v2/BUILD | 6 +- .../http/rate_limit/v2/rate_limit.proto | 1 - .../filter/http/rate_limit/v3alpha/BUILD | 6 +- .../http/rate_limit/v3alpha/rate_limit.proto | 1 - envoy/config/filter/http/rbac/v2/BUILD | 6 +- envoy/config/filter/http/rbac/v2/rbac.proto | 1 - envoy/config/filter/http/rbac/v3alpha/BUILD | 6 +- .../filter/http/rbac/v3alpha/rbac.proto | 1 - envoy/config/filter/http/router/v2/BUILD | 12 +- .../config/filter/http/router/v2/router.proto | 1 - envoy/config/filter/http/router/v3alpha/BUILD | 12 +- .../filter/http/router/v3alpha/router.proto | 1 - envoy/config/filter/http/squash/v2/BUILD | 4 +- .../config/filter/http/squash/v2/squash.proto | 1 - envoy/config/filter/http/squash/v3alpha/BUILD | 4 +- .../filter/http/squash/v3alpha/squash.proto | 1 - envoy/config/filter/http/tap/v2alpha/BUILD | 6 +- envoy/config/filter/http/tap/v3alpha/BUILD | 6 +- envoy/config/filter/http/transcoder/v2/BUILD | 9 +- .../http/transcoder/v2/transcoder.proto | 1 - .../filter/http/transcoder/v3alpha/BUILD | 9 +- .../http/transcoder/v3alpha/transcoder.proto | 1 - .../listener/original_src/v2alpha1/BUILD | 4 +- .../original_src/v2alpha1/original_src.proto | 2 - .../filter/network/client_ssl_auth/v2/BUILD | 6 +- .../client_ssl_auth/v2/client_ssl_auth.proto | 1 - .../network/client_ssl_auth/v3alpha/BUILD | 6 +- .../v3alpha/client_ssl_auth.proto | 1 - .../filter/network/dubbo_proxy/v2alpha1/BUILD | 11 +- .../dubbo_proxy/v2alpha1/dubbo_proxy.proto | 3 +- .../network/dubbo_proxy/v2alpha1/route.proto | 1 - .../config/filter/network/ext_authz/v2/BUILD | 6 +- .../network/ext_authz/v2/ext_authz.proto | 1 - .../filter/network/ext_authz/v3alpha/BUILD | 6 +- .../network/ext_authz/v3alpha/ext_authz.proto | 1 - .../network/http_connection_manager/v2/BUILD | 25 ++-- .../v2/http_connection_manager.proto | 1 - .../http_connection_manager/v3alpha/BUILD | 25 ++-- .../v3alpha/http_connection_manager.proto | 1 - .../filter/network/mongo_proxy/v2/BUILD | 6 +- .../network/mongo_proxy/v2/mongo_proxy.proto | 1 - .../filter/network/mongo_proxy/v3alpha/BUILD | 6 +- .../mongo_proxy/v3alpha/mongo_proxy.proto | 1 - .../filter/network/mysql_proxy/v1alpha1/BUILD | 4 +- .../mysql_proxy/v1alpha1/mysql_proxy.proto | 1 - .../config/filter/network/rate_limit/v2/BUILD | 9 +- .../network/rate_limit/v2/rate_limit.proto | 1 - .../filter/network/rate_limit/v3alpha/BUILD | 9 +- .../rate_limit/v3alpha/rate_limit.proto | 1 - envoy/config/filter/network/rbac/v2/BUILD | 6 +- .../config/filter/network/rbac/v2/rbac.proto | 1 - .../config/filter/network/rbac/v3alpha/BUILD | 6 +- .../filter/network/rbac/v3alpha/rbac.proto | 1 - .../filter/network/redis_proxy/v2/BUILD | 9 +- .../network/redis_proxy/v2/redis_proxy.proto | 1 - .../filter/network/redis_proxy/v3alpha/BUILD | 9 +- .../redis_proxy/v3alpha/redis_proxy.proto | 1 - .../config/filter/network/tcp_proxy/v2/BUILD | 19 ++- .../network/tcp_proxy/v2/tcp_proxy.proto | 1 - .../filter/network/tcp_proxy/v3alpha/BUILD | 19 ++- .../network/tcp_proxy/v3alpha/tcp_proxy.proto | 1 - .../network/thrift_proxy/v2alpha1/BUILD | 9 +- .../network/thrift_proxy/v2alpha1/route.proto | 1 - .../thrift_proxy/v2alpha1/thrift_proxy.proto | 1 - .../network/zookeeper_proxy/v1alpha1/BUILD | 4 +- .../v1alpha1/zookeeper_proxy.proto | 1 - .../filter/thrift/rate_limit/v2alpha1/BUILD | 9 +- .../rate_limit/v2alpha1/rate_limit.proto | 1 - .../filter/thrift/router/v2alpha1/BUILD | 4 +- .../thrift/router/v2alpha1/router.proto | 1 - envoy/config/grpc_credential/v2alpha/BUILD | 19 +-- .../grpc_credential/v2alpha/aws_iam.proto | 1 - .../v2alpha/file_based_metadata.proto | 1 - envoy/config/grpc_credential/v3alpha/BUILD | 19 +-- .../grpc_credential/v3alpha/aws_iam.proto | 1 - .../v3alpha/file_based_metadata.proto | 1 - envoy/config/health_checker/redis/v2/BUILD | 4 +- .../health_checker/redis/v2/redis.proto | 1 - .../config/health_checker/redis/v3alpha/BUILD | 4 +- .../health_checker/redis/v3alpha/redis.proto | 1 - envoy/config/metrics/v2/BUILD | 26 ++-- envoy/config/metrics/v2/stats.proto | 1 - envoy/config/metrics/v3alpha/BUILD | 26 ++-- envoy/config/metrics/v3alpha/stats.proto | 1 - envoy/config/overload/v2alpha/BUILD | 9 +- envoy/config/overload/v2alpha/overload.proto | 1 - envoy/config/overload/v3alpha/BUILD | 9 +- envoy/config/overload/v3alpha/overload.proto | 1 - envoy/config/ratelimit/v2/BUILD | 14 +-- envoy/config/ratelimit/v2/rls.proto | 1 - envoy/config/ratelimit/v3alpha/BUILD | 14 +-- envoy/config/ratelimit/v3alpha/rls.proto | 1 - envoy/config/rbac/v2/BUILD | 23 ++-- envoy/config/rbac/v2/rbac.proto | 1 - envoy/config/rbac/v3alpha/BUILD | 23 ++-- envoy/config/rbac/v3alpha/rbac.proto | 1 - .../resource_monitor/fixed_heap/v2alpha/BUILD | 4 +- .../fixed_heap/v2alpha/fixed_heap.proto | 1 - .../resource_monitor/fixed_heap/v3alpha/BUILD | 4 +- .../fixed_heap/v3alpha/fixed_heap.proto | 1 - .../injected_resource/v2alpha/BUILD | 4 +- .../v2alpha/injected_resource.proto | 1 - .../injected_resource/v3alpha/BUILD | 4 +- .../v3alpha/injected_resource.proto | 1 - envoy/config/retry/previous_priorities/BUILD | 6 +- envoy/config/trace/v2/BUILD | 18 ++- envoy/config/trace/v2/trace.proto | 1 - envoy/config/trace/v3alpha/BUILD | 18 ++- envoy/config/trace/v3alpha/trace.proto | 1 - .../transport_socket/alts/v2alpha/BUILD | 6 +- .../transport_socket/alts/v2alpha/alts.proto | 1 - .../transport_socket/alts/v3alpha/BUILD | 6 +- .../transport_socket/alts/v3alpha/alts.proto | 1 - .../config/transport_socket/tap/v2alpha/BUILD | 9 +- .../transport_socket/tap/v2alpha/tap.proto | 1 - .../config/transport_socket/tap/v3alpha/BUILD | 9 +- .../transport_socket/tap/v3alpha/tap.proto | 1 - envoy/data/accesslog/v2/BUILD | 15 +-- envoy/data/accesslog/v3alpha/BUILD | 15 +-- envoy/data/cluster/v2alpha/BUILD | 4 +- envoy/data/cluster/v3alpha/BUILD | 4 +- envoy/data/core/v2alpha/BUILD | 6 +- envoy/data/core/v3alpha/BUILD | 6 +- envoy/data/tap/v2alpha/BUILD | 6 +- envoy/data/tap/v2alpha/transport.proto | 1 - envoy/data/tap/v3alpha/BUILD | 6 +- envoy/data/tap/v3alpha/transport.proto | 1 - envoy/service/accesslog/v2/BUILD | 19 ++- envoy/service/accesslog/v2/als.proto | 1 - envoy/service/accesslog/v3alpha/BUILD | 19 ++- envoy/service/accesslog/v3alpha/als.proto | 1 - envoy/service/auth/v2/BUILD | 10 +- envoy/service/auth/v2/external_auth.proto | 1 - envoy/service/auth/v2alpha/BUILD | 9 +- .../service/auth/v2alpha/external_auth.proto | 2 - envoy/service/auth/v3alpha/BUILD | 10 +- .../service/auth/v3alpha/external_auth.proto | 1 - envoy/service/discovery/v2/BUILD | 45 ++----- envoy/service/discovery/v2/ads.proto | 1 - envoy/service/discovery/v3alpha/BUILD | 45 ++----- envoy/service/discovery/v3alpha/ads.proto | 1 - envoy/service/load_stats/v2/BUILD | 19 ++- envoy/service/load_stats/v2/lrs.proto | 1 - envoy/service/load_stats/v3alpha/BUILD | 19 ++- envoy/service/load_stats/v3alpha/lrs.proto | 1 - envoy/service/metrics/v2/BUILD | 19 ++- .../service/metrics/v2/metrics_service.proto | 1 - envoy/service/metrics/v3alpha/BUILD | 19 ++- .../metrics/v3alpha/metrics_service.proto | 1 - envoy/service/ratelimit/v2/BUILD | 20 ++- envoy/service/ratelimit/v2/rls.proto | 1 - envoy/service/ratelimit/v3alpha/BUILD | 20 ++- envoy/service/ratelimit/v3alpha/rls.proto | 1 - envoy/service/tap/v2alpha/BUILD | 12 +- envoy/service/tap/v3alpha/BUILD | 12 +- envoy/service/trace/v2/BUILD | 19 ++- envoy/service/trace/v2/trace_service.proto | 1 - envoy/service/trace/v3alpha/BUILD | 19 ++- .../service/trace/v3alpha/trace_service.proto | 1 - envoy/type/BUILD | 21 +--- envoy/type/matcher/BUILD | 45 +------ envoy/type/matcher/metadata.proto | 1 - envoy/type/matcher/number.proto | 1 - envoy/type/matcher/regex.proto | 1 - envoy/type/matcher/string.proto | 1 - envoy/type/matcher/value.proto | 1 - envoy/type/range.proto | 1 - test/build/BUILD | 21 ++-- test/build/go_build_test.go | 21 ++-- 288 files changed, 1036 insertions(+), 1313 deletions(-) diff --git a/bazel/BUILD b/bazel/BUILD index e69de29b..4b582bb8 100644 --- a/bazel/BUILD +++ b/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/bazel/api_build_system.bzl b/bazel/api_build_system.bzl index 14cc6f89..0ad60bf8 100644 --- a/bazel/api_build_system.bzl +++ b/bazel/api_build_system.bzl @@ -7,9 +7,23 @@ _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/" +_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 @@ -61,41 +75,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. @@ -108,8 +87,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"], @@ -124,20 +101,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( @@ -181,3 +145,50 @@ 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 = "pkg", srcs = [], deps = [], has_services = False, visibility = ["//visibility:public"]): + if srcs == []: + srcs = native.glob(["*.proto"]) + + native.proto_library( + name = name, + srcs = srcs, + deps = deps + _COMMON_PROTO_DEPS, + visibility = visibility, + ) + + compilers = ["@io_bazel_rules_go//proto:go_proto", "//bazel:pgv_plugin_go"] + if has_services: + compilers = ["@io_bazel_rules_go//proto:go_grpc", "//bazel:pgv_plugin_go"] + + 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", + "@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", + ], + ) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 7af054b2..b992717d 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -161,7 +161,7 @@ filegroup( ZIPKINAPI_BUILD_CONTENT = """ -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library", "api_go_proto_library") +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( @@ -173,8 +173,9 @@ api_proto_library( visibility = ["//visibility:public"], ) -api_go_proto_library( - name = "zipkin", +go_proto_library( + name = "zipkin_go_proto", proto = ":zipkin", + visibility = ["//visibility:public"], ) """ diff --git a/envoy/admin/v2alpha/BUILD b/envoy/admin/v2alpha/BUILD index aa35aa7c..850eb051 100644 --- a/envoy/admin/v2alpha/BUILD +++ b/envoy/admin/v2alpha/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/v2", + "//envoy/api/v2/auth", + "//envoy/api/v2/core", + "//envoy/config/bootstrap/v2:pkg", + "//envoy/service/tap/v2alpha:pkg", + "//envoy/type", + ], +) + api_proto_library_internal( name = "config_dump", srcs = ["config_dump.proto"], diff --git a/envoy/admin/v3alpha/BUILD b/envoy/admin/v3alpha/BUILD index 71b0790b..98492820 100644 --- a/envoy/admin/v3alpha/BUILD +++ b/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/envoy/api/v2/BUILD b/envoy/api/v2/BUILD index b86ca2a7..72fcb5f5 100644 --- a/envoy/api/v2/BUILD +++ b/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,21 @@ package_group( ], ) +api_proto_package( + name = "v2", + has_services = True, + deps = [ + "//envoy/api/v2/auth", + "//envoy/api/v2/cluster", + "//envoy/api/v2/core", + "//envoy/api/v2/endpoint:pkg", + "//envoy/api/v2/listener:pkg", + "//envoy/api/v2/ratelimit:pkg", + "//envoy/api/v2/route:pkg", + "//envoy/type", + ], +) + api_proto_library_internal( name = "discovery", srcs = ["discovery.proto"], @@ -23,12 +38,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 +53,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 +75,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"], @@ -113,18 +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", - "//envoy/api/v2/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/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"], @@ -160,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/envoy/api/v2/auth/BUILD b/envoy/api/v2/auth/BUILD index acc28aac..bb3951fb 100644 --- a/envoy/api/v2/auth/BUILD +++ b/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,13 @@ package_group( ], ) +api_proto_package( + name = "auth", + deps = [ + "//envoy/api/v2/core", + ], +) + api_proto_library_internal( name = "cert", srcs = ["cert.proto"], @@ -24,12 +31,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/envoy/api/v2/auth/cert.proto b/envoy/api/v2/auth/cert.proto index 30db22c6..2a826780 100644 --- a/envoy/api/v2/auth/cert.proto +++ b/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/envoy/api/v2/cluster/BUILD b/envoy/api/v2/cluster/BUILD index 5589905d..baf9a4bf 100644 --- a/envoy/api/v2/cluster/BUILD +++ b/envoy/api/v2/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/v2/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/v2/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/v2:__pkg__", ], ) - -api_go_proto_library( - name = "filter", - proto = ":filter", -) diff --git a/envoy/api/v2/cluster/circuit_breaker.proto b/envoy/api/v2/cluster/circuit_breaker.proto index bc2bcf25..5ae8cc3d 100644 --- a/envoy/api/v2/cluster/circuit_breaker.proto +++ b/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/envoy/api/v2/core/BUILD b/envoy/api/v2/core/BUILD index b3d2be23..01234d07 100644 --- a/envoy/api/v2/core/BUILD +++ b/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_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/envoy/api/v2/core/base.proto b/envoy/api/v2/core/base.proto index 2553fe04..0f73b83a 100644 --- a/envoy/api/v2/core/base.proto +++ b/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/envoy/api/v2/discovery.proto b/envoy/api/v2/discovery.proto index a3072a81..5328e515 100644 --- a/envoy/api/v2/discovery.proto +++ b/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/envoy/api/v2/endpoint/BUILD b/envoy/api/v2/endpoint/BUILD index 0dead0f5..a12db373 100644 --- a/envoy/api/v2/endpoint/BUILD +++ b/envoy/api/v2/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/v2/auth", + "//envoy/api/v2/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/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 +32,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/envoy/api/v2/endpoint/endpoint.proto b/envoy/api/v2/endpoint/endpoint.proto index 7abb7ea5..6327af00 100644 --- a/envoy/api/v2/endpoint/endpoint.proto +++ b/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/envoy/api/v2/listener/BUILD b/envoy/api/v2/listener/BUILD index e539c4b8..42c79fe4 100644 --- a/envoy/api/v2/listener/BUILD +++ b/envoy/api/v2/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/v2/auth", + "//envoy/api/v2/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/v2/auth:cert_go_proto", - "//envoy/api/v2/core:address_go_proto", - "//envoy/api/v2/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/v2/core:base", ], ) - -api_go_proto_library( - name = "udp_listener_config", - proto = ":udp_listener_config", - deps = [ - "//envoy/api/v2/core:base_go_proto", - ], -) diff --git a/envoy/api/v2/listener/listener.proto b/envoy/api/v2/listener/listener.proto index 293a4d2d..3b6cf74a 100644 --- a/envoy/api/v2/listener/listener.proto +++ b/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/envoy/api/v2/listener/udp_listener_config.proto b/envoy/api/v2/listener/udp_listener_config.proto index f75383ba..28d8233f 100644 --- a/envoy/api/v2/listener/udp_listener_config.proto +++ b/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/envoy/api/v2/ratelimit/BUILD b/envoy/api/v2/ratelimit/BUILD index 5f2a9201..234a3b20 100644 --- a/envoy/api/v2/ratelimit/BUILD +++ b/envoy/api/v2/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/v2:friends"], ) - -api_go_proto_library( - name = "ratelimit", - proto = ":ratelimit", -) diff --git a/envoy/api/v2/ratelimit/ratelimit.proto b/envoy/api/v2/ratelimit/ratelimit.proto index 8ebec718..6f4cd625 100644 --- a/envoy/api/v2/ratelimit/ratelimit.proto +++ b/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/envoy/api/v2/route/BUILD b/envoy/api/v2/route/BUILD index 968ab1c6..163281ca 100644 --- a/envoy/api/v2/route/BUILD +++ b/envoy/api/v2/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/v2/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/v2/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/envoy/api/v2/route/route.proto b/envoy/api/v2/route/route.proto index e0fbaf0f..d396344a 100644 --- a/envoy/api/v2/route/route.proto +++ b/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/envoy/api/v3alpha/BUILD b/envoy/api/v3alpha/BUILD index 0e2892e8..e61a715a 100644 --- a/envoy/api/v3alpha/BUILD +++ b/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/envoy/api/v3alpha/auth/BUILD b/envoy/api/v3alpha/auth/BUILD index f206a35f..6c47aff6 100644 --- a/envoy/api/v3alpha/auth/BUILD +++ b/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/envoy/api/v3alpha/auth/cert.proto b/envoy/api/v3alpha/auth/cert.proto index 92545307..2be82a1c 100644 --- a/envoy/api/v3alpha/auth/cert.proto +++ b/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/envoy/api/v3alpha/cluster/BUILD b/envoy/api/v3alpha/cluster/BUILD index 94270122..ef016240 100644 --- a/envoy/api/v3alpha/cluster/BUILD +++ b/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/envoy/api/v3alpha/cluster/circuit_breaker.proto b/envoy/api/v3alpha/cluster/circuit_breaker.proto index 39f4f77c..8a70008e 100644 --- a/envoy/api/v3alpha/cluster/circuit_breaker.proto +++ b/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/envoy/api/v3alpha/core/BUILD b/envoy/api/v3alpha/core/BUILD index cfc6bd83..871c9fe0 100644 --- a/envoy/api/v3alpha/core/BUILD +++ b/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/envoy/api/v3alpha/core/base.proto b/envoy/api/v3alpha/core/base.proto index 0661d99e..cf39df88 100644 --- a/envoy/api/v3alpha/core/base.proto +++ b/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/envoy/api/v3alpha/discovery.proto b/envoy/api/v3alpha/discovery.proto index 87433f0d..105b9988 100644 --- a/envoy/api/v3alpha/discovery.proto +++ b/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/envoy/api/v3alpha/endpoint/BUILD b/envoy/api/v3alpha/endpoint/BUILD index 1630438b..73356051 100644 --- a/envoy/api/v3alpha/endpoint/BUILD +++ b/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/envoy/api/v3alpha/endpoint/endpoint.proto b/envoy/api/v3alpha/endpoint/endpoint.proto index 4bb1b57e..15357cdb 100644 --- a/envoy/api/v3alpha/endpoint/endpoint.proto +++ b/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/envoy/api/v3alpha/listener/BUILD b/envoy/api/v3alpha/listener/BUILD index 693ead54..3ee071ca 100644 --- a/envoy/api/v3alpha/listener/BUILD +++ b/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/envoy/api/v3alpha/listener/listener.proto b/envoy/api/v3alpha/listener/listener.proto index 2aa7146a..dc44c145 100644 --- a/envoy/api/v3alpha/listener/listener.proto +++ b/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/envoy/api/v3alpha/listener/udp_listener_config.proto b/envoy/api/v3alpha/listener/udp_listener_config.proto index 763a08a9..532028da 100644 --- a/envoy/api/v3alpha/listener/udp_listener_config.proto +++ b/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/envoy/api/v3alpha/ratelimit/BUILD b/envoy/api/v3alpha/ratelimit/BUILD index b08c1fc0..a99624b1 100644 --- a/envoy/api/v3alpha/ratelimit/BUILD +++ b/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/envoy/api/v3alpha/ratelimit/ratelimit.proto b/envoy/api/v3alpha/ratelimit/ratelimit.proto index c10bfef8..9f2b6781 100644 --- a/envoy/api/v3alpha/ratelimit/ratelimit.proto +++ b/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/envoy/api/v3alpha/route/BUILD b/envoy/api/v3alpha/route/BUILD index 0b660893..cbed3ec0 100644 --- a/envoy/api/v3alpha/route/BUILD +++ b/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/envoy/api/v3alpha/route/route.proto b/envoy/api/v3alpha/route/route.proto index 963d94f1..e69e116b 100644 --- a/envoy/api/v3alpha/route/route.proto +++ b/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/envoy/config/accesslog/v2/BUILD b/envoy/config/accesslog/v2/BUILD index 85ac228c..22c48f79 100644 --- a/envoy/config/accesslog/v2/BUILD +++ b/envoy/config/accesslog/v2/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/v2/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/v2/core:grpc_service_go_proto"], -) diff --git a/envoy/config/accesslog/v2/als.proto b/envoy/config/accesslog/v2/als.proto index 9d83ebfc..c02835db 100644 --- a/envoy/config/accesslog/v2/als.proto +++ b/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/envoy/config/accesslog/v2/file.proto b/envoy/config/accesslog/v2/file.proto index 48a1841a..b88529a3 100644 --- a/envoy/config/accesslog/v2/file.proto +++ b/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/envoy/config/accesslog/v3alpha/BUILD b/envoy/config/accesslog/v3alpha/BUILD index 4f5da73e..8409598d 100644 --- a/envoy/config/accesslog/v3alpha/BUILD +++ b/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/envoy/config/accesslog/v3alpha/als.proto b/envoy/config/accesslog/v3alpha/als.proto index a194d144..07ec724d 100644 --- a/envoy/config/accesslog/v3alpha/als.proto +++ b/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/envoy/config/accesslog/v3alpha/file.proto b/envoy/config/accesslog/v3alpha/file.proto index b07658bc..2f32da7b 100644 --- a/envoy/config/accesslog/v3alpha/file.proto +++ b/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/envoy/config/bootstrap/v2/BUILD b/envoy/config/bootstrap/v2/BUILD index 455365ab..1f3a7910 100644 --- a/envoy/config/bootstrap/v2/BUILD +++ b/envoy/config/bootstrap/v2/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/v2", + "//envoy/api/v2/auth", + "//envoy/api/v2/core", + "//envoy/config/metrics/v2:pkg", + "//envoy/config/overload/v2alpha:pkg", + "//envoy/config/ratelimit/v2:pkg", + "//envoy/config/trace/v2:pkg", + ], +) + api_proto_library_internal( name = "bootstrap", srcs = ["bootstrap.proto"], @@ -20,21 +32,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/envoy/config/bootstrap/v2/bootstrap.proto b/envoy/config/bootstrap/v2/bootstrap.proto index 9e3d9fe1..66f05aa7 100644 --- a/envoy/config/bootstrap/v2/bootstrap.proto +++ b/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/envoy/config/bootstrap/v3alpha/BUILD b/envoy/config/bootstrap/v3alpha/BUILD index d148021c..c88b9824 100644 --- a/envoy/config/bootstrap/v3alpha/BUILD +++ b/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/envoy/config/bootstrap/v3alpha/bootstrap.proto b/envoy/config/bootstrap/v3alpha/bootstrap.proto index 57157a4a..0bf18ffa 100644 --- a/envoy/config/bootstrap/v3alpha/bootstrap.proto +++ b/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/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD b/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD index b09f5c85..669b6745 100644 --- a/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD +++ b/envoy/config/cluster/dynamic_forward_proxy/v2alpha/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/v2alpha:pkg"], +) + api_proto_library_internal( name = "cluster", srcs = ["cluster.proto"], diff --git a/envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.proto b/envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.proto index d9ae8590..c6d47807 100644 --- a/envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.proto +++ b/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/envoy/config/cluster/dynamic_forward_proxy/v3alpha/BUILD b/envoy/config/cluster/dynamic_forward_proxy/v3alpha/BUILD index 50d0aa23..3c1d7378 100644 --- a/envoy/config/cluster/dynamic_forward_proxy/v3alpha/BUILD +++ b/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/envoy/config/cluster/dynamic_forward_proxy/v3alpha/cluster.proto b/envoy/config/cluster/dynamic_forward_proxy/v3alpha/cluster.proto index baed68d3..6bc7bdd4 100644 --- a/envoy/config/cluster/dynamic_forward_proxy/v3alpha/cluster.proto +++ b/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/envoy/config/cluster/redis/BUILD b/envoy/config/cluster/redis/BUILD index 42e2d408..760ae606 100644 --- a/envoy/config/cluster/redis/BUILD +++ b/envoy/config/cluster/redis/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_cluster", srcs = ["redis_cluster.proto"], diff --git a/envoy/config/cluster/redis/redis_cluster.proto b/envoy/config/cluster/redis/redis_cluster.proto index 2644288c..abe2c857 100644 --- a/envoy/config/cluster/redis/redis_cluster.proto +++ b/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/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD b/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD index 53095826..312ae36b 100644 --- a/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD +++ b/envoy/config/common/dynamic_forward_proxy/v2alpha/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/v2"], +) + api_proto_library_internal( name = "dns_cache", srcs = ["dns_cache.proto"], diff --git a/envoy/config/common/dynamic_forward_proxy/v3alpha/BUILD b/envoy/config/common/dynamic_forward_proxy/v3alpha/BUILD index bdd23e86..e1853725 100644 --- a/envoy/config/common/dynamic_forward_proxy/v3alpha/BUILD +++ b/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/envoy/config/common/tap/v2alpha/BUILD b/envoy/config/common/tap/v2alpha/BUILD index 863ba519..89877329 100644 --- a/envoy/config/common/tap/v2alpha/BUILD +++ b/envoy/config/common/tap/v2alpha/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/v2/core", + "//envoy/service/tap/v2alpha:pkg", + ], +) + api_proto_library_internal( name = "common", srcs = ["common.proto"], diff --git a/envoy/config/common/tap/v3alpha/BUILD b/envoy/config/common/tap/v3alpha/BUILD index 673a6028..55147b12 100644 --- a/envoy/config/common/tap/v3alpha/BUILD +++ b/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/envoy/config/filter/accesslog/v2/BUILD b/envoy/config/filter/accesslog/v2/BUILD index fdbf376a..d9b74092 100644 --- a/envoy/config/filter/accesslog/v2/BUILD +++ b/envoy/config/filter/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( + deps = [ + "//envoy/api/v2/core", + "//envoy/api/v2/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/v2/core:base_go_proto", - "//envoy/api/v2/route:route_go_proto", - "//envoy/type:percent_go_proto", - ], -) diff --git a/envoy/config/filter/accesslog/v2/accesslog.proto b/envoy/config/filter/accesslog/v2/accesslog.proto index 76fc4baf..d7777081 100644 --- a/envoy/config/filter/accesslog/v2/accesslog.proto +++ b/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/envoy/config/filter/accesslog/v3alpha/BUILD b/envoy/config/filter/accesslog/v3alpha/BUILD index 3f241bc5..454a1ab4 100644 --- a/envoy/config/filter/accesslog/v3alpha/BUILD +++ b/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/envoy/config/filter/accesslog/v3alpha/accesslog.proto b/envoy/config/filter/accesslog/v3alpha/accesslog.proto index 381e7bdf..b7beef0b 100644 --- a/envoy/config/filter/accesslog/v3alpha/accesslog.proto +++ b/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/envoy/config/filter/dubbo/router/v2alpha1/BUILD b/envoy/config/filter/dubbo/router/v2alpha1/BUILD index 51c69c0d..68bd8c12 100644 --- a/envoy/config/filter/dubbo/router/v2alpha1/BUILD +++ b/envoy/config/filter/dubbo/router/v2alpha1/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 = "router", srcs = ["router.proto"], diff --git a/envoy/config/filter/dubbo/router/v2alpha1/router.proto b/envoy/config/filter/dubbo/router/v2alpha1/router.proto index 37a5542a..4e65f14e 100644 --- a/envoy/config/filter/dubbo/router/v2alpha1/router.proto +++ b/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/envoy/config/filter/fault/v2/BUILD b/envoy/config/filter/fault/v2/BUILD index 35419a99..78687f4e 100644 --- a/envoy/config/filter/fault/v2/BUILD +++ b/envoy/config/filter/fault/v2/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/envoy/config/filter/fault/v2/fault.proto b/envoy/config/filter/fault/v2/fault.proto index f27f9d44..2298ecf4 100644 --- a/envoy/config/filter/fault/v2/fault.proto +++ b/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/envoy/config/filter/fault/v3alpha/BUILD b/envoy/config/filter/fault/v3alpha/BUILD index 22e3bec5..61bc8dc6 100644 --- a/envoy/config/filter/fault/v3alpha/BUILD +++ b/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/envoy/config/filter/fault/v3alpha/fault.proto b/envoy/config/filter/fault/v3alpha/fault.proto index b54a063e..054eb847 100644 --- a/envoy/config/filter/fault/v3alpha/fault.proto +++ b/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/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD b/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD index 948ceec2..b58f88c7 100644 --- a/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD +++ b/envoy/config/filter/http/adaptive_concurrency/v2alpha/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/v2/core"], +) + api_proto_library_internal( name = "adaptive_concurrency", srcs = ["adaptive_concurrency.proto"], diff --git a/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.proto b/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.proto index ff196572..303b6814 100644 --- a/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.proto +++ b/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/envoy/config/filter/http/adaptive_concurrency/v3alpha/BUILD b/envoy/config/filter/http/adaptive_concurrency/v3alpha/BUILD index aa2b0634..f9813a6a 100644 --- a/envoy/config/filter/http/adaptive_concurrency/v3alpha/BUILD +++ b/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/envoy/config/filter/http/adaptive_concurrency/v3alpha/adaptive_concurrency.proto b/envoy/config/filter/http/adaptive_concurrency/v3alpha/adaptive_concurrency.proto index 17bac558..3d57196f 100644 --- a/envoy/config/filter/http/adaptive_concurrency/v3alpha/adaptive_concurrency.proto +++ b/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/envoy/config/filter/http/buffer/v2/BUILD b/envoy/config/filter/http/buffer/v2/BUILD index e59429af..039ebb63 100644 --- a/envoy/config/filter/http/buffer/v2/BUILD +++ b/envoy/config/filter/http/buffer/v2/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/envoy/config/filter/http/buffer/v2/buffer.proto b/envoy/config/filter/http/buffer/v2/buffer.proto index a203d9d9..92780ada 100644 --- a/envoy/config/filter/http/buffer/v2/buffer.proto +++ b/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/envoy/config/filter/http/buffer/v3alpha/BUILD b/envoy/config/filter/http/buffer/v3alpha/BUILD index e59429af..039ebb63 100644 --- a/envoy/config/filter/http/buffer/v3alpha/BUILD +++ b/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/envoy/config/filter/http/buffer/v3alpha/buffer.proto b/envoy/config/filter/http/buffer/v3alpha/buffer.proto index a948493b..25530c5a 100644 --- a/envoy/config/filter/http/buffer/v3alpha/buffer.proto +++ b/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/envoy/config/filter/http/csrf/v2/BUILD b/envoy/config/filter/http/csrf/v2/BUILD index 0d58b1ef..af3a87b0 100644 --- a/envoy/config/filter/http/csrf/v2/BUILD +++ b/envoy/config/filter/http/csrf/v2/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/v2/core", + "//envoy/type/matcher", + ], +) + api_proto_library_internal( name = "csrf", srcs = ["csrf.proto"], diff --git a/envoy/config/filter/http/csrf/v2/csrf.proto b/envoy/config/filter/http/csrf/v2/csrf.proto index 525ed118..d4c35291 100644 --- a/envoy/config/filter/http/csrf/v2/csrf.proto +++ b/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/envoy/config/filter/http/csrf/v3alpha/BUILD b/envoy/config/filter/http/csrf/v3alpha/BUILD index b5da684c..67655983 100644 --- a/envoy/config/filter/http/csrf/v3alpha/BUILD +++ b/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/envoy/config/filter/http/csrf/v3alpha/csrf.proto b/envoy/config/filter/http/csrf/v3alpha/csrf.proto index 5eaa14c5..8fe68d5e 100644 --- a/envoy/config/filter/http/csrf/v3alpha/csrf.proto +++ b/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/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD b/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD index 4fd1d843..15d18437 100644 --- a/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD +++ b/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/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/v2alpha:pkg"], +) + api_proto_library_internal( name = "dynamic_forward_proxy", srcs = ["dynamic_forward_proxy.proto"], diff --git a/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.proto b/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.proto index 631363a6..c315ddb4 100644 --- a/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.proto +++ b/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/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/BUILD b/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/BUILD index f09166ba..c0622767 100644 --- a/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/BUILD +++ b/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/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/dynamic_forward_proxy.proto b/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/dynamic_forward_proxy.proto index 0fab44d6..f60aaae8 100644 --- a/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/dynamic_forward_proxy.proto +++ b/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/envoy/config/filter/http/ext_authz/v2/BUILD b/envoy/config/filter/http/ext_authz/v2/BUILD index b1d02437..10187f48 100644 --- a/envoy/config/filter/http/ext_authz/v2/BUILD +++ b/envoy/config/filter/http/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( + deps = [ + "//envoy/api/v2/core", + "//envoy/type", + "//envoy/type/matcher", + ], +) + api_proto_library_internal( name = "ext_authz", srcs = ["ext_authz.proto"], diff --git a/envoy/config/filter/http/ext_authz/v2/ext_authz.proto b/envoy/config/filter/http/ext_authz/v2/ext_authz.proto index de105eff..e2922348 100644 --- a/envoy/config/filter/http/ext_authz/v2/ext_authz.proto +++ b/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/envoy/config/filter/http/ext_authz/v3alpha/BUILD b/envoy/config/filter/http/ext_authz/v3alpha/BUILD index 39f9e44b..cb0d25a3 100644 --- a/envoy/config/filter/http/ext_authz/v3alpha/BUILD +++ b/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/envoy/config/filter/http/ext_authz/v3alpha/ext_authz.proto b/envoy/config/filter/http/ext_authz/v3alpha/ext_authz.proto index af6f3c48..8cc48e36 100644 --- a/envoy/config/filter/http/ext_authz/v3alpha/ext_authz.proto +++ b/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/envoy/config/filter/http/fault/v2/BUILD b/envoy/config/filter/http/fault/v2/BUILD index e561e881..b169a090 100644 --- a/envoy/config/filter/http/fault/v2/BUILD +++ b/envoy/config/filter/http/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( + deps = [ + "//envoy/api/v2/route:pkg", + "//envoy/config/filter/fault/v2:pkg", + "//envoy/type", + ], +) + api_proto_library_internal( name = "fault", srcs = ["fault.proto"], diff --git a/envoy/config/filter/http/fault/v2/fault.proto b/envoy/config/filter/http/fault/v2/fault.proto index 51ee24ac..82566908 100644 --- a/envoy/config/filter/http/fault/v2/fault.proto +++ b/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/envoy/config/filter/http/fault/v3alpha/BUILD b/envoy/config/filter/http/fault/v3alpha/BUILD index 1fd5632c..508e2d3c 100644 --- a/envoy/config/filter/http/fault/v3alpha/BUILD +++ b/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/envoy/config/filter/http/fault/v3alpha/fault.proto b/envoy/config/filter/http/fault/v3alpha/fault.proto index f654ec17..2189e4a4 100644 --- a/envoy/config/filter/http/fault/v3alpha/fault.proto +++ b/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/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/BUILD b/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/BUILD index 7c1deb71..a88ba244 100644 --- a/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/BUILD +++ b/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/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 = "config", srcs = ["config.proto"], diff --git a/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.proto b/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.proto index 0c33b6d0..b3b1fde5 100644 --- a/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.proto +++ b/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/envoy/config/filter/http/gzip/v2/BUILD b/envoy/config/filter/http/gzip/v2/BUILD index e34d73c5..a3f4b0af 100644 --- a/envoy/config/filter/http/gzip/v2/BUILD +++ b/envoy/config/filter/http/gzip/v2/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/envoy/config/filter/http/gzip/v2/gzip.proto b/envoy/config/filter/http/gzip/v2/gzip.proto index fb6b8878..ec512c49 100644 --- a/envoy/config/filter/http/gzip/v2/gzip.proto +++ b/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/envoy/config/filter/http/gzip/v3alpha/BUILD b/envoy/config/filter/http/gzip/v3alpha/BUILD index e34d73c5..a3f4b0af 100644 --- a/envoy/config/filter/http/gzip/v3alpha/BUILD +++ b/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/envoy/config/filter/http/gzip/v3alpha/gzip.proto b/envoy/config/filter/http/gzip/v3alpha/gzip.proto index 5b5c6d6d..d7afb891 100644 --- a/envoy/config/filter/http/gzip/v3alpha/gzip.proto +++ b/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/envoy/config/filter/http/header_to_metadata/v2/BUILD b/envoy/config/filter/http/header_to_metadata/v2/BUILD index 3f8503ac..cfd34fcf 100644 --- a/envoy/config/filter/http/header_to_metadata/v2/BUILD +++ b/envoy/config/filter/http/header_to_metadata/v2/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/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto b/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto index 5e70bbfc..345c5225 100644 --- a/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto +++ b/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/envoy/config/filter/http/header_to_metadata/v3alpha/BUILD b/envoy/config/filter/http/header_to_metadata/v3alpha/BUILD index 3f8503ac..cfd34fcf 100644 --- a/envoy/config/filter/http/header_to_metadata/v3alpha/BUILD +++ b/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/envoy/config/filter/http/header_to_metadata/v3alpha/header_to_metadata.proto b/envoy/config/filter/http/header_to_metadata/v3alpha/header_to_metadata.proto index 927574a5..c3811a00 100644 --- a/envoy/config/filter/http/header_to_metadata/v3alpha/header_to_metadata.proto +++ b/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/envoy/config/filter/http/health_check/v2/BUILD b/envoy/config/filter/http/health_check/v2/BUILD index 9dc0af2d..8a995f16 100644 --- a/envoy/config/filter/http/health_check/v2/BUILD +++ b/envoy/config/filter/http/health_check/v2/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/v2/route", - "//envoy/type:percent", + "//envoy/api/v2/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/v2/route:route_go_proto", - "//envoy/type:percent_go_proto", + "//envoy/api/v2/route", + "//envoy/type:percent", ], ) diff --git a/envoy/config/filter/http/health_check/v2/health_check.proto b/envoy/config/filter/http/health_check/v2/health_check.proto index bc843373..2aa6d419 100644 --- a/envoy/config/filter/http/health_check/v2/health_check.proto +++ b/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/envoy/config/filter/http/health_check/v3alpha/BUILD b/envoy/config/filter/http/health_check/v3alpha/BUILD index 89e6eb3a..b5836857 100644 --- a/envoy/config/filter/http/health_check/v3alpha/BUILD +++ b/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/envoy/config/filter/http/health_check/v3alpha/health_check.proto b/envoy/config/filter/http/health_check/v3alpha/health_check.proto index 31fcdfff..ecbb8e50 100644 --- a/envoy/config/filter/http/health_check/v3alpha/health_check.proto +++ b/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/envoy/config/filter/http/ip_tagging/v2/BUILD b/envoy/config/filter/http/ip_tagging/v2/BUILD index 4c700197..b318ae58 100644 --- a/envoy/config/filter/http/ip_tagging/v2/BUILD +++ b/envoy/config/filter/http/ip_tagging/v2/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/v2/core"], +) + api_proto_library_internal( name = "ip_tagging", srcs = ["ip_tagging.proto"], diff --git a/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto b/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto index 4f5da601..92ec469c 100644 --- a/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto +++ b/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/envoy/config/filter/http/ip_tagging/v3alpha/BUILD b/envoy/config/filter/http/ip_tagging/v3alpha/BUILD index 5b34fcd9..a05f0fd9 100644 --- a/envoy/config/filter/http/ip_tagging/v3alpha/BUILD +++ b/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/envoy/config/filter/http/ip_tagging/v3alpha/ip_tagging.proto b/envoy/config/filter/http/ip_tagging/v3alpha/ip_tagging.proto index e305800a..de7871d9 100644 --- a/envoy/config/filter/http/ip_tagging/v3alpha/ip_tagging.proto +++ b/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/envoy/config/filter/http/jwt_authn/v2alpha/BUILD b/envoy/config/filter/http/jwt_authn/v2alpha/BUILD index e48aa582..80b4345f 100644 --- a/envoy/config/filter/http/jwt_authn/v2alpha/BUILD +++ b/envoy/config/filter/http/jwt_authn/v2alpha/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/v2/core", + "//envoy/api/v2/route:pkg", + ], +) api_proto_library_internal( name = "jwt_authn", @@ -11,13 +18,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/envoy/config/filter/http/jwt_authn/v3alpha/BUILD b/envoy/config/filter/http/jwt_authn/v3alpha/BUILD index 2970da93..ea5d0d17 100644 --- a/envoy/config/filter/http/jwt_authn/v3alpha/BUILD +++ b/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/envoy/config/filter/http/lua/v2/BUILD b/envoy/config/filter/http/lua/v2/BUILD index 6daf0c82..7aaf7461 100644 --- a/envoy/config/filter/http/lua/v2/BUILD +++ b/envoy/config/filter/http/lua/v2/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/envoy/config/filter/http/lua/v2/lua.proto b/envoy/config/filter/http/lua/v2/lua.proto index f29bcdbe..6fc7fabc 100644 --- a/envoy/config/filter/http/lua/v2/lua.proto +++ b/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/envoy/config/filter/http/lua/v3alpha/BUILD b/envoy/config/filter/http/lua/v3alpha/BUILD index 6daf0c82..7aaf7461 100644 --- a/envoy/config/filter/http/lua/v3alpha/BUILD +++ b/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/envoy/config/filter/http/lua/v3alpha/lua.proto b/envoy/config/filter/http/lua/v3alpha/lua.proto index ff586ca2..934a5926 100644 --- a/envoy/config/filter/http/lua/v3alpha/lua.proto +++ b/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/envoy/config/filter/http/original_src/v2alpha1/BUILD b/envoy/config/filter/http/original_src/v2alpha1/BUILD index e064545b..a7435bb5 100644 --- a/envoy/config/filter/http/original_src/v2alpha1/BUILD +++ b/envoy/config/filter/http/original_src/v2alpha1/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 = "original_src", srcs = ["original_src.proto"], diff --git a/envoy/config/filter/http/original_src/v2alpha1/original_src.proto b/envoy/config/filter/http/original_src/v2alpha1/original_src.proto index 32f37a8c..5c09b860 100644 --- a/envoy/config/filter/http/original_src/v2alpha1/original_src.proto +++ b/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/envoy/config/filter/http/rate_limit/v2/BUILD b/envoy/config/filter/http/rate_limit/v2/BUILD index d8fb8e72..4a6d451d 100644 --- a/envoy/config/filter/http/rate_limit/v2/BUILD +++ b/envoy/config/filter/http/rate_limit/v2/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/v2:pkg"], +) + api_proto_library_internal( name = "rate_limit", srcs = ["rate_limit.proto"], diff --git a/envoy/config/filter/http/rate_limit/v2/rate_limit.proto b/envoy/config/filter/http/rate_limit/v2/rate_limit.proto index 9d93e4a2..1ad3c4c3 100644 --- a/envoy/config/filter/http/rate_limit/v2/rate_limit.proto +++ b/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/envoy/config/filter/http/rate_limit/v3alpha/BUILD b/envoy/config/filter/http/rate_limit/v3alpha/BUILD index e131d3a9..7060f7e9 100644 --- a/envoy/config/filter/http/rate_limit/v3alpha/BUILD +++ b/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/envoy/config/filter/http/rate_limit/v3alpha/rate_limit.proto b/envoy/config/filter/http/rate_limit/v3alpha/rate_limit.proto index 69e8d389..427d22a6 100644 --- a/envoy/config/filter/http/rate_limit/v3alpha/rate_limit.proto +++ b/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/envoy/config/filter/http/rbac/v2/BUILD b/envoy/config/filter/http/rbac/v2/BUILD index 6182fe26..ca9aa2ca 100644 --- a/envoy/config/filter/http/rbac/v2/BUILD +++ b/envoy/config/filter/http/rbac/v2/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/v2:pkg"], +) + api_proto_library_internal( name = "rbac", srcs = ["rbac.proto"], diff --git a/envoy/config/filter/http/rbac/v2/rbac.proto b/envoy/config/filter/http/rbac/v2/rbac.proto index 0a75d959..611cdc6c 100644 --- a/envoy/config/filter/http/rbac/v2/rbac.proto +++ b/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/envoy/config/filter/http/rbac/v3alpha/BUILD b/envoy/config/filter/http/rbac/v3alpha/BUILD index a6ee42cf..1e4d51b5 100644 --- a/envoy/config/filter/http/rbac/v3alpha/BUILD +++ b/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/envoy/config/filter/http/rbac/v3alpha/rbac.proto b/envoy/config/filter/http/rbac/v3alpha/rbac.proto index 8ec89896..47160ffa 100644 --- a/envoy/config/filter/http/rbac/v3alpha/rbac.proto +++ b/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/envoy/config/filter/http/router/v2/BUILD b/envoy/config/filter/http/router/v2/BUILD index 7a80299a..9ddaf54b 100644 --- a/envoy/config/filter/http/router/v2/BUILD +++ b/envoy/config/filter/http/router/v2/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/v2:pkg"], +) + 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/envoy/config/filter/http/router/v2/router.proto b/envoy/config/filter/http/router/v2/router.proto index e7767567..fd0cadec 100644 --- a/envoy/config/filter/http/router/v2/router.proto +++ b/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/envoy/config/filter/http/router/v3alpha/BUILD b/envoy/config/filter/http/router/v3alpha/BUILD index f0b6c100..d68a0ac2 100644 --- a/envoy/config/filter/http/router/v3alpha/BUILD +++ b/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/envoy/config/filter/http/router/v3alpha/router.proto b/envoy/config/filter/http/router/v3alpha/router.proto index 92efe315..a4ceae7d 100644 --- a/envoy/config/filter/http/router/v3alpha/router.proto +++ b/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/envoy/config/filter/http/squash/v2/BUILD b/envoy/config/filter/http/squash/v2/BUILD index 86bd4e8c..2a0c1c8e 100644 --- a/envoy/config/filter/http/squash/v2/BUILD +++ b/envoy/config/filter/http/squash/v2/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/envoy/config/filter/http/squash/v2/squash.proto b/envoy/config/filter/http/squash/v2/squash.proto index 006af438..2f3a2e21 100644 --- a/envoy/config/filter/http/squash/v2/squash.proto +++ b/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/envoy/config/filter/http/squash/v3alpha/BUILD b/envoy/config/filter/http/squash/v3alpha/BUILD index 86bd4e8c..2a0c1c8e 100644 --- a/envoy/config/filter/http/squash/v3alpha/BUILD +++ b/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/envoy/config/filter/http/squash/v3alpha/squash.proto b/envoy/config/filter/http/squash/v3alpha/squash.proto index 43a62af9..24236def 100644 --- a/envoy/config/filter/http/squash/v3alpha/squash.proto +++ b/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/envoy/config/filter/http/tap/v2alpha/BUILD b/envoy/config/filter/http/tap/v2alpha/BUILD index f84625a7..0949dad0 100644 --- a/envoy/config/filter/http/tap/v2alpha/BUILD +++ b/envoy/config/filter/http/tap/v2alpha/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/v2alpha:pkg"], +) + api_proto_library_internal( name = "tap", srcs = ["tap.proto"], diff --git a/envoy/config/filter/http/tap/v3alpha/BUILD b/envoy/config/filter/http/tap/v3alpha/BUILD index a2af2305..0535cfbc 100644 --- a/envoy/config/filter/http/tap/v3alpha/BUILD +++ b/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/envoy/config/filter/http/transcoder/v2/BUILD b/envoy/config/filter/http/transcoder/v2/BUILD index c1a845bc..33a99a23 100644 --- a/envoy/config/filter/http/transcoder/v2/BUILD +++ b/envoy/config/filter/http/transcoder/v2/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/envoy/config/filter/http/transcoder/v2/transcoder.proto b/envoy/config/filter/http/transcoder/v2/transcoder.proto index 14f54124..85f837fa 100644 --- a/envoy/config/filter/http/transcoder/v2/transcoder.proto +++ b/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/envoy/config/filter/http/transcoder/v3alpha/BUILD b/envoy/config/filter/http/transcoder/v3alpha/BUILD index c1a845bc..33a99a23 100644 --- a/envoy/config/filter/http/transcoder/v3alpha/BUILD +++ b/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/envoy/config/filter/http/transcoder/v3alpha/transcoder.proto b/envoy/config/filter/http/transcoder/v3alpha/transcoder.proto index 078ac524..630ad245 100644 --- a/envoy/config/filter/http/transcoder/v3alpha/transcoder.proto +++ b/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/envoy/config/filter/listener/original_src/v2alpha1/BUILD b/envoy/config/filter/listener/original_src/v2alpha1/BUILD index e064545b..a7435bb5 100644 --- a/envoy/config/filter/listener/original_src/v2alpha1/BUILD +++ b/envoy/config/filter/listener/original_src/v2alpha1/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 = "original_src", srcs = ["original_src.proto"], diff --git a/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto b/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto index aa38e1d3..11f55a78 100644 --- a/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto +++ b/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/envoy/config/filter/network/client_ssl_auth/v2/BUILD b/envoy/config/filter/network/client_ssl_auth/v2/BUILD index dad2d7fe..96b5e9d0 100644 --- a/envoy/config/filter/network/client_ssl_auth/v2/BUILD +++ b/envoy/config/filter/network/client_ssl_auth/v2/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/v2/core"], +) + api_proto_library_internal( name = "client_ssl_auth", srcs = ["client_ssl_auth.proto"], diff --git a/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto b/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto index fe0a6a38..6add30a5 100644 --- a/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto +++ b/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/envoy/config/filter/network/client_ssl_auth/v3alpha/BUILD b/envoy/config/filter/network/client_ssl_auth/v3alpha/BUILD index bece1410..540d8b4a 100644 --- a/envoy/config/filter/network/client_ssl_auth/v3alpha/BUILD +++ b/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/envoy/config/filter/network/client_ssl_auth/v3alpha/client_ssl_auth.proto b/envoy/config/filter/network/client_ssl_auth/v3alpha/client_ssl_auth.proto index a0ea3bf0..821d6349 100644 --- a/envoy/config/filter/network/client_ssl_auth/v3alpha/client_ssl_auth.proto +++ b/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/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD b/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD index e3e83a70..c6cee209 100644 --- a/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD +++ b/envoy/config/filter/network/dubbo_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( + deps = [ + "//envoy/api/v2/core", + "//envoy/api/v2/route:pkg", + "//envoy/type", + "//envoy/type/matcher", + ], +) + api_proto_library_internal( name = "dubbo_proxy", srcs = [ diff --git a/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto b/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto index 5b0995ba..e9834b70 100644 --- a/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto +++ b/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/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto b/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto index 39f16e1a..c852a7cf 100644 --- a/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto +++ b/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/envoy/config/filter/network/ext_authz/v2/BUILD b/envoy/config/filter/network/ext_authz/v2/BUILD index 96184437..3bdae606 100644 --- a/envoy/config/filter/network/ext_authz/v2/BUILD +++ b/envoy/config/filter/network/ext_authz/v2/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/v2/core"], +) + api_proto_library_internal( name = "ext_authz", srcs = ["ext_authz.proto"], diff --git a/envoy/config/filter/network/ext_authz/v2/ext_authz.proto b/envoy/config/filter/network/ext_authz/v2/ext_authz.proto index f9a2f351..8d0a6c6c 100644 --- a/envoy/config/filter/network/ext_authz/v2/ext_authz.proto +++ b/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/envoy/config/filter/network/ext_authz/v3alpha/BUILD b/envoy/config/filter/network/ext_authz/v3alpha/BUILD index 839724af..58aa2890 100644 --- a/envoy/config/filter/network/ext_authz/v3alpha/BUILD +++ b/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/envoy/config/filter/network/ext_authz/v3alpha/ext_authz.proto b/envoy/config/filter/network/ext_authz/v3alpha/ext_authz.proto index 99c0c723..c53b509f 100644 --- a/envoy/config/filter/network/ext_authz/v3alpha/ext_authz.proto +++ b/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/envoy/config/filter/network/http_connection_manager/v2/BUILD b/envoy/config/filter/network/http_connection_manager/v2/BUILD index 95d3811f..6a090f3a 100644 --- a/envoy/config/filter/network/http_connection_manager/v2/BUILD +++ b/envoy/config/filter/network/http_connection_manager/v2/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/v2", + "//envoy/api/v2/core", + "//envoy/config/filter/accesslog/v2: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/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/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto b/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto index bf119573..e20a9154 100644 --- a/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto +++ b/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/envoy/config/filter/network/http_connection_manager/v3alpha/BUILD b/envoy/config/filter/network/http_connection_manager/v3alpha/BUILD index 300b3c8e..57e0528c 100644 --- a/envoy/config/filter/network/http_connection_manager/v3alpha/BUILD +++ b/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/envoy/config/filter/network/http_connection_manager/v3alpha/http_connection_manager.proto b/envoy/config/filter/network/http_connection_manager/v3alpha/http_connection_manager.proto index 57e529b2..4102c701 100644 --- a/envoy/config/filter/network/http_connection_manager/v3alpha/http_connection_manager.proto +++ b/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/envoy/config/filter/network/mongo_proxy/v2/BUILD b/envoy/config/filter/network/mongo_proxy/v2/BUILD index 5535f010..59bad30e 100644 --- a/envoy/config/filter/network/mongo_proxy/v2/BUILD +++ b/envoy/config/filter/network/mongo_proxy/v2/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/v2:pkg"], +) + api_proto_library_internal( name = "mongo_proxy", srcs = ["mongo_proxy.proto"], diff --git a/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto b/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto index 0d3d67bf..46ef44c9 100644 --- a/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto +++ b/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/envoy/config/filter/network/mongo_proxy/v3alpha/BUILD b/envoy/config/filter/network/mongo_proxy/v3alpha/BUILD index a2c09e70..67dca3bb 100644 --- a/envoy/config/filter/network/mongo_proxy/v3alpha/BUILD +++ b/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/envoy/config/filter/network/mongo_proxy/v3alpha/mongo_proxy.proto b/envoy/config/filter/network/mongo_proxy/v3alpha/mongo_proxy.proto index 9149b433..780483cc 100644 --- a/envoy/config/filter/network/mongo_proxy/v3alpha/mongo_proxy.proto +++ b/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/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD b/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD index fde66483..7f7da3af 100644 --- a/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD +++ b/envoy/config/filter/network/mysql_proxy/v1alpha1/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 = "mysql_proxy", srcs = ["mysql_proxy.proto"], diff --git a/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.proto b/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.proto index e4246c93..dee01455 100644 --- a/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.proto +++ b/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/envoy/config/filter/network/rate_limit/v2/BUILD b/envoy/config/filter/network/rate_limit/v2/BUILD index 08d5db95..fcdcd0df 100644 --- a/envoy/config/filter/network/rate_limit/v2/BUILD +++ b/envoy/config/filter/network/rate_limit/v2/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/v2/ratelimit:pkg", + "//envoy/config/ratelimit/v2:pkg", + ], +) + api_proto_library_internal( name = "rate_limit", srcs = ["rate_limit.proto"], diff --git a/envoy/config/filter/network/rate_limit/v2/rate_limit.proto b/envoy/config/filter/network/rate_limit/v2/rate_limit.proto index 6a1b7955..9a8f2f02 100644 --- a/envoy/config/filter/network/rate_limit/v2/rate_limit.proto +++ b/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/envoy/config/filter/network/rate_limit/v3alpha/BUILD b/envoy/config/filter/network/rate_limit/v3alpha/BUILD index 9dc17266..a13183b9 100644 --- a/envoy/config/filter/network/rate_limit/v3alpha/BUILD +++ b/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/envoy/config/filter/network/rate_limit/v3alpha/rate_limit.proto b/envoy/config/filter/network/rate_limit/v3alpha/rate_limit.proto index a0edc98e..60e2d27a 100644 --- a/envoy/config/filter/network/rate_limit/v3alpha/rate_limit.proto +++ b/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/envoy/config/filter/network/rbac/v2/BUILD b/envoy/config/filter/network/rbac/v2/BUILD index 6182fe26..ca9aa2ca 100644 --- a/envoy/config/filter/network/rbac/v2/BUILD +++ b/envoy/config/filter/network/rbac/v2/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/v2:pkg"], +) + api_proto_library_internal( name = "rbac", srcs = ["rbac.proto"], diff --git a/envoy/config/filter/network/rbac/v2/rbac.proto b/envoy/config/filter/network/rbac/v2/rbac.proto index aea17f72..c6c6fac4 100644 --- a/envoy/config/filter/network/rbac/v2/rbac.proto +++ b/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/envoy/config/filter/network/rbac/v3alpha/BUILD b/envoy/config/filter/network/rbac/v3alpha/BUILD index a6ee42cf..1e4d51b5 100644 --- a/envoy/config/filter/network/rbac/v3alpha/BUILD +++ b/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/envoy/config/filter/network/rbac/v3alpha/rbac.proto b/envoy/config/filter/network/rbac/v3alpha/rbac.proto index 5c2114cd..5faa5f5c 100644 --- a/envoy/config/filter/network/rbac/v3alpha/rbac.proto +++ b/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/envoy/config/filter/network/redis_proxy/v2/BUILD b/envoy/config/filter/network/redis_proxy/v2/BUILD index 16cff613..d23450a5 100644 --- a/envoy/config/filter/network/redis_proxy/v2/BUILD +++ b/envoy/config/filter/network/redis_proxy/v2/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/v2/core", + "//envoy/type", + ], +) + api_proto_library_internal( name = "redis_proxy", srcs = ["redis_proxy.proto"], diff --git a/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto b/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto index 175e564d..656cedf7 100644 --- a/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto +++ b/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/envoy/config/filter/network/redis_proxy/v3alpha/BUILD b/envoy/config/filter/network/redis_proxy/v3alpha/BUILD index ef7cc568..4db47e3b 100644 --- a/envoy/config/filter/network/redis_proxy/v3alpha/BUILD +++ b/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/envoy/config/filter/network/redis_proxy/v3alpha/redis_proxy.proto b/envoy/config/filter/network/redis_proxy/v3alpha/redis_proxy.proto index 1bda0ab7..a690451f 100644 --- a/envoy/config/filter/network/redis_proxy/v3alpha/redis_proxy.proto +++ b/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/envoy/config/filter/network/tcp_proxy/v2/BUILD b/envoy/config/filter/network/tcp_proxy/v2/BUILD index e75ab703..a0cc0670 100644 --- a/envoy/config/filter/network/tcp_proxy/v2/BUILD +++ b/envoy/config/filter/network/tcp_proxy/v2/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/v2/core", + "//envoy/config/filter/accesslog/v2:pkg", + ], +) + api_proto_library_internal( name = "tcp_proxy", srcs = ["tcp_proxy.proto"], @@ -11,13 +18,3 @@ api_proto_library_internal( "//envoy/config/filter/accesslog/v2:accesslog", ], ) - -api_go_proto_library( - name = "tcp_proxy", - proto = ":tcp_proxy", - deps = [ - "//envoy/api/v2/core:address_go_proto", - "//envoy/api/v2/core:base_go_proto", - "//envoy/config/filter/accesslog/v2:accesslog_go_proto", - ], -) diff --git a/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto b/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto index 62874fe1..376c980f 100644 --- a/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto +++ b/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/envoy/config/filter/network/tcp_proxy/v3alpha/BUILD b/envoy/config/filter/network/tcp_proxy/v3alpha/BUILD index a9ea8de3..305e06bc 100644 --- a/envoy/config/filter/network/tcp_proxy/v3alpha/BUILD +++ b/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/envoy/config/filter/network/tcp_proxy/v3alpha/tcp_proxy.proto b/envoy/config/filter/network/tcp_proxy/v3alpha/tcp_proxy.proto index f2597a3a..4e04d7b3 100644 --- a/envoy/config/filter/network/tcp_proxy/v3alpha/tcp_proxy.proto +++ b/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/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD b/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD index f758f7f5..28a64a0a 100644 --- a/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD +++ b/envoy/config/filter/network/thrift_proxy/v2alpha1/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/v2/core", + "//envoy/api/v2/route:pkg", + ], +) + api_proto_library_internal( name = "thrift_proxy", srcs = [ diff --git a/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto b/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto index dcd83f2f..5d230d44 100644 --- a/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto +++ b/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/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto b/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto index 0be6c337..4cfe5387 100644 --- a/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto +++ b/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/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD b/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD index 8719f508..02594c24 100644 --- a/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD +++ b/envoy/config/filter/network/zookeeper_proxy/v1alpha1/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 = "zookeeper_proxy", srcs = ["zookeeper_proxy.proto"], diff --git a/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.proto b/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.proto index 6a8afdd1..72d09810 100644 --- a/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.proto +++ b/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/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD b/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD index 08d5db95..fcdcd0df 100644 --- a/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD +++ b/envoy/config/filter/thrift/rate_limit/v2alpha1/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/v2/ratelimit:pkg", + "//envoy/config/ratelimit/v2:pkg", + ], +) + api_proto_library_internal( name = "rate_limit", srcs = ["rate_limit.proto"], diff --git a/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto b/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto index 15a50d55..743bdc72 100644 --- a/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto +++ b/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/envoy/config/filter/thrift/router/v2alpha1/BUILD b/envoy/config/filter/thrift/router/v2alpha1/BUILD index 51c69c0d..68bd8c12 100644 --- a/envoy/config/filter/thrift/router/v2alpha1/BUILD +++ b/envoy/config/filter/thrift/router/v2alpha1/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 = "router", srcs = ["router.proto"], diff --git a/envoy/config/filter/thrift/router/v2alpha1/router.proto b/envoy/config/filter/thrift/router/v2alpha1/router.proto index c515752c..9c9383ca 100644 --- a/envoy/config/filter/thrift/router/v2alpha1/router.proto +++ b/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/envoy/config/grpc_credential/v2alpha/BUILD b/envoy/config/grpc_credential/v2alpha/BUILD index f299179e..484aa568 100644 --- a/envoy/config/grpc_credential/v2alpha/BUILD +++ b/envoy/config/grpc_credential/v2alpha/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/v2/core"], +) api_proto_library_internal( name = "file_based_metadata", @@ -8,20 +12,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/envoy/config/grpc_credential/v2alpha/aws_iam.proto b/envoy/config/grpc_credential/v2alpha/aws_iam.proto index 3689b806..e7a7bf94 100644 --- a/envoy/config/grpc_credential/v2alpha/aws_iam.proto +++ b/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/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto b/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto index c91c50e3..1746492f 100644 --- a/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto +++ b/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/envoy/config/grpc_credential/v3alpha/BUILD b/envoy/config/grpc_credential/v3alpha/BUILD index 2f673673..7c327f91 100644 --- a/envoy/config/grpc_credential/v3alpha/BUILD +++ b/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/envoy/config/grpc_credential/v3alpha/aws_iam.proto b/envoy/config/grpc_credential/v3alpha/aws_iam.proto index 33921db6..29c9cf14 100644 --- a/envoy/config/grpc_credential/v3alpha/aws_iam.proto +++ b/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/envoy/config/grpc_credential/v3alpha/file_based_metadata.proto b/envoy/config/grpc_credential/v3alpha/file_based_metadata.proto index 2886921b..9bab390c 100644 --- a/envoy/config/grpc_credential/v3alpha/file_based_metadata.proto +++ b/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/envoy/config/health_checker/redis/v2/BUILD b/envoy/config/health_checker/redis/v2/BUILD index 239d1f22..f7b289b0 100644 --- a/envoy/config/health_checker/redis/v2/BUILD +++ b/envoy/config/health_checker/redis/v2/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/envoy/config/health_checker/redis/v2/redis.proto b/envoy/config/health_checker/redis/v2/redis.proto index 130454b5..8ab2de26 100644 --- a/envoy/config/health_checker/redis/v2/redis.proto +++ b/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/envoy/config/health_checker/redis/v3alpha/BUILD b/envoy/config/health_checker/redis/v3alpha/BUILD index 239d1f22..f7b289b0 100644 --- a/envoy/config/health_checker/redis/v3alpha/BUILD +++ b/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/envoy/config/health_checker/redis/v3alpha/redis.proto b/envoy/config/health_checker/redis/v3alpha/redis.proto index 234da40d..1409e954 100644 --- a/envoy/config/health_checker/redis/v3alpha/redis.proto +++ b/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/envoy/config/metrics/v2/BUILD b/envoy/config/metrics/v2/BUILD index 157b09c4..13ac8bdd 100644 --- a/envoy/config/metrics/v2/BUILD +++ b/envoy/config/metrics/v2/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/v2/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/v2/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/v2/core:address_go_proto", - "//envoy/type/matcher:string_go_proto", - ], -) diff --git a/envoy/config/metrics/v2/stats.proto b/envoy/config/metrics/v2/stats.proto index 08172180..fea8b9b0 100644 --- a/envoy/config/metrics/v2/stats.proto +++ b/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/envoy/config/metrics/v3alpha/BUILD b/envoy/config/metrics/v3alpha/BUILD index 39d0b796..399ec444 100644 --- a/envoy/config/metrics/v3alpha/BUILD +++ b/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/envoy/config/metrics/v3alpha/stats.proto b/envoy/config/metrics/v3alpha/stats.proto index 91324ed0..afa4468b 100644 --- a/envoy/config/metrics/v3alpha/stats.proto +++ b/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/envoy/config/overload/v2alpha/BUILD b/envoy/config/overload/v2alpha/BUILD index bfffb563..e247848d 100644 --- a/envoy/config/overload/v2alpha/BUILD +++ b/envoy/config/overload/v2alpha/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/envoy/config/overload/v2alpha/overload.proto b/envoy/config/overload/v2alpha/overload.proto index efdba5a0..e3276467 100644 --- a/envoy/config/overload/v2alpha/overload.proto +++ b/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/envoy/config/overload/v3alpha/BUILD b/envoy/config/overload/v3alpha/BUILD index bfffb563..e247848d 100644 --- a/envoy/config/overload/v3alpha/BUILD +++ b/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/envoy/config/overload/v3alpha/overload.proto b/envoy/config/overload/v3alpha/overload.proto index 474c7677..857b510e 100644 --- a/envoy/config/overload/v3alpha/overload.proto +++ b/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/envoy/config/ratelimit/v2/BUILD b/envoy/config/ratelimit/v2/BUILD index be3fc1c2..432f4b95 100644 --- a/envoy/config/ratelimit/v2/BUILD +++ b/envoy/config/ratelimit/v2/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/v2/core"], +) + api_proto_library_internal( name = "rls", srcs = ["rls.proto"], @@ -10,11 +14,3 @@ api_proto_library_internal( "//envoy/api/v2/core:grpc_service", ], ) - -api_go_grpc_library( - name = "rls", - proto = ":rls", - deps = [ - "//envoy/api/v2/core:grpc_service_go_proto", - ], -) diff --git a/envoy/config/ratelimit/v2/rls.proto b/envoy/config/ratelimit/v2/rls.proto index 8f039b44..55577d4a 100644 --- a/envoy/config/ratelimit/v2/rls.proto +++ b/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/envoy/config/ratelimit/v3alpha/BUILD b/envoy/config/ratelimit/v3alpha/BUILD index 571a768d..1d009164 100644 --- a/envoy/config/ratelimit/v3alpha/BUILD +++ b/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/envoy/config/ratelimit/v3alpha/rls.proto b/envoy/config/ratelimit/v3alpha/rls.proto index 67ac6479..16d5a4ad 100644 --- a/envoy/config/ratelimit/v3alpha/rls.proto +++ b/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/envoy/config/rbac/v2/BUILD b/envoy/config/rbac/v2/BUILD index fac50eb6..18b1bb24 100644 --- a/envoy/config/rbac/v2/BUILD +++ b/envoy/config/rbac/v2/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/v2/core", + "//envoy/api/v2/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/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/envoy/config/rbac/v2/rbac.proto b/envoy/config/rbac/v2/rbac.proto index 15554e56..34a062be 100644 --- a/envoy/config/rbac/v2/rbac.proto +++ b/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/envoy/config/rbac/v3alpha/BUILD b/envoy/config/rbac/v3alpha/BUILD index 89f98c97..60200f03 100644 --- a/envoy/config/rbac/v3alpha/BUILD +++ b/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/envoy/config/rbac/v3alpha/rbac.proto b/envoy/config/rbac/v3alpha/rbac.proto index d299c384..9087e745 100644 --- a/envoy/config/rbac/v3alpha/rbac.proto +++ b/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/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD b/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD index 363d90f1..a5003e21 100644 --- a/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD +++ b/envoy/config/resource_monitor/fixed_heap/v2alpha/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/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto b/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto index f7efe0b5..110123e3 100644 --- a/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto +++ b/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/envoy/config/resource_monitor/fixed_heap/v3alpha/BUILD b/envoy/config/resource_monitor/fixed_heap/v3alpha/BUILD index 363d90f1..a5003e21 100644 --- a/envoy/config/resource_monitor/fixed_heap/v3alpha/BUILD +++ b/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/envoy/config/resource_monitor/fixed_heap/v3alpha/fixed_heap.proto b/envoy/config/resource_monitor/fixed_heap/v3alpha/fixed_heap.proto index 2bc1baf8..bc84ee99 100644 --- a/envoy/config/resource_monitor/fixed_heap/v3alpha/fixed_heap.proto +++ b/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/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD b/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD index 10abf09e..3a176421 100644 --- a/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD +++ b/envoy/config/resource_monitor/injected_resource/v2alpha/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/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto b/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto index cab704a4..64c984fa 100644 --- a/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto +++ b/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/envoy/config/resource_monitor/injected_resource/v3alpha/BUILD b/envoy/config/resource_monitor/injected_resource/v3alpha/BUILD index 10abf09e..3a176421 100644 --- a/envoy/config/resource_monitor/injected_resource/v3alpha/BUILD +++ b/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/envoy/config/resource_monitor/injected_resource/v3alpha/injected_resource.proto b/envoy/config/resource_monitor/injected_resource/v3alpha/injected_resource.proto index f5b41ef1..555e1532 100644 --- a/envoy/config/resource_monitor/injected_resource/v3alpha/injected_resource.proto +++ b/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/envoy/config/retry/previous_priorities/BUILD b/envoy/config/retry/previous_priorities/BUILD index 13a694af..8140346d 100644 --- a/envoy/config/retry/previous_priorities/BUILD +++ b/envoy/config/retry/previous_priorities/BUILD @@ -1,6 +1,10 @@ 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( + deps = ["//envoy/api/v2/core"], +) api_proto_library_internal( name = "previous_priorities", diff --git a/envoy/config/trace/v2/BUILD b/envoy/config/trace/v2/BUILD index b00f63da..f894a528 100644 --- a/envoy/config/trace/v2/BUILD +++ b/envoy/config/trace/v2/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/v2/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/v2/core:grpc_service_go_proto", - "@opencensus_proto//opencensus/proto/trace/v1:trace_and_config_proto_go", - ], -) diff --git a/envoy/config/trace/v2/trace.proto b/envoy/config/trace/v2/trace.proto index 65c027cd..43f5013b 100644 --- a/envoy/config/trace/v2/trace.proto +++ b/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/envoy/config/trace/v3alpha/BUILD b/envoy/config/trace/v3alpha/BUILD index 72056b3a..97014ca6 100644 --- a/envoy/config/trace/v3alpha/BUILD +++ b/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/envoy/config/trace/v3alpha/trace.proto b/envoy/config/trace/v3alpha/trace.proto index 2771c1b4..f98f1f70 100644 --- a/envoy/config/trace/v3alpha/trace.proto +++ b/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/envoy/config/transport_socket/alts/v2alpha/BUILD b/envoy/config/transport_socket/alts/v2alpha/BUILD index 6cb181f2..eb247ae1 100644 --- a/envoy/config/transport_socket/alts/v2alpha/BUILD +++ b/envoy/config/transport_socket/alts/v2alpha/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/v2/core"], +) + api_proto_library( name = "alts", srcs = ["alts.proto"], diff --git a/envoy/config/transport_socket/alts/v2alpha/alts.proto b/envoy/config/transport_socket/alts/v2alpha/alts.proto index f5a9db64..ec294af1 100644 --- a/envoy/config/transport_socket/alts/v2alpha/alts.proto +++ b/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/envoy/config/transport_socket/alts/v3alpha/BUILD b/envoy/config/transport_socket/alts/v3alpha/BUILD index 7ffc0309..4e664228 100644 --- a/envoy/config/transport_socket/alts/v3alpha/BUILD +++ b/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/envoy/config/transport_socket/alts/v3alpha/alts.proto b/envoy/config/transport_socket/alts/v3alpha/alts.proto index 22684b86..adec43c2 100644 --- a/envoy/config/transport_socket/alts/v3alpha/alts.proto +++ b/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/envoy/config/transport_socket/tap/v2alpha/BUILD b/envoy/config/transport_socket/tap/v2alpha/BUILD index 75810cd0..e18d4fc1 100644 --- a/envoy/config/transport_socket/tap/v2alpha/BUILD +++ b/envoy/config/transport_socket/tap/v2alpha/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/v2/core", + "//envoy/config/common/tap/v2alpha:pkg", + ], +) + api_proto_library_internal( name = "tap", srcs = ["tap.proto"], diff --git a/envoy/config/transport_socket/tap/v2alpha/tap.proto b/envoy/config/transport_socket/tap/v2alpha/tap.proto index 84918699..e68b40da 100644 --- a/envoy/config/transport_socket/tap/v2alpha/tap.proto +++ b/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/envoy/config/transport_socket/tap/v3alpha/BUILD b/envoy/config/transport_socket/tap/v3alpha/BUILD index 8056ad6f..0f24cca4 100644 --- a/envoy/config/transport_socket/tap/v3alpha/BUILD +++ b/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/envoy/config/transport_socket/tap/v3alpha/tap.proto b/envoy/config/transport_socket/tap/v3alpha/tap.proto index 1cca6814..21625e17 100644 --- a/envoy/config/transport_socket/tap/v3alpha/tap.proto +++ b/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/envoy/data/accesslog/v2/BUILD b/envoy/data/accesslog/v2/BUILD index d3ade88e..22c4c45e 100644 --- a/envoy/data/accesslog/v2/BUILD +++ b/envoy/data/accesslog/v2/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/v2/core"], +) + api_proto_library_internal( name = "accesslog", srcs = ["accesslog.proto"], @@ -13,12 +17,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/envoy/data/accesslog/v3alpha/BUILD b/envoy/data/accesslog/v3alpha/BUILD index 30157958..e1fafc00 100644 --- a/envoy/data/accesslog/v3alpha/BUILD +++ b/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/envoy/data/cluster/v2alpha/BUILD b/envoy/data/cluster/v2alpha/BUILD index 00edd829..4d921f4d 100644 --- a/envoy/data/cluster/v2alpha/BUILD +++ b/envoy/data/cluster/v2alpha/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/envoy/data/cluster/v3alpha/BUILD b/envoy/data/cluster/v3alpha/BUILD index 00edd829..4d921f4d 100644 --- a/envoy/data/cluster/v3alpha/BUILD +++ b/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/envoy/data/core/v2alpha/BUILD b/envoy/data/core/v2alpha/BUILD index 8320031d..33103234 100644 --- a/envoy/data/core/v2alpha/BUILD +++ b/envoy/data/core/v2alpha/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/v2/core"], +) + api_proto_library( name = "health_check_event", srcs = ["health_check_event.proto"], diff --git a/envoy/data/core/v3alpha/BUILD b/envoy/data/core/v3alpha/BUILD index 9e82e3eb..6c44f3e4 100644 --- a/envoy/data/core/v3alpha/BUILD +++ b/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/envoy/data/tap/v2alpha/BUILD b/envoy/data/tap/v2alpha/BUILD index 1b373eee..bf108c47 100644 --- a/envoy/data/tap/v2alpha/BUILD +++ b/envoy/data/tap/v2alpha/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/v2/core"], +) + api_proto_library_internal( name = "common", srcs = ["common.proto"], diff --git a/envoy/data/tap/v2alpha/transport.proto b/envoy/data/tap/v2alpha/transport.proto index 3b8c244b..c3a3d8b8 100644 --- a/envoy/data/tap/v2alpha/transport.proto +++ b/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/envoy/data/tap/v3alpha/BUILD b/envoy/data/tap/v3alpha/BUILD index ab9be74c..33d151e3 100644 --- a/envoy/data/tap/v3alpha/BUILD +++ b/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/envoy/data/tap/v3alpha/transport.proto b/envoy/data/tap/v3alpha/transport.proto index 3dfb0c64..e35f036f 100644 --- a/envoy/data/tap/v3alpha/transport.proto +++ b/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/envoy/service/accesslog/v2/BUILD b/envoy/service/accesslog/v2/BUILD index 1dad9447..d4f7c300 100644 --- a/envoy/service/accesslog/v2/BUILD +++ b/envoy/service/accesslog/v2/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/v2/core", + "//envoy/data/accesslog/v2:pkg", + ], +) + api_proto_library_internal( name = "als", srcs = ["als.proto"], @@ -12,12 +20,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/envoy/service/accesslog/v2/als.proto b/envoy/service/accesslog/v2/als.proto index 52788e06..c06199a2 100644 --- a/envoy/service/accesslog/v2/als.proto +++ b/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/envoy/service/accesslog/v3alpha/BUILD b/envoy/service/accesslog/v3alpha/BUILD index 1a8eab97..0bb8716b 100644 --- a/envoy/service/accesslog/v3alpha/BUILD +++ b/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/envoy/service/accesslog/v3alpha/als.proto b/envoy/service/accesslog/v3alpha/als.proto index 092d4d17..ad05b823 100644 --- a/envoy/service/accesslog/v3alpha/als.proto +++ b/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/envoy/service/auth/v2/BUILD b/envoy/service/auth/v2/BUILD index 57041668..91a4eeeb 100644 --- a/envoy/service/auth/v2/BUILD +++ b/envoy/service/auth/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( + has_services = True, + deps = [ + "//envoy/api/v2/core", + "//envoy/type", + ], +) + api_proto_library_internal( name = "attribute_context", srcs = [ diff --git a/envoy/service/auth/v2/external_auth.proto b/envoy/service/auth/v2/external_auth.proto index 0f723c98..8a3d4f1a 100644 --- a/envoy/service/auth/v2/external_auth.proto +++ b/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/envoy/service/auth/v2alpha/BUILD b/envoy/service/auth/v2alpha/BUILD index 1d9873a5..1940f4f2 100644 --- a/envoy/service/auth/v2alpha/BUILD +++ b/envoy/service/auth/v2alpha/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( + has_services = True, + deps = [ + "//envoy/service/auth/v2:pkg", + ], +) + api_proto_library_internal( name = "external_auth", srcs = [ diff --git a/envoy/service/auth/v2alpha/external_auth.proto b/envoy/service/auth/v2alpha/external_auth.proto index bdf0d2e4..85e9c12c 100644 --- a/envoy/service/auth/v2alpha/external_auth.proto +++ b/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/envoy/service/auth/v3alpha/BUILD b/envoy/service/auth/v3alpha/BUILD index 6a335f88..f6a70cb5 100644 --- a/envoy/service/auth/v3alpha/BUILD +++ b/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/envoy/service/auth/v3alpha/external_auth.proto b/envoy/service/auth/v3alpha/external_auth.proto index 4b7e459a..0130040c 100644 --- a/envoy/service/auth/v3alpha/external_auth.proto +++ b/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/envoy/service/discovery/v2/BUILD b/envoy/service/discovery/v2/BUILD index a9c2efd0..13db2701 100644 --- a/envoy/service/discovery/v2/BUILD +++ b/envoy/service/discovery/v2/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/v2:discovery", + "//envoy/api/v2", + "//envoy/api/v2/core", + "//envoy/api/v2/endpoint:pkg", ], ) -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 +31,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 +40,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 +48,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/envoy/service/discovery/v2/ads.proto b/envoy/service/discovery/v2/ads.proto index 6a9d044a..45a7407f 100644 --- a/envoy/service/discovery/v2/ads.proto +++ b/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/envoy/service/discovery/v3alpha/BUILD b/envoy/service/discovery/v3alpha/BUILD index d34955c1..138186e6 100644 --- a/envoy/service/discovery/v3alpha/BUILD +++ b/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/envoy/service/discovery/v3alpha/ads.proto b/envoy/service/discovery/v3alpha/ads.proto index d6b7897b..251c5130 100644 --- a/envoy/service/discovery/v3alpha/ads.proto +++ b/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/envoy/service/load_stats/v2/BUILD b/envoy/service/load_stats/v2/BUILD index f126ebcb..af07d8aa 100644 --- a/envoy/service/load_stats/v2/BUILD +++ b/envoy/service/load_stats/v2/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/v2/core", + "//envoy/api/v2/endpoint:pkg", + ], +) + api_proto_library_internal( name = "lrs", srcs = ["lrs.proto"], @@ -11,12 +19,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/envoy/service/load_stats/v2/lrs.proto b/envoy/service/load_stats/v2/lrs.proto index 2fe95f3b..d7029db0 100644 --- a/envoy/service/load_stats/v2/lrs.proto +++ b/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/envoy/service/load_stats/v3alpha/BUILD b/envoy/service/load_stats/v3alpha/BUILD index 42c7ce84..bc4ff264 100644 --- a/envoy/service/load_stats/v3alpha/BUILD +++ b/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/envoy/service/load_stats/v3alpha/lrs.proto b/envoy/service/load_stats/v3alpha/lrs.proto index 81058ed5..ec8adedb 100644 --- a/envoy/service/load_stats/v3alpha/lrs.proto +++ b/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/envoy/service/metrics/v2/BUILD b/envoy/service/metrics/v2/BUILD index 7f3921ce..091d40e7 100644 --- a/envoy/service/metrics/v2/BUILD +++ b/envoy/service/metrics/v2/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/v2/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/v2/core:base_go_proto", - "@prometheus_metrics_model//:client_model_go_proto", - ], -) diff --git a/envoy/service/metrics/v2/metrics_service.proto b/envoy/service/metrics/v2/metrics_service.proto index b70be3bd..10745ba6 100644 --- a/envoy/service/metrics/v2/metrics_service.proto +++ b/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/envoy/service/metrics/v3alpha/BUILD b/envoy/service/metrics/v3alpha/BUILD index 1f1bb553..6053aac4 100644 --- a/envoy/service/metrics/v3alpha/BUILD +++ b/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/envoy/service/metrics/v3alpha/metrics_service.proto b/envoy/service/metrics/v3alpha/metrics_service.proto index 9a530655..bcf1caa2 100644 --- a/envoy/service/metrics/v3alpha/metrics_service.proto +++ b/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/envoy/service/ratelimit/v2/BUILD b/envoy/service/ratelimit/v2/BUILD index 24278fbe..7bc5db71 100644 --- a/envoy/service/ratelimit/v2/BUILD +++ b/envoy/service/ratelimit/v2/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/v2/core", + "//envoy/api/v2/ratelimit:pkg", + ], +) + api_proto_library_internal( name = "rls", srcs = ["rls.proto"], @@ -12,13 +20,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/envoy/service/ratelimit/v2/rls.proto b/envoy/service/ratelimit/v2/rls.proto index 18b6b678..328bb547 100644 --- a/envoy/service/ratelimit/v2/rls.proto +++ b/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/envoy/service/ratelimit/v3alpha/BUILD b/envoy/service/ratelimit/v3alpha/BUILD index 19954c5b..965458be 100644 --- a/envoy/service/ratelimit/v3alpha/BUILD +++ b/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/envoy/service/ratelimit/v3alpha/rls.proto b/envoy/service/ratelimit/v3alpha/rls.proto index 7bbd2e3e..57a3ee98 100644 --- a/envoy/service/ratelimit/v3alpha/rls.proto +++ b/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/envoy/service/tap/v2alpha/BUILD b/envoy/service/tap/v2alpha/BUILD index 63d11e80..621bf208 100644 --- a/envoy/service/tap/v2alpha/BUILD +++ b/envoy/service/tap/v2alpha/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/v2", + "//envoy/api/v2/core", + "//envoy/api/v2/route:pkg", + "//envoy/data/tap/v2alpha:pkg", + ], +) + api_proto_library_internal( name = "common", srcs = ["common.proto"], diff --git a/envoy/service/tap/v3alpha/BUILD b/envoy/service/tap/v3alpha/BUILD index a90b2d81..005ef96b 100644 --- a/envoy/service/tap/v3alpha/BUILD +++ b/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/envoy/service/trace/v2/BUILD b/envoy/service/trace/v2/BUILD index 2b3367f0..cee54d8b 100644 --- a/envoy/service/trace/v2/BUILD +++ b/envoy/service/trace/v2/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/v2/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/v2/core:base_go_proto", - "@opencensus_proto//opencensus/proto/trace/v1:trace_proto_go", - ], -) diff --git a/envoy/service/trace/v2/trace_service.proto b/envoy/service/trace/v2/trace_service.proto index ec87b356..92b8489f 100644 --- a/envoy/service/trace/v2/trace_service.proto +++ b/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/envoy/service/trace/v3alpha/BUILD b/envoy/service/trace/v3alpha/BUILD index 815d0c4c..fbfafec6 100644 --- a/envoy/service/trace/v3alpha/BUILD +++ b/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/envoy/service/trace/v3alpha/trace_service.proto b/envoy/service/trace/v3alpha/trace_service.proto index 521139a0..b6559800 100644 --- a/envoy/service/trace/v3alpha/trace_service.proto +++ b/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"; diff --git a/envoy/type/BUILD b/envoy/type/BUILD index 97f0fd42..26dd9730 100644 --- a/envoy/type/BUILD +++ b/envoy/type/BUILD @@ -1,36 +1,25 @@ -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 = "type", +) + api_proto_library_internal( name = "http_status", srcs = ["http_status.proto"], 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/envoy/type/matcher/BUILD b/envoy/type/matcher/BUILD index 5fe594db..c7db01b6 100644 --- a/envoy/type/matcher/BUILD +++ b/envoy/type/matcher/BUILD @@ -1,7 +1,12 @@ -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", + deps = ["//envoy/type"], +) + api_proto_library_internal( name = "metadata", srcs = ["metadata.proto"], @@ -11,14 +16,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,14 +25,6 @@ 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"], @@ -45,14 +34,6 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "string", - proto = ":string", - deps = [ - ":regex_go_proto", - ], -) - api_proto_library_internal( name = "value", srcs = ["value.proto"], @@ -63,22 +44,8 @@ api_proto_library_internal( ], ) -api_go_proto_library( - name = "value", - proto = ":value", - deps = [ - ":number_go_proto", - ":string_go_proto", - ], -) - api_proto_library_internal( name = "regex", srcs = ["regex.proto"], visibility = ["//visibility:public"], ) - -api_go_proto_library( - name = "regex", - proto = ":regex", -) diff --git a/envoy/type/matcher/metadata.proto b/envoy/type/matcher/metadata.proto index 08190a9f..56b69eae 100644 --- a/envoy/type/matcher/metadata.proto +++ b/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/envoy/type/matcher/number.proto b/envoy/type/matcher/number.proto index f6c49b3f..5c8cec7b 100644 --- a/envoy/type/matcher/number.proto +++ b/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/envoy/type/matcher/regex.proto b/envoy/type/matcher/regex.proto index 048a576c..cf6343c9 100644 --- a/envoy/type/matcher/regex.proto +++ b/envoy/type/matcher/regex.proto @@ -5,7 +5,6 @@ package envoy.type.matcher; option java_outer_classname = "RegexProto"; 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"; diff --git a/envoy/type/matcher/string.proto b/envoy/type/matcher/string.proto index 35628b7c..986e393b 100644 --- a/envoy/type/matcher/string.proto +++ b/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 "envoy/type/matcher/regex.proto"; diff --git a/envoy/type/matcher/value.proto b/envoy/type/matcher/value.proto index 52f5e5b1..71645043 100644 --- a/envoy/type/matcher/value.proto +++ b/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/envoy/type/range.proto b/envoy/type/range.proto index e64b71e4..cc38e8f2 100644 --- a/envoy/type/range.proto +++ b/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"; diff --git a/test/build/BUILD b/test/build/BUILD index a271aa5d..c8390c1f 100644 --- a/test/build/BUILD +++ b/test/build/BUILD @@ -26,18 +26,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: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", ], ) diff --git a/test/build/go_build_test.go b/test/build/go_build_test.go index 911d3ef3..c5c15bec 100644 --- a/test/build/go_build_test.go +++ b/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) {