Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

api: shadowing for API protos. #9429

Merged
merged 17 commits into from
Dec 29, 2019
Merged
Prev Previous commit
Next Next commit
Misc. BUILD fixes.
Signed-off-by: Harvey Tuch <htuch@google.com>
  • Loading branch information
htuch committed Dec 26, 2019
commit 3656acef49be8bfd659c105638117abb94f8bbee
4 changes: 2 additions & 2 deletions test/common/router/BUILD
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ envoy_proto_library(
srcs = ["header_parser_fuzz.proto"],
deps = [
"//test/fuzz:common_proto",
"@envoy_api//envoy/api/v2/core:pkg",
"@envoy_api_shadow//envoy/api/v2/core:pkg",
],
)

@@ -164,7 +164,7 @@ envoy_proto_library(
srcs = ["route_fuzz.proto"],
deps = [
"//test/fuzz:common_proto",
"@envoy_api//envoy/api/v2:pkg",
"@envoy_api_shadow//envoy/api/v2:pkg",
],
)

2 changes: 1 addition & 1 deletion test/extensions/grpc_credentials/aws_iam/BUILD
Original file line number Diff line number Diff line change
@@ -18,6 +18,6 @@ envoy_cc_test(
"//source/extensions/grpc_credentials/aws_iam:config",
"//test/common/grpc:grpc_client_integration_test_harness_lib",
"//test/integration:integration_lib",
"@envoy_api//envoy/config/grpc_credential/v2alpha:pkg_cc_proto",
"@envoy_api_shadow//envoy/config/grpc_credential/v2alpha:pkg_cc_proto",
] + envoy_select_google_grpc(["//source/common/grpc:google_async_client_lib"]),
)
2 changes: 1 addition & 1 deletion test/extensions/grpc_credentials/file_based_metadata/BUILD
Original file line number Diff line number Diff line change
@@ -18,6 +18,6 @@ envoy_cc_test(
"//source/extensions/grpc_credentials/file_based_metadata:config",
"//test/common/grpc:grpc_client_integration_test_harness_lib",
"//test/integration:integration_lib",
"@envoy_api//envoy/config/grpc_credential/v2alpha:pkg_cc_proto",
"@envoy_api_shadow//envoy/config/grpc_credential/v2alpha:pkg_cc_proto",
] + envoy_select_google_grpc(["//source/common/grpc:google_async_client_lib"]),
)
2 changes: 1 addition & 1 deletion test/extensions/transport_sockets/alts/BUILD
Original file line number Diff line number Diff line change
@@ -87,6 +87,6 @@ envoy_extension_cc_test(
"//test/mocks/runtime:runtime_mocks",
"//test/mocks/secret:secret_mocks",
"//test/test_common:utility_lib",
"@envoy_api//envoy/config/transport_socket/alts/v2alpha:pkg_cc_proto",
"@envoy_api_shadow//envoy/config/transport_socket/alts/v2alpha:pkg_cc_proto",
],
)
2 changes: 1 addition & 1 deletion test/fuzz/BUILD
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ envoy_package()
envoy_proto_library(
name = "common_proto",
srcs = ["common.proto"],
deps = ["@envoy_api//envoy/api/v2/core:pkg"],
deps = ["@envoy_api_shadow//envoy/api/v2/core:pkg"],
)

envoy_cc_test_library(
2 changes: 1 addition & 1 deletion test/integration/BUILD
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ py_binary(
visibility = ["//visibility:public"],
deps = [
":capture_fuzz_proto_py_proto",
"@envoy_api//envoy/data/tap/v2alpha:pkg_py_proto",
"@envoy_api_shadow//envoy/data/tap/v2alpha:pkg_py_proto",
],
)

2 changes: 1 addition & 1 deletion test/tools/router_check/BUILD
Original file line number Diff line number Diff line change
@@ -47,5 +47,5 @@ envoy_cc_test_library(
envoy_proto_library(
name = "validation_proto",
srcs = ["validation.proto"],
deps = ["@envoy_api//envoy/api/v2/core:pkg"],
deps = ["@envoy_api_shadow//envoy/api/v2/core:pkg"],
)