From 8e13c8b4af1e78836fcf51f94fda7b63992c4e6c Mon Sep 17 00:00:00 2001 From: "data-plane-api(CircleCI)" Date: Fri, 29 Jun 2018 23:20:10 +0000 Subject: [PATCH] Fixes #3756 by creating a new api_proto_library_internal build rule that (#3764) adds the required visibility rules and delegates the rest to the generic api_proto_library. I tested the change by doing the following without getting errors. ./ci/run_envoy_docker.sh './ci/do_ci.sh docs' I changed the BUILD files using the following commands. /envoy/api$ find . -type f -name BUILD | xargs sed -i -e 's/api_proto_library(/api_proto_library_internal(/g' envoy/api$ find . -type f -name BUILD | xargs sed -i -e 's/"api_proto_library"/"api_proto_library_internal"/g' Signed-off-by: mickey Mirrored from https://github.com/envoyproxy/envoy @ 4b871c0ab9350882271a490adcee44e613ed9807 --- bazel/api_build_system.bzl | 16 +++++++++++----- envoy/admin/v2alpha/BUILD | 8 ++++---- envoy/api/v2/BUILD | 12 ++++++------ envoy/api/v2/auth/BUILD | 4 ++-- envoy/api/v2/cluster/BUILD | 6 +++--- envoy/api/v2/core/BUILD | 16 ++++++++-------- envoy/api/v2/endpoint/BUILD | 6 +++--- envoy/api/v2/listener/BUILD | 4 ++-- envoy/api/v2/ratelimit/BUILD | 4 ++-- envoy/api/v2/route/BUILD | 4 ++-- envoy/config/accesslog/v2/BUILD | 6 +++--- envoy/config/bootstrap/v2/BUILD | 4 ++-- envoy/config/filter/accesslog/v2/BUILD | 4 ++-- envoy/config/filter/fault/v2/BUILD | 4 ++-- envoy/config/filter/http/buffer/v2/BUILD | 4 ++-- envoy/config/filter/http/ext_authz/v2alpha/BUILD | 4 ++-- envoy/config/filter/http/fault/v2/BUILD | 4 ++-- envoy/config/filter/http/gzip/v2/BUILD | 4 ++-- .../filter/http/header_to_metadata/v2/BUILD | 4 ++-- envoy/config/filter/http/health_check/v2/BUILD | 4 ++-- envoy/config/filter/http/ip_tagging/v2/BUILD | 4 ++-- envoy/config/filter/http/jwt_authn/v2alpha/BUILD | 4 ++-- envoy/config/filter/http/lua/v2/BUILD | 4 ++-- envoy/config/filter/http/rate_limit/v2/BUILD | 4 ++-- envoy/config/filter/http/rbac/v2/BUILD | 4 ++-- envoy/config/filter/http/router/v2/BUILD | 4 ++-- envoy/config/filter/http/squash/v2/BUILD | 4 ++-- envoy/config/filter/http/transcoder/v2/BUILD | 4 ++-- .../filter/network/client_ssl_auth/v2/BUILD | 4 ++-- envoy/config/filter/network/ext_authz/v2/BUILD | 4 ++-- .../network/http_connection_manager/v2/BUILD | 4 ++-- envoy/config/filter/network/mongo_proxy/v2/BUILD | 4 ++-- envoy/config/filter/network/rate_limit/v2/BUILD | 4 ++-- envoy/config/filter/network/redis_proxy/v2/BUILD | 4 ++-- envoy/config/filter/network/tcp_proxy/v2/BUILD | 4 ++-- envoy/config/grpc_credential/v2alpha/BUILD | 4 ++-- envoy/config/health_checker/redis/v2/BUILD | 4 ++-- envoy/config/metrics/v2/BUILD | 6 +++--- envoy/config/ratelimit/v2/BUILD | 4 ++-- envoy/config/rbac/v2alpha/BUILD | 4 ++-- envoy/config/trace/v2/BUILD | 4 ++-- .../transport_socket/capture/v2alpha/BUILD | 4 ++-- envoy/data/accesslog/v2/BUILD | 4 ++-- envoy/data/tap/v2alpha/BUILD | 4 ++-- .../filters/network/thrift_proxy/v2alpha1/BUILD | 4 ++-- envoy/service/accesslog/v2/BUILD | 4 ++-- envoy/service/auth/v2alpha/BUILD | 6 +++--- envoy/service/discovery/v2/BUILD | 8 ++++---- envoy/service/load_stats/v2/BUILD | 4 ++-- envoy/service/metrics/v2/BUILD | 4 ++-- envoy/service/ratelimit/v2/BUILD | 4 ++-- envoy/service/trace/v2/BUILD | 4 ++-- envoy/type/BUILD | 8 ++++---- envoy/type/matcher/BUILD | 8 ++++---- test/validate/BUILD | 2 +- 55 files changed, 141 insertions(+), 135 deletions(-) diff --git a/bazel/api_build_system.bzl b/bazel/api_build_system.bzl index 875df406..8099e9f0 100644 --- a/bazel/api_build_system.bzl +++ b/bazel/api_build_system.bzl @@ -74,6 +74,17 @@ def api_go_grpc_library(name, proto, deps = []): ] ) +# This is api_proto_library plus some logic internal to //envoy/api. +def api_proto_library_internal(visibility = ["//visibility:private"], **kwargs): + # //envoy/docs/build.sh needs visibility in order to generate documents. + if visibility == ["//visibility:private"]: + visibility = ["//docs"] + elif visibility != ["//visibility:public"]: + visibility = visibility + ["//docs"] + + api_proto_library(visibility=visibility, **kwargs) + + # 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 @@ -86,11 +97,6 @@ def api_proto_library(name, visibility = ["//visibility:private"], srcs = [], de # it can play well with the PGV plugin and (2) other language support that # can make use of native proto_library. - if visibility == ["//visibility:private"]: - visibility = ["//docs"] - elif visibility != ["//visibility:public"]: - visibility = visibility + ["//docs"] - native.proto_library( name = name, srcs = srcs, diff --git a/envoy/admin/v2alpha/BUILD b/envoy/admin/v2alpha/BUILD index 6b8e6b18..98696461 100644 --- a/envoy/admin/v2alpha/BUILD +++ b/envoy/admin/v2alpha/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "config_dump", srcs = ["config_dump.proto"], visibility = ["//visibility:public"], @@ -14,7 +14,7 @@ api_proto_library( ], ) -api_proto_library( +api_proto_library_internal( name = "clusters", srcs = ["clusters.proto"], visibility = ["//visibility:public"], @@ -26,7 +26,7 @@ api_proto_library( ], ) -api_proto_library( +api_proto_library_internal( name = "metrics", srcs = ["metrics.proto"], visibility = ["//visibility:public"], diff --git a/envoy/api/v2/BUILD b/envoy/api/v2/BUILD index 3e557a10..09bdf6dd 100644 --- a/envoy/api/v2/BUILD +++ b/envoy/api/v2/BUILD @@ -1,4 +1,4 @@ -load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 @@ -16,7 +16,7 @@ package_group( ], ) -api_proto_library( +api_proto_library_internal( name = "discovery", srcs = ["discovery.proto"], visibility = [":friends"], @@ -29,7 +29,7 @@ api_go_proto_library( deps = ["//envoy/api/v2/core:base_go_proto"], ) -api_proto_library( +api_proto_library_internal( name = "eds", srcs = ["eds.proto"], has_services = 1, @@ -55,7 +55,7 @@ api_go_grpc_library( ], ) -api_proto_library( +api_proto_library_internal( name = "cds", srcs = ["cds.proto"], has_services = 1, @@ -95,7 +95,7 @@ api_go_grpc_library( ], ) -api_proto_library( +api_proto_library_internal( name = "lds", srcs = ["lds.proto"], has_services = 1, @@ -119,7 +119,7 @@ api_go_grpc_library( ], ) -api_proto_library( +api_proto_library_internal( name = "rds", srcs = ["rds.proto"], has_services = 1, diff --git a/envoy/api/v2/auth/BUILD b/envoy/api/v2/auth/BUILD index c3ea89de..55f522c0 100644 --- a/envoy/api/v2/auth/BUILD +++ b/envoy/api/v2/auth/BUILD @@ -1,4 +1,4 @@ -load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 @@ -15,7 +15,7 @@ package_group( ], ) -api_proto_library( +api_proto_library_internal( name = "cert", srcs = ["cert.proto"], visibility = [":friends"], diff --git a/envoy/api/v2/cluster/BUILD b/envoy/api/v2/cluster/BUILD index 16e75906..a3b091de 100644 --- a/envoy/api/v2/cluster/BUILD +++ b/envoy/api/v2/cluster/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "circuit_breaker", srcs = ["circuit_breaker.proto"], visibility = [ @@ -21,7 +21,7 @@ api_go_proto_library( ], ) -api_proto_library( +api_proto_library_internal( name = "outlier_detection", srcs = ["outlier_detection.proto"], visibility = [ diff --git a/envoy/api/v2/core/BUILD b/envoy/api/v2/core/BUILD index 1b5f9aba..71a8d33f 100644 --- a/envoy/api/v2/core/BUILD +++ b/envoy/api/v2/core/BUILD @@ -1,4 +1,4 @@ -load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 @@ -16,7 +16,7 @@ package_group( ], ) -api_proto_library( +api_proto_library_internal( name = "address", srcs = ["address.proto"], visibility = [ @@ -31,7 +31,7 @@ api_go_proto_library( deps = [":base_go_proto"], ) -api_proto_library( +api_proto_library_internal( name = "base", srcs = ["base.proto"], visibility = [ @@ -44,7 +44,7 @@ api_go_proto_library( proto = ":base", ) -api_proto_library( +api_proto_library_internal( name = "health_check", srcs = ["health_check.proto"], visibility = [ @@ -59,7 +59,7 @@ api_go_proto_library( deps = [":base_go_proto"], ) -api_proto_library( +api_proto_library_internal( name = "config_source", srcs = ["config_source.proto"], visibility = [ @@ -85,7 +85,7 @@ api_go_proto_library( proto = ":http_uri", ) -api_proto_library( +api_proto_library_internal( name = "http_uri", srcs = ["http_uri.proto"], visibility = [ @@ -93,7 +93,7 @@ api_proto_library( ], ) -api_proto_library( +api_proto_library_internal( name = "grpc_service", srcs = ["grpc_service.proto"], visibility = [ @@ -108,7 +108,7 @@ api_go_proto_library( deps = [":base_go_proto"], ) -api_proto_library( +api_proto_library_internal( name = "protocol", srcs = ["protocol.proto"], visibility = [ diff --git a/envoy/api/v2/endpoint/BUILD b/envoy/api/v2/endpoint/BUILD index 14808743..87884fe3 100644 --- a/envoy/api/v2/endpoint/BUILD +++ b/envoy/api/v2/endpoint/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "endpoint", srcs = ["endpoint.proto"], visibility = ["//envoy/api/v2:friends"], @@ -29,7 +29,7 @@ api_go_proto_library( ], ) -api_proto_library( +api_proto_library_internal( name = "load_report", srcs = ["load_report.proto"], visibility = ["//envoy/api/v2:friends"], diff --git a/envoy/api/v2/listener/BUILD b/envoy/api/v2/listener/BUILD index e8f48a10..bfa6a140 100644 --- a/envoy/api/v2/listener/BUILD +++ b/envoy/api/v2/listener/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "listener", srcs = ["listener.proto"], visibility = ["//envoy/api/v2:friends"], diff --git a/envoy/api/v2/ratelimit/BUILD b/envoy/api/v2/ratelimit/BUILD index 0c6497e6..6e640b04 100644 --- a/envoy/api/v2/ratelimit/BUILD +++ b/envoy/api/v2/ratelimit/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "ratelimit", srcs = ["ratelimit.proto"], visibility = ["//envoy/api/v2:friends"], diff --git a/envoy/api/v2/route/BUILD b/envoy/api/v2/route/BUILD index 09c6b2dd..5bc60102 100644 --- a/envoy/api/v2/route/BUILD +++ b/envoy/api/v2/route/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "route", srcs = ["route.proto"], visibility = ["//envoy/api/v2:friends"], diff --git a/envoy/config/accesslog/v2/BUILD b/envoy/config/accesslog/v2/BUILD index 63bdc5c5..63ef7b0a 100644 --- a/envoy/config/accesslog/v2/BUILD +++ b/envoy/config/accesslog/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "als", srcs = ["als.proto"], deps = [ @@ -10,7 +10,7 @@ api_proto_library( ], ) -api_proto_library( +api_proto_library_internal( name = "file", srcs = ["file.proto"], ) diff --git a/envoy/config/bootstrap/v2/BUILD b/envoy/config/bootstrap/v2/BUILD index 9b97ffab..4024b11a 100644 --- a/envoy/config/bootstrap/v2/BUILD +++ b/envoy/config/bootstrap/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "bootstrap", srcs = ["bootstrap.proto"], visibility = ["//visibility:public"], diff --git a/envoy/config/filter/accesslog/v2/BUILD b/envoy/config/filter/accesslog/v2/BUILD index fbab9f76..3eedcf39 100644 --- a/envoy/config/filter/accesslog/v2/BUILD +++ b/envoy/config/filter/accesslog/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "accesslog", srcs = ["accesslog.proto"], visibility = [ diff --git a/envoy/config/filter/fault/v2/BUILD b/envoy/config/filter/fault/v2/BUILD index 0b4310f4..9fba2fbe 100644 --- a/envoy/config/filter/fault/v2/BUILD +++ b/envoy/config/filter/fault/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "fault", srcs = ["fault.proto"], visibility = [ diff --git a/envoy/config/filter/http/buffer/v2/BUILD b/envoy/config/filter/http/buffer/v2/BUILD index d2be36c5..0460c2d4 100644 --- a/envoy/config/filter/http/buffer/v2/BUILD +++ b/envoy/config/filter/http/buffer/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "buffer", srcs = ["buffer.proto"], ) diff --git a/envoy/config/filter/http/ext_authz/v2alpha/BUILD b/envoy/config/filter/http/ext_authz/v2alpha/BUILD index 62e7fc3d..8ab21451 100644 --- a/envoy/config/filter/http/ext_authz/v2alpha/BUILD +++ b/envoy/config/filter/http/ext_authz/v2alpha/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "ext_authz", srcs = ["ext_authz.proto"], deps = [ diff --git a/envoy/config/filter/http/fault/v2/BUILD b/envoy/config/filter/http/fault/v2/BUILD index 0c517c3e..7b414c48 100644 --- a/envoy/config/filter/http/fault/v2/BUILD +++ b/envoy/config/filter/http/fault/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "fault", srcs = ["fault.proto"], deps = [ diff --git a/envoy/config/filter/http/gzip/v2/BUILD b/envoy/config/filter/http/gzip/v2/BUILD index e1b592f4..79c1076d 100644 --- a/envoy/config/filter/http/gzip/v2/BUILD +++ b/envoy/config/filter/http/gzip/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "gzip", srcs = ["gzip.proto"], ) diff --git a/envoy/config/filter/http/header_to_metadata/v2/BUILD b/envoy/config/filter/http/header_to_metadata/v2/BUILD index 102dd076..67b45090 100644 --- a/envoy/config/filter/http/header_to_metadata/v2/BUILD +++ b/envoy/config/filter/http/header_to_metadata/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "header_to_metadata", srcs = ["header_to_metadata.proto"], deps = [], diff --git a/envoy/config/filter/http/health_check/v2/BUILD b/envoy/config/filter/http/health_check/v2/BUILD index 1616f046..37152bde 100644 --- a/envoy/config/filter/http/health_check/v2/BUILD +++ b/envoy/config/filter/http/health_check/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "health_check", srcs = ["health_check.proto"], deps = [ diff --git a/envoy/config/filter/http/ip_tagging/v2/BUILD b/envoy/config/filter/http/ip_tagging/v2/BUILD index 147693b8..8a6c0ee5 100644 --- a/envoy/config/filter/http/ip_tagging/v2/BUILD +++ b/envoy/config/filter/http/ip_tagging/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "ip_tagging", srcs = ["ip_tagging.proto"], deps = ["//envoy/api/v2/core:address"], diff --git a/envoy/config/filter/http/jwt_authn/v2alpha/BUILD b/envoy/config/filter/http/jwt_authn/v2alpha/BUILD index cc07bd29..90863e3f 100644 --- a/envoy/config/filter/http/jwt_authn/v2alpha/BUILD +++ b/envoy/config/filter/http/jwt_authn/v2alpha/BUILD @@ -1,8 +1,8 @@ licenses(["notice"]) # Apache 2 -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") -api_proto_library( +api_proto_library_internal( name = "jwt_authn", srcs = ["config.proto"], deps = [ diff --git a/envoy/config/filter/http/lua/v2/BUILD b/envoy/config/filter/http/lua/v2/BUILD index ce571d97..d399bc5b 100644 --- a/envoy/config/filter/http/lua/v2/BUILD +++ b/envoy/config/filter/http/lua/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "lua", srcs = ["lua.proto"], ) diff --git a/envoy/config/filter/http/rate_limit/v2/BUILD b/envoy/config/filter/http/rate_limit/v2/BUILD index 484e19c4..3b90a57c 100644 --- a/envoy/config/filter/http/rate_limit/v2/BUILD +++ b/envoy/config/filter/http/rate_limit/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "rate_limit", srcs = ["rate_limit.proto"], ) diff --git a/envoy/config/filter/http/rbac/v2/BUILD b/envoy/config/filter/http/rbac/v2/BUILD index e96a01d5..d325e3bc 100644 --- a/envoy/config/filter/http/rbac/v2/BUILD +++ b/envoy/config/filter/http/rbac/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "rbac", srcs = ["rbac.proto"], deps = ["//envoy/config/rbac/v2alpha:rbac"], diff --git a/envoy/config/filter/http/router/v2/BUILD b/envoy/config/filter/http/router/v2/BUILD index 00392ac7..38697ac8 100644 --- a/envoy/config/filter/http/router/v2/BUILD +++ b/envoy/config/filter/http/router/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "router", srcs = ["router.proto"], deps = ["//envoy/config/filter/accesslog/v2:accesslog"], diff --git a/envoy/config/filter/http/squash/v2/BUILD b/envoy/config/filter/http/squash/v2/BUILD index ea5e9c6c..8cf2c80d 100644 --- a/envoy/config/filter/http/squash/v2/BUILD +++ b/envoy/config/filter/http/squash/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "squash", srcs = ["squash.proto"], ) diff --git a/envoy/config/filter/http/transcoder/v2/BUILD b/envoy/config/filter/http/transcoder/v2/BUILD index 087f8ce8..eddef5a7 100644 --- a/envoy/config/filter/http/transcoder/v2/BUILD +++ b/envoy/config/filter/http/transcoder/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "transcoder", srcs = ["transcoder.proto"], ) diff --git a/envoy/config/filter/network/client_ssl_auth/v2/BUILD b/envoy/config/filter/network/client_ssl_auth/v2/BUILD index d382848c..a6d31d63 100644 --- a/envoy/config/filter/network/client_ssl_auth/v2/BUILD +++ b/envoy/config/filter/network/client_ssl_auth/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "client_ssl_auth", srcs = ["client_ssl_auth.proto"], deps = ["//envoy/api/v2/core:address"], diff --git a/envoy/config/filter/network/ext_authz/v2/BUILD b/envoy/config/filter/network/ext_authz/v2/BUILD index 22dc8915..4d716dee 100644 --- a/envoy/config/filter/network/ext_authz/v2/BUILD +++ b/envoy/config/filter/network/ext_authz/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "ext_authz", srcs = ["ext_authz.proto"], deps = ["//envoy/api/v2/core:grpc_service"], diff --git a/envoy/config/filter/network/http_connection_manager/v2/BUILD b/envoy/config/filter/network/http_connection_manager/v2/BUILD index da2f4dda..c89ea09a 100644 --- a/envoy/config/filter/network/http_connection_manager/v2/BUILD +++ b/envoy/config/filter/network/http_connection_manager/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "http_connection_manager", srcs = ["http_connection_manager.proto"], deps = [ diff --git a/envoy/config/filter/network/mongo_proxy/v2/BUILD b/envoy/config/filter/network/mongo_proxy/v2/BUILD index 03bc3034..69b0f85e 100644 --- a/envoy/config/filter/network/mongo_proxy/v2/BUILD +++ b/envoy/config/filter/network/mongo_proxy/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "mongo_proxy", srcs = ["mongo_proxy.proto"], deps = ["//envoy/config/filter/fault/v2:fault"], diff --git a/envoy/config/filter/network/rate_limit/v2/BUILD b/envoy/config/filter/network/rate_limit/v2/BUILD index b1936e3b..2cda26cf 100644 --- a/envoy/config/filter/network/rate_limit/v2/BUILD +++ b/envoy/config/filter/network/rate_limit/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "rate_limit", srcs = ["rate_limit.proto"], deps = ["//envoy/api/v2/ratelimit"], diff --git a/envoy/config/filter/network/redis_proxy/v2/BUILD b/envoy/config/filter/network/redis_proxy/v2/BUILD index 78f26930..c35e219b 100644 --- a/envoy/config/filter/network/redis_proxy/v2/BUILD +++ b/envoy/config/filter/network/redis_proxy/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "redis_proxy", srcs = ["redis_proxy.proto"], ) diff --git a/envoy/config/filter/network/tcp_proxy/v2/BUILD b/envoy/config/filter/network/tcp_proxy/v2/BUILD index 2e7296fa..7cb467d6 100644 --- a/envoy/config/filter/network/tcp_proxy/v2/BUILD +++ b/envoy/config/filter/network/tcp_proxy/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "tcp_proxy", srcs = ["tcp_proxy.proto"], deps = [ diff --git a/envoy/config/grpc_credential/v2alpha/BUILD b/envoy/config/grpc_credential/v2alpha/BUILD index 09f3e691..ca0a71ea 100644 --- a/envoy/config/grpc_credential/v2alpha/BUILD +++ b/envoy/config/grpc_credential/v2alpha/BUILD @@ -1,8 +1,8 @@ licenses(["notice"]) # Apache 2 -load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") -api_proto_library( +api_proto_library_internal( name = "file_based_metadata", srcs = ["file_based_metadata.proto"], deps = ["//envoy/api/v2/core:base"], diff --git a/envoy/config/health_checker/redis/v2/BUILD b/envoy/config/health_checker/redis/v2/BUILD index 7d217c54..b784e8d1 100644 --- a/envoy/config/health_checker/redis/v2/BUILD +++ b/envoy/config/health_checker/redis/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "redis", srcs = ["redis.proto"], ) diff --git a/envoy/config/metrics/v2/BUILD b/envoy/config/metrics/v2/BUILD index 1c682a13..9d061aeb 100644 --- a/envoy/config/metrics/v2/BUILD +++ b/envoy/config/metrics/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "metrics_service", srcs = ["metrics_service.proto"], visibility = [ @@ -21,7 +21,7 @@ api_go_proto_library( ], ) -api_proto_library( +api_proto_library_internal( name = "stats", srcs = ["stats.proto"], visibility = [ diff --git a/envoy/config/ratelimit/v2/BUILD b/envoy/config/ratelimit/v2/BUILD index 08bad146..2e69326a 100644 --- a/envoy/config/ratelimit/v2/BUILD +++ b/envoy/config/ratelimit/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "rls", srcs = ["rls.proto"], visibility = [ diff --git a/envoy/config/rbac/v2alpha/BUILD b/envoy/config/rbac/v2alpha/BUILD index b889a3df..f24c8594 100644 --- a/envoy/config/rbac/v2alpha/BUILD +++ b/envoy/config/rbac/v2alpha/BUILD @@ -1,8 +1,8 @@ licenses(["notice"]) # Apache 2 -load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") -api_proto_library( +api_proto_library_internal( name = "rbac", srcs = ["rbac.proto"], visibility = ["//visibility:public"], diff --git a/envoy/config/trace/v2/BUILD b/envoy/config/trace/v2/BUILD index b888bd1b..518395f2 100644 --- a/envoy/config/trace/v2/BUILD +++ b/envoy/config/trace/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "trace", srcs = ["trace.proto"], visibility = [ diff --git a/envoy/config/transport_socket/capture/v2alpha/BUILD b/envoy/config/transport_socket/capture/v2alpha/BUILD index 1786d008..bd25da3e 100644 --- a/envoy/config/transport_socket/capture/v2alpha/BUILD +++ b/envoy/config/transport_socket/capture/v2alpha/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "capture", srcs = ["capture.proto"], deps = [ diff --git a/envoy/data/accesslog/v2/BUILD b/envoy/data/accesslog/v2/BUILD index 21c1ea44..8ecfdd5b 100644 --- a/envoy/data/accesslog/v2/BUILD +++ b/envoy/data/accesslog/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "accesslog", srcs = ["accesslog.proto"], visibility = [ diff --git a/envoy/data/tap/v2alpha/BUILD b/envoy/data/tap/v2alpha/BUILD index 2211bb37..46de68e3 100644 --- a/envoy/data/tap/v2alpha/BUILD +++ b/envoy/data/tap/v2alpha/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "capture", srcs = ["capture.proto"], deps = ["//envoy/api/v2/core:address"], diff --git a/envoy/extensions/filters/network/thrift_proxy/v2alpha1/BUILD b/envoy/extensions/filters/network/thrift_proxy/v2alpha1/BUILD index 19eea2ec..60540cd8 100644 --- a/envoy/extensions/filters/network/thrift_proxy/v2alpha1/BUILD +++ b/envoy/extensions/filters/network/thrift_proxy/v2alpha1/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "thrift_proxy", srcs = ["thrift_proxy.proto"], ) diff --git a/envoy/service/accesslog/v2/BUILD b/envoy/service/accesslog/v2/BUILD index c5073996..e6e389e2 100644 --- a/envoy/service/accesslog/v2/BUILD +++ b/envoy/service/accesslog/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "als", srcs = ["als.proto"], has_services = 1, diff --git a/envoy/service/auth/v2alpha/BUILD b/envoy/service/auth/v2alpha/BUILD index 4f44cafc..5faba48a 100644 --- a/envoy/service/auth/v2alpha/BUILD +++ b/envoy/service/auth/v2alpha/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "attribute_context", srcs = [ "attribute_context.proto", @@ -12,7 +12,7 @@ api_proto_library( ], ) -api_proto_library( +api_proto_library_internal( name = "external_auth", srcs = [ "external_auth.proto", diff --git a/envoy/service/discovery/v2/BUILD b/envoy/service/discovery/v2/BUILD index f0a67f20..ac652cf1 100644 --- a/envoy/service/discovery/v2/BUILD +++ b/envoy/service/discovery/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "ads", srcs = ["ads.proto"], has_services = 1, @@ -19,7 +19,7 @@ api_go_grpc_library( ], ) -api_proto_library( +api_proto_library_internal( name = "hds", srcs = ["hds.proto"], has_services = 1, @@ -40,7 +40,7 @@ api_go_grpc_library( ], ) -api_proto_library( +api_proto_library_internal( name = "sds", srcs = ["sds.proto"], has_services = 1, diff --git a/envoy/service/load_stats/v2/BUILD b/envoy/service/load_stats/v2/BUILD index 4068eafb..66294100 100644 --- a/envoy/service/load_stats/v2/BUILD +++ b/envoy/service/load_stats/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "lrs", srcs = ["lrs.proto"], has_services = 1, diff --git a/envoy/service/metrics/v2/BUILD b/envoy/service/metrics/v2/BUILD index bbad50c7..ec32e205 100644 --- a/envoy/service/metrics/v2/BUILD +++ b/envoy/service/metrics/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "metrics_service", srcs = ["metrics_service.proto"], has_services = 1, diff --git a/envoy/service/ratelimit/v2/BUILD b/envoy/service/ratelimit/v2/BUILD index be6fdbc9..4ee72b65 100644 --- a/envoy/service/ratelimit/v2/BUILD +++ b/envoy/service/ratelimit/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "rls", srcs = ["rls.proto"], has_services = 1, diff --git a/envoy/service/trace/v2/BUILD b/envoy/service/trace/v2/BUILD index a5f13f2c..49c935f1 100644 --- a/envoy/service/trace/v2/BUILD +++ b/envoy/service/trace/v2/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_grpc_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "trace_service", srcs = ["trace_service.proto"], has_services = 1, diff --git a/envoy/type/BUILD b/envoy/type/BUILD index 6d5e0833..150e2265 100644 --- a/envoy/type/BUILD +++ b/envoy/type/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "http_status", srcs = ["http_status.proto"], visibility = ["//visibility:public"], @@ -13,7 +13,7 @@ api_go_proto_library( proto = ":http_status", ) -api_proto_library( +api_proto_library_internal( name = "percent", srcs = ["percent.proto"], visibility = ["//visibility:public"], @@ -24,7 +24,7 @@ api_go_proto_library( proto = ":percent", ) -api_proto_library( +api_proto_library_internal( name = "range", srcs = ["range.proto"], visibility = ["//visibility:public"], diff --git a/envoy/type/matcher/BUILD b/envoy/type/matcher/BUILD index 23562665..eb261e6f 100644 --- a/envoy/type/matcher/BUILD +++ b/envoy/type/matcher/BUILD @@ -1,8 +1,8 @@ -load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_go_proto_library", "api_proto_library_internal") licenses(["notice"]) # Apache 2 -api_proto_library( +api_proto_library_internal( name = "metadata", srcs = ["metadata.proto"], visibility = ["//visibility:public"], @@ -21,7 +21,7 @@ api_go_proto_library( ], ) -api_proto_library( +api_proto_library_internal( name = "number", srcs = ["number.proto"], visibility = ["//visibility:public"], @@ -38,7 +38,7 @@ api_go_proto_library( ], ) -api_proto_library( +api_proto_library_internal( name = "string", srcs = ["string.proto"], visibility = ["//visibility:public"], diff --git a/test/validate/BUILD b/test/validate/BUILD index 2707e02c..2c98249c 100644 --- a/test/validate/BUILD +++ b/test/validate/BUILD @@ -1,4 +1,4 @@ -load("//bazel:api_build_system.bzl", "api_cc_test", "api_proto_library") +load("//bazel:api_build_system.bzl", "api_cc_test", "api_proto_library_internal") licenses(["notice"]) # Apache 2