From 4a4dc267513c08f7be6995502e85a0fd702e098d Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Sun, 1 Feb 2026 15:47:03 +0000 Subject: [PATCH 1/8] deps: More renaming for bzlmod alignment Signed-off-by: Ryan Northey --- DEPENDENCY_POLICY.md | 2 +- MODULE.bazel.lock | 2 +- api/MODULE.bazel | 13 +- api/bazel/cc_proto_descriptor_library/BUILD | 18 +- .../cc_proto_descriptor_library/builddefs.bzl | 2 +- .../testdata/BUILD | 6 +- api/bazel/external_proto_deps.bzl | 30 +- api/bazel/repositories.bzl | 8 +- .../access_loggers/open_telemetry/v3/BUILD | 2 +- .../stat_sinks/open_telemetry/v3/BUILD | 2 +- bazel/BUILD | 8 +- bazel/dependency_imports.bzl | 6 +- bazel/deps.yaml | 120 +++--- bazel/envoy_internal.bzl | 2 +- bazel/envoy_test.bzl | 4 +- bazel/external/BUILD | 4 +- bazel/external/quiche.BUILD | 162 ++++---- bazel/external/spdlog.BUILD | 2 +- bazel/foreign_cc/BUILD | 24 +- bazel/foreign_cc/cel-cpp.patch | 20 + bazel/foreign_cc/luajit.patch | 2 +- bazel/grpc.patch | 2 +- bazel/pgv.patch | 31 ++ bazel/proxy_wasm_cpp_host.patch | 4 +- bazel/repositories.bzl | 352 ++++++++++-------- bazel/repository_locations.bzl | 106 +++--- ci/do_ci.sh | 11 +- contrib/config/source/BUILD | 2 +- .../private_key_providers/source/BUILD | 2 +- .../cryptomb/private_key_providers/test/BUILD | 2 +- contrib/dlb/source/BUILD | 2 +- contrib/golang/filters/http/source/BUILD | 22 +- .../http/test/test_data/access_log/BUILD | 2 +- .../filters/http/test/test_data/action/BUILD | 2 +- .../http/test/test_data/add_data/BUILD | 2 +- .../filters/http/test/test_data/buffer/BUILD | 2 +- .../test/test_data/bufferinjectdata/BUILD | 2 +- .../filters/http/test/test_data/echo/BUILD | 2 +- .../http/test/test_data/passthrough/BUILD | 2 +- .../http/test/test_data/property/BUILD | 2 +- .../http/test/test_data/routeconfig/BUILD | 2 +- .../filters/http/test/test_data/secrets/BUILD | 2 +- .../filters/network/test/test_data/BUILD | 2 +- .../test/test_data/simple/BUILD | 2 +- .../http/tcp/test/test_data/add_data/BUILD | 2 +- .../http/tcp/test/test_data/buffered/BUILD | 2 +- .../http/tcp/test/test_data/header_op/BUILD | 2 +- .../http/tcp/test/test_data/local_reply/BUILD | 2 +- .../http/tcp/test/test_data/panic/BUILD | 2 +- .../http/tcp/test/test_data/property/BUILD | 2 +- .../tcp/test/test_data/self_half_close/BUILD | 2 +- .../http/tcp/test/test_data/streaming/BUILD | 2 +- .../matching/input_matchers/source/BUILD | 8 +- .../matching/input_matchers/test/BUILD | 6 +- contrib/istio/filters/common/source/BUILD | 4 +- .../filters/http/istio_stats/source/BUILD | 6 +- .../network/metadata_exchange/source/BUILD | 4 +- contrib/kafka/filters/network/source/BUILD | 2 +- .../kafka/filters/network/source/broker/BUILD | 2 +- .../kafka/filters/network/source/mesh/BUILD | 2 +- contrib/qat/BUILD | 2 +- .../qatzip/compressor/source/BUILD | 2 +- .../qatzstd/compressor/source/BUILD | 4 +- .../filters/network/source/BUILD | 2 +- .../sip_proxy/filters/network/source/BUILD | 6 +- .../filters/network/source/router/BUILD | 2 +- .../filters/network/source/tra/BUILD | 4 +- contrib/vcl/source/BUILD | 2 +- distribution/binary/BUILD | 2 +- distribution/binary/compiler.bzl | 2 +- envoy/api/BUILD | 2 +- envoy/buffer/BUILD | 2 +- envoy/common/BUILD | 8 +- envoy/config/BUILD | 4 +- envoy/event/BUILD | 2 +- envoy/filesystem/BUILD | 2 +- envoy/grpc/BUILD | 2 +- envoy/http/BUILD | 14 +- envoy/matcher/BUILD | 4 +- envoy/network/BUILD | 12 +- envoy/router/BUILD | 16 +- envoy/runtime/BUILD | 4 +- envoy/server/BUILD | 2 +- envoy/ssl/BUILD | 4 +- envoy/stats/BUILD | 2 +- envoy/stream_info/BUILD | 4 +- envoy/udp/BUILD | 2 +- envoy/upstream/BUILD | 6 +- mobile/WORKSPACE | 2 +- mobile/bazel/envoy_mobile_repositories.bzl | 2 +- mobile/examples/cc/fetch_client/BUILD | 2 +- mobile/library/cc/BUILD | 4 +- mobile/library/common/BUILD | 6 +- mobile/library/common/event/BUILD | 2 +- mobile/library/common/http/BUILD | 2 +- mobile/library/jni/BUILD | 8 +- mobile/test/common/mocks/dns/BUILD | 2 +- source/common/access_log/BUILD | 2 +- source/common/buffer/BUILD | 2 +- source/common/common/BUILD | 72 ++-- source/common/config/BUILD | 4 +- source/common/event/BUILD | 2 +- source/common/formatter/BUILD | 2 +- source/common/grpc/BUILD | 12 +- source/common/html/BUILD | 2 +- source/common/http/BUILD | 34 +- source/common/http/http1/BUILD | 12 +- source/common/http/http2/BUILD | 14 +- source/common/http/http3/BUILD | 2 +- source/common/http/sse/BUILD | 4 +- source/common/json/BUILD | 8 +- source/common/jwt/BUILD | 8 +- source/common/listener_manager/BUILD | 2 +- source/common/network/BUILD | 16 +- source/common/orca/BUILD | 16 +- source/common/profiler/BUILD | 2 +- source/common/protobuf/BUILD | 8 +- source/common/quic/BUILD | 142 +++---- source/common/quic/platform/BUILD | 52 +-- source/common/quic/platform/mobile_impl/BUILD | 2 +- source/common/router/BUILD | 12 +- source/common/runtime/BUILD | 8 +- source/common/singleton/BUILD | 2 +- source/common/ssl/BUILD | 2 +- source/common/stats/BUILD | 8 +- source/common/stream_info/BUILD | 4 +- source/common/tcp/BUILD | 2 +- source/common/tls/BUILD | 30 +- source/common/tls/cert_validator/BUILD | 4 +- source/common/upstream/BUILD | 6 +- source/exe/BUILD | 2 +- source/extensions/access_loggers/common/BUILD | 4 +- .../access_loggers/filters/cel/BUILD | 2 +- .../access_loggers/open_telemetry/BUILD | 24 +- source/extensions/clusters/redis/BUILD | 2 +- source/extensions/common/async_files/BUILD | 14 +- source/extensions/common/aws/BUILD | 6 +- source/extensions/common/dubbo/BUILD | 2 +- .../common/dynamic_forward_proxy/BUILD | 2 +- source/extensions/common/wasm/BUILD | 24 +- .../compression/brotli/compressor/BUILD | 2 +- .../compression/brotli/decompressor/BUILD | 2 +- .../extensions/config_subscription/grpc/BUILD | 2 +- .../extensions/dynamic_modules/sdk/cpp/BUILD | 14 +- source/extensions/filters/common/expr/BUILD | 30 +- source/extensions/filters/common/lua/BUILD | 2 +- .../filters/common/mutation_rules/BUILD | 4 +- .../extensions/filters/common/ratelimit/BUILD | 2 +- .../filters/common/ratelimit_config/BUILD | 4 +- source/extensions/filters/common/rbac/BUILD | 2 +- .../http/alternate_protocols_cache/BUILD | 2 +- source/extensions/filters/http/cache/BUILD | 6 +- source/extensions/filters/http/cache_v2/BUILD | 10 +- source/extensions/filters/http/cors/BUILD | 2 +- source/extensions/filters/http/ext_proc/BUILD | 14 +- .../extensions/filters/http/gcp_authn/BUILD | 2 +- .../filters/http/grpc_field_extraction/BUILD | 4 +- .../http/grpc_json_reverse_transcoder/BUILD | 4 +- .../extensions/filters/http/jwt_authn/BUILD | 2 +- .../extensions/filters/http/mcp_router/BUILD | 18 +- .../filters/http/proto_api_scrubber/BUILD | 8 +- .../http/proto_message_extraction/BUILD | 22 +- .../extraction_util/BUILD | 2 +- .../filters/network/common/redis/BUILD | 4 +- .../filters/network/dubbo_proxy/BUILD | 2 +- .../filters/network/generic_proxy/BUILD | 6 +- .../network/generic_proxy/router/BUILD | 2 +- .../filters/network/redis_proxy/BUILD | 2 +- .../filters/network/thrift_proxy/BUILD | 12 +- .../filters/network/thrift_proxy/router/BUILD | 2 +- .../extensions/filters/udp/dns_filter/BUILD | 2 +- .../session_filters/http_capsule/BUILD | 4 +- source/extensions/formatter/cel/BUILD | 6 +- .../http/cache/file_system_http_cache/BUILD | 12 +- .../cache_v2/file_system_http_cache/BUILD | 12 +- .../mapped_attribute_builder/BUILD | 2 +- .../save_processing_response/BUILD | 2 +- .../header_validators/envoy_default/BUILD | 14 +- .../load_balancing_policies/common/BUILD | 2 +- .../override_host/BUILD | 16 +- .../load_balancing_policies/ring_hash/BUILD | 2 +- .../filter_state_override/BUILD | 2 +- .../network/dns_resolver/cares/BUILD | 2 +- source/extensions/path/uri_template_lib/BUILD | 26 +- .../quic/connection_debug_visitor/basic/BUILD | 8 +- .../connection_id_generator/quic_lb/BUILD | 6 +- .../rate_limit_descriptors/expr/BUILD | 2 +- .../resource_monitors/cgroup_memory/BUILD | 4 +- .../resource_monitors/cpu_utilization/BUILD | 4 +- .../stat_sinks/open_telemetry/BUILD | 4 +- source/extensions/tracers/datadog/BUILD | 4 +- source/extensions/tracers/opentelemetry/BUILD | 8 +- .../tracers/opentelemetry/samplers/BUILD | 2 +- .../opentelemetry/samplers/dynatrace/BUILD | 2 +- source/extensions/tracers/zipkin/BUILD | 2 +- .../extensions/transport_sockets/alts/BUILD | 14 +- .../transport_sockets/starttls/BUILD | 4 +- .../tls/cert_validator/spiffe/BUILD | 4 +- source/extensions/upstreams/http/udp/BUILD | 4 +- .../extensions/watchdog/profile_action/BUILD | 2 +- source/server/BUILD | 18 +- source/server/admin/BUILD | 2 +- source/server/config_validation/BUILD | 2 +- test/BUILD | 4 +- test/benchmark/BUILD | 4 +- test/common/buffer/BUILD | 2 +- test/common/common/BUILD | 30 +- test/common/config/BUILD | 2 +- test/common/formatter/BUILD | 2 +- test/common/grpc/BUILD | 2 +- test/common/http/BUILD | 8 +- test/common/http/http2/BUILD | 12 +- test/common/listener_manager/BUILD | 4 +- test/common/network/BUILD | 12 +- test/common/orca/BUILD | 18 +- test/common/protobuf/BUILD | 2 +- test/common/quic/BUILD | 54 +-- test/common/quic/platform/BUILD | 26 +- test/common/quic/platform/quiche_test_impl.h | 2 +- test/common/router/BUILD | 12 +- test/common/stats/BUILD | 22 +- test/common/tls/BUILD | 2 +- test/common/upstream/BUILD | 10 +- test/common/watchdog/BUILD | 2 +- .../access_loggers/open_telemetry/BUILD | 24 +- .../access_loggers/wasm/test_data/BUILD | 2 +- test/extensions/bootstrap/wasm/BUILD | 6 +- .../extensions/bootstrap/wasm/test_data/BUILD | 6 +- test/extensions/clusters/eds/BUILD | 2 +- test/extensions/common/aws/signers/BUILD | 4 +- .../aws/signers/sigv4_signer_corpus_test.cc | 2 +- .../aws/signers/sigv4a_signer_corpus_test.cc | 2 +- test/extensions/common/wasm/BUILD | 6 +- test/extensions/common/wasm/test_data/BUILD | 6 +- .../extensions/config_subscription/grpc/BUILD | 2 +- test/extensions/filters/common/expr/BUILD | 4 +- test/extensions/filters/http/cache/BUILD | 8 +- test/extensions/filters/http/cache_v2/BUILD | 8 +- test/extensions/filters/http/compressor/BUILD | 4 +- .../filters/http/custom_response/BUILD | 2 +- test/extensions/filters/http/ext_proc/BUILD | 28 +- .../filters/http/grpc_field_extraction/BUILD | 2 +- .../http/grpc_json_reverse_transcoder/BUILD | 2 +- .../filters/http/header_mutation/BUILD | 2 +- .../filters/http/proto_api_scrubber/BUILD | 12 +- .../http/proto_message_extraction/BUILD | 2 +- .../extraction_util/BUILD | 6 +- test/extensions/filters/http/transform/BUILD | 2 +- .../filters/http/wasm/test_data/BUILD | 2 +- .../filters/listener/tls_inspector/BUILD | 2 +- .../filters/network/common/fuzz/BUILD | 2 +- .../filters/network/redis_proxy/BUILD | 4 +- .../filters/network/wasm/test_data/BUILD | 2 +- test/extensions/filters/udp/dns_filter/BUILD | 2 +- test/extensions/formatter/cel/BUILD | 2 +- .../load_balancing_policies/common/BUILD | 2 +- .../override_host/BUILD | 14 +- .../load_balancing_policies/subset/BUILD | 2 +- .../network/dns_resolver/apple/BUILD | 2 +- test/extensions/path/uri_template_lib/BUILD | 14 +- .../connection_id_generator/quic_lb/BUILD | 2 +- .../resource_monitors/cpu_utilization/BUILD | 4 +- .../downstream_connections/BUILD | 2 +- .../resource_monitors/fixed_heap/BUILD | 2 +- test/extensions/stats_sinks/wasm/BUILD | 2 +- test/extensions/tracers/datadog/BUILD | 4 +- test/extensions/tracers/opentelemetry/BUILD | 2 +- test/extensions/tracers/zipkin/BUILD | 2 +- test/extensions/transport_sockets/alts/BUILD | 18 +- test/extensions/watchdog/profile_action/BUILD | 2 +- test/fuzz/BUILD | 10 +- test/integration/BUILD | 22 +- test/integration/admin_html/BUILD | 2 +- test/integration/filters/BUILD | 8 +- test/mocks/http/BUILD | 2 +- test/mocks/network/BUILD | 4 +- test/mocks/runtime/BUILD | 2 +- test/server/BUILD | 2 +- test/test_common/BUILD | 6 +- test/tools/router_check/BUILD | 2 +- test/tools/schema_validator/BUILD | 2 +- tools/code/BUILD | 8 +- tools/code_format/BUILD | 8 +- tools/type_whisperer/BUILD | 2 +- 284 files changed, 1391 insertions(+), 1324 deletions(-) create mode 100644 bazel/pgv.patch diff --git a/DEPENDENCY_POLICY.md b/DEPENDENCY_POLICY.md index 17c1d641bfd7a..e9794c52459a2 100644 --- a/DEPENDENCY_POLICY.md +++ b/DEPENDENCY_POLICY.md @@ -19,7 +19,7 @@ in either [bazel/repository_locations.bzl](bazel/repository_locations.bzl) or An example entry for the `nghttp2` dependency is: ```python -com_github_nghttp2_nghttp2 = dict( +nghttp2 = dict( project_name = "Nghttp2", project_desc = "Implementation of HTTP/2 and its header compression ...", project_url = "https://nghttp2.org", diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 85b6d6eb56ead..f5fea1019a0c4 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1115,7 +1115,7 @@ ] } }, - "com_google_absl": { + "abseil-cpp": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { diff --git a/api/MODULE.bazel b/api/MODULE.bazel index aa7ff823beef9..bdf4b13061ab0 100644 --- a/api/MODULE.bazel +++ b/api/MODULE.bazel @@ -6,20 +6,19 @@ module( # All bazel_dep entries are organized alphabetically for improved readability. # Core dependencies from Bazel Central Registry -bazel_dep(name = "abseil-cpp", version = "20250814.1", repo_name = "com_google_absl") +bazel_dep(name = "abseil-cpp", version = "20250814.1") bazel_dep(name = "bazel_skylib", version = "1.8.2") bazel_dep(name = "cel-spec", version = "0.25.1", repo_name = "dev_cel") -bazel_dep(name = "gazelle", version = "0.47.0", repo_name = "bazel_gazelle") -bazel_dep(name = "googleapis", version = "0.0.0-20251003-2193a2bf", repo_name = "com_google_googleapis") +bazel_dep(name = "gazelle", version = "0.47.0", repo_name = "gazelle") +bazel_dep(name = "googleapis", version = "0.0.0-20251003-2193a2bf") bazel_dep(name = "googleapis-cc", version = "1.0.0") bazel_dep(name = "googleapis-go", version = "1.0.0") bazel_dep(name = "googleapis-java", version = "1.0.0") bazel_dep(name = "grpc", version = "1.76.0.bcr.1", repo_name = "com_github_grpc_grpc") -bazel_dep(name = "opencensus-proto", version = "0.4.1.bcr.2", repo_name = "opencensus_proto") -bazel_dep(name = "opentelemetry-proto", version = "1.8.0", repo_name = "opentelemetry_proto") +bazel_dep(name = "opentelemetry-proto", version = "1.8.0") bazel_dep(name = "protobuf", version = "33.1", repo_name = "com_google_protobuf") bazel_dep(name = "protoc-gen-validate", version = "1.2.1.bcr.2", repo_name = "com_envoyproxy_protoc_gen_validate") -bazel_dep(name = "re2", version = "2024-07-02.bcr.1", repo_name = "com_googlesource_code_re2") +bazel_dep(name = "re2", version = "2024-07-02.bcr.1") bazel_dep(name = "rules_cc", version = "0.2.14") bazel_dep(name = "rules_go", version = "0.59.0", repo_name = "io_bazel_rules_go") bazel_dep(name = "rules_java", version = "9.0.3") @@ -33,7 +32,7 @@ bazel_dep(name = "zipkin-api", version = "1.0.0", repo_name = "com_github_openzi bazel_dep(name = "google_benchmark", version = "1.9.2") # Test dependencies from Bazel Central Registry -bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True, repo_name = "com_google_googletest") +bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True) # Go SDK and toolchain configuration go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk") diff --git a/api/bazel/cc_proto_descriptor_library/BUILD b/api/bazel/cc_proto_descriptor_library/BUILD index 1f539c9308383..b8a4e46920026 100644 --- a/api/bazel/cc_proto_descriptor_library/BUILD +++ b/api/bazel/cc_proto_descriptor_library/BUILD @@ -8,7 +8,7 @@ cc_library( hdrs = ["file_descriptor_info.h"], visibility = ["//visibility:public"], deps = [ - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -24,9 +24,9 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":file_descriptor_info", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", "@com_google_protobuf//:protobuf", ], ) @@ -36,8 +36,8 @@ cc_library( srcs = ["file_descriptor_generator.cc"], hdrs = ["file_descriptor_generator.h"], deps = [ - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", "@com_google_protobuf//:protobuf", "@com_google_protobuf//src/google/protobuf/compiler:code_generator", ], @@ -62,9 +62,9 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":text_format_transcoder", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", "@com_google_protobuf//:protobuf", ], ) diff --git a/api/bazel/cc_proto_descriptor_library/builddefs.bzl b/api/bazel/cc_proto_descriptor_library/builddefs.bzl index e3ae549e7d5bb..2fdf3d2d1938b 100644 --- a/api/bazel/cc_proto_descriptor_library/builddefs.bzl +++ b/api/bazel/cc_proto_descriptor_library/builddefs.bzl @@ -323,7 +323,7 @@ cc_proto_descriptor_library_aspect = aspect( "_descriptor": attr.label_list( default = [ Label("//bazel/cc_proto_descriptor_library:file_descriptor_info"), - Label("@com_google_absl//absl/base:core_headers"), + Label("@abseil-cpp//absl/base:core_headers"), ], ), }), diff --git a/api/bazel/cc_proto_descriptor_library/testdata/BUILD b/api/bazel/cc_proto_descriptor_library/testdata/BUILD index 9aa43014e99ac..005064c0aee91 100644 --- a/api/bazel/cc_proto_descriptor_library/testdata/BUILD +++ b/api/bazel/cc_proto_descriptor_library/testdata/BUILD @@ -102,8 +102,8 @@ cc_test( "test_extension_cc_proto", "test_extension_descriptors", "//bazel/cc_proto_descriptor_library:text_format_transcoder", - "@com_google_googletest//:gtest_main", "@com_google_protobuf//:protobuf", + "@googletest//:gtest_main", ], ) @@ -116,8 +116,8 @@ cc_test( deps = [ "test_cc_proto", "//bazel/cc_proto_descriptor_library:text_format_transcoder", - "@com_google_googletest//:gtest_main", "@com_google_protobuf//:protobuf", + "@googletest//:gtest_main", ], ) @@ -132,7 +132,7 @@ cc_test( "test_descriptors", "//bazel/cc_proto_descriptor_library:create_dynamic_message", "//bazel/cc_proto_descriptor_library:text_format_transcoder", - "@com_google_googletest//:gtest_main", "@com_google_protobuf//:protobuf", + "@googletest//:gtest_main", ], ) diff --git a/api/bazel/external_proto_deps.bzl b/api/bazel/external_proto_deps.bzl index a88f6730c0bfd..9dfdfee41ab93 100644 --- a/api/bazel/external_proto_deps.bzl +++ b/api/bazel/external_proto_deps.bzl @@ -12,7 +12,7 @@ EXTERNAL_PROTO_IMPORT_BAZEL_DEP_MAP = { "google/api/expr/v1alpha1/checked.proto": "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto", "google/api/expr/v1alpha1/syntax.proto": "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto", "io/prometheus/client/metrics.proto": "@prometheus_metrics_model//:client_model", - "opentelemetry/proto/common/v1/common.proto": "@opentelemetry_proto//:common_proto", + "opentelemetry/proto/common/v1/common.proto": "@opentelemetry-proto//:common_proto", } # This maps from the Bazel proto_library target to the Go language binding target for external dependencies. @@ -28,24 +28,24 @@ EXTERNAL_PROTO_GO_BAZEL_DEP_MAP = { # go_googleapis in https://github.com/bazelbuild/rules_go/blob/master/go/dependencies.rst#overriding-dependencies "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto": "@org_golang_google_genproto_googleapis_api//expr/v1alpha1", "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@org_golang_google_genproto_googleapis_api//expr/v1alpha1", - "@opentelemetry_proto//:trace_proto": "@opentelemetry_proto//:trace_proto_go", - "@opentelemetry_proto//:trace_service_proto": "@opentelemetry_proto//:trace_service_grpc_go", - "@opentelemetry_proto//:logs_proto": "@opentelemetry_proto//:logs_proto_go", - "@opentelemetry_proto//:logs_service_proto": "@opentelemetry_proto//:logs_service_grpc_go", - "@opentelemetry_proto//:metrics_proto": "@opentelemetry_proto//:metrics_proto_go", - "@opentelemetry_proto//:metrics_service_proto": "@opentelemetry_proto//:metrics_service_grpc_go", - "@opentelemetry_proto//:common_proto": "@opentelemetry_proto//:common_proto_go", + "@opentelemetry-proto//:trace_proto": "@opentelemetry-proto//:trace_proto_go", + "@opentelemetry-proto//:trace_service_proto": "@opentelemetry-proto//:trace_service_grpc_go", + "@opentelemetry-proto//:logs_proto": "@opentelemetry-proto//:logs_proto_go", + "@opentelemetry-proto//:logs_service_proto": "@opentelemetry-proto//:logs_service_grpc_go", + "@opentelemetry-proto//:metrics_proto": "@opentelemetry-proto//:metrics_proto_go", + "@opentelemetry-proto//:metrics_service_proto": "@opentelemetry-proto//:metrics_service_grpc_go", + "@opentelemetry-proto//:common_proto": "@opentelemetry-proto//:common_proto_go", } # This maps from the Bazel proto_library target to the C++ language binding target for external dependencies. EXTERNAL_PROTO_CC_BAZEL_DEP_MAP = { "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto": "@com_google_googleapis//google/api/expr/v1alpha1:checked_cc_proto", "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto", - "@opentelemetry_proto//:trace_proto": "@opentelemetry_proto//:trace_proto_cc", - "@opentelemetry_proto//:trace_service_proto": "@opentelemetry_proto//:trace_service_grpc_cc", - "@opentelemetry_proto//:logs_proto": "@opentelemetry_proto//:logs_proto_cc", - "@opentelemetry_proto//:logs_service_proto": "@opentelemetry_proto//:logs_service_grpc_cc", - "@opentelemetry_proto//:metrics_proto": "@opentelemetry_proto//:metrics_proto_cc", - "@opentelemetry_proto//:metrics_service_proto": "@opentelemetry_proto//:metrics_service_grpc_cc", - "@opentelemetry_proto//:common_proto": "@opentelemetry_proto//:common_proto_cc", + "@opentelemetry-proto//:trace_proto": "@opentelemetry-proto//:trace_proto_cc", + "@opentelemetry-proto//:trace_service_proto": "@opentelemetry-proto//:trace_service_grpc_cc", + "@opentelemetry-proto//:logs_proto": "@opentelemetry-proto//:logs_proto_cc", + "@opentelemetry-proto//:logs_service_proto": "@opentelemetry-proto//:logs_service_grpc_cc", + "@opentelemetry-proto//:metrics_proto": "@opentelemetry-proto//:metrics_proto_cc", + "@opentelemetry-proto//:metrics_service_proto": "@opentelemetry-proto//:metrics_service_grpc_cc", + "@opentelemetry-proto//:common_proto": "@opentelemetry-proto//:common_proto_cc", } diff --git a/api/bazel/repositories.bzl b/api/bazel/repositories.bzl index 77e9ae297a7f6..f20864222a270 100644 --- a/api/bazel/repositories.bzl +++ b/api/bazel/repositories.bzl @@ -37,6 +37,9 @@ def api_dependencies(bzlmod = False): ) external_http_archive( name = "com_envoyproxy_protoc_gen_validate", + patch_args = ["-p1"], + patches = ["@envoy//bazel:pgv.patch"], + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) external_http_archive( name = "com_google_googleapis", @@ -55,11 +58,14 @@ def api_dependencies(bzlmod = False): build_file_content = ZIPKINAPI_BUILD_CONTENT, ) external_http_archive( - name = "opentelemetry_proto", + name = "opentelemetry-proto", + location_name = "opentelemetry_proto", build_file_content = OPENTELEMETRY_BUILD_CONTENT, + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) external_http_archive( name = "dev_cel", + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) PROMETHEUSMETRICS_BUILD_CONTENT = """ diff --git a/api/envoy/extensions/access_loggers/open_telemetry/v3/BUILD b/api/envoy/extensions/access_loggers/open_telemetry/v3/BUILD index 59b8f8a44901e..2bb75a78f2557 100644 --- a/api/envoy/extensions/access_loggers/open_telemetry/v3/BUILD +++ b/api/envoy/extensions/access_loggers/open_telemetry/v3/BUILD @@ -10,7 +10,7 @@ api_proto_package( "//envoy/config/core/v3:pkg", "//envoy/extensions/access_loggers/grpc/v3:pkg", "//envoy/type/tracing/v3:pkg", - "@opentelemetry_proto//:common_proto", + "@opentelemetry-proto//:common_proto", "@xds//udpa/annotations:pkg", ], ) diff --git a/api/envoy/extensions/stat_sinks/open_telemetry/v3/BUILD b/api/envoy/extensions/stat_sinks/open_telemetry/v3/BUILD index 018e5e8d91f3d..70179bc96d09c 100644 --- a/api/envoy/extensions/stat_sinks/open_telemetry/v3/BUILD +++ b/api/envoy/extensions/stat_sinks/open_telemetry/v3/BUILD @@ -7,7 +7,7 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/config/core/v3:pkg", - "@opentelemetry_proto//:common_proto", + "@opentelemetry-proto//:common_proto", "@xds//udpa/annotations:pkg", "@xds//xds/type/matcher/v3:pkg", ], diff --git a/bazel/BUILD b/bazel/BUILD index f23ebaf771742..17c56431808b0 100644 --- a/bazel/BUILD +++ b/bazel/BUILD @@ -994,9 +994,9 @@ cc_library( visibility = ["//visibility:public"], deps = selects.with_or({ ("//bazel:linux_x86_64", "//bazel:linux_aarch64"): [ - "@com_github_google_tcmalloc//tcmalloc", - "@com_github_google_tcmalloc//tcmalloc:profile_marshaler", - "@com_github_google_tcmalloc//tcmalloc:malloc_extension", + "@tcmalloc//tcmalloc", + "@tcmalloc//tcmalloc:profile_marshaler", + "@tcmalloc//tcmalloc:malloc_extension", ], "//conditions:default": ["//bazel/external:gperftools"], }), @@ -1009,7 +1009,7 @@ cc_library( ( "//bazel:linux_x86_64", "//bazel:linux_aarch64", - ): ["@com_github_google_tcmalloc//tcmalloc"], + ): ["@tcmalloc//tcmalloc"], "//conditions:default": ["//bazel/external:gperftools"], }), ) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index ad84a286e8383..b3dba31fffa45 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -2,9 +2,8 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "register_jq_toolchains", "regis load("@base_pip3//:requirements.bzl", pip_dependencies = "install_deps") load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies") -load("@com_github_aignas_rules_shellcheck//:deps.bzl", "shellcheck_dependencies") +load("@cel-cpp//bazel:deps.bzl", "parser_deps") load("@com_github_chrusty_protoc_gen_jsonschema//:deps.bzl", protoc_gen_jsonschema_go_dependencies = "go_dependencies") -load("@com_google_cel_cpp//bazel:deps.bzl", "parser_deps") load("@dev_pip3//:requirements.bzl", pip_dev_dependencies = "install_deps") load("@emsdk//:emscripten_deps.bzl", "emscripten_deps") load("@emsdk//:toolchains.bzl", "register_emscripten_toolchains") @@ -23,6 +22,7 @@ load("@rules_rust//crate_universe:defs.bzl", "crates_repository") load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies") load("@rules_rust//rust:defs.bzl", "rust_common") load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains", "rust_repository_set") +load("@shellcheck//:deps.bzl", "shellcheck_dependencies") # go version for rules_go GO_VERSION = "1.24.6" @@ -140,7 +140,7 @@ def envoy_dependency_imports( build_external = "external", ) go_repository( - name = "com_github_cncf_xds_go", + name = "xds_go", importpath = "github.com/cncf/xds/go", sum = "h1:gt7U1Igw0xbJdyaCM5H2CnlAlPSkzrhsebQB6WQWjLA=", version = "v0.0.0-20251110193048-8bfbf64dc13e", diff --git a/bazel/deps.yaml b/bazel/deps.yaml index 38cabc7c54324..cc1f67707f6c2 100644 --- a/bazel/deps.yaml +++ b/bazel/deps.yaml @@ -71,7 +71,7 @@ build_bazel_rules_apple: license: "Apache-2.0" license_url: "https://github.com/bazelbuild/rules_apple/blob/{version}/LICENSE" -com_github_aignas_rules_shellcheck: +shellcheck: project_name: "Shellcheck rules for bazel" project_desc: "Now you do not need to depend on the system shellcheck version in your bazel-managed (mono)repos." project_url: "https://github.com/aignas/rules_shellcheck" @@ -81,7 +81,7 @@ com_github_aignas_rules_shellcheck: license: "MIT" license_url: "https://github.com/aignas/rules_shellcheck/blob/{version}/LICENSE" -com_github_alibaba_hessian2_codec: +hessian2_codec: project_name: "hessian2-codec" project_desc: "hessian2-codec is a C++ library for hessian2 codec" project_url: "https://github.com/alibaba/hessian2-codec.git" @@ -95,7 +95,7 @@ com_github_alibaba_hessian2_codec: license: "Apache-2.0" license_url: "https://github.com/alibaba/hessian2-codec/blob/{version}/LICENSE" -com_github_awslabs_aws_c_auth: +aws_c_auth_testdata: project_name: "aws-c-auth" project_desc: "C99 library implementation of AWS client-side authentication: standard credentials providers and signing" project_url: "https://github.com/awslabs/aws-c-auth" @@ -107,7 +107,7 @@ com_github_awslabs_aws_c_auth: license: "Apache-2.0" license_url: "https://github.com/awslabs/aws-c-auth/blob/v{version}/LICENSE" -com_github_axboe_liburing: +liburing: project_name: "liburing" project_desc: "C helpers to set up and tear down io_uring instances" project_url: "https://github.com/axboe/liburing" @@ -116,7 +116,7 @@ com_github_axboe_liburing: - dataplane_core - controlplane -com_github_bazelbuild_buildtools: +buildtools: project_name: "Bazel build tools" project_desc: "Developer tools for working with Google's bazel buildtool." project_url: "https://github.com/bazelbuild/buildtools" @@ -124,7 +124,7 @@ com_github_bazelbuild_buildtools: use_category: - test_only -com_github_cares_cares: +c_ares: project_name: "c-ares" project_desc: "C library for asynchronous DNS requests" project_url: "https://c-ares.haxx.se/" @@ -136,7 +136,7 @@ com_github_cares_cares: license: "c-ares" license_url: "https://github.com/c-ares/c-ares/blob/cares-{underscore_version}/LICENSE.md" -com_github_cyan4973_xxhash: +xxhash: project_name: "xxHash" project_desc: "Extremely fast hash algorithm" project_url: "https://github.com/Cyan4973/xxHash" @@ -147,7 +147,7 @@ com_github_cyan4973_xxhash: license: "BSD-2-Clause" license_url: "https://github.com/Cyan4973/xxHash/blob/v{version}/LICENSE" -com_github_datadog_dd_trace_cpp: +dd_trace_cpp: project_name: "Datadog C++ Tracing Library" project_desc: "Datadog distributed tracing for C++" project_url: "https://github.com/DataDog/dd-trace-cpp" @@ -159,7 +159,7 @@ com_github_datadog_dd_trace_cpp: license: "Apache-2.0" license_url: "https://github.com/DataDog/dd-trace-cpp/blob/v{version}/LICENSE.md" -com_github_envoyproxy_sqlparser: +sql_parser: project_name: "C++ SQL Parser Library" project_desc: "Forked from Hyrise SQL Parser" project_url: "https://github.com/envoyproxy/sql-parser" @@ -172,7 +172,7 @@ com_github_envoyproxy_sqlparser: license: "MIT" license_url: "https://github.com/envoyproxy/sql-parser/blob/{version}/LICENSE" -com_github_fdio_vpp_vcl: +vpp_vcl: project_name: "VPP Comms Library" project_desc: "FD.io Vector Packet Processor (VPP) Comms Library" project_url: "https://fd.io/" @@ -184,7 +184,7 @@ com_github_fdio_vpp_vcl: license: "Apache-2.0" license_url: "https://github.com/FDio/vpp/blob/{version}/LICENSE" -com_github_fmtlib_fmt: +fmt: project_name: "fmt" project_desc: "{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams" project_url: "https://fmt.dev" @@ -196,7 +196,7 @@ com_github_fmtlib_fmt: license: "fmt" license_url: "https://github.com/fmtlib/fmt/blob/{version}/LICENSE" -com_github_gabime_spdlog: +spdlog: project_name: "spdlog" project_desc: "Very fast, header-only/compiled, C++ logging library" project_url: "https://github.com/gabime/spdlog" @@ -207,7 +207,7 @@ com_github_gabime_spdlog: license: "MIT" license_url: "https://github.com/gabime/spdlog/blob/v{version}/LICENSE" -com_github_google_benchmark: +benchmark: project_name: "Benchmark" project_desc: "Library to benchmark code snippets" project_url: "https://github.com/google/benchmark" @@ -217,7 +217,7 @@ com_github_google_benchmark: license: "Apache-2.0" license_url: "https://github.com/google/benchmark/blob/v{version}/LICENSE" -com_github_google_flatbuffers: +flatbuffers: project_name: "FlatBuffers" project_desc: "FlatBuffers is a cross platform serialization library architected for maximum memory efficiency" project_url: "https://github.com/google/flatbuffers" @@ -247,21 +247,7 @@ com_github_google_flatbuffers: license: "Apache-2.0" license_url: "https://github.com/google/flatbuffers/blob/v{version}/LICENSE" -com_github_google_jwt_verify: - project_name: "jwt_verify_lib" - project_desc: "JWT verification library for C++" - project_url: "https://github.com/google/jwt_verify_lib" - release_date: "2023-05-17" - use_category: - - dataplane_ext - extensions: - - envoy.filters.http.jwt_authn - - envoy.filters.http.gcp_authn - - envoy.filters.http.oauth2 - license: "Apache-2.0" - license_url: "https://github.com/google/jwt_verify_lib/blob/{version}/LICENSE" - -com_github_google_libprotobuf_mutator: +libprotobuf_mutator: project_name: "libprotobuf-mutator" project_desc: "Library to randomly mutate protobuffers" project_url: "https://github.com/google/libprotobuf-mutator" @@ -271,7 +257,7 @@ com_github_google_libprotobuf_mutator: license: "Apache-2.0" license_url: "https://github.com/google/libprotobuf-mutator/blob/v{version}/LICENSE" -com_github_google_libsxg: +libsxg: project_name: "libsxg" project_desc: "Signed HTTP Exchange library" project_url: "https://github.com/google/libsxg" @@ -283,7 +269,7 @@ com_github_google_libsxg: license: "Apache-2.0" license_url: "https://github.com/google/libsxg/blob/{version}/LICENSE" -com_github_google_perfetto: +perfetto: project_name: "Perfetto" project_desc: "Perfetto Tracing SDK" project_url: "https://perfetto.dev/" @@ -294,7 +280,7 @@ com_github_google_perfetto: license: "Apache-2.0" license_url: "https://github.com/google/perfetto/blob/v{version}/LICENSE" -com_github_google_quiche: +quiche: project_name: "QUICHE" project_desc: "QUICHE (QUIC, HTTP/2, Etc) is Google‘s implementation of QUIC and related protocols" project_url: "https://github.com/google/quiche" @@ -305,7 +291,7 @@ com_github_google_quiche: license: "BSD-3-Clause" license_url: "https://github.com/google/quiche/blob/{version}/LICENSE" -com_github_google_tcmalloc: +tcmalloc: project_name: "tcmalloc" project_desc: "Fast, multi-threaded malloc implementation" project_url: "https://github.com/google/tcmalloc" @@ -328,7 +314,7 @@ com_github_grpc_grpc: license: "Apache-2.0" license_url: "https://github.com/grpc/grpc/blob/v{version}/LICENSE" -com_github_intel_ipp_crypto_crypto_mb: +ipp_crypto: project_name: "libipp-crypto" project_desc: "Intel® Integrated Performance Primitives Cryptography" project_url: "https://github.com/intel/cryptography-primitives" @@ -341,7 +327,7 @@ com_github_intel_ipp_crypto_crypto_mb: license: "Apache-2.0" license_url: "https://github.com/intel/cryptography-primitives/blob/ippcp_{version}/LICENSE" -com_github_intel_qatlib: +qatlib: project_name: "qatlib" project_desc: "Intel QuickAssist Technology Library" project_url: "https://github.com/intel/qatlib" @@ -355,7 +341,7 @@ com_github_intel_qatlib: license: "BSD-3-Clause" license_url: "https://github.com/intel/qatlib/blob/{version}/LICENSE" -com_github_intel_qatzip: +qatzip: project_name: "qatzip" project_desc: "Intel QuickAssist Technology QATzip Library" project_url: "https://github.com/intel/qatzip" @@ -367,7 +353,7 @@ com_github_intel_qatzip: license: "BSD-3-Clause" license_url: "https://github.com/intel/QATzip/blob/v{version}/LICENSE" -com_github_jbeder_yaml_cpp: +yaml_cpp: project_name: "yaml-cpp" project_desc: "YAML parser and emitter in C++ matching the YAML 1.2 spec" project_url: "https://github.com/jbeder/yaml-cpp" @@ -379,7 +365,7 @@ com_github_jbeder_yaml_cpp: license: "MIT" license_url: "https://github.com/jbeder/yaml-cpp/blob/{version}/LICENSE" -com_github_libevent_libevent: +libevent: project_name: "libevent" project_desc: "Event notification library" project_url: "https://libevent.org" @@ -391,7 +377,7 @@ com_github_libevent_libevent: license: "BSD-3-Clause" license_url: "https://github.com/libevent/libevent/blob/{version}/LICENSE" -com_github_luajit_luajit: +luajit: project_name: "LuaJIT" project_desc: "Just-In-Time compiler for Lua" project_url: "https://luajit.org" @@ -406,7 +392,7 @@ com_github_luajit_luajit: license: "MIT" license_url: "https://github.com/LuaJIT/LuaJIT/blob/{version}/COPYRIGHT" -com_github_lz4_lz4: +lz4: project_name: "LZ4" project_desc: "Extremely Fast Compression algorithm" project_url: "http://www.lz4.org/" @@ -416,7 +402,7 @@ com_github_lz4_lz4: extensions: - envoy.compression.qatzip.compressor -com_github_maxmind_libmaxminddb: +libmaxminddb: project_name: "maxmind_libmaxminddb" project_desc: "C library for reading MaxMind DB files" project_url: "https://github.com/maxmind/libmaxminddb" @@ -429,7 +415,7 @@ com_github_maxmind_libmaxminddb: license: "Apache-2.0" license_url: "https://github.com/maxmind/libmaxminddb/blob/{version}/LICENSE" -com_github_mirror_tclap: +tclap: project_name: "tclap" project_desc: "Small, flexible library that provides a simple interface for defining and accessing command line arguments" project_url: "http://tclap.sourceforge.net" @@ -440,7 +426,7 @@ com_github_mirror_tclap: license: "MIT" license_url: "https://github.com/mirror/tclap/blob/v{version}/COPYING" -com_github_msgpack_cpp: +msgpack_cxx: project_name: "msgpack for C/C++" project_desc: "MessagePack is an efficient binary serialization format" project_url: "https://github.com/msgpack/msgpack-c" @@ -454,7 +440,7 @@ com_github_msgpack_cpp: license: "Boost" license_url: "https://github.com/msgpack/msgpack-c/blob/cpp-{version}/LICENSE_1_0.txt" -com_github_ncopa_suexec: +su_exec: project_name: "su-exec" project_desc: "Utility to switch user and group id, setgroups and exec" project_url: "https://github.com/ncopa/su-exec" @@ -464,7 +450,7 @@ com_github_ncopa_suexec: license: "MIT" license_url: "https://github.com/ncopa/su-exec/blob/v{version}/LICENSE" -com_github_nghttp2_nghttp2: +nghttp2: project_name: "Nghttp2" project_desc: "Implementation of HTTP/2 and its header compression algorithm HPACK in C" project_url: "https://nghttp2.org" @@ -476,7 +462,7 @@ com_github_nghttp2_nghttp2: license: "MIT" license_url: "https://github.com/nghttp2/nghttp2/blob/v{version}/LICENSE" -com_github_nlohmann_json: +nlohmann_json: project_name: "nlohmann JSON" project_desc: "Fast JSON parser/generator for C++" project_url: "https://nlohmann.github.io/json" @@ -500,7 +486,7 @@ libcircllhist: license: "Apache-2.0" license_url: "https://github.com/openhistogram/libcircllhist/blob/{version}/LICENSE" -com_github_qat_zstd: +qat_zstd: project_name: "QAT-ZSTD-Plugin" project_desc: "Intel® QuickAssist Technology ZSTD Plugin (QAT ZSTD Plugin)" project_url: "https://github.com/intel/QAT-ZSTD-Plugin/" @@ -510,7 +496,7 @@ com_github_qat_zstd: extensions: - envoy.compression.qatzstd.compressor -com_github_skyapm_cpp2sky: +cpp2sky: project_name: "cpp2sky" project_desc: "C++ SDK for Apache SkyWalking" project_url: "https://github.com/SkyAPM/cpp2sky" @@ -522,7 +508,7 @@ com_github_skyapm_cpp2sky: license: "Apache-2.0" license_url: "https://github.com/SkyAPM/cpp2sky/blob/v{version}/LICENSE" -com_github_unicode_org_icu: +icu: project_name: "ICU Library" project_desc: "Development files for International Components for Unicode" project_url: "https://github.com/unicode-org/icu" @@ -534,7 +520,7 @@ com_github_unicode_org_icu: license: "ICU" license_url: "https://github.com/unicode-org/icu/blob/release-{version}/icu4c/LICENSE" -com_github_wamr: +wamr: project_name: "Webassembly Micro Runtime" project_desc: "A standalone runtime with a small footprint for WebAssembly" project_url: "https://github.com/bytecodealliance/wasm-micro-runtime" @@ -546,7 +532,7 @@ com_github_wamr: license: "Apache-2.0" license_url: "https://github.com/bytecodealliance/wasm-micro-runtime/blob/{version}/LICENSE" -com_github_wasmtime: +wasmtime: project_name: "wasmtime" project_desc: "A standalone runtime for WebAssembly" project_url: "https://github.com/bytecodealliance/wasmtime" @@ -559,7 +545,7 @@ com_github_wasmtime: license: "Apache-2.0" license_url: "https://github.com/bytecodealliance/wasmtime/blob/v{version}/LICENSE" -com_google_absl: +abseil_cpp: project_name: "Abseil" project_desc: "Open source collection of C++ libraries drawn from the most fundamental pieces of Google’s internal codebase" project_url: "https://abseil.io/" @@ -570,7 +556,7 @@ com_google_absl: license: "Apache-2.0" license_url: "https://github.com/abseil/abseil-cpp/blob/{version}/LICENSE" -com_google_cel_cpp: +cel_cpp: project_name: "Common Expression Language (CEL) C++ library" project_desc: "Common Expression Language (CEL) C++ library" project_url: "https://opensource.google/projects/cel" @@ -598,7 +584,7 @@ com_google_cel_cpp: license: "Apache-2.0" license_url: "https://github.com/google/cel-cpp/blob/v{version}/LICENSE" -com_google_cel_spec: +cel_spec: project_name: "Common Expression Language (CEL) spec" project_desc: "Common Expression Language (CEL) spec and conformance tests" project_url: "https://opensource.google/projects/cel" @@ -626,7 +612,7 @@ com_google_cel_spec: license: "Apache-2.0" license_url: "https://github.com/google/cel-spec/blob/v{version}/LICENSE" -com_google_googletest: +googletest: project_name: "Google Test" project_desc: "Google's C++ test framework" project_url: "https://github.com/google/googletest" @@ -704,7 +690,7 @@ com_google_protobuf_protoc_win64: use_category: - build -com_google_protoconverter: +proto_converter: project_name: "proto-converter" project_desc: "Library that supports the conversion between protobuf binary and json" project_url: "https://github.com/grpc-ecosystem/proto-converter" @@ -722,7 +708,7 @@ com_google_protoconverter: license: "Apache-2.0" license_url: "https://github.com/grpc-ecosystem/proto-converter/blob/{version}/LICENSE" -com_google_protofieldextraction: +proto_field_extraction: project_name: "proto-field-extraction" project_desc: "Library that supports the extraction from protobuf binary" project_url: "https://github.com/grpc-ecosystem/proto-field-extraction" @@ -737,7 +723,7 @@ com_google_protofieldextraction: license: "Apache-2.0" license_url: "https://github.com/grpc-ecosystem/proto-field-extraction/blob/{version}/LICENSE" -com_google_protoprocessinglib: +proto_processing: project_name: "proto-processing" project_desc: "Library that provides utility functionality for proto field scrubbing" project_url: "https://github.com/grpc-ecosystem/proto_processing_lib" @@ -752,7 +738,7 @@ com_google_protoprocessinglib: license: "Apache-2.0" license_url: "https://github.com/grpc-ecosystem/proto_processing_lib/blob/{version}/LICENSE" -com_googlesource_code_re2: +re2: project_name: "RE2" project_desc: "RE2, a regular expression library" project_url: "https://github.com/google/re2" @@ -961,7 +947,7 @@ highway: extensions: - envoy.wasm.runtime.v8 -intel_dlb: +dlb: project_name: "Intel Dlb" project_desc: "Dlb" project_url: "https://networkbuilders.intel.com/solutionslibrary/queue-management-and-load-balancing-on-intel-architecture" @@ -993,7 +979,7 @@ io_bazel_rules_go: license: "Apache-2.0" license_url: "https://github.com/bazelbuild/rules_go/blob/v{version}/LICENSE.txt" -io_hyperscan: +hyperscan: project_name: "Hyperscan" project_desc: "High-performance regular expression matching library" project_url: "https://hyperscan.io" @@ -1006,7 +992,7 @@ io_hyperscan: license: "BSD-3-Clause" license_url: "https://github.com/intel/hyperscan/blob/v{version}/LICENSE" -io_opentelemetry_cpp: +opentelemetry_cpp: project_name: "OpenTelemetry" project_desc: "Observability framework and toolkit designed to create and manage telemetry data such as traces, metrics, and logs." project_url: "https://opentelemetry.io" @@ -1024,7 +1010,7 @@ io_opentelemetry_cpp: license: "Apache-2.0" license_url: "https://github.com/open-telemetry/opentelemetry-cpp/blob/v{version}/LICENSE" -io_vectorscan: +vectorscan: project_name: "Vectorscan" project_desc: "Hyperscan port for additional CPU architectures" project_url: "https://www.vectorcamp.gr/vectorscan/" @@ -1059,7 +1045,7 @@ libpfm: use_category: - test_only -net_colm_open_source_colm: +colm: project_name: "Colm" project_desc: "The Colm Programming Language" project_url: "https://www.colm.net/open-source/colm/" @@ -1072,7 +1058,7 @@ net_colm_open_source_colm: license: "MIT" license_url: "https://github.com/adrian-thurston/colm/blob/{version}/COPYING" -net_colm_open_source_ragel: +ragel: project_name: "Ragel" project_desc: "Ragel State Machine Compiler" project_url: "https://www.colm.net/open-source/ragel/" @@ -1113,7 +1099,7 @@ ocp: license: "Apache-2.0" license_url: "https://github.com/opencomputeproject/ocp-diag-core/blob/{version}/LICENSE" -org_boost: +boost: project_name: "Boost" project_desc: "Boost C++ source libraries" project_url: "https://www.boost.org/" @@ -1127,7 +1113,7 @@ org_boost: license: "Boost" license_url: "https://github.com/boostorg/boost/blob/boost-{version}/LICENSE_1_0.txt" -org_brotli: +brotli: project_name: "brotli" project_desc: "brotli compression library" project_url: "https://brotli.org" diff --git a/bazel/envoy_internal.bzl b/bazel/envoy_internal.bzl index 43e26ec6d9e6b..8282fb3e4f56f 100644 --- a/bazel/envoy_internal.bzl +++ b/bazel/envoy_internal.bzl @@ -136,7 +136,7 @@ def envoy_copts(repository, test = False): # This replaces the need for native.bind() calls and //external: references. EXTERNAL_DEPS_MAP = { # Abseil - "abseil_strings": "@com_google_absl//absl/strings", + "abseil_strings": "@abseil-cpp//absl/strings", # gRPC transcoding "grpc_transcoding": "@grpc_httpjson_transcoding//src:transcoding", "path_matcher": "@grpc_httpjson_transcoding//src:path_matcher", diff --git a/bazel/envoy_test.bzl b/bazel/envoy_test.bzl index 97307d301876c..9e15e57689275 100644 --- a/bazel/envoy_test.bzl +++ b/bazel/envoy_test.bzl @@ -43,7 +43,7 @@ def _envoy_cc_test_infrastructure_library( extra_deps = [] pch_copts = [] if disable_pch: - extra_deps = ["@com_google_googletest//:gtest"] + extra_deps = ["@googletest//:gtest"] else: extra_deps = envoy_pch_deps(repository, "//test:test_pch") pch_copts = envoy_pch_copts(repository, "//test:test_pch") @@ -197,7 +197,7 @@ def envoy_cc_test( deps = envoy_stdlib_deps() + deps + [envoy_external_dep_path(dep) for dep in external_deps] + [ repository + "//test:main", repository + "//test/test_common:test_version_linkstamp", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ] + envoy_pch_deps(repository, "//test:test_pch"), # from https://github.com/google/googletest/blob/6e1970e2376c14bf658eb88f655a054030353f9f/googlemock/src/gmock.cc#L51 # 2 - by default, mocks act as StrictMocks. diff --git a/bazel/external/BUILD b/bazel/external/BUILD index d5dc4d578d8e6..1babded863bc9 100644 --- a/bazel/external/BUILD +++ b/bazel/external/BUILD @@ -14,8 +14,8 @@ cc_library( srcs = [":empty.cc"], tags = ["skip_on_windows"], deps = [ - "@com_github_datadog_dd_trace_cpp//:dd_trace_cpp", - "@com_google_googletest//:gtest", + "@dd-trace-cpp//:dd_trace_cpp", + "@googletest//:gtest", ], ) diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD index 920413ef0f12e..0964dfba3f912 100644 --- a/bazel/external/quiche.BUILD +++ b/bazel/external/quiche.BUILD @@ -95,7 +95,7 @@ envoy_cc_test( repository = "@envoy", deps = [ ":quiche_common_platform_test", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -177,8 +177,8 @@ envoy_cc_library( visibility = ["//visibility:public"], deps = [ ":quiche_common_platform_export", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:variant", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:variant", ], ) @@ -444,8 +444,8 @@ envoy_cc_library( ":http2_header_byte_listener_interface_lib", ":http2_no_op_headers_handler_lib", ":quiche_common_callbacks", - "@com_google_absl//absl/algorithm", - "@com_google_absl//absl/cleanup", + "@abseil-cpp//absl/algorithm", + "@abseil-cpp//absl/cleanup", ], ) @@ -608,7 +608,7 @@ envoy_cc_test( ":quiche_common_platform_expect_bug", ":quiche_common_platform_export", ":quiche_common_platform_test", - "@com_google_absl//absl/functional:bind_front", + "@abseil-cpp//absl/functional:bind_front", ], ) @@ -2265,7 +2265,7 @@ envoy_quic_cc_library( ":quic_platform_export", ":quiche_common_platform", ":quiche_common_text_utils_lib", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/strings:str_format", ], ) @@ -2397,8 +2397,8 @@ envoy_cc_library( visibility = ["//visibility:public"], deps = [ ":quiche_common_platform_logging", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", ], ) @@ -2636,8 +2636,8 @@ envoy_quic_cc_library( ":quic_core_data_lib", ":quic_platform_base", ":quiche_common_endian_lib", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:node_hash_map", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/container:node_hash_map", ], ) @@ -2759,9 +2759,9 @@ envoy_cc_library( copts = quiche_copts, repository = "@envoy", deps = [ - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", ], ) @@ -2775,7 +2775,7 @@ envoy_cc_library( ":quiche_common_lib", ":quiche_common_platform_logging", ":quiche_common_status_utils", - "@com_google_absl//absl/status:statusor", + "@abseil-cpp//absl/status:statusor", ], ) @@ -2787,8 +2787,8 @@ envoy_cc_library( visibility = ["//visibility:public"], deps = [ ":quiche_common_platform_export", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/functional:function_ref", + "@abseil-cpp//absl/functional:any_invocable", + "@abseil-cpp//absl/functional:function_ref", ], ) @@ -2861,7 +2861,7 @@ envoy_quic_cc_library( ":quic_platform_base", ":quiche_common_text_utils_lib", ":quiche_common_wire_serialization", - "@com_google_absl//absl/cleanup", + "@abseil-cpp//absl/cleanup", ], ) @@ -2980,7 +2980,7 @@ envoy_cc_library( ":quiche_common_lib", ":quiche_common_platform_bug_tracker", ":quiche_common_platform_logging", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -2993,8 +2993,8 @@ envoy_cc_library( deps = [ ":quiche_common_mem_slice", ":quiche_common_platform_export", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:span", ], ) @@ -3006,9 +3006,9 @@ envoy_cc_library( repository = "@envoy", deps = [ ":quiche_common_platform_export", - "@com_google_absl//absl/base:prefetch", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/base:prefetch", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:span", ], ) @@ -3074,7 +3074,7 @@ envoy_quic_cc_library( ":quic_core_http_spdy_utils_lib", ":quic_core_types_lib", ":quic_platform_base", - "@com_google_absl//absl/base:nullability", + "@abseil-cpp//absl/base:nullability", ], ) @@ -3292,7 +3292,7 @@ envoy_cc_library( ":quic_core_alarm_factory_lib", ":quic_core_clock_lib", ":quic_core_udp_socket_lib", - "@com_google_absl//absl/base:core_headers", + "@abseil-cpp//absl/base:core_headers", ], }), ) @@ -3317,12 +3317,12 @@ envoy_cc_library( ":quic_platform_socket_address", ":quiche_common_platform_export", ":quiche_common_platform_logging", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:span", ], ) @@ -3356,11 +3356,11 @@ envoy_cc_library( ":quic_platform_socket_address", ":quiche_common_buffer_allocator_lib", ":quiche_common_platform", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", - "@com_google_absl//absl/types:variant", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:span", + "@abseil-cpp//absl/types:variant", ], }), ) @@ -4076,8 +4076,8 @@ envoy_quic_cc_library( ":quic_platform_base", ":quic_platform_bug_tracker", ":quiche_common_mem_slice", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:span", ], ) @@ -4086,8 +4086,8 @@ envoy_quic_cc_library( hdrs = ["quiche/quic/core/quic_inlined_string_view.h"], deps = [ ":quic_platform_base", - "@com_google_absl//absl/numeric:bits", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/numeric:bits", + "@abseil-cpp//absl/strings", ], ) @@ -4106,8 +4106,8 @@ envoy_quic_cc_library( ":quic_platform_base", ":quic_platform_bug_tracker", ":quiche_common_mem_slice", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:span", ], ) @@ -4692,7 +4692,7 @@ envoy_cc_library( ":quiche_common_buffer_allocator_lib", ":quiche_common_callbacks", ":quiche_common_platform_export", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -4769,10 +4769,10 @@ envoy_quiche_platform_impl_cc_library( "quiche/common/platform/default/quiche_platform_impl/quiche_logging_impl.h", ], deps = [ - "@com_google_absl//absl/flags:flag", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/log:flags", + "@abseil-cpp//absl/flags:flag", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/log:flags", ], ) @@ -5046,7 +5046,7 @@ envoy_cc_library( repository = "@envoy", deps = [ ":quiche_common_platform_export", - "@com_google_absl//absl/container:inlined_vector", + "@abseil-cpp//absl/container:inlined_vector", ], ) @@ -5062,7 +5062,7 @@ envoy_cc_test_library( ":quiche_common_platform_googleurl", ":quiche_common_platform_iovec", ":quiche_common_platform_test", - "@com_google_absl//absl/status:status_matchers", + "@abseil-cpp//absl/status:status_matchers", "@envoy//test/common/quic/platform:quiche_test_helpers_impl_lib", "@envoy//test/common/quic/platform:quiche_test_impl_lib", ], @@ -5075,8 +5075,8 @@ envoy_cc_library( repository = "@envoy", deps = [ ":quiche_common_platform_export", - "@com_google_absl//absl/hash", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/hash", + "@abseil-cpp//absl/strings:str_format", ], ) @@ -5144,7 +5144,7 @@ envoy_cc_test( ":http2_test_tools_test_utils_lib", ":quiche_common_platform_test", ":quiche_http_header_block_lib", - "@com_google_absl//absl/functional:bind_front", + "@abseil-cpp//absl/functional:bind_front", ], ) @@ -5158,13 +5158,13 @@ envoy_cc_library( ":quiche_common_platform", ":quiche_common_platform_export", ":quiche_common_platform_logging", - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", - "@com_google_absl//absl/types:variant", + "@abseil-cpp//absl/algorithm:container", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:span", + "@abseil-cpp//absl/types:variant", ], ) @@ -5327,8 +5327,8 @@ envoy_cc_library( repository = "@envoy", deps = [ ":quiche_common_text_utils_lib", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/strings", ], ) @@ -5360,7 +5360,7 @@ envoy_cc_library( ":quiche_common_callbacks", ":quiche_common_platform_export", ":quiche_common_platform_lower_case_string", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -5375,7 +5375,7 @@ envoy_cc_library( ":quiche_common_platform_bug_tracker", ":quiche_common_platform_export", ":quiche_common_platform_logging", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -5388,7 +5388,7 @@ envoy_cc_test( ":quiche_balsa_simple_buffer_lib", ":quiche_common_platform_expect_bug", ":quiche_common_platform_test", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -5402,8 +5402,8 @@ envoy_cc_library( ":quiche_common_platform", ":quiche_common_platform_export", ":quiche_common_text_utils_lib", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/strings", ], ) @@ -5436,9 +5436,9 @@ envoy_cc_library( ":quiche_common_platform_export", ":quiche_common_platform_header_policy", ":quiche_common_platform_logging", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/strings", ], ) @@ -5456,10 +5456,10 @@ envoy_cc_test( ":quiche_common_platform_logging", ":quiche_common_platform_test", ":quiche_common_test_tools_test_utils_lib", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", ], ) @@ -5482,7 +5482,7 @@ envoy_cc_library( ":quiche_common_platform_bug_tracker", ":quiche_common_platform_export", ":quiche_common_platform_logging", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -5502,9 +5502,9 @@ envoy_cc_test( ":quiche_common_platform_expect_bug", ":quiche_common_platform_logging", ":quiche_common_platform_test", - "@com_google_absl//absl/flags:flag", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/flags:flag", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", ], ) @@ -5525,8 +5525,8 @@ envoy_cc_library( ":quiche_common_quiche_vectorized_io_utils_lib", ":quiche_common_status_utils", ":quiche_common_structured_headers_lib", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/time", + "@abseil-cpp//absl/types:span", ], ) diff --git a/bazel/external/spdlog.BUILD b/bazel/external/spdlog.BUILD index 849dd9717e0db..60677233bed9a 100644 --- a/bazel/external/spdlog.BUILD +++ b/bazel/external/spdlog.BUILD @@ -13,5 +13,5 @@ cc_library( ], includes = ["include"], visibility = ["//visibility:public"], - deps = ["@com_github_fmtlib_fmt//:fmt"], + deps = ["@fmt"], ) diff --git a/bazel/foreign_cc/BUILD b/bazel/foreign_cc/BUILD index 8ad760590023e..63c1b0337446e 100644 --- a/bazel/foreign_cc/BUILD +++ b/bazel/foreign_cc/BUILD @@ -35,7 +35,7 @@ configure_make( }, "//conditions:default": {}, }), - lib_source = "@com_github_axboe_liburing//:all", + lib_source = "@liburing//:all", tags = [ "nocompdb", "skip_on_windows", @@ -58,7 +58,7 @@ make( "MOREFLAGS='-fPIC'", "BUILD_SHARED=no", ], - lib_source = "@com_github_lz4_lz4//:all", + lib_source = "@lz4//:all", out_static_libs = [ "liblz4.a", ], @@ -113,7 +113,7 @@ configure_make( "//bazel:windows_dbg_build": {"WINDOWS_DBG_BUILD": "debug"}, "//conditions:default": {}, }), - lib_source = "@com_github_luajit_luajit//:all", + lib_source = "@luajit//:all", out_include_dir = "include/luajit-2.1", out_static_libs = select({ "//bazel:windows_x86_64": ["lua51.lib"], @@ -132,7 +132,7 @@ configure_make( "--disable-shared", "--enable-static", ], - lib_source = "@net_colm_open_source_colm//:all", + lib_source = "@colm//:all", out_binaries = ["colm"], tags = ["skip_on_windows"], ) @@ -149,7 +149,7 @@ configure_make( "--enable-static", "--with-colm=$$EXT_BUILD_DEPS/colm", ], - lib_source = "@net_colm_open_source_ragel//:all", + lib_source = "@ragel//:all", out_binaries = ["ragel"], tags = ["skip_on_windows"], deps = [":colm"], @@ -176,7 +176,7 @@ configure_make( "--disable-tests", "--with-data-packaging=static", ], - data = ["@com_github_unicode_org_icu//:all"], + data = ["@icu//:all"], env = { "CXXFLAGS": "-fPIC -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0 -DUCONFIG_ONLY_HTML_CONVERSION=1 -DUCONFIG_NO_LEGACY_CONVERSION=1 -DUCONFIG_NO_BREAK_ITERATION=1 -DUCONFIG_NO_COLLATION=1 -DUCONFIG_NO_FORMATTING=1 -DUCONFIG_NO_TRANSLITERATION=1 -DUCONFIG_NO_REGULAR_EXPRESSIONS=1", "CFLAGS": "-fPIC", @@ -201,7 +201,7 @@ configure_make( }, "//conditions:default": {}, }), - lib_source = "@com_github_unicode_org_icu//:all", + lib_source = "@icu//:all", out_static_libs = [ "libicuuc.a", "libicudata.a", @@ -251,7 +251,7 @@ envoy_cmake( "-G", "Ninja", ], - lib_source = "@com_github_google_libsxg//:all", + lib_source = "@libsxg//:all", out_static_libs = ["libsxg.a"], tags = ["skip_on_windows"], # Use boringssl alias to select fips vs non-fips version. @@ -291,7 +291,7 @@ envoy_cmake( "-G", "Ninja", ], - lib_source = "@com_github_libevent_libevent//:all", + lib_source = "@libevent//:all", out_static_libs = select({ # macOS organization of libevent is different from Windows/Linux. # Including libevent_core is a requirement on those platforms, but @@ -342,7 +342,7 @@ envoy_cmake( "-G", "Ninja", ], - lib_source = "@com_github_nghttp2_nghttp2//:all", + lib_source = "@nghttp2//:all", out_static_libs = select({ "//bazel:windows_x86_64": ["nghttp2.lib"], "//conditions:default": ["libnghttp2.a"], @@ -399,7 +399,7 @@ envoy_cmake( "-G", "Ninja", ], - lib_source = "@com_github_wamr//:all", + lib_source = "@wamr//:all", out_static_libs = ["libiwasm.a"], tags = ["skip_on_windows"], ) @@ -431,7 +431,7 @@ envoy_cmake( "-G", "Ninja", ], - lib_source = "@com_github_maxmind_libmaxminddb//:all", + lib_source = "@libmaxminddb//:all", out_static_libs = ["libmaxminddb.a"], tags = ["skip_on_windows"], ) diff --git a/bazel/foreign_cc/cel-cpp.patch b/bazel/foreign_cc/cel-cpp.patch index 9b28219a40d53..eedfc5efa9249 100644 --- a/bazel/foreign_cc/cel-cpp.patch +++ b/bazel/foreign_cc/cel-cpp.patch @@ -60,3 +60,23 @@ index 06225796..18f56e59 100644 ABSL_DCHECK(descriptor_pool != nullptr); ABSL_DCHECK(message_factory != nullptr); ABSL_DCHECK(arena != nullptr); + + +--- a/bazel/deps.bzl ++++ b/bazel/deps.bzl +@@ -85,10 +85,10 @@ cc_library( + defines = ["ANTLR4CPP_USING_ABSEIL"], + includes = ["runtime/Cpp/runtime/src"], + deps = [ +- "@com_google_absl//absl/base", +- "@com_google_absl//absl/base:core_headers", +- "@com_google_absl//absl/container:flat_hash_map", +- "@com_google_absl//absl/container:flat_hash_set", +- "@com_google_absl//absl/synchronization", ++ "@abseil-cpp//absl/base", ++ "@abseil-cpp//absl/base:core_headers", ++ "@abseil-cpp//absl/container:flat_hash_map", ++ "@abseil-cpp//absl/container:flat_hash_set", ++ "@abseil-cpp//absl/synchronization", + ], + ) diff --git a/bazel/foreign_cc/luajit.patch b/bazel/foreign_cc/luajit.patch index 9e490c1544edc..286c02f2802c9 100644 --- a/bazel/foreign_cc/luajit.patch +++ b/bazel/foreign_cc/luajit.patch @@ -80,7 +80,7 @@ index 00000000..3b4f8eca + +# Copy source tree to a build directory +SRC_DIR="$(dirname "$(realpath "$0")")" -+BUILD_DIR="$(basename "$SRC_DIR")" ++BUILD_DIR="$(basename "$SRC_DIR")_build" +cp -r "$SRC_DIR" "$BUILD_DIR" +cd "$BUILD_DIR" + diff --git a/bazel/grpc.patch b/bazel/grpc.patch index 4c6e098df5690..0f0be258d5949 100644 --- a/bazel/grpc.patch +++ b/bazel/grpc.patch @@ -301,7 +301,7 @@ index 13a4714d4b..8664e99ffc 100644 alias( name = "cares", - actual = "@com_github_cares_cares//:ares", -+ actual = "@com_github_cares_cares//:ares", ++ actual = "@c-ares//:ares", tags = ["manual"], ) diff --git a/bazel/pgv.patch b/bazel/pgv.patch new file mode 100644 index 0000000000000..e5af1d37788ac --- /dev/null +++ b/bazel/pgv.patch @@ -0,0 +1,31 @@ +diff --git a/bazel/pgv_proto_library.bzl b/bazel/pgv_proto_library.bzl +index b8fb865..9a7e361 100644 +--- a/bazel/pgv_proto_library.bzl ++++ b/bazel/pgv_proto_library.bzl +@@ -48,7 +48,7 @@ def pgv_cc_proto_library( + "@com_envoyproxy_protoc_gen_validate//validate:cc_validate", + "@com_envoyproxy_protoc_gen_validate//validate:validate_cc", + "@com_google_protobuf//:protobuf", +- "@com_googlesource_code_re2//:re2", ++ "@re2", + ], + copts = copts + select({ + "@com_envoyproxy_protoc_gen_validate//bazel:windows_x86_64": ["-DWIN32"], +diff --git a/bazel/protobuf.bzl b/bazel/protobuf.bzl +index 1a41f68..4d95b0d 100644 +--- a/bazel/protobuf.bzl ++++ b/bazel/protobuf.bzl +@@ -107,11 +107,11 @@ cc_proto_gen_validate = rule( + providers = [ProtoInfo], + ), + "_validate_deps": attr.label_list( +- default = [Label("@com_googlesource_code_re2//:re2")], ++ default = [Label("@re2")], + ), + "_protoc": attr.label( + cfg = "exec", +- default = Label("@com_google_protobuf//:protoc"), ++ default = Label("@com_google_protobuf//:protoc"), + executable = True, + allow_single_file = True, + ), diff --git a/bazel/proxy_wasm_cpp_host.patch b/bazel/proxy_wasm_cpp_host.patch index ab07c33596af4..0093e4bfaa6bf 100644 --- a/bazel/proxy_wasm_cpp_host.patch +++ b/bazel/proxy_wasm_cpp_host.patch @@ -25,7 +25,7 @@ index 91792a8..872131c 100644 deps = [ ":wasm_vm_headers", - "@com_github_bytecodealliance_wasmtime//:wasmtime_lib", -+ "@com_github_wasmtime//:wasmtime_lib", ++ "@wasmtime//:wasmtime_lib", ], ) @@ -34,7 +34,7 @@ index 91792a8..872131c 100644 deps = [ ":wasm_vm_headers", - "@com_github_bytecodealliance_wasmtime//:prefixed_wasmtime_lib", -+ "@com_github_wasmtime//:prefixed_wasmtime_lib", ++ "@wasmtime//:prefixed_wasmtime_lib", ], ) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index b247ff239872f..1096b6d97f5c9 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -79,12 +79,13 @@ def _cc_deps(): patch_args = ["-p1"], patches = ["@envoy//bazel:grpc_httpjson_transcoding.patch"], repo_mapping = { + "@com_google_absl": "@abseil-cpp", "@com_google_protoconverter": "@proto-converter", }, ) external_http_archive( "proto-converter", - location_name = "com_google_protoconverter", + location_name = "proto_converter", patch_args = ["-p1"], patches = ["@envoy//bazel:com_google_protoconverter.patch"], patch_cmds = [ @@ -94,20 +95,23 @@ def _cc_deps(): "rm src/google/protobuf/util/converter/port_def.inc", "rm src/google/protobuf/util/converter/port_undef.inc", ], + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) external_http_archive( "proto-field-extraction", - location_name = "com_google_protofieldextraction", + location_name = "proto_field_extraction", repo_mapping = { + "@com_google_absl": "@abseil-cpp", "@ocp": "@ocp-diag-core", }, ) external_http_archive( "proto-processing", - location_name = "com_google_protoprocessinglib", + location_name = "proto_processing", patch_args = ["-p1"], patches = ["@envoy//bazel:proto_processing_lib.patch"], repo_mapping = { + "@com_google_absl": "@abseil-cpp", "@ocp": "@ocp-diag-core", "@com_google_protoconverter": "@proto-converter", "@com_google_protofieldextraction": "@proto-field-extraction", @@ -116,6 +120,10 @@ def _cc_deps(): external_http_archive( name = "ocp-diag-core", location_name = "ocp", + repo_mapping = { + "@com_google_absl": "@abseil-cpp", + "@com_google_googletest": "@googletest", + }, ) def _go_deps(skip_targets): @@ -157,46 +165,43 @@ def envoy_dependencies(skip_targets = []): _boringssl_fips() _aws_lc() - # The long repo names (`com_github_fmtlib_fmt` instead of `fmtlib`) are - # semi-standard in the Bazel community, intended to avoid both duplicate - # dependencies and name conflicts. - _com_github_awslabs_aws_c_auth() - _com_github_axboe_liburing() + _aws_c_auth_testdata() + _liburing() _com_github_bazel_buildtools() - _com_github_cares_cares() + _c_ares() _com_github_openhistogram_libcircllhist() - _com_github_cyan4973_xxhash() - _com_github_datadog_dd_trace_cpp() - _com_github_mirror_tclap() - _com_github_envoyproxy_sqlparser() - _com_github_fmtlib_fmt() - _com_github_gabime_spdlog() - _com_github_google_benchmark() - _com_github_google_libprotobuf_mutator() - _com_github_google_libsxg() - _com_github_google_tcmalloc() + _xxhash() + _dd_trace_cpp() + _tclap() + _sql_parser() + _fmt() + _spdlog() + _benchmark() + _libprotobuf_mutator() + _libsxg() + _tcmalloc() _gperftools() _com_github_grpc_grpc() _rules_proto_grpc() - _com_github_unicode_org_icu() - _com_github_intel_ipp_crypto_crypto_mb() + _icu() + _ipp_crypto() _numactl() _uadk() - _com_github_intel_qatlib() - _com_github_intel_qatzip() - _com_github_qat_zstd() - _com_github_lz4_lz4() - _com_github_jbeder_yaml_cpp() - _com_github_libevent_libevent() - _com_github_luajit_luajit() - _com_github_nghttp2_nghttp2() - _com_github_msgpack_cpp() - _com_github_skyapm_cpp2sky() - _com_github_alibaba_hessian2_codec() - _com_github_nlohmann_json() - _com_github_ncopa_suexec() - _com_google_absl() - _com_google_googletest() + _qatlib() + _qatzip() + _qat_zstd() + _lz4() + _yaml_cpp() + _libevent() + _luajit() + _nghttp2() + _msgpack_cxx() + _cpp2sky() + _hessian2_codec() + _nlohmann_json() + _su_exec() + _abseil_cpp() + _googletest() _com_google_protobuf() _v8() _fast_float() @@ -204,17 +209,17 @@ def envoy_dependencies(skip_targets = []): _dragonbox() _fp16() _simdutf() - _com_github_google_quiche() + _quiche() _googleurl() - _io_hyperscan() - _io_vectorscan() + _hyperscan() + _vectorscan() _io_opentelemetry_api_cpp() - _net_colm_open_source_colm() - _net_colm_open_source_ragel() - _intel_dlb() + _colm() + _ragel() + _dlb() _zlib_ng() - _org_boost() - _org_brotli() + _boost() + _brotli() _zstd() _re2() _proxy_wasm_cpp_sdk() @@ -222,10 +227,10 @@ def envoy_dependencies(skip_targets = []): _emsdk() _rules_fuzzing() external_http_archive("proxy_wasm_rust_sdk") - _com_google_cel_cpp() - _com_github_google_perfetto() + _cel_cpp() + _perfetto() _rules_ruby() - external_http_archive("com_github_google_flatbuffers") + external_http_archive("flatbuffers") external_http_archive("bazel_features") external_http_archive("bazel_compdb") external_http_archive( @@ -233,12 +238,12 @@ def envoy_dependencies(skip_targets = []): ) external_http_archive("envoy_toolshed") - _com_github_maxmind_libmaxminddb() + _libmaxminddb() _thrift() external_http_archive("rules_license") external_http_archive("rules_pkg") - external_http_archive("com_github_aignas_rules_shellcheck") + external_http_archive("shellcheck") external_http_archive( name = "yq.bzl", @@ -248,7 +253,7 @@ def envoy_dependencies(skip_targets = []): ) external_http_archive("aspect_bazel_lib") - _com_github_fdio_vpp_vcl() + _vpp_vcl() _toolchains_llvm() @@ -256,8 +261,8 @@ def envoy_dependencies(skip_targets = []): _go_deps(skip_targets) _rust_deps() _kafka_deps() - _com_github_wamr() - _com_github_wasmtime() + _wamr() + _wasmtime() switched_rules_by_language( name = "com_google_googleapis_imports", @@ -313,15 +318,16 @@ def _com_github_openhistogram_libcircllhist(): build_file = "@envoy//bazel/external:libcircllhist.BUILD", ) -def _com_github_awslabs_aws_c_auth(): +def _aws_c_auth_testdata(): external_http_archive( - name = "com_github_awslabs_aws_c_auth", + name = "aws-c-auth-testdata", + location_name = "aws_c_auth_testdata", build_file = "@envoy//bazel/external:aws-c-auth.BUILD", ) -def _com_github_axboe_liburing(): +def _liburing(): external_http_archive( - name = "com_github_axboe_liburing", + name = "liburing", build_file_content = BUILD_ALL_CONTENT, patch_args = ["-p1"], patches = ["@envoy//bazel/foreign_cc:liburing.patch"], @@ -331,73 +337,76 @@ def _com_github_bazel_buildtools(): # TODO(phlax): Add binary download # cf: https://github.com/bazelbuild/buildtools/issues/367 external_http_archive( - name = "com_github_bazelbuild_buildtools", + name = "buildtools", ) -def _com_github_cares_cares(): +def _c_ares(): external_http_archive( - name = "com_github_cares_cares", + name = "c-ares", + location_name = "c_ares", build_file = "@envoy//bazel/external:c-ares.BUILD", patch_args = ["-p1"], patches = ["@envoy//bazel:c-ares.patch"], ) -def _com_github_cyan4973_xxhash(): +def _xxhash(): external_http_archive( - name = "com_github_cyan4973_xxhash", + name = "xxhash", build_file = "@envoy//bazel/external:xxhash.BUILD", ) -def _com_github_envoyproxy_sqlparser(): +def _sql_parser(): external_http_archive( name = "sql-parser", - location_name = "com_github_envoyproxy_sqlparser", + location_name = "sql_parser", build_file = "@envoy//bazel/external:sqlparser.BUILD", ) -def _com_github_mirror_tclap(): +def _tclap(): external_http_archive( - name = "com_github_mirror_tclap", + name = "tclap", build_file = "@envoy//bazel/external:tclap.BUILD", patch_args = ["-p1"], ) -def _com_github_fmtlib_fmt(): +def _fmt(): external_http_archive( - name = "com_github_fmtlib_fmt", + name = "fmt", build_file = "@envoy//bazel/external:fmtlib.BUILD", ) -def _com_github_gabime_spdlog(): +def _spdlog(): external_http_archive( - name = "com_github_gabime_spdlog", + name = "spdlog", build_file = "@envoy//bazel/external:spdlog.BUILD", ) -def _com_github_google_benchmark(): +def _benchmark(): external_http_archive( - name = "com_github_google_benchmark", + name = "benchmark", + repo_mapping = {"@com_google_googletest": "@googletest"}, ) external_http_archive( name = "libpfm", - build_file = "@com_github_google_benchmark//tools:libpfm.BUILD.bazel", + build_file = "@benchmark//tools:libpfm.BUILD.bazel", ) -def _com_github_google_libprotobuf_mutator(): +def _libprotobuf_mutator(): external_http_archive( - name = "com_github_google_libprotobuf_mutator", + name = "libprotobuf-mutator", + location_name = "libprotobuf_mutator", build_file = "@envoy//bazel/external:libprotobuf_mutator.BUILD", ) -def _com_github_google_libsxg(): +def _libsxg(): external_http_archive( - name = "com_github_google_libsxg", + name = "libsxg", build_file_content = BUILD_ALL_CONTENT, ) -def _com_github_unicode_org_icu(): +def _icu(): external_http_archive( - name = "com_github_unicode_org_icu", + name = "icu", patches = ["@envoy//bazel/foreign_cc:icu.patch"], patch_args = ["-p1"], patch_cmds = [ @@ -407,9 +416,10 @@ def _com_github_unicode_org_icu(): build_file_content = BUILD_ALL_CONTENT, ) -def _com_github_intel_ipp_crypto_crypto_mb(): +def _ipp_crypto(): external_http_archive( - name = "com_github_intel_ipp_crypto_crypto_mb", + name = "ipp-crypto", + location_name = "ipp_crypto", build_file_content = BUILD_ALL_CONTENT, ) @@ -427,56 +437,59 @@ def _uadk(): build_file_content = BUILD_ALL_CONTENT, ) -def _com_github_intel_qatlib(): +def _qatlib(): external_http_archive( - name = "com_github_intel_qatlib", + name = "qatlib", build_file_content = BUILD_ALL_CONTENT, patches = ["@envoy//bazel/foreign_cc:qatlib.patch"], patch_args = ["-p1"], ) -def _com_github_intel_qatzip(): +def _qatzip(): external_http_archive( - name = "com_github_intel_qatzip", + name = "qatzip", build_file_content = BUILD_ALL_CONTENT, patches = ["@envoy//bazel/foreign_cc:qatzip.patch"], patch_args = ["-p1"], ) -def _com_github_qat_zstd(): +def _qat_zstd(): external_http_archive( - name = "com_github_qat_zstd", + name = "qat-zstd", + location_name = "qat_zstd", build_file_content = BUILD_ALL_CONTENT, patch_args = ["-p1"], patches = ["@envoy//bazel/foreign_cc:qatzstd.patch"], ) -def _com_github_lz4_lz4(): +def _lz4(): external_http_archive( - name = "com_github_lz4_lz4", + name = "lz4", build_file_content = BUILD_ALL_CONTENT, ) -def _com_github_jbeder_yaml_cpp(): +def _yaml_cpp(): external_http_archive( - name = "com_github_jbeder_yaml_cpp", + name = "yaml-cpp", + location_name = "yaml_cpp", + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) -def _com_github_libevent_libevent(): +def _libevent(): external_http_archive( - name = "com_github_libevent_libevent", + name = "libevent", build_file_content = BUILD_ALL_CONTENT, ) -def _net_colm_open_source_colm(): +def _colm(): external_http_archive( - name = "net_colm_open_source_colm", + name = "colm", build_file_content = BUILD_ALL_CONTENT, ) -def _net_colm_open_source_ragel(): +def _ragel(): external_http_archive( - name = "net_colm_open_source_ragel", + name = "ragel", build_file_content = BUILD_ALL_CONTENT, ) @@ -489,9 +502,9 @@ def _zlib_ng(): # Boost in general is not approved for Envoy use, and the header-only # dependency is only for the Hyperscan contrib package. -def _org_boost(): +def _boost(): external_http_archive( - name = "org_boost", + name = "boost", build_file_content = """ filegroup( name = "header", @@ -508,9 +521,9 @@ filegroup( # If you're looking for envoy-filter-example / envoy_filter_example # the hash is in ci/filter_example_setup.sh -def _org_brotli(): +def _brotli(): external_http_archive( - name = "org_brotli", + name = "brotli", ) def _zstd(): @@ -519,15 +532,26 @@ def _zstd(): build_file = "@envoy//bazel/external:zstd.BUILD", ) -def _com_google_cel_cpp(): +def _cel_cpp(): external_http_archive( - name = "com_google_cel_cpp", + name = "cel-cpp", + location_name = "cel_cpp", patch_args = ["-p1"], patches = ["@envoy//bazel/foreign_cc:cel-cpp.patch"], + repo_mapping = { + "@com_google_absl": "@abseil-cpp", + "@com_google_cel_spec": "@cel-spec", + "@com_github_google_flatbuffers": "@flatbuffers", + "@com_googlesource_code_re2": "@re2", + }, ) # Load required dependencies that cel-cpp expects. - external_http_archive("com_google_cel_spec") + external_http_archive( + "cel-spec", + location_name = "cel_spec", + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, + ) # cel-cpp references ``@antlr4-cpp-runtime//:antlr4-cpp-runtime`` but it internally # defines ``antlr4_runtimes`` with a cpp target. @@ -544,11 +568,12 @@ alias( actual = "@antlr4_runtimes//:cpp", ) """, + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) -def _com_github_google_perfetto(): +def _perfetto(): external_http_archive( - name = "com_github_google_perfetto", + name = "perfetto", build_file_content = """ package(default_visibility = ["//visibility:public"]) cc_library( @@ -559,9 +584,9 @@ cc_library( """, ) -def _com_github_nghttp2_nghttp2(): +def _nghttp2(): external_http_archive( - name = "com_github_nghttp2_nghttp2", + name = "nghttp2", build_file_content = BUILD_ALL_CONTENT, patch_args = ["-p1"], # This patch cannot be picked up due to ABI rules. Discussion at; @@ -573,26 +598,26 @@ def _com_github_nghttp2_nghttp2(): ], ) -def _com_github_msgpack_cpp(): +def _msgpack_cxx(): external_http_archive( name = "msgpack-cxx", - location_name = "com_github_msgpack_cpp", + location_name = "msgpack_cxx", build_file = "@envoy//bazel/external:msgpack.BUILD", ) -def _io_hyperscan(): +def _hyperscan(): external_http_archive( name = "hyperscan", - location_name = "io_hyperscan", + location_name = "hyperscan", build_file_content = BUILD_ALL_CONTENT, patch_args = ["-p1"], patches = ["@envoy//bazel/foreign_cc:hyperscan.patch"], ) -def _io_vectorscan(): +def _vectorscan(): external_http_archive( name = "vectorscan", - location_name = "io_vectorscan", + location_name = "vectorscan", build_file_content = BUILD_ALL_CONTENT, type = "tar.gz", patch_args = ["-p1"], @@ -602,61 +627,65 @@ def _io_vectorscan(): def _io_opentelemetry_api_cpp(): external_http_archive( name = "opentelemetry-cpp", - location_name = "io_opentelemetry_cpp", + location_name = "opentelemetry_cpp", + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) -def _com_github_datadog_dd_trace_cpp(): - external_http_archive("com_github_datadog_dd_trace_cpp") +def _dd_trace_cpp(): + external_http_archive( + "dd-trace-cpp", + location_name = "dd_trace_cpp", + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, + ) -def _com_github_skyapm_cpp2sky(): +def _cpp2sky(): external_http_archive( name = "cpp2sky", - location_name = "com_github_skyapm_cpp2sky", patches = ["@envoy//bazel:com_github_skyapm_cpp2sky.patch"], patch_args = ["-p1"], + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) external_http_archive( name = "skywalking_data_collect_protocol", ) -def _com_github_nlohmann_json(): +def _nlohmann_json(): external_http_archive( - name = "com_github_nlohmann_json", + name = "nlohmann_json", ) -def _com_github_alibaba_hessian2_codec(): +def _hessian2_codec(): external_http_archive( name = "hessian2-codec", - location_name = "com_github_alibaba_hessian2_codec", + location_name = "hessian2_codec", + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) -def _com_github_ncopa_suexec(): +def _su_exec(): external_http_archive( - name = "com_github_ncopa_suexec", + name = "su-exec", + location_name = "su_exec", build_file = "@envoy//bazel/external:su-exec.BUILD", ) -def _com_google_googletest(): +def _googletest(): external_http_archive( - "com_google_googletest", + "googletest", patches = ["@envoy//bazel:googletest.patch"], patch_args = ["-p1"], - repo_mapping = { - "@abseil-cpp": "@com_google_absl", - "@re2": "@com_googlesource_code_re2", - }, + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) # TODO(jmarantz): replace the use of bind and external_deps with just # the direct Bazel path at all sites. This will make it easier to # pull in more bits of abseil as needed, and is now the preferred # method for pure Bazel deps. -def _com_google_absl(): +def _abseil_cpp(): external_http_archive( - name = "com_google_absl", + name = "abseil-cpp", + location_name = "abseil_cpp", patches = ["@envoy//bazel:abseil.patch"], patch_args = ["-p1"], - repo_mapping = {"@googletest": "@com_google_googletest"}, ) def _com_google_protobuf(): @@ -669,6 +698,7 @@ def _com_google_protobuf(): patches = [ "@envoy//bazel:rules_java.patch", ], + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) for platform in PROTOC_VERSIONS: @@ -685,9 +715,7 @@ def _com_google_protobuf(): "com_google_protobuf", patches = ["@envoy//bazel:protobuf.patch"], patch_args = ["-p1"], - repo_mapping = { - "@abseil-cpp": "@com_google_absl", - }, + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) def _v8(): @@ -707,10 +735,6 @@ def _v8(): "find ./src ./include -type f -exec sed -i.bak -e 's!#include \"third_party/dragonbox/src/include/dragonbox/dragonbox.h\"!#include \"dragonbox/dragonbox.h\"!' {} \\;", "find ./src ./include -type f -exec sed -i.bak -e 's!#include \"third_party/fast_float/src/include/fast_float/!#include \"fast_float/!' {} \\;", ], - repo_mapping = { - "@abseil-cpp": "@com_google_absl", - "@icu": "@com_github_unicode_org_icu", - }, ) def _fast_float(): @@ -745,11 +769,12 @@ def _simdutf(): build_file = "@envoy//bazel/external:simdutf.BUILD", ) -def _com_github_google_quiche(): +def _quiche(): external_http_archive( - name = "com_github_google_quiche", + name = "quiche", patch_cmds = ["find quiche/ -type f -name \"*.bazel\" -delete"], build_file = "@envoy//bazel/external:quiche.BUILD", + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) def _googleurl(): @@ -757,6 +782,7 @@ def _googleurl(): name = "googleurl", patches = ["@envoy//bazel/external:googleurl.patch"], patch_args = ["-p1"], + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) def _com_github_grpc_grpc(): @@ -765,7 +791,9 @@ def _com_github_grpc_grpc(): patch_args = ["-p1"], patches = ["@envoy//bazel:grpc.patch"], repo_mapping = { + "@com_google_absl": "@abseil-cpp", "@com_github_cncf_xds": "@xds", + "@com_googlesource_code_re2": "@re2", "@openssl": "@boringssl", }, ) @@ -782,10 +810,7 @@ def _rules_proto_grpc(): external_http_archive("rules_proto_grpc") def _re2(): - external_http_archive( - "com_googlesource_code_re2", - repo_mapping = {"@abseil-cpp": "@com_google_absl"}, - ) + external_http_archive("re2") def _proxy_wasm_cpp_sdk(): external_http_archive( @@ -794,6 +819,7 @@ def _proxy_wasm_cpp_sdk(): patches = [ "@envoy//bazel:proxy_wasm_cpp_sdk.patch", ], + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) def _proxy_wasm_cpp_host(): @@ -803,6 +829,7 @@ def _proxy_wasm_cpp_host(): patches = [ "@envoy//bazel:proxy_wasm_cpp_host.patch", ], + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) def _emsdk(): @@ -810,21 +837,23 @@ def _emsdk(): name = "emsdk", patch_args = ["-p2"], patches = ["@envoy//bazel:emsdk.patch"], + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) -def _com_github_luajit_luajit(): +def _luajit(): external_http_archive( - name = "com_github_luajit_luajit", + name = "luajit", build_file_content = BUILD_ALL_CONTENT, patches = ["@envoy//bazel/foreign_cc:luajit.patch"], patch_args = ["-p1"], ) -def _com_github_google_tcmalloc(): +def _tcmalloc(): external_http_archive( - name = "com_github_google_tcmalloc", + name = "tcmalloc", patches = ["@envoy//bazel:tcmalloc.patch"], patch_args = ["-p1"], + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) def _gperftools(): @@ -832,24 +861,25 @@ def _gperftools(): name = "gperftools", ) -def _com_github_wamr(): +def _wamr(): external_http_archive( - name = "com_github_wamr", + name = "wamr", build_file_content = BUILD_ALL_CONTENT, ) def _toolchains_llvm(): external_http_archive(name = "toolchains_llvm") -def _com_github_wasmtime(): +def _wasmtime(): external_http_archive( - name = "com_github_wasmtime", + name = "wasmtime", build_file = "@proxy_wasm_cpp_host//:bazel/external/wasmtime.BUILD", + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) -def _intel_dlb(): +def _dlb(): external_http_archive( - name = "intel_dlb", + name = "dlb", build_file_content = """ filegroup( name = "libdlb", @@ -866,6 +896,7 @@ def _rules_fuzzing(): external_http_archive( name = "rules_fuzzing", repo_mapping = { + "@com_google_absl": "@abseil-cpp", "@fuzzing_py_deps": "@fuzzing_pip3", }, # TODO(asraa): Try this fix for OSS-Fuzz build failure on tar command. @@ -904,9 +935,10 @@ filegroup( patch_args = ["-p1"], ) -def _com_github_fdio_vpp_vcl(): +def _vpp_vcl(): external_http_archive( - name = "com_github_fdio_vpp_vcl", + name = "vpp-vcl", + location_name = "vpp_vcl", build_file_content = _build_all_content(exclude = ["**/*doc*/**", "**/examples/**", "**/plugins/**"]), patches = ["@envoy//bazel/foreign_cc:vpp_vcl.patch"], patch_args = ["-p1"], @@ -931,8 +963,8 @@ def _thrift(): patch_cmds = ["mv src thrift"], ) -def _com_github_maxmind_libmaxminddb(): +def _libmaxminddb(): external_http_archive( - name = "com_github_maxmind_libmaxminddb", + name = "libmaxminddb", build_file_content = BUILD_ALL_CONTENT, ) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 02953271b2bb0..13442b279505f 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -39,7 +39,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( sha256 = "73ad768dfe824c736d0a8a81521867b1fb7a822acda2ed265897c03de6ae6767", urls = ["https://github.com/bazelbuild/rules_apple/releases/download/{version}/rules_apple.{version}.tar.gz"], ), - com_github_bazelbuild_buildtools = dict( + buildtools = dict( version = "8.2.1", sha256 = "53119397bbce1cd7e4c590e117dcda343c2086199de62932106c80733526c261", strip_prefix = "buildtools-{version}", @@ -84,25 +84,25 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "bazel-lib-{version}", urls = ["https://github.com/aspect-build/bazel-lib/archive/v{version}.tar.gz"], ), - com_google_absl = dict( + abseil_cpp = dict( version = "20260107.0", sha256 = "4c124408da902be896a2f368042729655709db5e3004ec99f57e3e14439bc1b2", strip_prefix = "abseil-cpp-{version}", urls = ["https://github.com/abseil/abseil-cpp/archive/{version}.tar.gz"], ), - com_github_aignas_rules_shellcheck = dict( + shellcheck = dict( version = "0.4.0", sha256 = "cef935ea1088d2b45c5bc3630f8178c91ba367b071af2bfdcd16c042c5efe8ae", strip_prefix = "rules_shellcheck-{version}", urls = ["https://github.com/aignas/rules_shellcheck/archive/{version}.tar.gz"], ), - com_github_awslabs_aws_c_auth = dict( + aws_c_auth_testdata = dict( version = "0.9.5", sha256 = "39000bff55fe8c82265b9044a966ab37da5c192a775e1b68b6fcba7e7f9882fb", strip_prefix = "aws-c-auth-{version}", urls = ["https://github.com/awslabs/aws-c-auth/archive/refs/tags/v{version}.tar.gz"], ), - com_github_axboe_liburing = dict( + liburing = dict( version = "2.13", sha256 = "618e34dbea408fc9e33d7c4babd746036dbdedf7fce2496b1178ced0f9b5b357", strip_prefix = "liburing-liburing-{version}", @@ -110,13 +110,13 @@ REPOSITORY_LOCATIONS_SPEC = dict( ), # This dependency is built only when performance tracing is enabled with the # option --define=perf_tracing=enabled. It's never built for releases. - com_github_google_perfetto = dict( + perfetto = dict( version = "53.0", sha256 = "b25023f3281165a1a7d7cde9f3ed2dfcfce022ffd727e77f6589951e0ba6af9a", strip_prefix = "perfetto-{version}/sdk", urls = ["https://github.com/google/perfetto/archive/v{version}.tar.gz"], ), - com_github_cares_cares = dict( + c_ares = dict( version = "1.34.6", sha256 = "912dd7cc3b3e8a79c52fd7fb9c0f4ecf0aaa73e45efda880266a2d6e26b84ef5", strip_prefix = "c-ares-{version}", @@ -128,49 +128,49 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "libcircllhist-py-{version}", urls = ["https://github.com/openhistogram/libcircllhist/archive/refs/tags/py-{version}.tar.gz"], ), - com_github_cyan4973_xxhash = dict( + xxhash = dict( version = "0.8.3", sha256 = "aae608dfe8213dfd05d909a57718ef82f30722c392344583d3f39050c7f29a80", strip_prefix = "xxHash-{version}", urls = ["https://github.com/Cyan4973/xxHash/archive/v{version}.tar.gz"], ), - com_github_envoyproxy_sqlparser = dict( + sql_parser = dict( version = "3b40ba2d106587bdf053a292f7e3bb17e818a57f", sha256 = "96c10c8e950a141a32034f19b19cdeb1da48fe859cf96ae5e19f894f36c62c71", strip_prefix = "sql-parser-{version}", urls = ["https://github.com/envoyproxy/sql-parser/archive/{version}.tar.gz"], ), - com_github_mirror_tclap = dict( + tclap = dict( version = "1.2.5", sha256 = "7e87d13734076fa4f626f6144ce9a02717198b3f054341a6886e2107b048b235", strip_prefix = "tclap-{version}", urls = ["https://github.com/mirror/tclap/archive/v{version}.tar.gz"], ), - com_github_fmtlib_fmt = dict( + fmt = dict( version = "12.1.0", sha256 = "695fd197fa5aff8fc67b5f2bbc110490a875cdf7a41686ac8512fb480fa8ada7", strip_prefix = "fmt-{version}", urls = ["https://github.com/fmtlib/fmt/releases/download/{version}/fmt-{version}.zip"], ), - com_github_gabime_spdlog = dict( + spdlog = dict( version = "1.17.0", sha256 = "d8862955c6d74e5846b3f580b1605d2428b11d97a410d86e2fb13e857cd3a744", strip_prefix = "spdlog-{version}", urls = ["https://github.com/gabime/spdlog/archive/v{version}.tar.gz"], ), - com_github_google_libprotobuf_mutator = dict( + libprotobuf_mutator = dict( version = "1.5", sha256 = "895958881b4993df70b4f652c2d82c5bd97d22f801ca4f430d6546809df293d5", strip_prefix = "libprotobuf-mutator-{version}", urls = ["https://github.com/google/libprotobuf-mutator/archive/v{version}.tar.gz"], ), - com_github_google_libsxg = dict( + libsxg = dict( version = "beaa3939b76f8644f6833267e9f2462760838f18", sha256 = "082bf844047a9aeec0d388283d5edc68bd22bcf4d32eb5a566654ae89956ad1f", strip_prefix = "libsxg-{version}", urls = ["https://github.com/google/libsxg/archive/{version}.tar.gz"], ), - com_github_google_tcmalloc = dict( + tcmalloc = dict( version = "5da4a882003102fba0c0c0e8f6372567057332eb", sha256 = "fd92d64d8302f1677570fdff844e8152c314e559a6c788c6bfc3844954d0dabd", strip_prefix = "tcmalloc-{version}", @@ -194,7 +194,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "rules_proto_grpc-{version}", urls = ["https://github.com/rules-proto-grpc/rules_proto_grpc/releases/download/{version}/rules_proto_grpc-{version}.tar.gz"], ), - com_github_unicode_org_icu = dict( + icu = dict( # When this is updated, make sure to update the icu.patch patch file and remove # all remaining Bazel build artifacts (for example WORKSPACE and BUILD.bazel files) # from the icu source code, to prevent Bazel from treating the foreign library @@ -205,7 +205,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "icu", urls = ["https://github.com/unicode-org/icu/releases/download/release-{version}/icu4c-{version}-sources.zip"], ), - com_github_intel_ipp_crypto_crypto_mb = dict( + ipp_crypto = dict( version = "1.3.0", sha256 = "a1d87cb3b90fe4718609e4e9dd8343fd4531bb815e69bad901ac6b46f98b3b53", strip_prefix = "cryptography-primitives-{version}", @@ -223,50 +223,50 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "uadk-{version}", urls = ["https://github.com/Linaro/uadk/archive/refs/tags/v{version}.tar.gz"], ), - com_github_intel_qatlib = dict( + qatlib = dict( version = "25.08.0", sha256 = "786101683b4817ded72c8ea51204a190aa26e0b5ac8205ee199c7a9438138770", strip_prefix = "qatlib-{version}", urls = ["https://github.com/intel/qatlib/archive/refs/tags/{version}.tar.gz"], ), - com_github_intel_qatzip = dict( + qatzip = dict( version = "1.3.1", sha256 = "75e6e57f49da739d0a509220263e9dabb30b1e8c94be11c809aecc0adf4ee2dc", strip_prefix = "QATzip-{version}", urls = ["https://github.com/intel/QATzip/archive/v{version}.tar.gz"], ), - com_github_qat_zstd = dict( + qat_zstd = dict( version = "1.0.0", sha256 = "00f2611719f0a1c9585965c6c3c1fe599119aa8e932a569041b1876ffc944fb3", strip_prefix = "QAT-ZSTD-Plugin-{version}", urls = ["https://github.com/intel/QAT-ZSTD-Plugin/archive/refs/tags/v{version}.tar.gz"], ), - com_github_luajit_luajit = dict( + luajit = dict( # LuaJIT only provides rolling releases version = "871db2c84ecefd70a850e03a6c340214a81739f0", sha256 = "ab3f16d82df6946543565cfb0d2810d387d79a3a43e0431695b03466188e2680", strip_prefix = "LuaJIT-{version}", urls = ["https://github.com/LuaJIT/LuaJIT/archive/{version}.tar.gz"], ), - com_github_nghttp2_nghttp2 = dict( + nghttp2 = dict( version = "1.66.0", sha256 = "e178687730c207f3a659730096df192b52d3752786c068b8e5ee7aeb8edae05a", strip_prefix = "nghttp2-{version}", urls = ["https://github.com/nghttp2/nghttp2/releases/download/v{version}/nghttp2-{version}.tar.gz"], ), - io_hyperscan = dict( + hyperscan = dict( version = "5.4.2", sha256 = "32b0f24b3113bbc46b6bfaa05cf7cf45840b6b59333d078cc1f624e4c40b2b99", strip_prefix = "hyperscan-{version}", urls = ["https://github.com/intel/hyperscan/archive/v{version}.tar.gz"], ), - io_vectorscan = dict( + vectorscan = dict( version = "5.4.11", sha256 = "905f76ad1fa9e4ae0eb28232cac98afdb96c479666202c5a4c27871fb30a2711", strip_prefix = "vectorscan-vectorscan-{version}", urls = ["https://codeload.github.com/VectorCamp/vectorscan/tar.gz/refs/tags/vectorscan/{version}"], ), - io_opentelemetry_cpp = dict( + opentelemetry_cpp = dict( version = "1.24.0", sha256 = "7b8e966affca1daf1906272f4d983631cad85fb6ea60fb6f55dcd1811a730604", strip_prefix = "opentelemetry-cpp-{version}", @@ -278,25 +278,25 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "skywalking-data-collect-protocol-{version}", version = "10.3.0", ), - com_github_skyapm_cpp2sky = dict( + cpp2sky = dict( sha256 = "d7e52f517de5a1dc7d927dd63a2e5aa5cf8c2dcfd8fcf6b64e179978daf1c3ed", version = "0.6.0", strip_prefix = "cpp2sky-{version}", urls = ["https://github.com/SkyAPM/cpp2sky/archive/v{version}.tar.gz"], ), - com_github_datadog_dd_trace_cpp = dict( + dd_trace_cpp = dict( version = "2.0.0", sha256 = "e4a0dabc3e186ce99c71685178448f93c501577102cdc50ddbf12cbaaba54713", strip_prefix = "dd-trace-cpp-{version}", urls = ["https://github.com/DataDog/dd-trace-cpp/archive/v{version}.tar.gz"], ), - com_github_google_benchmark = dict( + benchmark = dict( version = "1.9.4", sha256 = "b334658edd35efcf06a99d9be21e4e93e092bd5f95074c1673d5c8705d95c104", strip_prefix = "benchmark-{version}", urls = ["https://github.com/google/benchmark/archive/v{version}.tar.gz"], ), - com_github_libevent_libevent = dict( + libevent = dict( # This SHA includes the new "prepare" and "check" watchers, used for event loop performance # stats (see https://github.com/libevent/libevent/pull/793) and the fix for a race condition # in the watchers (see https://github.com/libevent/libevent/pull/802). @@ -312,7 +312,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "libevent-{version}", urls = ["https://github.com/libevent/libevent/archive/{version}.tar.gz"], ), - net_colm_open_source_colm = dict( + colm = dict( # The latest release version v0.14.7 prevents building statically (see # https://github.com/adrian-thurston/colm/issues/146). The latest SHA includes the fix (see # https://github.com/adrian-thurston/colm/commit/fc61ecb3a22b89864916ec538eaf04840e7dd6b5). @@ -322,7 +322,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "colm-{version}", urls = ["https://github.com/adrian-thurston/colm/archive/{version}.tar.gz"], ), - net_colm_open_source_ragel = dict( + ragel = dict( # We used the stable release Ragel 6.10 previously and it is under GPLv2 license (see # http://www.colm.net/open-source/ragel). Envoy uses its binary only as a tool for # compiling contrib extension Hyperscan. For copyright consideration, we update Ragel to @@ -335,13 +335,13 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "ragel-{version}", urls = ["https://github.com/adrian-thurston/ragel/archive/{version}.tar.gz"], ), - org_boost = dict( + boost = dict( version = "1.89.0", sha256 = "9de758db755e8330a01d995b0a24d09798048400ac25c03fc5ea9be364b13c93", strip_prefix = "boost_{underscore_version}", urls = ["https://archives.boost.io/release/{version}/source/boost_{underscore_version}.tar.gz"], ), - org_brotli = dict( + brotli = dict( version = "1.2.0", sha256 = "816c96e8e8f193b40151dad7e8ff37b1221d019dbcb9c35cd3fadbfe6477dfec", strip_prefix = "brotli-{version}", @@ -359,7 +359,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "zlib-ng-{version}", urls = ["https://github.com/zlib-ng/zlib-ng/archive/{version}.tar.gz"], ), - com_github_jbeder_yaml_cpp = dict( + yaml_cpp = dict( version = "0.8.0", sha256 = "fbe74bbdcee21d656715688706da3c8becfd946d92cd44705cc6098bb23b3a16", strip_prefix = "yaml-cpp-{version}", @@ -367,19 +367,19 @@ REPOSITORY_LOCATIONS_SPEC = dict( # YAML is also used for runtime as well as controlplane. It shouldn't appear on the # dataplane but we can't verify this automatically due to code structure today. ), - com_github_msgpack_cpp = dict( + msgpack_cxx = dict( version = "7.0.0", sha256 = "7504b7af7e7b9002ce529d4f941e1b7fb1fb435768780ce7da4abaac79bb156f", strip_prefix = "msgpack-cxx-{version}", urls = ["https://github.com/msgpack/msgpack-c/releases/download/cpp-{version}/msgpack-cxx-{version}.tar.gz"], ), - com_github_alibaba_hessian2_codec = dict( + hessian2_codec = dict( version = "6f5a64770f0374a761eece13c8863b80dc5adcd8", sha256 = "bb4c4af6a7e3031160bf38dfa957b0ee950e2d8de47d4ba14c7a658c3a2c74d1", strip_prefix = "hessian2-codec-{version}", urls = ["https://github.com/alibaba/hessian2-codec/archive/{version}.tar.gz"], ), - com_github_nlohmann_json = dict( + nlohmann_json = dict( version = "3.12.0", sha256 = "4b92eb0c06d10683f7447ce9406cb97cd4b453be18d7279320f7b2f025c10187", strip_prefix = "json-{version}", @@ -392,13 +392,13 @@ REPOSITORY_LOCATIONS_SPEC = dict( # there is no binary package available for the utility on Ubuntu # which is the base image used to build an envoy container. # This is not needed to build an envoy binary or run tests. - com_github_ncopa_suexec = dict( + su_exec = dict( version = "0.3", sha256 = "1de7479857879b6d14772792375290a87eac9a37b0524d39739a4a0739039620", strip_prefix = "su-exec-{version}", urls = ["https://github.com/ncopa/su-exec/archive/v{version}.tar.gz"], ), - com_google_googletest = dict( + googletest = dict( version = "1.17.0", sha256 = "65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c", strip_prefix = "googletest-{version}", @@ -420,19 +420,19 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "grpc-httpjson-transcoding-{version}", urls = ["https://github.com/grpc-ecosystem/grpc-httpjson-transcoding/archive/{version}.tar.gz"], ), - com_google_protoconverter = dict( + proto_converter = dict( version = "1db76535b86b80aa97489a1edcc7009e18b67ab7", sha256 = "9555d9cf7bd541ea5fdb67d7d6b72ea44da77df3e27b960b4155dc0c6b81d476", strip_prefix = "proto-converter-{version}", urls = ["https://github.com/grpc-ecosystem/proto-converter/archive/{version}.zip"], ), - com_google_protofieldextraction = dict( + proto_field_extraction = dict( version = "d5d39f0373e9b6691c32c85929838b1006bcb3fb", sha256 = "cba864db90806515afa553aaa2fb3683df2859a7535e53a32cb9619da9cebc59", strip_prefix = "proto-field-extraction-{version}", urls = ["https://github.com/grpc-ecosystem/proto-field-extraction/archive/{version}.zip"], ), - com_google_protoprocessinglib = dict( + proto_processing = dict( version = "279353cfab372ac7f268ae529df29c4d546ca18d", sha256 = "bac7a0d02fd8533cd5ce6d0f39dc324fc0565702d85a9ee3b65b0be8e7cbdd8d", strip_prefix = "proto_processing_lib-{version}", @@ -491,13 +491,13 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "rules_shell-{version}", urls = ["https://github.com/bazelbuild/rules_shell/releases/download/v{version}/rules_shell-v{version}.tar.gz"], ), - com_github_wamr = dict( + wamr = dict( version = "WAMR-2.4.4", sha256 = "03ad51037f06235577b765ee042a462326d8919300107af4546719c35525b298", strip_prefix = "wasm-micro-runtime-{version}", urls = ["https://github.com/bytecodealliance/wasm-micro-runtime/archive/{version}.tar.gz"], ), - com_github_wasmtime = dict( + wasmtime = dict( version = "24.0.4", sha256 = "d714d987a50cfc7d0b384ef4720e7c757cf4f5b7df617cbf38e432a3dc6c400d", strip_prefix = "wasmtime-{version}", @@ -547,7 +547,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( sha256 = "a8d2b481a2089280b84df7dc234223b658056b5bbd40bd4d476902d25d353a1f", urls = ["https://github.com/simdutf/simdutf/releases/download/v{version}/singleheader.zip"], ), - com_github_google_quiche = dict( + quiche = dict( version = "b7b4c0cfe393a57b8706b0f1be81518595daaa44", sha256 = "9d8344faf932165b6013f8fdd2cbfe2be7c2e7a5129c5e572036d13718a3f1bf", urls = ["https://github.com/google/quiche/archive/{version}.tar.gz"], @@ -559,25 +559,25 @@ REPOSITORY_LOCATIONS_SPEC = dict( urls = ["https://github.com/google/gurl/archive/{version}.tar.gz"], strip_prefix = "gurl-{version}", ), - com_google_cel_spec = dict( + cel_spec = dict( version = "0.25.1", sha256 = "13583c5a312861648449845b709722676a3c9b43396b6b8e9cbe4538feb74ad2", strip_prefix = "cel-spec-{version}", urls = ["https://github.com/google/cel-spec/archive/v{version}.tar.gz"], ), - com_google_cel_cpp = dict( + cel_cpp = dict( version = "0.14.0", sha256 = "0a4f9a1c0bcc83629eb30d1c278883d32dec0f701efcdabd7bebf33fef8dab71", strip_prefix = "cel-cpp-{version}", urls = ["https://github.com/google/cel-cpp/archive/v{version}.tar.gz"], ), - com_github_google_flatbuffers = dict( + flatbuffers = dict( version = "25.12.19", sha256 = "f81c3162b1046fe8b84b9a0dbdd383e24fdbcf88583b9cb6028f90d04d90696a", strip_prefix = "flatbuffers-{version}", urls = ["https://github.com/google/flatbuffers/archive/v{version}.tar.gz"], ), - com_googlesource_code_re2 = dict( + re2 = dict( version = "2024-07-02", sha256 = "a835fe55fbdcd8e80f38584ab22d0840662c67f2feb36bd679402da9641dc71e", strip_prefix = "re2-{version}", @@ -643,13 +643,13 @@ REPOSITORY_LOCATIONS_SPEC = dict( # is required which in turn requires a system CC toolchains, not the bazel controlled ones. urls = ["https://github.com/bazelbuild/rules_rust/releases/download/{version}/rules_rust-{version}.tar.gz"], ), - com_github_fdio_vpp_vcl = dict( + vpp_vcl = dict( version = "85abefb55ee931fa4e45c0b6a9fc8c43118651b3", sha256 = "5624c4a4407285d9f269d0041ed4fc8d5fa3664abc22850069236b026f97d3f2", strip_prefix = "vpp-{version}", urls = ["https://github.com/FDio/vpp/archive/{version}.tar.gz"], ), - intel_dlb = dict( + dlb = dict( version = "8.8.0", sha256 = "564534254ef32bfed56e0a464c53fca0907e446b30929c253210e2c3d6de58b9", urls = ["https://downloadmirror.intel.com/819078/dlb_linux_src_release_8.8.0.txz"], @@ -665,7 +665,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( sha256 = "26d4021f6898e23b82ef953078389dd49ac2b5618ac564ade4ef87cced147b38", urls = ["https://github.com/bazelbuild/rules_license/releases/download/{version}/rules_license-{version}.tar.gz"], ), - com_github_maxmind_libmaxminddb = dict( + libmaxminddb = dict( version = "1.12.2", sha256 = "1bfbf8efba3ed6462e04e225906ad5ce5fe958aa3d626a1235b2a2253d600743", strip_prefix = "libmaxminddb-{version}", @@ -683,7 +683,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "toolchains_llvm-v{version}", urls = ["https://github.com/bazel-contrib/toolchains_llvm/releases/download/v{version}/toolchains_llvm-v{version}.tar.gz"], ), - com_github_lz4_lz4 = dict( + lz4 = dict( version = "1.10.0", sha256 = "537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b", strip_prefix = "lz4-{version}", diff --git a/ci/do_ci.sh b/ci/do_ci.sh index b2add5f2b1c48..6ed9a4beb9a82 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -105,7 +105,7 @@ function cp_binary_for_image_build() { if [[ -n "$ENVOY_CI_BZLMOD" ]]; then cp -f bazel-bin/external/su-exec~/su-exec "${BASE_TARGET_DIR}"/"${TARGET_DIR}" else - cp -f bazel-bin/external/com_github_ncopa_suexec/su-exec "${BASE_TARGET_DIR}"/"${TARGET_DIR}" + cp -f bazel-bin/external/su-exec/su-exec "${BASE_TARGET_DIR}"/"${TARGET_DIR}" fi # Stripped binaries for the debug image. @@ -171,12 +171,7 @@ function bazel_binary_build() { bazel build "${BAZEL_BUILD_OPTIONS[@]}" --remote_download_toplevel -c "${COMPILE_TYPE}" \ //test/tools/config_load_check:config_load_check_tool "${CONFIG_ARGS[@]}" - # Build su-exec utility - if [[ -n "$ENVOY_CI_BZLMOD" ]]; then - bazel build "${BAZEL_BUILD_OPTIONS[@]}" --remote_download_toplevel -c "${COMPILE_TYPE}" @su-exec - else - bazel build "${BAZEL_BUILD_OPTIONS[@]}" --remote_download_toplevel -c "${COMPILE_TYPE}" @com_github_ncopa_suexec//:su-exec - fi + bazel build "${BAZEL_BUILD_OPTIONS[@]}" --remote_download_toplevel -c "${COMPILE_TYPE}" @su-exec cp_binary_for_image_build "${BINARY_TYPE}" "${COMPILE_TYPE}" "${EXE_NAME}" } @@ -271,7 +266,7 @@ else elif [[ "${CI_TARGET}" == "msan" ]]; then COVERAGE_TEST_TARGETS=("${COVERAGE_TEST_TARGETS[@]}" "-//test/extensions/...") fi - TEST_TARGETS=("${COVERAGE_TEST_TARGETS[@]}" "@com_github_google_quiche//:ci_tests") + TEST_TARGETS=("${COVERAGE_TEST_TARGETS[@]}" "@quiche//:ci_tests") fi case $CI_TARGET in diff --git a/contrib/config/source/BUILD b/contrib/config/source/BUILD index d807ee238da97..a65930d72dab4 100644 --- a/contrib/config/source/BUILD +++ b/contrib/config/source/BUILD @@ -20,7 +20,7 @@ envoy_cc_contrib_extension( "//envoy/stats:stats_macros", "//source/common/config:utility_lib", "//source/common/protobuf:utility_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//contrib/envoy/extensions/config/v3alpha:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", ], diff --git a/contrib/cryptomb/private_key_providers/source/BUILD b/contrib/cryptomb/private_key_providers/source/BUILD index 6ed70b7646c4b..ec8429bdf9d63 100644 --- a/contrib/cryptomb/private_key_providers/source/BUILD +++ b/contrib/cryptomb/private_key_providers/source/BUILD @@ -48,7 +48,7 @@ envoy_cmake( "-G", "Ninja", ], - lib_source = "@com_github_intel_ipp_crypto_crypto_mb//:all", + lib_source = "@ipp-crypto//:all", out_static_libs = ["libcrypto_mb.a"], tags = ["skip_on_windows"], target_compatible_with = envoy_contrib_linux_x86_64_constraints(), diff --git a/contrib/cryptomb/private_key_providers/test/BUILD b/contrib/cryptomb/private_key_providers/test/BUILD index 5ec7bf869c60b..dafc2fec9d381 100644 --- a/contrib/cryptomb/private_key_providers/test/BUILD +++ b/contrib/cryptomb/private_key_providers/test/BUILD @@ -93,6 +93,6 @@ envoy_cc_benchmark_binary( "//contrib/cryptomb/private_key_providers/source:ipp_crypto_wrapper_lib", "//source/common/common:assert_lib", "//source/common/common:utility_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) diff --git a/contrib/dlb/source/BUILD b/contrib/dlb/source/BUILD index c4e777a90ce14..95b6c56c627ba 100644 --- a/contrib/dlb/source/BUILD +++ b/contrib/dlb/source/BUILD @@ -16,7 +16,7 @@ envoy_contrib_package() make( name = "dlb", env = {"DLB_DISABLE_DOMAIN_SERVER": "TRUE"}, - lib_source = "@intel_dlb//:libdlb", + lib_source = "@dlb//:libdlb", out_static_libs = ["libdlb.a"], postfix_script = "mv libdlb.a $$INSTALLDIR/lib && rm -rf $$INSTALLDIR/include && mkdir -p $$INSTALLDIR/include && cp -L *.h $$INSTALLDIR/include", tags = ["skip_on_windows"], diff --git a/contrib/golang/filters/http/source/BUILD b/contrib/golang/filters/http/source/BUILD index f4e3d53aa3f76..22198eb5925fb 100644 --- a/contrib/golang/filters/http/source/BUILD +++ b/contrib/golang/filters/http/source/BUILD @@ -42,17 +42,17 @@ envoy_cc_library( "//source/common/secret:secret_provider_impl_lib", "//source/extensions/filters/common/expr:cel_state_lib", "//source/extensions/filters/common/expr:evaluator_lib", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/types:optional", - "@com_google_cel_cpp//eval/public:activation", - "@com_google_cel_cpp//eval/public:builtin_func_registrar", - "@com_google_cel_cpp//eval/public:cel_expr_builder_factory", - "@com_google_cel_cpp//eval/public:cel_value", - "@com_google_cel_cpp//eval/public:value_export_util", - "@com_google_cel_cpp//eval/public/containers:field_access", - "@com_google_cel_cpp//eval/public/containers:field_backed_list_impl", - "@com_google_cel_cpp//eval/public/containers:field_backed_map_impl", - "@com_google_cel_cpp//eval/public/structs:cel_proto_wrapper", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/types:optional", + "@cel-cpp//eval/public:activation", + "@cel-cpp//eval/public:builtin_func_registrar", + "@cel-cpp//eval/public:cel_expr_builder_factory", + "@cel-cpp//eval/public:cel_value", + "@cel-cpp//eval/public:value_export_util", + "@cel-cpp//eval/public/containers:field_access", + "@cel-cpp//eval/public/containers:field_backed_list_impl", + "@cel-cpp//eval/public/containers:field_backed_map_impl", + "@cel-cpp//eval/public/structs:cel_proto_wrapper", "@envoy_api//contrib/envoy/extensions/filters/http/golang/v3alpha:pkg_cc_proto", ], ) diff --git a/contrib/golang/filters/http/test/test_data/access_log/BUILD b/contrib/golang/filters/http/test/test_data/access_log/BUILD index f8cec79007a87..7913ad33d5cee 100644 --- a/contrib/golang/filters/http/test/test_data/access_log/BUILD +++ b/contrib/golang/filters/http/test/test_data/access_log/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/filters/http/source/go/pkg/http", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/filters/http/test/test_data/action/BUILD b/contrib/golang/filters/http/test/test_data/action/BUILD index 9f514ee18b7cb..c76865e9057db 100644 --- a/contrib/golang/filters/http/test/test_data/action/BUILD +++ b/contrib/golang/filters/http/test/test_data/action/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/filters/http/source/go/pkg/http", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/filters/http/test/test_data/add_data/BUILD b/contrib/golang/filters/http/test/test_data/add_data/BUILD index b91299616a422..bfe8f0ca063a9 100644 --- a/contrib/golang/filters/http/test/test_data/add_data/BUILD +++ b/contrib/golang/filters/http/test/test_data/add_data/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/filters/http/source/go/pkg/http", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/filters/http/test/test_data/buffer/BUILD b/contrib/golang/filters/http/test/test_data/buffer/BUILD index 8c1540b70c5a0..dd98a69d05318 100644 --- a/contrib/golang/filters/http/test/test_data/buffer/BUILD +++ b/contrib/golang/filters/http/test/test_data/buffer/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/filters/http/source/go/pkg/http", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/filters/http/test/test_data/bufferinjectdata/BUILD b/contrib/golang/filters/http/test/test_data/bufferinjectdata/BUILD index 181eff4e54b90..fdb30460e6c56 100644 --- a/contrib/golang/filters/http/test/test_data/bufferinjectdata/BUILD +++ b/contrib/golang/filters/http/test/test_data/bufferinjectdata/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/filters/http/source/go/pkg/http", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/filters/http/test/test_data/echo/BUILD b/contrib/golang/filters/http/test/test_data/echo/BUILD index 37ab2f0a8fa72..9b7720aed5396 100644 --- a/contrib/golang/filters/http/test/test_data/echo/BUILD +++ b/contrib/golang/filters/http/test/test_data/echo/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/filters/http/source/go/pkg/http", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/filters/http/test/test_data/passthrough/BUILD b/contrib/golang/filters/http/test/test_data/passthrough/BUILD index 0126623ea5748..ed6413df9c3b9 100644 --- a/contrib/golang/filters/http/test/test_data/passthrough/BUILD +++ b/contrib/golang/filters/http/test/test_data/passthrough/BUILD @@ -13,7 +13,7 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/filters/http/source/go/pkg/http", - "@com_github_cncf_xds_go//udpa/type/v1:type", "@org_golang_google_protobuf//types/known/anypb", + "@xds_go//udpa/type/v1:type", ], ) diff --git a/contrib/golang/filters/http/test/test_data/property/BUILD b/contrib/golang/filters/http/test/test_data/property/BUILD index 29ae5208c2ffd..46e6567b1dc89 100644 --- a/contrib/golang/filters/http/test/test_data/property/BUILD +++ b/contrib/golang/filters/http/test/test_data/property/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/filters/http/source/go/pkg/http", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/filters/http/test/test_data/routeconfig/BUILD b/contrib/golang/filters/http/test/test_data/routeconfig/BUILD index f3e6a69188812..7d60a9784abc8 100644 --- a/contrib/golang/filters/http/test/test_data/routeconfig/BUILD +++ b/contrib/golang/filters/http/test/test_data/routeconfig/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/filters/http/source/go/pkg/http", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/filters/http/test/test_data/secrets/BUILD b/contrib/golang/filters/http/test/test_data/secrets/BUILD index 94c4ea4d84f34..cb997735351f0 100644 --- a/contrib/golang/filters/http/test/test_data/secrets/BUILD +++ b/contrib/golang/filters/http/test/test_data/secrets/BUILD @@ -14,7 +14,7 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/filters/http/source/go/pkg/http", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/filters/network/test/test_data/BUILD b/contrib/golang/filters/network/test/test_data/BUILD index d21b0925ef86c..e6bb5d4bda068 100644 --- a/contrib/golang/filters/network/test/test_data/BUILD +++ b/contrib/golang/filters/network/test/test_data/BUILD @@ -15,7 +15,7 @@ go_binary( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/filters/network/source/go/pkg/network", - "@com_github_cncf_xds_go//udpa/type/v1:type", "@org_golang_google_protobuf//types/known/anypb", + "@xds_go//udpa/type/v1:type", ], ) diff --git a/contrib/golang/router/cluster_specifier/test/test_data/simple/BUILD b/contrib/golang/router/cluster_specifier/test/test_data/simple/BUILD index 0d9403d4bb282..6459f0914a6b0 100644 --- a/contrib/golang/router/cluster_specifier/test/test_data/simple/BUILD +++ b/contrib/golang/router/cluster_specifier/test/test_data/simple/BUILD @@ -16,8 +16,8 @@ go_binary( deps = [ "//contrib/golang/router/cluster_specifier/source/go/pkg/api", "//contrib/golang/router/cluster_specifier/source/go/pkg/cluster_specifier", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/upstreams/http/tcp/test/test_data/add_data/BUILD b/contrib/golang/upstreams/http/tcp/test/test_data/add_data/BUILD index c1ecd9b25a2cf..03b30d7042667 100644 --- a/contrib/golang/upstreams/http/tcp/test/test_data/add_data/BUILD +++ b/contrib/golang/upstreams/http/tcp/test/test_data/add_data/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/upstreams/http/tcp/source/go/pkg/upstreams/http/tcp:http_tcp_bridge", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/upstreams/http/tcp/test/test_data/buffered/BUILD b/contrib/golang/upstreams/http/tcp/test/test_data/buffered/BUILD index 7bf3f627a57e9..76674e7b36fa0 100644 --- a/contrib/golang/upstreams/http/tcp/test/test_data/buffered/BUILD +++ b/contrib/golang/upstreams/http/tcp/test/test_data/buffered/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/upstreams/http/tcp/source/go/pkg/upstreams/http/tcp:http_tcp_bridge", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/upstreams/http/tcp/test/test_data/header_op/BUILD b/contrib/golang/upstreams/http/tcp/test/test_data/header_op/BUILD index c3799009aea17..d8fe402061a43 100644 --- a/contrib/golang/upstreams/http/tcp/test/test_data/header_op/BUILD +++ b/contrib/golang/upstreams/http/tcp/test/test_data/header_op/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/upstreams/http/tcp/source/go/pkg/upstreams/http/tcp:http_tcp_bridge", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/upstreams/http/tcp/test/test_data/local_reply/BUILD b/contrib/golang/upstreams/http/tcp/test/test_data/local_reply/BUILD index 4b90f59c1eeb1..b10bc1578da7e 100644 --- a/contrib/golang/upstreams/http/tcp/test/test_data/local_reply/BUILD +++ b/contrib/golang/upstreams/http/tcp/test/test_data/local_reply/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/upstreams/http/tcp/source/go/pkg/upstreams/http/tcp:http_tcp_bridge", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/upstreams/http/tcp/test/test_data/panic/BUILD b/contrib/golang/upstreams/http/tcp/test/test_data/panic/BUILD index fabb202df162c..95eaf881e43d1 100644 --- a/contrib/golang/upstreams/http/tcp/test/test_data/panic/BUILD +++ b/contrib/golang/upstreams/http/tcp/test/test_data/panic/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/upstreams/http/tcp/source/go/pkg/upstreams/http/tcp:http_tcp_bridge", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/upstreams/http/tcp/test/test_data/property/BUILD b/contrib/golang/upstreams/http/tcp/test/test_data/property/BUILD index 2e0a30d1ea478..d8a2647c4b435 100644 --- a/contrib/golang/upstreams/http/tcp/test/test_data/property/BUILD +++ b/contrib/golang/upstreams/http/tcp/test/test_data/property/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/upstreams/http/tcp/source/go/pkg/upstreams/http/tcp:http_tcp_bridge", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/upstreams/http/tcp/test/test_data/self_half_close/BUILD b/contrib/golang/upstreams/http/tcp/test/test_data/self_half_close/BUILD index de1d3ed38012e..a038d98cc7898 100644 --- a/contrib/golang/upstreams/http/tcp/test/test_data/self_half_close/BUILD +++ b/contrib/golang/upstreams/http/tcp/test/test_data/self_half_close/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/upstreams/http/tcp/source/go/pkg/upstreams/http/tcp:http_tcp_bridge", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/golang/upstreams/http/tcp/test/test_data/streaming/BUILD b/contrib/golang/upstreams/http/tcp/test/test_data/streaming/BUILD index 3227b943d8dc6..ceaaa1de8a73a 100644 --- a/contrib/golang/upstreams/http/tcp/test/test_data/streaming/BUILD +++ b/contrib/golang/upstreams/http/tcp/test/test_data/streaming/BUILD @@ -14,8 +14,8 @@ go_library( deps = [ "//contrib/golang/common/go/api", "//contrib/golang/upstreams/http/tcp/source/go/pkg/upstreams/http/tcp:http_tcp_bridge", - "@com_github_cncf_xds_go//xds/type/v3:type", "@org_golang_google_protobuf//types/known/anypb", "@org_golang_google_protobuf//types/known/structpb", + "@xds_go//xds/type/v3:type", ], ) diff --git a/contrib/hyperscan/matching/input_matchers/source/BUILD b/contrib/hyperscan/matching/input_matchers/source/BUILD index 7cf67bfa8c8d1..aee9201faf7dc 100644 --- a/contrib/hyperscan/matching/input_matchers/source/BUILD +++ b/contrib/hyperscan/matching/input_matchers/source/BUILD @@ -21,9 +21,9 @@ envoy_cmake( "//bazel/foreign_cc:parallel_builds_enabled": ["-j"], "//conditions:default": ["-j1"], }), - build_data = ["@org_boost//:header"], + build_data = ["@boost//:header"], cache_entries = { - "BOOST_ROOT": "$$EXT_BUILD_ROOT/external/org_boost", + "BOOST_ROOT": "$$EXT_BUILD_ROOT/external/boost", "BUILD_AVX512": "on", "BUILD_AVX512VBMI": "on", "BUILD_EXAMPLES": "off", @@ -64,9 +64,9 @@ envoy_cmake( "//bazel/foreign_cc:parallel_builds_enabled": ["-j"], "//conditions:default": ["-j1"], }), - build_data = ["@org_boost//:header"], + build_data = ["@boost//:header"], cache_entries = { - "BOOST_ROOT": "$$EXT_BUILD_ROOT/external/org_boost", + "BOOST_ROOT": "$$EXT_BUILD_ROOT/external/boost", # "BUILD_SVE2_BITPERM": "on", # "BUILD_SVE2": "on", # "BUILD_SVE": "on", diff --git a/contrib/hyperscan/matching/input_matchers/test/BUILD b/contrib/hyperscan/matching/input_matchers/test/BUILD index b1e86a85a4bed..c3c64a5fe5a97 100644 --- a/contrib/hyperscan/matching/input_matchers/test/BUILD +++ b/contrib/hyperscan/matching/input_matchers/test/BUILD @@ -43,8 +43,8 @@ envoy_cc_benchmark_binary( deps = [ "//source/common/common:assert_lib", "//source/common/common:utility_lib", - "@com_github_google_benchmark//:benchmark", - "@com_googlesource_code_re2//:re2", + "@benchmark", + "@re2", ] + select({ "//bazel:linux_x86_64": [ "//contrib/hyperscan/matching/input_matchers/source:hyperscan", @@ -64,7 +64,7 @@ envoy_cc_benchmark_binary( "//source/common/common:utility_lib", "//source/common/thread_local:thread_local_lib", "//test/mocks/event:event_mocks", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ] + select({ "//bazel:linux_x86_64": [ "//contrib/hyperscan/matching/input_matchers/source:hyperscan_matcher_lib", diff --git a/contrib/istio/filters/common/source/BUILD b/contrib/istio/filters/common/source/BUILD index 72258ebdadc2a..a4fa643810537 100644 --- a/contrib/istio/filters/common/source/BUILD +++ b/contrib/istio/filters/common/source/BUILD @@ -20,8 +20,8 @@ envoy_cc_library( "//source/common/common:hash_lib", "//source/common/protobuf", "//source/common/protobuf:utility_lib", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/contrib/istio/filters/http/istio_stats/source/BUILD b/contrib/istio/filters/http/istio_stats/source/BUILD index 235263c9324a8..0891d7c6b5250 100644 --- a/contrib/istio/filters/http/istio_stats/source/BUILD +++ b/contrib/istio/filters/http/istio_stats/source/BUILD @@ -29,9 +29,9 @@ envoy_cc_contrib_extension( "//source/extensions/filters/common/expr:evaluator_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", "//source/extensions/filters/http/grpc_stats:config", - "@com_google_cel_cpp//eval/public:builtin_func_registrar", - "@com_google_cel_cpp//eval/public:cel_expr_builder_factory", - "@com_google_cel_cpp//parser", + "@cel-cpp//eval/public:builtin_func_registrar", + "@cel-cpp//eval/public:cel_expr_builder_factory", + "@cel-cpp//parser", "@envoy_api//contrib/envoy/extensions/filters/http/istio_stats/v3:pkg_cc_proto", ], ) diff --git a/contrib/istio/filters/network/metadata_exchange/source/BUILD b/contrib/istio/filters/network/metadata_exchange/source/BUILD index 558107eed0f98..cb70667f1aaff 100644 --- a/contrib/istio/filters/network/metadata_exchange/source/BUILD +++ b/contrib/istio/filters/network/metadata_exchange/source/BUILD @@ -36,8 +36,8 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/common/stream_info:bool_accessor_lib", "//source/extensions/filters/common/expr:cel_state_lib", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/strings", "@envoy_api//contrib/envoy/extensions/filters/network/metadata_exchange/v3:pkg_cc_proto", ], ) diff --git a/contrib/kafka/filters/network/source/BUILD b/contrib/kafka/filters/network/source/BUILD index d1d0780994bb7..80477fffabfd4 100644 --- a/contrib/kafka/filters/network/source/BUILD +++ b/contrib/kafka/filters/network/source/BUILD @@ -257,6 +257,6 @@ envoy_cc_library( ], deps = [ "//source/common/common:macros", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/contrib/kafka/filters/network/source/broker/BUILD b/contrib/kafka/filters/network/source/broker/BUILD index 7ec5cf8bf4552..e2b028c5a7a83 100644 --- a/contrib/kafka/filters/network/source/broker/BUILD +++ b/contrib/kafka/filters/network/source/broker/BUILD @@ -35,7 +35,7 @@ envoy_cc_library( ], deps = [ "//source/common/common:assert_lib", - "@com_google_absl//absl/container:flat_hash_set", + "@abseil-cpp//absl/container:flat_hash_set", "@envoy_api//contrib/envoy/extensions/filters/network/kafka_broker/v3:pkg_cc_proto", ], ) diff --git a/contrib/kafka/filters/network/source/mesh/BUILD b/contrib/kafka/filters/network/source/mesh/BUILD index 69f6e35ff242c..98928bb22b799 100644 --- a/contrib/kafka/filters/network/source/mesh/BUILD +++ b/contrib/kafka/filters/network/source/mesh/BUILD @@ -254,7 +254,7 @@ envoy_cc_library( deps = [ "//bazel/foreign_cc:librdkafka", "//envoy/common:pure_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) diff --git a/contrib/qat/BUILD b/contrib/qat/BUILD index 03c4145d82d25..987bbd94c1c73 100644 --- a/contrib/qat/BUILD +++ b/contrib/qat/BUILD @@ -34,7 +34,7 @@ configure_make( env = { "LDFLAGS": "-L$$EXT_BUILD_ROOT/$(BINDIR)/bazel/external/lib", }, - lib_source = "@com_github_intel_qatlib//:all", + lib_source = "@qatlib//:all", out_static_libs = [ "libqat.a", "libusdm.a", diff --git a/contrib/qat/compression/qatzip/compressor/source/BUILD b/contrib/qat/compression/qatzip/compressor/source/BUILD index e80dd911c49e6..a31c504e4812e 100644 --- a/contrib/qat/compression/qatzip/compressor/source/BUILD +++ b/contrib/qat/compression/qatzip/compressor/source/BUILD @@ -42,7 +42,7 @@ configure_make( }, "//conditions:default": COMMON_ENV, }), - lib_source = "@com_github_intel_qatzip//:all", + lib_source = "@qatzip//:all", out_static_libs = [ "libqatzip.a", ], diff --git a/contrib/qat/compression/qatzstd/compressor/source/BUILD b/contrib/qat/compression/qatzstd/compressor/source/BUILD index 2bd99195c19e0..d72ff576fbfb6 100644 --- a/contrib/qat/compression/qatzstd/compressor/source/BUILD +++ b/contrib/qat/compression/qatzstd/compressor/source/BUILD @@ -24,7 +24,7 @@ COMMON_CFLAGS = "-I$$EXT_BUILD_ROOT/external/numactl" make( name = "qat-zstd", - build_data = ["@com_github_qat_zstd//:all"], + build_data = ["@qat-zstd//:all"], # Include the numa_archive genrule output so that libnuma.a is available # for the linker to find with -lnuma. data = ["//bazel/external:numa_archive"], @@ -37,7 +37,7 @@ make( }, }), includes = [], - lib_source = "@com_github_qat_zstd//:all", + lib_source = "@qat-zstd//:all", out_static_libs = ["libqatseqprod.a"], tags = ["skip_on_windows"], target_compatible_with = envoy_contrib_linux_x86_64_constraints(), diff --git a/contrib/rocketmq_proxy/filters/network/source/BUILD b/contrib/rocketmq_proxy/filters/network/source/BUILD index 7fe92542ba109..460d421dc9003 100644 --- a/contrib/rocketmq_proxy/filters/network/source/BUILD +++ b/contrib/rocketmq_proxy/filters/network/source/BUILD @@ -141,6 +141,6 @@ envoy_cc_library( hdrs = ["metadata.h"], deps = [ "//source/common/http:header_map_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/contrib/sip_proxy/filters/network/source/BUILD b/contrib/sip_proxy/filters/network/source/BUILD index 167cd61f3fafd..ddbec711b38f8 100644 --- a/contrib/sip_proxy/filters/network/source/BUILD +++ b/contrib/sip_proxy/filters/network/source/BUILD @@ -66,7 +66,7 @@ envoy_cc_library( "//source/common/stats:timespan_lib", "//source/common/stream_info:stream_info_lib", "//source/common/tracing:http_tracer_lib", - "@com_google_absl//absl/types:any", + "@abseil-cpp//absl/types:any", ], ) @@ -117,7 +117,7 @@ envoy_cc_library( "//envoy/buffer:buffer_interface", "//source/common/common:macros", "//source/common/http:header_map_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//contrib/envoy/extensions/filters/network/sip_proxy/v3alpha:pkg_cc_proto", ], ) @@ -149,7 +149,7 @@ envoy_cc_library( "//source/common/config:utility_lib", "//source/common/protobuf", "//source/common/singleton:const_singleton", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha:pkg_cc_proto", "@envoy_api//contrib/envoy/extensions/filters/network/sip_proxy/v3alpha:pkg_cc_proto", ], diff --git a/contrib/sip_proxy/filters/network/source/router/BUILD b/contrib/sip_proxy/filters/network/source/router/BUILD index abc82236735e3..4d560bc6ccce9 100644 --- a/contrib/sip_proxy/filters/network/source/router/BUILD +++ b/contrib/sip_proxy/filters/network/source/router/BUILD @@ -30,7 +30,7 @@ envoy_cc_library( deps = [ "//contrib/sip_proxy/filters/network/source:metadata_lib", "//envoy/router:router_interface", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/contrib/sip_proxy/filters/network/source/tra/BUILD b/contrib/sip_proxy/filters/network/source/tra/BUILD index 7d1c69681f047..683c74f0be005 100644 --- a/contrib/sip_proxy/filters/network/source/tra/BUILD +++ b/contrib/sip_proxy/filters/network/source/tra/BUILD @@ -38,7 +38,7 @@ envoy_cc_library( "//envoy/singleton:manager_interface", "//envoy/tracing:tracer_interface", "//source/common/stats:symbol_table_lib", - "@com_google_absl//absl/types:any", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:any", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/contrib/vcl/source/BUILD b/contrib/vcl/source/BUILD index bf1b3008ab8fa..ece7514f41900 100644 --- a/contrib/vcl/source/BUILD +++ b/contrib/vcl/source/BUILD @@ -66,7 +66,7 @@ envoy_cmake( "-G", "Ninja", ], - lib_source = "@com_github_fdio_vpp_vcl//:all", + lib_source = "@vpp-vcl//:all", linkopts = ["-Wno-unused-variable"], out_static_libs = [ "libvppcom.a", diff --git a/distribution/binary/BUILD b/distribution/binary/BUILD index 324bef4058e7b..41c63913dcedb 100644 --- a/distribution/binary/BUILD +++ b/distribution/binary/BUILD @@ -15,7 +15,7 @@ bundled( "//distribution:envoy-dwarf": "dbg/envoy.dwp", "//distribution:envoy-contrib-binary": "dbg/envoy-contrib", "//distribution:envoy-contrib-dwarf": "dbg/envoy-contrib.dwp", - "@com_github_ncopa_suexec//:su-exec": "utils/su-exec", + "@su-exec": "utils/su-exec", }, ) diff --git a/distribution/binary/compiler.bzl b/distribution/binary/compiler.bzl index aa4a287371511..8dd4df9ace0ac 100644 --- a/distribution/binary/compiler.bzl +++ b/distribution/binary/compiler.bzl @@ -32,7 +32,7 @@ # targets = { # "//distribution:envoy-binary": "envoy", # "//distribution:envoy-contrib-binary": "envoy-contrib", -# "@com_github_ncopa_suexec//:su-exec": "utils/su-exec", +# "@su-exec": "utils/su-exec", # }, # ) # diff --git a/envoy/api/BUILD b/envoy/api/BUILD index 2753a6e6248d5..eef9caa255d74 100644 --- a/envoy/api/BUILD +++ b/envoy/api/BUILD @@ -38,6 +38,6 @@ envoy_cc_library( ], deps = [ "//envoy/network:address_interface", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/envoy/buffer/BUILD b/envoy/buffer/BUILD index 3ca278369db78..d86bedb6a5f3f 100644 --- a/envoy/buffer/BUILD +++ b/envoy/buffer/BUILD @@ -18,6 +18,6 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/common:byte_order_lib", "//source/common/common:utility_lib", - "@com_google_absl//absl/container:inlined_vector", + "@abseil-cpp//absl/container:inlined_vector", ], ) diff --git a/envoy/common/BUILD b/envoy/common/BUILD index 6b921b1c146f4..5035c59d5e8a8 100644 --- a/envoy/common/BUILD +++ b/envoy/common/BUILD @@ -14,7 +14,7 @@ envoy_basic_cc_library( hdrs = [ "platform.h", ], - deps = ["@com_google_absl//absl/strings"], + deps = ["@abseil-cpp//absl/strings"], ) envoy_basic_cc_library( @@ -39,7 +39,7 @@ envoy_basic_cc_library( hdrs = [ "optref.h", ], - deps = ["@com_google_absl//absl/types:optional"], + deps = ["@abseil-cpp//absl/types:optional"], ) envoy_cc_library( @@ -159,7 +159,7 @@ envoy_cc_library( deps = [ "//source/common/common:assert_lib", "//source/common/common:utility_lib", - "@com_google_absl//absl/container:inlined_vector", - "@com_google_absl//absl/types:variant", + "@abseil-cpp//absl/container:inlined_vector", + "@abseil-cpp//absl/types:variant", ], ) diff --git a/envoy/config/BUILD b/envoy/config/BUILD index 244e14fbceb01..15648fb335292 100644 --- a/envoy/config/BUILD +++ b/envoy/config/BUILD @@ -15,7 +15,7 @@ envoy_cc_library( "//envoy/common:time_interface", "//source/common/common:assert_lib", "//source/common/protobuf", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) @@ -130,7 +130,7 @@ envoy_cc_library( ":typed_config_interface", "//envoy/api:api_interface", "//envoy/protobuf:message_validator_interface", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", ], ) diff --git a/envoy/event/BUILD b/envoy/event/BUILD index 7ed0de276a5c2..61fa72d576e48 100644 --- a/envoy/event/BUILD +++ b/envoy/event/BUILD @@ -41,7 +41,7 @@ envoy_cc_library( "//envoy/server:watchdog_interface", "//envoy/server/overload:thread_local_overload_state", "//envoy/thread:thread_interface", - "@com_google_absl//absl/functional:any_invocable", + "@abseil-cpp//absl/functional:any_invocable", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) diff --git a/envoy/filesystem/BUILD b/envoy/filesystem/BUILD index 3652ad67c197a..83756c3138419 100644 --- a/envoy/filesystem/BUILD +++ b/envoy/filesystem/BUILD @@ -15,7 +15,7 @@ envoy_cc_library( "//envoy/api:io_error_interface", "//envoy/api:os_sys_calls_interface", "//envoy/common:time_interface", - "@com_google_absl//absl/status:statusor", + "@abseil-cpp//absl/status:statusor", ], ) diff --git a/envoy/grpc/BUILD b/envoy/grpc/BUILD index 50ae15b20519a..cac24879490ca 100644 --- a/envoy/grpc/BUILD +++ b/envoy/grpc/BUILD @@ -20,7 +20,7 @@ envoy_cc_library( "//envoy/tracing:tracer_interface", "//source/common/common:assert_lib", "//source/common/protobuf", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/envoy/http/BUILD b/envoy/http/BUILD index 46ca859a5098b..8baa4937567a7 100644 --- a/envoy/http/BUILD +++ b/envoy/http/BUILD @@ -35,7 +35,7 @@ envoy_cc_library( "//envoy/tracing:tracer_interface", "//source/common/protobuf", "//source/common/protobuf:utility_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", ], ) @@ -43,7 +43,7 @@ envoy_cc_library( envoy_cc_library( name = "codec_runtime_overrides", hdrs = ["codec_runtime_overrides.h"], - deps = ["@com_google_absl//absl/strings"], + deps = ["@abseil-cpp//absl/strings"], ) envoy_cc_library( @@ -103,7 +103,7 @@ envoy_cc_library( ":header_map_interface", "//envoy/access_log:access_log_interface", "//envoy/grpc:status", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) @@ -126,7 +126,7 @@ envoy_cc_library( "//envoy/tracing:tracer_interface", "//envoy/upstream:load_balancer_interface", "//source/common/common:scope_tracked_object_stack", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) @@ -149,7 +149,7 @@ envoy_cc_library( "//envoy/stream_info:filter_state_interface", "//source/common/common:assert_lib", "//source/common/common:hash_lib", - "@com_google_absl//absl/container:inlined_vector", + "@abseil-cpp//absl/container:inlined_vector", ], ) @@ -170,13 +170,13 @@ envoy_cc_library( envoy_cc_library( name = "query_params_interface", hdrs = ["query_params.h"], - deps = ["@com_google_absl//absl/container:btree"], + deps = ["@abseil-cpp//absl/container:btree"], ) envoy_cc_library( name = "metadata_interface", hdrs = ["metadata_interface.h"], - deps = ["@com_google_absl//absl/container:node_hash_map"], + deps = ["@abseil-cpp//absl/container:node_hash_map"], ) envoy_cc_library( diff --git a/envoy/matcher/BUILD b/envoy/matcher/BUILD index 19ff6ae27f125..adf13d2c9b35e 100644 --- a/envoy/matcher/BUILD +++ b/envoy/matcher/BUILD @@ -14,8 +14,8 @@ envoy_cc_library( deps = [ "//envoy/config:typed_config_interface", "//envoy/protobuf:message_validator_interface", - "@com_google_absl//absl/base", - "@com_google_absl//absl/hash", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/hash", "@envoy_api//envoy/config/common/matcher/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@xds//xds/type/matcher/v3:pkg_cc_proto", diff --git a/envoy/network/BUILD b/envoy/network/BUILD index 53610381d599d..be56ae3afa56b 100644 --- a/envoy/network/BUILD +++ b/envoy/network/BUILD @@ -31,8 +31,8 @@ envoy_cc_library( "//envoy/event:deferred_deletable", "//envoy/ssl:connection_interface", "//envoy/stream_info:stream_info_interface", - "@com_google_absl//absl/numeric:int128", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/numeric:int128", + "@abseil-cpp//absl/types:span", ], ) @@ -108,8 +108,8 @@ envoy_cc_library( hdrs = ["drain_decision.h"], deps = [ "//envoy/common:callback", - "@com_google_absl//absl/base", - "@com_google_absl//absl/status", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/status", ], ) @@ -140,7 +140,7 @@ envoy_cc_library( hdrs = ["hash_policy.h"], deps = [ ":connection_interface", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) @@ -155,7 +155,7 @@ envoy_cc_library( "//envoy/event:file_event_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/envoy/router/BUILD b/envoy/router/BUILD index 578b97a1c4e1e..cf351eb7f73a8 100644 --- a/envoy/router/BUILD +++ b/envoy/router/BUILD @@ -53,7 +53,7 @@ envoy_cc_library( ":rds_interface", "//envoy/common:time_interface", "//source/common/protobuf", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", ], @@ -69,7 +69,7 @@ envoy_cc_library( "//envoy/stream_info:stream_info_interface", "//envoy/upstream:cluster_manager_interface", "//envoy/upstream:host_description_interface", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) @@ -99,7 +99,7 @@ envoy_cc_library( "//envoy/upstream:retry_interface", "//source/common/protobuf", "//source/common/protobuf:utility_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", "@envoy_api//envoy/type/v3:pkg_cc_proto", @@ -140,7 +140,7 @@ envoy_cc_library( hdrs = ["string_accessor.h"], deps = [ "//envoy/stream_info:filter_state_interface", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) @@ -170,8 +170,8 @@ envoy_cc_library( deps = [ "//envoy/config:typed_config_interface", "//source/common/common:minimal_logger_lib", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", ], ) @@ -181,7 +181,7 @@ envoy_cc_library( deps = [ "//envoy/config:typed_config_interface", "//source/common/common:minimal_logger_lib", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", ], ) diff --git a/envoy/runtime/BUILD b/envoy/runtime/BUILD index 4a384841ed614..a5630f3f3fc29 100644 --- a/envoy/runtime/BUILD +++ b/envoy/runtime/BUILD @@ -16,8 +16,8 @@ envoy_cc_library( "//envoy/thread_local:thread_local_object", "//source/common/common:assert_lib", "//source/common/singleton:threadsafe_singleton", - "@com_google_absl//absl/container:node_hash_map", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/container:node_hash_map", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/type/v3:pkg_cc_proto", ], ) diff --git a/envoy/server/BUILD b/envoy/server/BUILD index e036664ee82f4..2b94ff9f70e2d 100644 --- a/envoy/server/BUILD +++ b/envoy/server/BUILD @@ -38,7 +38,7 @@ envoy_cc_library( "//envoy/http:context_interface", "//envoy/stats:sink_interface", "//envoy/upstream:cluster_manager_interface", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", ], ) diff --git a/envoy/ssl/BUILD b/envoy/ssl/BUILD index fa337b2f15bb2..321f796d794b4 100644 --- a/envoy/ssl/BUILD +++ b/envoy/ssl/BUILD @@ -18,7 +18,7 @@ envoy_cc_library( ":ssl_socket_state", "//envoy/common:optref_lib", "//envoy/common:time_interface", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) @@ -67,7 +67,7 @@ envoy_cc_library( name = "certificate_validation_context_config_interface", hdrs = ["certificate_validation_context_config.h"], deps = [ - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", "@envoy_api//envoy/type/matcher/v3:pkg_cc_proto", ], diff --git a/envoy/stats/BUILD b/envoy/stats/BUILD index 20815c1ec7dea..8550b7949f3ea 100644 --- a/envoy/stats/BUILD +++ b/envoy/stats/BUILD @@ -38,7 +38,7 @@ envoy_cc_library( "//envoy/common:interval_set_interface", "//envoy/common:optref_lib", "//envoy/common:time_interface", - "@com_google_absl//absl/container:inlined_vector", + "@abseil-cpp//absl/container:inlined_vector", ], ) diff --git a/envoy/stream_info/BUILD b/envoy/stream_info/BUILD index ad7a490ecc5d2..c538b70a946cf 100644 --- a/envoy/stream_info/BUILD +++ b/envoy/stream_info/BUILD @@ -24,7 +24,7 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/protobuf", "//source/common/singleton:const_singleton", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -37,7 +37,7 @@ envoy_cc_library( "//source/common/common:fmt_lib", "//source/common/common:utility_lib", "//source/common/protobuf", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/envoy/udp/BUILD b/envoy/udp/BUILD index e89a26ea315b4..4ec0a65032a94 100644 --- a/envoy/udp/BUILD +++ b/envoy/udp/BUILD @@ -13,6 +13,6 @@ envoy_cc_library( hdrs = ["hash_policy.h"], deps = [ "//envoy/network:address_interface", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/envoy/upstream/BUILD b/envoy/upstream/BUILD index 4e28feac5be8a..272e71f0aac0f 100644 --- a/envoy/upstream/BUILD +++ b/envoy/upstream/BUILD @@ -32,7 +32,7 @@ envoy_cc_library( "//envoy/singleton:manager_interface", "//envoy/tcp:conn_pool_interface", "//envoy/thread_local:thread_local_interface", - "@com_google_absl//absl/container:node_hash_map", + "@abseil-cpp//absl/container:node_hash_map", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -103,7 +103,7 @@ envoy_cc_library( hdrs = ["outlier_detection.h"], deps = [ "//envoy/common:time_interface", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/data/cluster/v3:pkg_cc_proto", ], ) @@ -163,7 +163,7 @@ envoy_cc_library( "//envoy/ssl:context_interface", "//envoy/ssl:context_manager_interface", "//envoy/upstream:types_interface", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], diff --git a/mobile/WORKSPACE b/mobile/WORKSPACE index 6f34d7397ffec..e82a60268819e 100644 --- a/mobile/WORKSPACE +++ b/mobile/WORKSPACE @@ -4,7 +4,7 @@ workspace(name = "envoy_mobile") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( - name = "bazel_gazelle", + name = "gazelle", sha256 = "e467b801046b6598c657309b45d2426dc03513777bd1092af2c62eebf990aca5", urls = [ "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.45.0/bazel-gazelle-v0.45.0.tar.gz", diff --git a/mobile/bazel/envoy_mobile_repositories.bzl b/mobile/bazel/envoy_mobile_repositories.bzl index c6f49a9b6d04e..0d253371e40c9 100644 --- a/mobile/bazel/envoy_mobile_repositories.bzl +++ b/mobile/bazel/envoy_mobile_repositories.bzl @@ -16,7 +16,7 @@ def envoy_mobile_repositories(): def upstream_envoy_overrides(): # Workaround old NDK version breakages https://github.com/envoyproxy/envoy-mobile/issues/934 http_archive( - name = "com_github_libevent_libevent", + name = "libevent", urls = ["https://github.com/libevent/libevent/archive/0d7d85c2083f7a4c9efe01c061486f332b576d28.tar.gz"], strip_prefix = "libevent-0d7d85c2083f7a4c9efe01c061486f332b576d28", sha256 = "549d34065eb2485dfad6c8de638caaa6616ed130eec36dd978f73b6bdd5af113", diff --git a/mobile/examples/cc/fetch_client/BUILD b/mobile/examples/cc/fetch_client/BUILD index 32c7088a3abef..ee2f4e4b54c06 100644 --- a/mobile/examples/cc/fetch_client/BUILD +++ b/mobile/examples/cc/fetch_client/BUILD @@ -10,7 +10,7 @@ cc_binary( "//library/common/http:client_lib", "//library/common/http:header_utility_lib", "//library/common/types:c_types_lib", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/synchronization", "@envoy//envoy/http:header_map_interface", "@envoy//source/common/http:header_map_lib", ], diff --git a/mobile/library/cc/BUILD b/mobile/library/cc/BUILD index 2857cfca3efbe..78f85a8edfd11 100644 --- a/mobile/library/cc/BUILD +++ b/mobile/library/cc/BUILD @@ -24,7 +24,7 @@ envoy_cc_library( visibility = ["//visibility:public"], deps = [ ":envoy_engine_cc_lib_no_stamp", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy//source/common/common:assert_lib", "@envoy//source/common/protobuf", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", @@ -85,7 +85,7 @@ envoy_cc_library( "//library/common/api:c_types", "//library/common/bridge:utility_lib", "//library/common/extensions/key_value/platform:config", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy//source/common/buffer:buffer_lib", "@envoy//source/common/http:header_map_lib", "@envoy//source/common/http:utility_lib", diff --git a/mobile/library/common/BUILD b/mobile/library/common/BUILD index 93845a3a8eb0b..54e0243d760d5 100644 --- a/mobile/library/common/BUILD +++ b/mobile/library/common/BUILD @@ -86,9 +86,9 @@ envoy_cc_library( ], repository = "@envoy", deps = [ - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/functional:any_invocable", + "@abseil-cpp//absl/strings", "@envoy//source/common/buffer:buffer_lib", "@envoy//source/common/common:base_logger_lib", "@envoy//source/common/http:header_map_lib", diff --git a/mobile/library/common/event/BUILD b/mobile/library/common/event/BUILD index 2219fd750a977..a04e39c312ed9 100644 --- a/mobile/library/common/event/BUILD +++ b/mobile/library/common/event/BUILD @@ -11,7 +11,7 @@ envoy_cc_library( repository = "@envoy", deps = [ "//library/common/types:c_types_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy//envoy/event:deferred_deletable", "@envoy//envoy/event:dispatcher_interface", "@envoy//source/common/common:lock_guard_lib", diff --git a/mobile/library/common/http/BUILD b/mobile/library/common/http/BUILD index e3a82e5ef901e..a06c83a836e90 100644 --- a/mobile/library/common/http/BUILD +++ b/mobile/library/common/http/BUILD @@ -22,7 +22,7 @@ envoy_cc_library( "//library/common/stream_info:extra_stream_info_lib", "//library/common/system:system_helper_lib", "//library/common/types:c_types_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy//envoy/buffer:buffer_interface", "@envoy//envoy/common:scope_tracker_interface", "@envoy//envoy/event:deferred_deletable", diff --git a/mobile/library/jni/BUILD b/mobile/library/jni/BUILD index 656147c3c2295..78b0d8f9ee1d6 100644 --- a/mobile/library/jni/BUILD +++ b/mobile/library/jni/BUILD @@ -41,10 +41,10 @@ envoy_cc_library( "@envoy//bazel:android": [], "//conditions:default": ["//bazel:jni"], }) + [ - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", "@envoy//source/common/common:assert_lib", ], ) diff --git a/mobile/test/common/mocks/dns/BUILD b/mobile/test/common/mocks/dns/BUILD index 30a8aafc5a1de..c2f1fb75c7434 100644 --- a/mobile/test/common/mocks/dns/BUILD +++ b/mobile/test/common/mocks/dns/BUILD @@ -22,7 +22,7 @@ envoy_cc_library( repository = "@envoy", deps = [ ":mock_dns_resolver_proto_cc_proto", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", "@envoy//envoy/api:api_interface", "@envoy//envoy/event:dispatcher_interface", "@envoy//envoy/network:dns_interface", diff --git a/source/common/access_log/BUILD b/source/common/access_log/BUILD index 7359f9b104ddb..431b5f9f78861 100644 --- a/source/common/access_log/BUILD +++ b/source/common/access_log/BUILD @@ -31,7 +31,7 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/common/stream_info:stream_info_lib", "//source/common/tracing:http_tracer_lib", - "@com_google_absl//absl/hash", + "@abseil-cpp//absl/hash", "@envoy_api//envoy/config/accesslog/v3:pkg_cc_proto", "@envoy_api//envoy/type/v3:pkg_cc_proto", ], diff --git a/source/common/buffer/BUILD b/source/common/buffer/BUILD index 8236df805fdbc..26a03016b8264 100644 --- a/source/common/buffer/BUILD +++ b/source/common/buffer/BUILD @@ -30,7 +30,7 @@ envoy_cc_library( "//source/common/common:non_copyable", "//source/common/common:utility_lib", "//source/common/event:libevent_lib", - "@com_google_absl//absl/functional:any_invocable", + "@abseil-cpp//absl/functional:any_invocable", ], ) diff --git a/source/common/common/BUILD b/source/common/common/BUILD index 4d14bc56f8a79..98bc6669d456c 100644 --- a/source/common/common/BUILD +++ b/source/common/common/BUILD @@ -23,10 +23,10 @@ envoy_cc_library( hdrs = ["assert.h"], deps = [ ":minimal_logger_lib", - "@com_google_absl//absl/base", - "@com_google_absl//absl/debugging:stacktrace", - "@com_google_absl//absl/debugging:symbolize", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/debugging:stacktrace", + "@abseil-cpp//absl/debugging:symbolize", + "@abseil-cpp//absl/synchronization", ], ) @@ -35,7 +35,7 @@ envoy_cc_library( hdrs = ["cancel_wrapper.h"], deps = [ "//source/common/common:assert_lib", - "@com_google_absl//absl/functional:any_invocable", + "@abseil-cpp//absl/functional:any_invocable", ], ) @@ -139,9 +139,9 @@ envoy_basic_cc_library( hdrs = ["fmt.h"], deps = [ "//envoy/common:base_includes", - "@com_github_fmtlib_fmt//:fmt", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", + "@fmt", ], ) @@ -153,9 +153,9 @@ envoy_cc_library( ":macros", ":safe_memcpy_lib", "//envoy/common:base_includes", - "@com_github_cyan4973_xxhash//:xxhash", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@xxhash", ], ) @@ -180,9 +180,9 @@ envoy_cc_library( "//envoy/event:dispatcher_interface", "//envoy/filesystem:filesystem_interface", "//source/common/config:ttl_lib", - "@com_github_google_quiche//:quic_platform", - "@com_github_google_quiche//:quiche_common_lib", - "@com_google_absl//absl/cleanup", + "@abseil-cpp//absl/cleanup", + "@quiche//:quic_platform", + "@quiche//:quiche_common_lib", ], ) @@ -223,8 +223,8 @@ envoy_cc_library( ":macros", ":non_copyable", "//source/common/protobuf", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/synchronization", ] + select({ "//bazel:android_logger": ["logger_impl_lib_android"], "//conditions:default": ["logger_impl_lib_standard"], @@ -236,8 +236,8 @@ envoy_cc_library( srcs = ["base_logger.cc"], hdrs = ["base_logger.h"], deps = [ - "@com_github_gabime_spdlog//:spdlog", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", + "@spdlog", ], ) @@ -284,7 +284,7 @@ envoy_cc_library( deps = [ ":assert_lib", "//envoy/common:mutex_tracer", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/synchronization", ], ) @@ -329,7 +329,7 @@ envoy_cc_library( "//source/common/config:utility_lib", "//source/common/http:path_utility_lib", "//source/common/protobuf", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/type/matcher/v3:pkg_cc_proto", ], @@ -344,7 +344,7 @@ envoy_cc_library( "//envoy/common:matchers_interface", "//envoy/common:pure_lib", "//source/common/network:cidr_range_lib", - "@com_google_absl//absl/status:statusor", + "@abseil-cpp//absl/status:statusor", ], ) @@ -373,9 +373,9 @@ envoy_cc_library( "//envoy/registry", "//source/common/protobuf:utility_lib", "//source/common/stats:symbol_table_lib", - "@com_googlesource_code_re2//:re2", "@envoy_api//envoy/extensions/regex_engines/v3:pkg_cc_proto", "@envoy_api//envoy/type/matcher/v3:pkg_cc_proto", + "@re2", "@xds//xds/type/matcher/v3:pkg_cc_proto", ], alwayslink = LEGACY_ALWAYSLINK, @@ -429,7 +429,7 @@ envoy_cc_library( envoy_cc_library( name = "thread_annotations", hdrs = ["thread_annotations.h"], - deps = ["@com_google_absl//absl/base"], + deps = ["@abseil-cpp//absl/base"], ) envoy_cc_library( @@ -438,7 +438,7 @@ envoy_cc_library( hdrs = ["thread_synchronizer.h"], deps = [ ":assert_lib", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/synchronization", ], ) @@ -450,7 +450,7 @@ envoy_cc_library( ":assert_lib", ":macros", ":non_copyable", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/synchronization", ], ) @@ -494,9 +494,9 @@ envoy_cc_library( deps = [ ":assert_lib", "//envoy/common:optref_lib", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:inlined_vector", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:inlined_vector", + "@abseil-cpp//absl/strings", ], ) @@ -512,8 +512,8 @@ envoy_cc_library( "//envoy/common:interval_set_interface", "//envoy/common:time_interface", "//source/common/singleton:const_singleton", - "@com_google_absl//absl/container:node_hash_map", - "@com_googlesource_code_re2//:re2", + "@abseil-cpp//absl/container:node_hash_map", + "@re2", ], ) @@ -523,7 +523,7 @@ envoy_cc_library( deps = [ "//envoy/common:pure_lib", "//source/common/common:assert_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -567,9 +567,7 @@ envoy_cc_library( srcs = ["perf_tracing.cc"], hdrs = ["perf_tracing.h"], deps = select({ - "//bazel:enable_perf_tracing": [ - "@com_github_google_perfetto//:perfetto", - ], + "//bazel:enable_perf_tracing": ["@perfetto"], "//conditions:default": [], }), ) @@ -615,7 +613,7 @@ envoy_cc_library( name = "statusor_lib", hdrs = ["statusor.h"], deps = [ - "@com_google_absl//absl/status:statusor", + "@abseil-cpp//absl/status:statusor", ], ) @@ -631,7 +629,7 @@ envoy_pch_library( "envoy/service/discovery/v3/discovery.pb.h", "spdlog/sinks/android_sink.h", "spdlog/spdlog.h", - "@com_github_gabime_spdlog//:spdlog", + "@spdlog", ], visibility = ["//visibility:public"], deps = [ @@ -653,6 +651,6 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/common:macros", "//source/common/common:utility_lib", - "@com_google_absl//absl/container:node_hash_set", + "@abseil-cpp//absl/container:node_hash_set", ], ) diff --git a/source/common/config/BUILD b/source/common/config/BUILD index 3df5c3e059308..5106417c3b32c 100644 --- a/source/common/config/BUILD +++ b/source/common/config/BUILD @@ -83,7 +83,7 @@ envoy_cc_library( "//envoy/config:subscription_interface", "//envoy/event:dispatcher_interface", "//envoy/event:timer_interface", - "@com_google_absl//absl/container:btree", + "@abseil-cpp//absl/container:btree", ], ) @@ -233,7 +233,7 @@ envoy_cc_library( "//source/common/runtime:runtime_features_lib", "//source/common/singleton:const_singleton", "//source/common/version:api_version_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/source/common/event/BUILD b/source/common/event/BUILD index 0bcc005674fa1..c5b45bcab726b 100644 --- a/source/common/event/BUILD +++ b/source/common/event/BUILD @@ -125,7 +125,7 @@ envoy_cc_library( "//source/common/common:minimal_logger_lib", "//source/common/common:thread_lib", "//source/common/signal:fatal_error_handler_lib", - "@com_google_absl//absl/container:inlined_vector", + "@abseil-cpp//absl/container:inlined_vector", ] + envoy_select_signal_trace(["//source/common/signal:sigaction_lib"]), ) diff --git a/source/common/formatter/BUILD b/source/common/formatter/BUILD index 876c6c9379804..5d85575fb4280 100644 --- a/source/common/formatter/BUILD +++ b/source/common/formatter/BUILD @@ -28,7 +28,7 @@ envoy_cc_library( "//source/common/json:json_loader_lib", "//source/common/json:json_streamer_lib", "//source/common/json:json_utility_lib", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/strings:str_format", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) diff --git a/source/common/grpc/BUILD b/source/common/grpc/BUILD index 200d365aec619..9999fbb2c123b 100644 --- a/source/common/grpc/BUILD +++ b/source/common/grpc/BUILD @@ -77,7 +77,7 @@ envoy_cc_library( hdrs = ["status.h"], deps = [ "//envoy/grpc:status", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) @@ -108,7 +108,7 @@ envoy_cc_library( "//source/common/http:message_lib", "//source/common/http:utility_lib", "//source/common/protobuf", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) @@ -125,7 +125,7 @@ envoy_cc_library( "//source/common/common:hash_lib", "//source/common/stats:symbol_table_lib", "//source/common/stats:utility_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) @@ -145,7 +145,7 @@ envoy_cc_library( "//source/common/common:macros", "//source/common/common:utility_lib", "//source/common/grpc:status_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -182,7 +182,7 @@ envoy_cc_library( "//source/common/common:linked_object", "//source/common/common:thread_annotations", "//source/common/tracing:http_tracer_lib", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/synchronization", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -222,7 +222,7 @@ envoy_cc_library( ":buffered_message_ttl_manager_lib", ":typed_async_client_lib", "//source/common/protobuf:utility_lib", - "@com_google_absl//absl/container:btree", + "@abseil-cpp//absl/container:btree", ], ) diff --git a/source/common/html/BUILD b/source/common/html/BUILD index 12998895046fb..fedcca2f6f6e8 100644 --- a/source/common/html/BUILD +++ b/source/common/html/BUILD @@ -12,5 +12,5 @@ envoy_cc_library( name = "utility_lib", srcs = ["utility.cc"], hdrs = ["utility.h"], - deps = ["@com_google_absl//absl/strings"], + deps = ["@abseil-cpp//absl/strings"], ) diff --git a/source/common/http/BUILD b/source/common/http/BUILD index 1f96459b82560..6ba02ac8d8359 100644 --- a/source/common/http/BUILD +++ b/source/common/http/BUILD @@ -178,8 +178,8 @@ envoy_cc_library( srcs = ["dependency_manager.cc"], hdrs = ["dependency_manager.h"], deps = [ - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/status", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/status", "@envoy_api//envoy/extensions/filters/common/dependency/v3:pkg_cc_proto", ], ) @@ -263,10 +263,10 @@ envoy_cc_library( "//source/common/common:key_value_store_lib", "//source/common/common:logger_lib", "//source/common/config:utility_lib", - "@com_github_google_quiche//:http2_core_alt_svc_wire_format_lib", - "@com_github_google_quiche//:quic_platform", "@envoy_api//envoy/config/common/key_value/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", + "@quiche//:http2_core_alt_svc_wire_format_lib", + "@quiche//:quic_platform", ], ) @@ -568,11 +568,11 @@ envoy_cc_library( "//source/common/network:utility_lib", "//source/common/protobuf:utility_lib", "//source/common/runtime:runtime_features_lib", - "@com_github_google_quiche//:http2_adapter_http2_protocol", - "@com_google_absl//absl/container:node_hash_set", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/container:node_hash_set", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", + "@quiche//:http2_adapter_http2_protocol", ], ) @@ -595,12 +595,12 @@ envoy_cc_library( "//source/common/common:utility_lib", "//source/common/protobuf:utility_lib", "//source/common/runtime:runtime_features_lib", - "@com_github_google_quiche//:http2_adapter", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", "@envoy_api//envoy/type/v3:pkg_cc_proto", + "@quiche//:http2_adapter", ] + envoy_select_enable_http_datagrams([ - "@com_github_google_quiche//:quiche_common_structured_headers_lib", + "@quiche//:quiche_common_structured_headers_lib", ]) + envoy_select_nghttp2([envoy_external_dep_path("nghttp2")]), ) @@ -612,7 +612,7 @@ envoy_cc_library( "//envoy/http:header_map_interface", "//source/common/common:logger_lib", "//source/common/runtime:runtime_features_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@googleurl//url", ], ) @@ -640,7 +640,7 @@ envoy_cc_library( deps = [ "//envoy/http:codes_interface", "//source/common/common:assert_lib", - "@com_google_absl//absl/status", + "@abseil-cpp//absl/status", ], ) @@ -671,11 +671,11 @@ envoy_cc_library( "//envoy/stream_info:stream_info_interface", "//envoy/upstream:thread_local_cluster_interface", "//source/common/common:assert_lib", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:string_view", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:span", ], ) diff --git a/source/common/http/http1/BUILD b/source/common/http/http1/BUILD index 6e6e62ccb25e7..f97da1de70a72 100644 --- a/source/common/http/http1/BUILD +++ b/source/common/http/http1/BUILD @@ -83,7 +83,7 @@ envoy_cc_library( "//source/common/http:headers_lib", "//source/common/runtime:runtime_features_lib", "//source/common/upstream:upstream_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) @@ -97,7 +97,7 @@ envoy_cc_library( "//source/common/common:matchers_lib", "//source/common/config:utility_lib", "//source/common/runtime:runtime_features_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -131,9 +131,9 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/common:regex_lib", "//source/common/http:headers_lib", - "@com_github_google_quiche//:quiche_balsa_balsa_enums_lib", - "@com_github_google_quiche//:quiche_balsa_balsa_frame_lib", - "@com_github_google_quiche//:quiche_balsa_balsa_headers_lib", - "@com_github_google_quiche//:quiche_balsa_balsa_visitor_interface_lib", + "@quiche//:quiche_balsa_balsa_enums_lib", + "@quiche//:quiche_balsa_balsa_frame_lib", + "@quiche//:quiche_balsa_balsa_headers_lib", + "@quiche//:quiche_balsa_balsa_visitor_interface_lib", ], ) diff --git a/source/common/http/http2/BUILD b/source/common/http/http2/BUILD index b01b0f9d7235c..da5201ffc2b23 100644 --- a/source/common/http/http2/BUILD +++ b/source/common/http/http2/BUILD @@ -57,12 +57,12 @@ envoy_cc_library( "//source/common/http:status_lib", "//source/common/http:utility_lib", "//source/common/runtime:runtime_features_lib", - "@com_github_google_quiche//:http2_adapter", - "@com_google_absl//absl/algorithm", - "@com_google_absl//absl/cleanup", - "@com_google_absl//absl/container:inlined_vector", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/algorithm", + "@abseil-cpp//absl/cleanup", + "@abseil-cpp//absl/container:inlined_vector", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", + "@quiche//:http2_adapter", ] + envoy_select_nghttp2([envoy_external_dep_path("nghttp2")]), ) @@ -99,7 +99,7 @@ envoy_cc_library( "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", - "@com_github_google_quiche//:http2_adapter", + "@quiche//:http2_adapter", ], ) @@ -113,7 +113,7 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/runtime:runtime_features_lib", - "@com_github_google_quiche//:http2_hpack_decoder_hpack_decoder_lib", + "@quiche//:http2_hpack_decoder_hpack_decoder_lib", ] + envoy_select_nghttp2([envoy_external_dep_path("nghttp2")]), ) diff --git a/source/common/http/http3/BUILD b/source/common/http/http3/BUILD index d2c9d66670cb1..21e2bab71a49a 100644 --- a/source/common/http/http3/BUILD +++ b/source/common/http/http3/BUILD @@ -20,7 +20,7 @@ envoy_cc_library( "//source/common/http:codec_client_lib", "//source/common/http:conn_pool_base_lib", "//source/common/quic:client_connection_factory_lib", - "@com_github_google_quiche//:quic_core_deterministic_connection_id_generator_lib", + "@quiche//:quic_core_deterministic_connection_id_generator_lib", ]), ) diff --git a/source/common/http/sse/BUILD b/source/common/http/sse/BUILD index 80287bddd4650..9b716b80be24b 100644 --- a/source/common/http/sse/BUILD +++ b/source/common/http/sse/BUILD @@ -13,7 +13,7 @@ envoy_cc_library( srcs = ["sse_parser.cc"], hdrs = ["sse_parser.h"], deps = [ - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/source/common/json/BUILD b/source/common/json/BUILD index a2070ca176cd1..97a3ac47aacc4 100644 --- a/source/common/json/BUILD +++ b/source/common/json/BUILD @@ -18,7 +18,7 @@ envoy_cc_library( "//source/common/common:hash_lib", "//source/common/common:utility_lib", "//source/common/protobuf:utility_lib", - "@com_github_nlohmann_json//:json", + "@nlohmann_json//:json", ], ) @@ -41,9 +41,9 @@ envoy_cc_library( ":json_internal_lib", "//source/common/common:assert_lib", "//source/common/common:thread_lib", - "@com_github_nlohmann_json//:json", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/strings:str_format", "@com_google_protobuf//third_party/utf8_range:utf8_validity", + "@nlohmann_json//:json", ], ) @@ -63,7 +63,7 @@ envoy_cc_library( name = "constants_lib", hdrs = ["constants.h"], deps = [ - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) diff --git a/source/common/jwt/BUILD b/source/common/jwt/BUILD index 85689b85ddef1..68a77fadc898b 100644 --- a/source/common/jwt/BUILD +++ b/source/common/jwt/BUILD @@ -29,9 +29,9 @@ envoy_cc_library( deps = [ "//bazel:ssl", "//source/common/protobuf", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/time", ], ) @@ -42,6 +42,6 @@ envoy_cc_library( "simple_lru_cache_inl.h", ], deps = [ - "@com_google_absl//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_map", ], ) diff --git a/source/common/listener_manager/BUILD b/source/common/listener_manager/BUILD index 016ce1150e6fa..c40ee6355f3ab 100644 --- a/source/common/listener_manager/BUILD +++ b/source/common/listener_manager/BUILD @@ -140,7 +140,7 @@ envoy_cc_library( "//source/common/grpc:common_lib", "//source/common/init:target_lib", "//source/common/protobuf:utility_lib", - "@com_google_absl//absl/container:node_hash_set", + "@abseil-cpp//absl/container:node_hash_set", "@envoy_api//envoy/admin/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", diff --git a/source/common/network/BUILD b/source/common/network/BUILD index 7db2cf3175aaa..4be1467f8f69e 100644 --- a/source/common/network/BUILD +++ b/source/common/network/BUILD @@ -121,7 +121,7 @@ envoy_cc_library( "//source/common/network:socket_option_factory_lib", "//source/common/runtime:runtime_features_lib", "//source/common/stream_info:stream_info_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -236,8 +236,8 @@ envoy_cc_library( ":cidr_range_lib", ":utility_lib", "//source/common/common:assert_lib", - "@com_google_absl//absl/container:node_hash_set", - "@com_google_absl//absl/numeric:int128", + "@abseil-cpp//absl/container:node_hash_set", + "@abseil-cpp//absl/numeric:int128", ], ) @@ -294,8 +294,8 @@ envoy_cc_library( "//source/common/api:os_sys_calls_lib", "//source/common/buffer:buffer_lib", "//source/common/event:dispatcher_includes", - "@com_github_google_quiche//:quic_platform_socket_address", "@envoy_api//envoy/extensions/network/socket_interface/v3:pkg_cc_proto", + "@quiche//:quic_platform_socket_address", ] + select({ "//bazel:android": [], "//bazel:liburing_enabled": [ @@ -440,7 +440,7 @@ envoy_cc_library( "//source/common/common:scalar_to_byte_vector_lib", "//source/common/common:utility_lib", "//source/common/memory:aligned_allocator_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -457,7 +457,7 @@ envoy_cc_library( "//source/common/api:os_sys_calls_lib", "//source/common/common:assert_lib", "//source/common/common:logger_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -491,7 +491,7 @@ envoy_cc_library( "//envoy/network:address_interface", "//envoy/network:listen_socket_interface", "//source/common/common:logger_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -619,7 +619,7 @@ envoy_cc_library( deps = [ "//envoy/network:filter_interface", "//envoy/network:listen_socket_interface", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/strings:str_format", "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", ], ) diff --git a/source/common/orca/BUILD b/source/common/orca/BUILD index 4b583650214b4..c9170245d8ea4 100644 --- a/source/common/orca/BUILD +++ b/source/common/orca/BUILD @@ -18,9 +18,9 @@ envoy_cc_library( "//source/common/common:base64_lib", "//source/common/http:header_utility_lib", "//source/common/protobuf:utility_lib_header", - "@com_github_fmtlib_fmt//:fmt", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@fmt", "@xds//xds/data/orca/v3:pkg_cc_proto", ], ) @@ -34,11 +34,11 @@ envoy_cc_library( "//envoy/http:header_map_interface", "//source/common/http:header_utility_lib", "//source/common/protobuf:utility_lib_header", - "@com_github_fmtlib_fmt//:fmt", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@fmt", "@xds//xds/data/orca/v3:pkg_cc_proto", ], ) diff --git a/source/common/profiler/BUILD b/source/common/profiler/BUILD index d5990ff8662c3..108b556f59812 100644 --- a/source/common/profiler/BUILD +++ b/source/common/profiler/BUILD @@ -15,6 +15,6 @@ envoy_cc_library( tcmalloc_dep = 1, deps = [ "//source/common/common:thread_lib", - "@com_google_absl//absl/status:statusor", + "@abseil-cpp//absl/status:statusor", ], ) diff --git a/source/common/protobuf/BUILD b/source/common/protobuf/BUILD index 207e221c2f4bc..708ad49d61fc2 100644 --- a/source/common/protobuf/BUILD +++ b/source/common/protobuf/BUILD @@ -65,7 +65,7 @@ envoy_cc_library( "//envoy/protobuf:message_validator_interface", "//source/common/common:statusor_lib", "//source/common/common:stl_helpers", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", "@envoy_api//envoy/type/v3:pkg_cc_proto", ], ) @@ -84,14 +84,14 @@ envoy_cc_library( "//source/common/common:utility_lib", "//source/common/protobuf:visitor_lib", "//source/common/runtime:runtime_features_lib", - "@com_github_jbeder_yaml_cpp//:yaml-cpp", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", "@com_google_protobuf//:protobuf", "@com_google_protobuf//third_party/utf8_range:utf8_validity", "@envoy_api//envoy/annotations:pkg_cc_proto", "@envoy_api//envoy/type/v3:pkg_cc_proto", "@xds//udpa/annotations:pkg_cc_proto", + "@yaml-cpp", ], ) diff --git a/source/common/quic/BUILD b/source/common/quic/BUILD index d0cd6c7b3e767..e3e26d7af0f61 100644 --- a/source/common/quic/BUILD +++ b/source/common/quic/BUILD @@ -24,9 +24,9 @@ envoy_cc_library( deps = envoy_select_enable_http3([ "//envoy/event:dispatcher_interface", "//envoy/event:timer_interface", - "@com_github_google_quiche//:quic_core_alarm_lib", - "@com_github_google_quiche//:quic_core_clock_lib", - "@com_github_google_quiche//:quic_platform", + "@quiche//:quic_core_alarm_lib", + "@quiche//:quic_core_clock_lib", + "@quiche//:quic_platform", ]), ) @@ -36,10 +36,10 @@ envoy_cc_library( hdrs = envoy_select_enable_http3(["envoy_quic_alarm_factory.h"]), deps = envoy_select_enable_http3([ ":envoy_quic_alarm_lib", - "@com_github_google_quiche//:quic_core_alarm_factory_lib", - "@com_github_google_quiche//:quic_core_arena_scoped_ptr_lib", - "@com_github_google_quiche//:quic_core_one_block_arena_lib", - "@com_github_google_quiche//:quic_platform", + "@quiche//:quic_core_alarm_factory_lib", + "@quiche//:quic_core_arena_scoped_ptr_lib", + "@quiche//:quic_core_one_block_arena_lib", + "@quiche//:quic_platform", ]), ) @@ -50,7 +50,7 @@ envoy_cc_library( visibility = ["//visibility:public"], deps = envoy_select_enable_http3([ "//envoy/event:dispatcher_interface", - "@com_github_google_quiche//:quic_core_clock_lib", + "@quiche//:quic_core_clock_lib", ]), ) @@ -63,8 +63,8 @@ envoy_cc_library( "//envoy/config:typed_config_interface", "//envoy/server:factory_context_interface", "//envoy/stream_info:stream_info_interface", - "@com_github_google_quiche//:quic_core_connection_lib", - "@com_github_google_quiche//:quic_core_session_lib", + "@quiche//:quic_core_connection_lib", + "@quiche//:quic_core_session_lib", ]), ) @@ -73,8 +73,8 @@ envoy_cc_library( hdrs = envoy_select_enable_http3(["envoy_quic_connection_helper.h"]), deps = envoy_select_enable_http3([ ":envoy_quic_clock_lib", - "@com_github_google_quiche//:quic_core_connection_lib", - "@com_github_google_quiche//:quiche_common_random_lib", + "@quiche//:quic_core_connection_lib", + "@quiche//:quiche_common_random_lib", ]), ) @@ -90,8 +90,8 @@ envoy_cc_library( "//conditions:default": [ "//envoy/stats:stats_interface", "//source/common/stats:symbol_table_lib", - "@com_github_google_quiche//:quic_core_error_codes_lib", - "@com_github_google_quiche//:quic_core_types_lib", + "@quiche//:quic_core_error_codes_lib", + "@quiche//:quic_core_types_lib", ], }), ) @@ -102,12 +102,12 @@ envoy_cc_library( hdrs = envoy_select_enable_http3(["envoy_quic_proof_source_base.h"]), deps = envoy_select_enable_http3([ ":envoy_quic_utils_lib", - "@com_github_google_quiche//:quic_core_crypto_certificate_view_lib", - "@com_github_google_quiche//:quic_core_crypto_crypto_handshake_lib", - "@com_github_google_quiche//:quic_core_crypto_proof_source_lib", - "@com_github_google_quiche//:quic_core_data_lib", - "@com_github_google_quiche//:quic_core_versions_lib", - "@com_github_google_quiche//:quic_platform", + "@quiche//:quic_core_crypto_certificate_view_lib", + "@quiche//:quic_core_crypto_crypto_handshake_lib", + "@quiche//:quic_core_crypto_proof_source_lib", + "@quiche//:quic_core_data_lib", + "@quiche//:quic_core_versions_lib", + "@quiche//:quic_platform", ]), ) @@ -126,7 +126,7 @@ envoy_cc_library( "//source/common/quic:quic_server_transport_socket_factory_lib", "//source/common/stream_info:stream_info_lib", "//source/server:listener_stats", - "@com_github_google_quiche//:quic_core_crypto_certificate_view_lib", + "@quiche//:quic_core_crypto_certificate_view_lib", ]), ) @@ -136,10 +136,10 @@ envoy_cc_library( hdrs = envoy_select_enable_http3(["envoy_quic_proof_verifier_base.h"]), deps = envoy_select_enable_http3([ ":envoy_quic_utils_lib", - "@com_github_google_quiche//:quic_core_crypto_certificate_view_lib", - "@com_github_google_quiche//:quic_core_crypto_crypto_handshake_lib", - "@com_github_google_quiche//:quic_core_versions_lib", - "@com_github_google_quiche//:quic_platform", + "@quiche//:quic_core_crypto_certificate_view_lib", + "@quiche//:quic_core_crypto_crypto_handshake_lib", + "@quiche//:quic_core_versions_lib", + "@quiche//:quic_platform", ]), ) @@ -152,7 +152,7 @@ envoy_cc_library( ":envoy_quic_utils_lib", ":quic_ssl_connection_info_lib", "//source/common/tls:context_lib", - "@com_github_google_quiche//:quic_platform", + "@quiche//:quic_platform", ]), ) @@ -169,9 +169,9 @@ envoy_cc_library( "//envoy/event:dispatcher_interface", "//envoy/http:codec_interface", "//source/common/http:codec_helper_lib", - "@com_github_google_quiche//:http2_adapter", - "@com_github_google_quiche//:quic_core_http_client_lib", - "@com_github_google_quiche//:quic_core_http_http_encoder_lib", + "@quiche//:http2_adapter", + "@quiche//:quic_core_http_client_lib", + "@quiche//:quic_core_http_http_encoder_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ]) + envoy_select_enable_http_datagrams([ ":http_datagram_handler", @@ -195,7 +195,7 @@ envoy_cc_library( "//source/common/tls:client_ssl_socket_lib", "//source/extensions/quic/crypto_stream:envoy_quic_crypto_client_stream_lib", "//source/extensions/quic/client_packet_writer:default_quic_client_packet_writer_factory_config", - "@com_github_google_quiche//:quic_core_http_spdy_session_lib", + "@quiche//:quic_core_http_spdy_session_lib", ]), ) @@ -211,7 +211,7 @@ envoy_cc_library( ":envoy_quic_utils_lib", "//envoy/http:codec_interface", "//envoy/registry", - "@com_github_google_quiche//:quic_core_http_spdy_session_lib", + "@quiche//:quic_core_http_spdy_session_lib", ]), ) @@ -229,7 +229,7 @@ envoy_cc_library( "//envoy/http:codec_interface", "//envoy/registry", "//envoy/server/overload:overload_manager_interface", - "@com_github_google_quiche//:quic_core_http_spdy_session_lib", + "@quiche//:quic_core_http_spdy_session_lib", ]), alwayslink = LEGACY_ALWAYSLINK, ) @@ -240,7 +240,7 @@ envoy_cc_library( external_deps = ["ssl"], deps = envoy_select_enable_http3([ "//source/common/tls:connection_info_impl_base_lib", - "@com_github_google_quiche//:quic_core_session_lib", + "@quiche//:quic_core_session_lib", ]), ) @@ -263,7 +263,7 @@ envoy_cc_library( "//source/common/http/http3:codec_stats_lib", "//source/common/network:connection_base_lib", "//source/common/stream_info:stream_info_lib", - "@com_github_google_quiche//:quic_core_connection_lib", + "@quiche//:quic_core_connection_lib", ]), ) @@ -290,8 +290,8 @@ envoy_cc_library( "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/http:header_map_lib", - "@com_github_google_quiche//:quic_server_http_spdy_session_lib", - "@com_google_absl//absl/types:optional", + "@quiche//:quic_server_http_spdy_session_lib", + "@abseil-cpp//absl/types:optional", ]) + envoy_select_enable_http_datagrams([ ":http_datagram_handler", ]), @@ -327,8 +327,8 @@ envoy_cc_library( "//source/common/http:codes_lib", "//source/common/http:header_map_lib", "//source/common/http:header_utility_lib", - "@com_github_google_quiche//:quic_core_http_client_lib", - "@com_github_google_quiche//:quic_core_error_codes_lib", + "@quiche//:quic_core_http_client_lib", + "@quiche//:quic_core_error_codes_lib", ]) + envoy_select_enable_http_datagrams([ ":http_datagram_handler", ]), @@ -341,7 +341,7 @@ envoy_cc_library( ], deps = envoy_select_enable_http3([ "//source/common/common:logger_lib", - "@com_github_google_quiche//:quic_core_path_validator_lib", + "@quiche//:quic_core_path_validator_lib", ]), ) @@ -384,9 +384,9 @@ envoy_cc_library( "//source/common/network:generic_listener_filter_impl_base_lib", "//source/common/network:listen_socket_lib", "//source/common/quic:envoy_quic_utils_lib", - "@com_github_google_quiche//:quic_core_connection_lib", - "@com_github_google_quiche//:quic_core_packet_writer_lib", - "@com_github_google_quiche//:quic_core_packets_lib", + "@quiche//:quic_core_connection_lib", + "@quiche//:quic_core_packet_writer_lib", + "@quiche//:quic_core_packets_lib", ]), ) @@ -412,8 +412,8 @@ envoy_cc_library( "//envoy/network:address_interface", "//envoy/network:listen_socket_interface", "//envoy/server:factory_context_interface", - "@com_github_google_quiche//:quic_core_path_validator_lib", - "@com_github_google_quiche//:quic_core_types_lib", + "@quiche//:quic_core_path_validator_lib", + "@quiche//:quic_core_types_lib", ]), ) @@ -431,8 +431,8 @@ envoy_cc_library( "//source/common/network:socket_option_factory_lib", "//source/common/network:udp_packet_writer_handler_lib", "//source/common/runtime:runtime_lib", - "@com_github_google_quiche//:quic_core_connection_lib", - "@com_github_google_quiche//:quic_core_http_client_lib", + "@quiche//:quic_core_connection_lib", + "@quiche//:quic_core_http_client_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ]), ) @@ -449,8 +449,8 @@ envoy_cc_library( ":envoy_quic_server_session_lib", ":quic_stat_names_lib", "//envoy/network:listener_interface", - "@com_github_google_quiche//:quic_core_server_lib", - "@com_github_google_quiche//:quic_core_utils_lib", + "@quiche//:quic_core_server_lib", + "@quiche//:quic_core_utils_lib", ]), ) @@ -502,10 +502,10 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/common/quic:quic_io_handle_wrapper_lib", "//source/common/runtime:runtime_lib", - "@com_github_google_quiche//:quic_core_config_lib", - "@com_github_google_quiche//:quic_core_http_header_list_lib", - "@com_github_google_quiche//:quic_platform", - "@com_github_google_quiche//:quic_core_http_client_lib", + "@quiche//:quic_core_config_lib", + "@quiche//:quic_core_http_header_list_lib", + "@quiche//:quic_platform", + "@quiche//:quic_core_http_client_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", ]), @@ -531,7 +531,7 @@ envoy_cc_library( "//source/common/quic:cert_compression_lib", "//source/common/tls:client_ssl_socket_lib", "//source/common/tls:context_config_lib", - "@com_github_google_quiche//:quic_core_crypto_crypto_handshake_lib", + "@quiche//:quic_core_crypto_crypto_handshake_lib", "@envoy_api//envoy/extensions/transport_sockets/quic/v3:pkg_cc_proto", ]), alwayslink = LEGACY_ALWAYSLINK, @@ -556,7 +556,7 @@ envoy_cc_library( "//source/common/tls:server_context_config_lib", "//source/common/tls:server_context_lib", "//source/common/tls:server_ssl_socket_lib", - "@com_github_google_quiche//:quic_core_crypto_crypto_handshake_lib", + "@quiche//:quic_core_crypto_crypto_handshake_lib", "@envoy_api//envoy/extensions/transport_sockets/quic/v3:pkg_cc_proto", ]), alwayslink = LEGACY_ALWAYSLINK, @@ -603,8 +603,8 @@ envoy_cc_library( hdrs = envoy_select_enable_http3(["envoy_quic_packet_writer.h"]), deps = envoy_select_enable_http3([ ":envoy_quic_utils_lib", - "@com_github_google_quiche//:quic_core_packet_writer_lib", - "@com_github_google_quiche//:quic_platform", + "@quiche//:quic_core_packet_writer_lib", + "@quiche//:quic_platform", ]), ) @@ -621,9 +621,9 @@ envoy_cc_library( "//source/common/network:io_socket_error_lib", "//source/common/protobuf:utility_lib", "//source/common/runtime:runtime_lib", - "@com_github_google_quiche//:quic_platform", + "@quiche//:quic_platform", ]) + select({ - "//bazel:http3_enabled_and_linux": ["@com_github_google_quiche//:quic_core_batch_writer_gso_batch_writer_lib"], + "//bazel:http3_enabled_and_linux": ["@quiche//:quic_core_batch_writer_gso_batch_writer_lib"], "//conditions:default": [], }), ) @@ -634,7 +634,7 @@ envoy_cc_library( hdrs = envoy_select_enable_http3(["send_buffer_monitor.h"]), deps = envoy_select_enable_http3([ "//source/common/common:assert_lib", - "@com_github_google_quiche//:quic_core_session_lib", + "@quiche//:quic_core_session_lib", ]), ) @@ -645,8 +645,8 @@ envoy_cc_library( "//envoy/common:optref_lib", "//envoy/config:typed_config_interface", "//envoy/network:transport_socket_interface", - "@com_github_google_quiche//:quic_client_session_lib", - "@com_github_google_quiche//:quic_core_http_spdy_session_lib", + "@quiche//:quic_client_session_lib", + "@quiche//:quic_core_http_spdy_session_lib", ]), ) @@ -655,8 +655,8 @@ envoy_cc_library( hdrs = envoy_select_enable_http3(["envoy_quic_server_crypto_stream_factory.h"]), deps = envoy_select_enable_http3([ "//envoy/config:typed_config_interface", - "@com_github_google_quiche//:quic_core_http_spdy_session_lib", - "@com_github_google_quiche//:quic_server_session_lib", + "@quiche//:quic_core_http_spdy_session_lib", + "@quiche//:quic_server_session_lib", ]), ) @@ -665,7 +665,7 @@ envoy_cc_library( hdrs = envoy_select_enable_http3(["envoy_quic_proof_source_factory_interface.h"]), deps = envoy_select_enable_http3([ "//envoy/config:typed_config_interface", - "@com_github_google_quiche//:quic_core_crypto_proof_source_lib", + "@quiche//:quic_core_crypto_proof_source_lib", ]), ) @@ -674,8 +674,8 @@ envoy_cc_library( hdrs = envoy_select_enable_http3(["envoy_quic_connection_id_generator_factory.h"]), deps = envoy_select_enable_http3([ "//envoy/config:typed_config_interface", - "@com_github_google_quiche//:quic_core_connection_id_generator_interface_lib", - "@com_github_google_quiche//:quic_load_balancer_encoder_lib", + "@quiche//:quic_core_connection_id_generator_interface_lib", + "@quiche//:quic_load_balancer_encoder_lib", ]), ) @@ -686,7 +686,7 @@ envoy_cc_library( deps = envoy_select_enable_http3([ ":envoy_quic_connection_id_generator_factory_interface", ":envoy_quic_utils_lib", - "@com_github_google_quiche//:quic_core_deterministic_connection_id_generator_lib", + "@quiche//:quic_core_deterministic_connection_id_generator_lib", ]), ) @@ -697,7 +697,7 @@ envoy_cc_library( "//envoy/config:typed_config_interface", "//envoy/network:address_interface", "//envoy/server:factory_context_interface", - "@com_github_google_quiche//:quic_platform_socket_address", + "@quiche//:quic_platform_socket_address", ]), ) @@ -711,7 +711,7 @@ envoy_cc_library( "//envoy/http:codec_interface", "//source/common/formatter:substitution_formatter_lib", "//source/common/http:header_map_lib", - "@com_github_google_quiche//:quic_core_ack_listener_interface_lib", + "@quiche//:quic_core_ack_listener_interface_lib", ]), ) @@ -724,8 +724,8 @@ envoy_cc_library( "//source/common/buffer:buffer_lib", "//source/common/common:logger_lib", "//source/common/http:header_map_lib", - "@com_github_google_quiche//:quic_core_http_spdy_session_lib", - "@com_github_google_quiche//:quic_core_types_lib", + "@quiche//:quic_core_http_spdy_session_lib", + "@quiche//:quic_core_types_lib", ]), ) diff --git a/source/common/quic/platform/BUILD b/source/common/quic/platform/BUILD index a1d12b8b1b5ca..2318c1e044aea 100644 --- a/source/common/quic/platform/BUILD +++ b/source/common/quic/platform/BUILD @@ -17,7 +17,7 @@ envoy_package() # used in 2 different ways: # # Most of them are not to be consumed or referenced directly by other Envoy code. -# Their only consumers should be build rules under @com_github_google_quiche//..., +# Their only consumers should be build rules under @quiche//..., # and tests. In a monorepo, this would be enforced via visibility attribute, but # Bazel does not support limiting visibility to specific external dependencies. # @@ -29,8 +29,8 @@ envoy_package() # These implementations are tested through their APIs with tests mostly brought in from # QUICHE, thus new unit tests for them are deliberately omitted in Envoy tree. These -# tests are added to @com_github_google_quiche//:quic_platform_api_test. And all tests -# under @com_github_google_quiche// are configured in test/coverage/gen_build.sh to run in +# tests are added to @quiche//:quic_platform_api_test. And all tests +# under @quiche// are configured in test/coverage/gen_build.sh to run in # CI. # For some APIs which are not covered in QUICHE tests, their tests is added into # //test/common/quic/platform/. @@ -42,7 +42,7 @@ envoy_cc_library( hdrs = ["quiche_flags_constants.h"], deps = [ "//source/common/http:http_option_limits_lib", - "@com_google_absl//absl/base", + "@abseil-cpp//absl/base", ], ) @@ -53,11 +53,11 @@ envoy_quiche_platform_impl_cc_library( deps = [ ":quiche_flags_constants", "//source/common/common:assert_lib", - "@com_github_google_quiche//:quiche_feature_flags_list_lib", - "@com_github_google_quiche//:quiche_protocol_flags_list_lib", - "@com_google_absl//absl/base", - "@com_google_absl//absl/flags:flag", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/flags:flag", + "@abseil-cpp//absl/synchronization", + "@quiche//:quiche_feature_flags_list_lib", + "@quiche//:quiche_protocol_flags_list_lib", ], ) @@ -66,9 +66,9 @@ envoy_quiche_platform_impl_cc_library( srcs = ["quiche_time_utils_impl.cc"], hdrs = ["quiche_time_utils_impl.h"], deps = [ - "@com_google_absl//absl/base", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/time", + "@abseil-cpp//absl/types:optional", ], ) @@ -93,14 +93,14 @@ envoy_quiche_platform_impl_cc_library( deps = [ ":quiche_flags_impl_lib", "//source/common/common:assert_lib", - "@com_github_google_quiche//:quic_platform_export", - "@com_google_absl//absl/base", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:inlined_vector", - "@com_google_absl//absl/container:node_hash_map", - "@com_google_absl//absl/container:node_hash_set", - "@com_google_absl//absl/hash", - "@com_google_absl//absl/memory", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/container:inlined_vector", + "@abseil-cpp//absl/container:node_hash_map", + "@abseil-cpp//absl/container:node_hash_set", + "@abseil-cpp//absl/hash", + "@abseil-cpp//absl/memory", + "@quiche//:quic_platform_export", ], ) @@ -121,7 +121,7 @@ envoy_quiche_platform_impl_cc_library( ], deps = [ "//source/server:backtrace_lib", - "@com_github_google_quiche//:quiche_common_platform_export", + "@quiche//:quiche_common_platform_export", ], ) @@ -137,10 +137,10 @@ envoy_quiche_platform_impl_cc_library( ":quiche_flags_impl_lib", ":quiche_logging_impl_lib", "//source/common/buffer:buffer_lib", - "@com_github_google_quiche//:quiche_common_buffer_allocator_lib", - "@com_github_google_quiche//:quiche_common_callbacks", - "@com_google_absl//absl/container:node_hash_map", - "@com_google_absl//absl/hash", + "@abseil-cpp//absl/container:node_hash_map", + "@abseil-cpp//absl/hash", + "@quiche//:quiche_common_buffer_allocator_lib", + "@quiche//:quiche_common_callbacks", ], ) @@ -153,5 +153,5 @@ envoy_quiche_platform_impl_cc_library( envoy_quiche_platform_impl_cc_library( name = "quiche_export_impl_lib", hdrs = ["quiche_export_impl.h"], - deps = ["@com_google_absl//absl/base"], + deps = ["@abseil-cpp//absl/base"], ) diff --git a/source/common/quic/platform/mobile_impl/BUILD b/source/common/quic/platform/mobile_impl/BUILD index 83fabaadf36d8..7ae741a9ab85f 100644 --- a/source/common/quic/platform/mobile_impl/BUILD +++ b/source/common/quic/platform/mobile_impl/BUILD @@ -17,6 +17,6 @@ envoy_quiche_platform_impl_cc_library( "quiche_bug_tracker_impl.h", ], deps = [ - "@com_github_google_quiche//:quiche_common_platform_logging", + "@quiche//:quiche_common_platform_logging", ], ) diff --git a/source/common/router/BUILD b/source/common/router/BUILD index 56389977ca3cd..5a8e7043c7d8b 100644 --- a/source/common/router/BUILD +++ b/source/common/router/BUILD @@ -81,7 +81,7 @@ envoy_cc_library( "//source/extensions/early_data:default_early_data_policy_lib", "//source/extensions/path/match/uri_template:config", "//source/extensions/path/rewrite/uri_template:config", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/common/matcher/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", @@ -113,8 +113,8 @@ envoy_cc_library( "//envoy/server:factory_context_interface", "//envoy/server:filter_config_interface", "//source/common/config:utility_lib", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status:statusor", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/status:statusor", ], ) @@ -289,7 +289,7 @@ envoy_cc_library( "//envoy/router:scopes_interface", "//envoy/thread_local:thread_local_interface", "//source/common/protobuf:utility_lib", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/strings:str_format", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", ], @@ -346,7 +346,7 @@ envoy_cc_library( "//source/common/http:header_utility_lib", "//source/common/http:headers_lib", "//source/common/http:utility_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", ], ) @@ -574,7 +574,7 @@ envoy_cc_library( "//envoy/server:factory_context_interface", "//source/common/config:utility_lib", "//source/common/upstream:retry_factory_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", ], ) diff --git a/source/common/runtime/BUILD b/source/common/runtime/BUILD index 7cc617d4cce80..88eb3e17c32c4 100644 --- a/source/common/runtime/BUILD +++ b/source/common/runtime/BUILD @@ -18,7 +18,7 @@ envoy_cc_library( "runtime_keys.h", ], deps = [ - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -46,8 +46,8 @@ envoy_cc_library( # AVOID ADDING TO THESE DEPENDENCIES IF POSSIBLE # Any code using runtime guards depends on this library, and the more dependencies there are, # the harder it is to runtime-guard without dependency loops. - "@com_google_absl//absl/flags:commandlineflag", - "@com_google_absl//absl/flags:flag", + "@abseil-cpp//absl/flags:commandlineflag", + "@abseil-cpp//absl/flags:flag", "//envoy/http:codec_runtime_overrides", "//envoy/runtime:runtime_interface", "//source/common/singleton:const_singleton", @@ -107,6 +107,6 @@ envoy_cc_library( "@envoy_api//envoy/type/v3:pkg_cc_proto", ] + envoy_select_enable_http3([ "//source/common/quic/platform:quiche_flags_impl_lib", - "@com_github_google_quiche//:quic_platform_base", + "@quiche//:quic_platform_base", ]), ) diff --git a/source/common/singleton/BUILD b/source/common/singleton/BUILD index 1580ec85b278d..9aaeaa4017f9c 100644 --- a/source/common/singleton/BUILD +++ b/source/common/singleton/BUILD @@ -31,6 +31,6 @@ envoy_cc_library( hdrs = ["threadsafe_singleton.h"], deps = [ "//source/common/common:assert_lib", - "@com_google_absl//absl/base", + "@abseil-cpp//absl/base", ], ) diff --git a/source/common/ssl/BUILD b/source/common/ssl/BUILD index 9a903309ba608..aab18b5b1b699 100644 --- a/source/common/ssl/BUILD +++ b/source/common/ssl/BUILD @@ -31,7 +31,7 @@ envoy_cc_library( "//envoy/ssl:certificate_validation_context_config_interface", "//source/common/common:empty_string", "//source/common/config:datasource_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", "@envoy_api//envoy/type/matcher/v3:pkg_cc_proto", diff --git a/source/common/stats/BUILD b/source/common/stats/BUILD index 124748d623fdc..b49842aaf5f29 100644 --- a/source/common/stats/BUILD +++ b/source/common/stats/BUILD @@ -46,7 +46,7 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/common:macros", "//source/common/common:thread_lib", - "@com_google_absl//absl/container:flat_hash_set", + "@abseil-cpp//absl/container:flat_hash_set", ], ) @@ -199,8 +199,8 @@ envoy_cc_library( "//source/common/common:minimal_logger_lib", "//source/common/common:thread_lib", "//source/common/common:utility_lib", - "@com_google_absl//absl/base", - "@com_google_absl//absl/container:inlined_vector", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/container:inlined_vector", ], ) @@ -228,7 +228,7 @@ envoy_cc_library( "//source/common/common:perf_annotation_lib", "//source/common/config:well_known_names", "//source/common/protobuf", - "@com_google_absl//absl/container:node_hash_set", + "@abseil-cpp//absl/container:node_hash_set", "@envoy_api//envoy/config/metrics/v3:pkg_cc_proto", ], ) diff --git a/source/common/stream_info/BUILD b/source/common/stream_info/BUILD index cabef2991a3f8..b64e144f0b7c6 100644 --- a/source/common/stream_info/BUILD +++ b/source/common/stream_info/BUILD @@ -45,8 +45,8 @@ envoy_cc_library( "//source/common/http:default_server_string_lib", "//source/common/network:cidr_range_lib", "//source/common/runtime:runtime_features_lib", - "@com_google_absl//absl/container:node_hash_map", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/container:node_hash_map", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", ], ) diff --git a/source/common/tcp/BUILD b/source/common/tcp/BUILD index 9d944f895c668..d7898fc655bc6 100644 --- a/source/common/tcp/BUILD +++ b/source/common/tcp/BUILD @@ -32,7 +32,7 @@ envoy_cc_library( "//source/common/network:utility_lib", "//source/common/stats:timespan_lib", "//source/common/upstream:upstream_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/source/common/tls/BUILD b/source/common/tls/BUILD index b4981836f9e9f..ab0bc8302498b 100644 --- a/source/common/tls/BUILD +++ b/source/common/tls/BUILD @@ -86,10 +86,10 @@ envoy_cc_library( "//source/common/common:thread_annotations", "//source/common/http:headers_lib", "//source/common/network:transport_socket_options_lib", - "@com_google_absl//absl/container:node_hash_set", - "@com_google_absl//absl/hash", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/container:node_hash_set", + "@abseil-cpp//absl/hash", + "@abseil-cpp//absl/synchronization", + "@abseil-cpp//absl/types:optional", ], ) @@ -100,10 +100,10 @@ envoy_cc_library( external_deps = ["ssl"], deps = [ ":ssl_socket_base", - "@com_google_absl//absl/container:node_hash_set", - "@com_google_absl//absl/hash", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/container:node_hash_set", + "@abseil-cpp//absl/hash", + "@abseil-cpp//absl/synchronization", + "@abseil-cpp//absl/types:optional", ], ) @@ -114,10 +114,10 @@ envoy_cc_library( external_deps = ["ssl"], deps = [ ":ssl_socket_base", - "@com_google_absl//absl/container:node_hash_set", - "@com_google_absl//absl/hash", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/container:node_hash_set", + "@abseil-cpp//absl/hash", + "@abseil-cpp//absl/synchronization", + "@abseil-cpp//absl/types:optional", ], ) @@ -203,11 +203,11 @@ envoy_cc_library( "//source/common/stats:utility_lib", "//source/common/tls/cert_validator:cert_validator_lib", "//source/common/tls/private_key:private_key_manager_lib", - "@com_github_google_quiche//:quic_core_crypto_proof_source_lib", - "@com_google_absl//absl/container:node_hash_set", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/container:node_hash_set", + "@abseil-cpp//absl/synchronization", "@envoy_api//envoy/admin/v3:pkg_cc_proto", "@envoy_api//envoy/type/matcher/v3:pkg_cc_proto", + "@quiche//:quic_core_crypto_proof_source_lib", ], ) diff --git a/source/common/tls/cert_validator/BUILD b/source/common/tls/cert_validator/BUILD index 63fbe3df359e6..c076976b7224a 100644 --- a/source/common/tls/cert_validator/BUILD +++ b/source/common/tls/cert_validator/BUILD @@ -40,8 +40,8 @@ envoy_cc_library( "//source/common/stats:utility_lib", "//source/common/tls:stats_lib", "//source/common/tls:utility_lib", - "@com_google_absl//absl/base", - "@com_google_absl//absl/hash", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/hash", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", "@envoy_api//envoy/type/matcher/v3:pkg_cc_proto", diff --git a/source/common/upstream/BUILD b/source/common/upstream/BUILD index 9112c6ff5a686..6e9d5bc74db0c 100644 --- a/source/common/upstream/BUILD +++ b/source/common/upstream/BUILD @@ -499,7 +499,7 @@ envoy_cc_library( "//source/extensions/upstreams/http:config", "//source/extensions/upstreams/tcp:config", "//source/server:transport_socket_config_lib", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/synchronization", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", @@ -589,7 +589,7 @@ envoy_cc_library( ], deps = [ "//envoy/upstream:upstream_interface", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) @@ -608,7 +608,7 @@ envoy_cc_library( "//envoy/registry", "//envoy/upstream:upstream_interface", "//source/common/network:resolver_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/upstream/local_address_selector/v3:pkg_cc_proto", ], # Ensure this factory in the source is always linked in. diff --git a/source/exe/BUILD b/source/exe/BUILD index 22241ddd0bf4d..16a51c89b39b1 100644 --- a/source/exe/BUILD +++ b/source/exe/BUILD @@ -66,7 +66,7 @@ envoy_cc_library( ":platform_impl_lib", ":scm_impl_lib", "//source/server:options_lib", - "@com_google_absl//absl/debugging:symbolize", + "@abseil-cpp//absl/debugging:symbolize", ], ) diff --git a/source/extensions/access_loggers/common/BUILD b/source/extensions/access_loggers/common/BUILD index 6325b55114315..77406c988da8d 100644 --- a/source/extensions/access_loggers/common/BUILD +++ b/source/extensions/access_loggers/common/BUILD @@ -68,7 +68,7 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/grpc:typed_async_client_lib", "//source/common/protobuf:utility_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -87,7 +87,7 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/grpc:typed_async_client_lib", "//source/common/protobuf:utility_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/access_loggers/filters/cel/BUILD b/source/extensions/access_loggers/filters/cel/BUILD index 6dc970abdcc31..dc52bfce07add 100644 --- a/source/extensions/access_loggers/filters/cel/BUILD +++ b/source/extensions/access_loggers/filters/cel/BUILD @@ -54,7 +54,7 @@ envoy_cc_extension( { "//bazel:windows_x86_64": [], "//conditions:default": [ - "@com_google_cel_cpp//parser", + "@cel-cpp//parser", ], }, ), diff --git a/source/extensions/access_loggers/open_telemetry/BUILD b/source/extensions/access_loggers/open_telemetry/BUILD index 53d5c11996c27..50609986d3cc8 100644 --- a/source/extensions/access_loggers/open_telemetry/BUILD +++ b/source/extensions/access_loggers/open_telemetry/BUILD @@ -28,12 +28,12 @@ envoy_cc_library( "//source/common/tracing:http_tracer_lib", "//source/common/tracing:trace_context_lib", "//source/common/version:version_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", "@envoy_api//envoy/data/accesslog/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/access_loggers/open_telemetry/v3:pkg_cc_proto", - "@opentelemetry_proto//:common_proto_cc", - "@opentelemetry_proto//:logs_proto_cc", - "@opentelemetry_proto//:logs_service_proto_cc", + "@opentelemetry-proto//:common_proto_cc", + "@opentelemetry-proto//:logs_proto_cc", + "@opentelemetry-proto//:logs_service_proto_cc", ], ) @@ -55,8 +55,8 @@ envoy_cc_library( "//source/extensions/tracers/opentelemetry/resource_detectors:resource_detector_lib", "@envoy_api//envoy/extensions/access_loggers/grpc/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/access_loggers/open_telemetry/v3:pkg_cc_proto", - "@opentelemetry_proto//:logs_proto_cc", - "@opentelemetry_proto//:logs_service_proto_cc", + "@opentelemetry-proto//:logs_proto_cc", + "@opentelemetry-proto//:logs_service_proto_cc", ], ) @@ -78,8 +78,8 @@ envoy_cc_library( "@envoy_api//envoy/data/accesslog/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/access_loggers/grpc/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/access_loggers/open_telemetry/v3:pkg_cc_proto", - "@opentelemetry_proto//:logs_proto_cc", - "@opentelemetry_proto//:logs_service_proto_cc", + "@opentelemetry-proto//:logs_proto_cc", + "@opentelemetry-proto//:logs_service_proto_cc", ], ) @@ -110,8 +110,8 @@ envoy_cc_library( "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/data/accesslog/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/access_loggers/open_telemetry/v3:pkg_cc_proto", - "@opentelemetry_proto//:logs_proto_cc", - "@opentelemetry_proto//:logs_service_proto_cc", + "@opentelemetry-proto//:logs_proto_cc", + "@opentelemetry-proto//:logs_service_proto_cc", ], ) @@ -151,7 +151,7 @@ envoy_cc_library( "//envoy/stream_info:stream_info_interface", "//source/common/common:assert_lib", "//source/common/formatter:substitution_formatter_lib", - "@com_google_absl//absl/strings:str_format", - "@opentelemetry_proto//:common_proto_cc", + "@abseil-cpp//absl/strings:str_format", + "@opentelemetry-proto//:common_proto_cc", ], ) diff --git a/source/extensions/clusters/redis/BUILD b/source/extensions/clusters/redis/BUILD index 14e29e6349030..e0becf3ebee72 100644 --- a/source/extensions/clusters/redis/BUILD +++ b/source/extensions/clusters/redis/BUILD @@ -13,7 +13,7 @@ envoy_cc_library( name = "crc16_lib", srcs = ["crc16.cc"], hdrs = ["crc16.h"], - deps = ["@com_google_absl//absl/strings"], + deps = ["@abseil-cpp//absl/strings"], ) envoy_cc_library( diff --git a/source/extensions/common/async_files/BUILD b/source/extensions/common/async_files/BUILD index 0858edabe4339..a7b79824c7fce 100644 --- a/source/extensions/common/async_files/BUILD +++ b/source/extensions/common/async_files/BUILD @@ -24,8 +24,8 @@ envoy_cc_library( "//envoy/event:dispatcher_interface", "//source/common/buffer:buffer_lib", "//source/common/common:utility_lib", - "@com_google_absl//absl/base", - "@com_google_absl//absl/status:statusor", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/status:statusor", ], ) @@ -44,8 +44,8 @@ envoy_cc_library( ":status_after_file_error", "//source/common/api:os_sys_calls_lib", "//source/common/buffer:buffer_lib", - "@com_google_absl//absl/base", - "@com_google_absl//absl/status:statusor", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/status:statusor", "@envoy_api//envoy/extensions/common/async_files/v3:pkg_cc_proto", ], ) @@ -63,8 +63,8 @@ envoy_cc_library( "//source/common/api:os_sys_calls_lib", "//source/common/buffer:buffer_lib", "//source/common/protobuf:utility_lib", - "@com_google_absl//absl/base", - "@com_google_absl//absl/status:statusor", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/status:statusor", "@envoy_api//envoy/extensions/common/async_files/v3:pkg_cc_proto", ], ) @@ -77,6 +77,6 @@ envoy_cc_library( "//envoy/api:os_sys_calls_interface", "//source/common/common:assert_lib", "//source/common/common:utility_lib", - "@com_google_absl//absl/status", + "@abseil-cpp//absl/status", ], ) diff --git a/source/extensions/common/aws/BUILD b/source/extensions/common/aws/BUILD index 788aa306a3b54..ef910284b06cc 100644 --- a/source/extensions/common/aws/BUILD +++ b/source/extensions/common/aws/BUILD @@ -79,7 +79,7 @@ envoy_cc_library( "//source/common/common:cleanup_lib", "//source/common/common:lock_guard_lib", "//source/common/common:thread_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) @@ -162,7 +162,7 @@ envoy_cc_library( "//source/common/http:utility_lib", "//source/common/json:json_loader_lib", "//source/common/singleton:const_singleton", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/upstreams/http/v3:pkg_cc_proto", ], @@ -173,7 +173,7 @@ envoy_cc_library( hdrs = ["region_provider.h"], deps = [ "//envoy/common:pure_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/source/extensions/common/dubbo/BUILD b/source/extensions/common/dubbo/BUILD index 5a5397adb99e4..90e169def7dda 100644 --- a/source/extensions/common/dubbo/BUILD +++ b/source/extensions/common/dubbo/BUILD @@ -39,7 +39,7 @@ envoy_cc_library( deps = [ ":message_lib", "//source/common/buffer:buffer_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/source/extensions/common/dynamic_forward_proxy/BUILD b/source/extensions/common/dynamic_forward_proxy/BUILD index 441cf93569876..eb1204fbcc410 100644 --- a/source/extensions/common/dynamic_forward_proxy/BUILD +++ b/source/extensions/common/dynamic_forward_proxy/BUILD @@ -77,6 +77,6 @@ envoy_cc_library( deps = [ "//envoy/server:factory_context_interface", "//envoy/upstream:upstream_interface", - "@com_google_absl//absl/container:flat_hash_set", + "@abseil-cpp//absl/container:flat_hash_set", ], ) diff --git a/source/extensions/common/wasm/BUILD b/source/extensions/common/wasm/BUILD index 00a7f667f289a..2c95e6d0524ba 100644 --- a/source/extensions/common/wasm/BUILD +++ b/source/extensions/common/wasm/BUILD @@ -46,7 +46,7 @@ envoy_cc_library( "//source/common/version:version_includes", "//source/extensions/filters/common/expr:cel_state_lib", "//source/extensions/filters/common/expr:evaluator_lib", - "@com_google_cel_cpp//eval/public:activation", + "@cel-cpp//eval/public:activation", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/wasm/v3:pkg_cc_proto", "@proxy_wasm_cpp_host//:headers", @@ -114,16 +114,16 @@ envoy_cc_extension( "//source/extensions/common/wasm/ext:sign_cc_proto", "//source/extensions/common/wasm/ext:verify_signature_cc_proto", "//source/extensions/filters/common/expr:context_lib", - "@com_google_absl//absl/base", - "@com_google_absl//absl/container:node_hash_map", - "@com_google_cel_cpp//eval/public:builtin_func_registrar", - "@com_google_cel_cpp//eval/public:cel_expr_builder_factory", - "@com_google_cel_cpp//eval/public:cel_value", - "@com_google_cel_cpp//eval/public:value_export_util", - "@com_google_cel_cpp//eval/public/containers:field_access", - "@com_google_cel_cpp//eval/public/containers:field_backed_list_impl", - "@com_google_cel_cpp//eval/public/containers:field_backed_map_impl", - "@com_google_cel_cpp//eval/public/structs:cel_proto_wrapper", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/container:node_hash_map", + "@cel-cpp//eval/public:builtin_func_registrar", + "@cel-cpp//eval/public:cel_expr_builder_factory", + "@cel-cpp//eval/public:cel_value", + "@cel-cpp//eval/public:value_export_util", + "@cel-cpp//eval/public/containers:field_access", + "@cel-cpp//eval/public/containers:field_backed_list_impl", + "@cel-cpp//eval/public/containers:field_backed_map_impl", + "@cel-cpp//eval/public/structs:cel_proto_wrapper", "@envoy_api//envoy/extensions/wasm/v3:pkg_cc_proto", "@proxy_wasm_cpp_host//:base_lib", "@proxy_wasm_cpp_host//:null_lib", @@ -131,7 +131,7 @@ envoy_cc_extension( { "//bazel:windows_x86_64": [], "//conditions:default": [ - "@com_google_cel_cpp//parser", + "@cel-cpp//parser", ], }, ), diff --git a/source/extensions/compression/brotli/compressor/BUILD b/source/extensions/compression/brotli/compressor/BUILD index 6eb824ae6dc04..38871a6c96778 100644 --- a/source/extensions/compression/brotli/compressor/BUILD +++ b/source/extensions/compression/brotli/compressor/BUILD @@ -17,7 +17,7 @@ envoy_cc_library( "//envoy/compression/compressor:compressor_interface", "//source/common/buffer:buffer_lib", "//source/extensions/compression/brotli/common:brotli_base_lib", - "@org_brotli//:brotlienc", + "@brotli//:brotlienc", ], ) diff --git a/source/extensions/compression/brotli/decompressor/BUILD b/source/extensions/compression/brotli/decompressor/BUILD index c5239f0df154f..3a5153756508f 100644 --- a/source/extensions/compression/brotli/decompressor/BUILD +++ b/source/extensions/compression/brotli/decompressor/BUILD @@ -20,7 +20,7 @@ envoy_cc_library( "//source/common/buffer:buffer_lib", "//source/common/runtime:runtime_features_lib", "//source/extensions/compression/brotli/common:brotli_base_lib", - "@org_brotli//:brotlidec", + "@brotli//:brotlidec", ], ) diff --git a/source/extensions/config_subscription/grpc/BUILD b/source/extensions/config_subscription/grpc/BUILD index 9114b4a5213f7..24d6961ef8dae 100644 --- a/source/extensions/config_subscription/grpc/BUILD +++ b/source/extensions/config_subscription/grpc/BUILD @@ -49,7 +49,7 @@ envoy_cc_extension( "//source/common/config:xds_resource_lib", "//source/common/memory:utils_lib", "//source/common/protobuf", - "@com_google_absl//absl/container:btree", + "@abseil-cpp//absl/container:btree", "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", ], diff --git a/source/extensions/dynamic_modules/sdk/cpp/BUILD b/source/extensions/dynamic_modules/sdk/cpp/BUILD index 5067826dd1b65..417c72a00be80 100644 --- a/source/extensions/dynamic_modules/sdk/cpp/BUILD +++ b/source/extensions/dynamic_modules/sdk/cpp/BUILD @@ -9,10 +9,10 @@ cc_library( hdrs = ["sdk.h"], visibility = ["//visibility:public"], deps = [ - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/strings:string_view", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:span", ], alwayslink = True, ) @@ -30,8 +30,8 @@ cc_library( deps = [ ":sdk", "//source/extensions/dynamic_modules/abi", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/synchronization", ], alwayslink = True, ) @@ -53,6 +53,6 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":sdk", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) diff --git a/source/extensions/filters/common/expr/BUILD b/source/extensions/filters/common/expr/BUILD index 2371cc021d4c3..011c9a3f5d4bc 100644 --- a/source/extensions/filters/common/expr/BUILD +++ b/source/extensions/filters/common/expr/BUILD @@ -19,13 +19,13 @@ envoy_cc_library( "//source/common/http:utility_lib", "//source/common/protobuf", "//source/common/runtime:runtime_features_lib", - "@com_google_cel_cpp//eval/public:activation", - "@com_google_cel_cpp//eval/public:builtin_func_registrar", - "@com_google_cel_cpp//eval/public:cel_expr_builder_factory", - "@com_google_cel_cpp//eval/public:cel_expression", - "@com_google_cel_cpp//eval/public:cel_value", - "@com_google_cel_cpp//extensions:regex_functions", - "@com_google_cel_cpp//extensions:strings", + "@cel-cpp//eval/public:activation", + "@cel-cpp//eval/public:builtin_func_registrar", + "@cel-cpp//eval/public:cel_expr_builder_factory", + "@cel-cpp//eval/public:cel_expression", + "@cel-cpp//eval/public:cel_value", + "@cel-cpp//extensions:regex_functions", + "@cel-cpp//extensions:strings", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@xds//xds/type/v3:pkg_cc_proto", ], @@ -43,10 +43,10 @@ envoy_cc_library( "//source/common/http:utility_lib", "//source/common/singleton:const_singleton", "//source/common/stream_info:utility_lib", - "@com_google_cel_cpp//eval/public:cel_value", - "@com_google_cel_cpp//eval/public:cel_value_producer", - "@com_google_cel_cpp//eval/public/containers:container_backed_list_impl", - "@com_google_cel_cpp//eval/public/structs:cel_proto_wrapper", + "@cel-cpp//eval/public:cel_value", + "@cel-cpp//eval/public:cel_value_producer", + "@cel-cpp//eval/public/containers:container_backed_list_impl", + "@cel-cpp//eval/public/structs:cel_proto_wrapper", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -64,9 +64,9 @@ envoy_cc_library( "//envoy/stream_info:filter_state_interface", "//source/common/protobuf", "//source/common/singleton:const_singleton", - "@com_github_google_flatbuffers//:flatbuffers", - "@com_google_cel_cpp//eval/public:cel_value", - "@com_google_cel_cpp//eval/public/structs:cel_proto_wrapper", - "@com_google_cel_cpp//tools:flatbuffers_backed_impl", + "@cel-cpp//eval/public:cel_value", + "@cel-cpp//eval/public/structs:cel_proto_wrapper", + "@cel-cpp//tools:flatbuffers_backed_impl", + "@flatbuffers", ], ) diff --git a/source/extensions/filters/common/lua/BUILD b/source/extensions/filters/common/lua/BUILD index f248bb0996f94..9b4cae8785b3a 100644 --- a/source/extensions/filters/common/lua/BUILD +++ b/source/extensions/filters/common/lua/BUILD @@ -45,6 +45,6 @@ envoy_cc_library( "//source/common/protobuf", "//source/common/protobuf:create_reflectable_message_lib", "//source/common/protobuf:utility_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) diff --git a/source/extensions/filters/common/mutation_rules/BUILD b/source/extensions/filters/common/mutation_rules/BUILD index 7f9f59bdf10c3..07a2d2b3f4468 100644 --- a/source/extensions/filters/common/mutation_rules/BUILD +++ b/source/extensions/filters/common/mutation_rules/BUILD @@ -18,8 +18,8 @@ envoy_cc_library( "//source/common/common:regex_lib", "//source/common/http:header_utility_lib", "//source/common/http:headers_lib", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/strings", "@envoy_api//envoy/config/common/mutation_rules/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/common/ratelimit/BUILD b/source/extensions/filters/common/ratelimit/BUILD index d69ea98a71a41..f34a9897e8bf5 100644 --- a/source/extensions/filters/common/ratelimit/BUILD +++ b/source/extensions/filters/common/ratelimit/BUILD @@ -38,7 +38,7 @@ envoy_cc_library( "//envoy/singleton:manager_interface", "//envoy/tracing:tracer_interface", "//source/common/stats:symbol_table_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/service/ratelimit/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/common/ratelimit_config/BUILD b/source/extensions/filters/common/ratelimit_config/BUILD index 8b91fd87c889f..858a56404d576 100644 --- a/source/extensions/filters/common/ratelimit_config/BUILD +++ b/source/extensions/filters/common/ratelimit_config/BUILD @@ -18,8 +18,8 @@ envoy_cc_library( "//source/common/formatter:substitution_formatter_lib", "//source/common/router:router_ratelimit_lib", "//source/common/runtime:runtime_features_lib", - "@com_google_absl//absl/container:inlined_vector", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:inlined_vector", + "@abseil-cpp//absl/strings", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/common/ratelimit/v3:pkg_cc_proto", ], diff --git a/source/extensions/filters/common/rbac/BUILD b/source/extensions/filters/common/rbac/BUILD index 1c3e87c8a770e..77df847c38260 100644 --- a/source/extensions/filters/common/rbac/BUILD +++ b/source/extensions/filters/common/rbac/BUILD @@ -52,7 +52,7 @@ envoy_cc_library( "//source/common/network:lc_trie_lib", "//source/extensions/filters/common/expr:evaluator_lib", "//source/extensions/path/match/uri_template:uri_template_match_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/rbac/v3:pkg_cc_proto", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", diff --git a/source/extensions/filters/http/alternate_protocols_cache/BUILD b/source/extensions/filters/http/alternate_protocols_cache/BUILD index 70c43a38263f5..4eb415885a8fc 100644 --- a/source/extensions/filters/http/alternate_protocols_cache/BUILD +++ b/source/extensions/filters/http/alternate_protocols_cache/BUILD @@ -18,10 +18,10 @@ envoy_cc_library( "//source/common/http:headers_lib", "//source/common/http:http_server_properties_cache", "//source/extensions/filters/http/common:pass_through_filter_lib", - "@com_github_google_quiche//:http2_core_alt_svc_wire_format_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/http/alternate_protocols_cache/v3:pkg_cc_proto", + "@quiche//:http2_core_alt_svc_wire_format_lib", ], ) diff --git a/source/extensions/filters/http/cache/BUILD b/source/extensions/filters/http/cache/BUILD index c8bb391d51cc0..af2af459dcdcb 100644 --- a/source/extensions/filters/http/cache/BUILD +++ b/source/extensions/filters/http/cache/BUILD @@ -126,7 +126,7 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/common:logger_lib", "//source/common/http:headers_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/extensions/filters/http/cache/v3:pkg_cc_proto", ], ) @@ -144,8 +144,8 @@ envoy_cc_library( "//source/common/http:header_utility_lib", "//source/common/http:headers_lib", "//source/common/protobuf", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/extensions/filters/http/cache/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/cache_v2/BUILD b/source/extensions/filters/http/cache_v2/BUILD index 9752f5b164a23..fa57f37475071 100644 --- a/source/extensions/filters/http/cache_v2/BUILD +++ b/source/extensions/filters/http/cache_v2/BUILD @@ -19,7 +19,7 @@ envoy_cc_library( ":range_utils_lib", "//envoy/buffer:buffer_interface", "//envoy/http:header_map_interface", - "@com_google_absl//absl/functional:any_invocable", + "@abseil-cpp//absl/functional:any_invocable", ], ) @@ -37,7 +37,7 @@ envoy_cc_library( "//source/common/buffer:watermark_buffer_lib", "//source/common/common:cancel_wrapper_lib", "//source/common/common:logger_lib", - "@com_google_absl//absl/types:variant", + "@abseil-cpp//absl/types:variant", ], ) @@ -188,7 +188,7 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/common:logger_lib", "//source/common/http:headers_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/extensions/filters/http/cache_v2/v3:pkg_cc_proto", ], ) @@ -207,8 +207,8 @@ envoy_cc_library( "//source/common/http:header_utility_lib", "//source/common/http:headers_lib", "//source/common/protobuf", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/extensions/filters/http/cache_v2/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/cors/BUILD b/source/extensions/filters/http/cors/BUILD index 4790eb885cf04..a2952ad422e15 100644 --- a/source/extensions/filters/http/cors/BUILD +++ b/source/extensions/filters/http/cors/BUILD @@ -26,7 +26,7 @@ envoy_cc_library( "//source/common/http:headers_lib", "//source/common/http:utility_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", - "@com_google_absl//absl/container:inlined_vector", + "@abseil-cpp//absl/container:inlined_vector", ], ) diff --git a/source/extensions/filters/http/ext_proc/BUILD b/source/extensions/filters/http/ext_proc/BUILD index fe65cbfd3252e..a7e41ec4e7a11 100644 --- a/source/extensions/filters/http/ext_proc/BUILD +++ b/source/extensions/filters/http/ext_proc/BUILD @@ -40,9 +40,9 @@ envoy_cc_library( "//source/extensions/filters/common/mutation_rules:mutation_rules_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", "//source/extensions/filters/http/ext_proc/http_client:http_client_lib", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/strings:string_view", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/strings:string_view", "@envoy_api//envoy/config/common/mutation_rules/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/http/ext_proc/v3:pkg_cc_proto", @@ -55,7 +55,7 @@ envoy_cc_library( hdrs = ["allowed_override_modes_set.h"], tags = ["skip_on_windows"], deps = [ - "@com_google_absl//absl/container:flat_hash_set", + "@abseil-cpp//absl/container:flat_hash_set", "@envoy_api//envoy/extensions/filters/http/ext_proc/v3:pkg_cc_proto", ], ) @@ -100,7 +100,7 @@ envoy_cc_library( "//source/common/http:header_utility_lib", "//source/common/protobuf:utility_lib", "//source/extensions/filters/common/mutation_rules:mutation_rules_lib", - "@com_google_absl//absl/status", + "@abseil-cpp//absl/status", "@envoy_api//envoy/service/ext_proc/v3:pkg_cc_proto", ], ) @@ -120,12 +120,12 @@ envoy_cc_library( "//envoy/http:header_map_interface", "//source/common/protobuf", "//source/extensions/filters/common/expr:evaluator_lib", - "@com_google_cel_cpp//eval/public:cel_expr_builder_factory", + "@cel-cpp//eval/public:cel_expr_builder_factory", ] + select( { "//bazel:windows_x86_64": [], "//conditions:default": [ - "@com_google_cel_cpp//parser", + "@cel-cpp//parser", ], }, ), diff --git a/source/extensions/filters/http/gcp_authn/BUILD b/source/extensions/filters/http/gcp_authn/BUILD index c06ee1eb8686d..18aca1f7e04cd 100644 --- a/source/extensions/filters/http/gcp_authn/BUILD +++ b/source/extensions/filters/http/gcp_authn/BUILD @@ -37,7 +37,7 @@ envoy_cc_library( "//source/common/http:utility_lib", "//source/extensions/filters/http/common:factory_base_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/extensions/filters/http/gcp_authn/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/grpc_field_extraction/BUILD b/source/extensions/filters/http/grpc_field_extraction/BUILD index 275f123b2e323..be696fbb5402b 100644 --- a/source/extensions/filters/http/grpc_field_extraction/BUILD +++ b/source/extensions/filters/http/grpc_field_extraction/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( hdrs = ["extractor.h"], external_deps = ["grpc_transcoding"], deps = [ - "@com_google_absl//absl/status", + "@abseil-cpp//absl/status", "@envoy_api//envoy/extensions/filters/http/grpc_field_extraction/v3:pkg_cc_proto", "@proto-field-extraction//:all_libs", ], @@ -29,7 +29,7 @@ envoy_cc_library( "extractor", "//envoy/common:exception_lib", "//source/common/common:minimal_logger_lib", - "@com_google_absl//absl/status", + "@abseil-cpp//absl/status", "@envoy_api//envoy/extensions/filters/http/grpc_field_extraction/v3:pkg_cc_proto", "@proto-field-extraction//:all_libs", ], diff --git a/source/extensions/filters/http/grpc_json_reverse_transcoder/BUILD b/source/extensions/filters/http/grpc_json_reverse_transcoder/BUILD index bdbf9ef914246..e36f26756a0d2 100644 --- a/source/extensions/filters/http/grpc_json_reverse_transcoder/BUILD +++ b/source/extensions/filters/http/grpc_json_reverse_transcoder/BUILD @@ -18,7 +18,7 @@ envoy_cc_library( deps = [ "//envoy/buffer:buffer_interface", "//source/common/http:utility_lib", - "@com_github_nlohmann_json//:json", + "@nlohmann_json//:json", ], ) @@ -62,8 +62,8 @@ envoy_cc_library( "//source/common/http:utility_lib", "//source/common/protobuf:utility_lib", "//source/common/singleton:const_singleton", - "@com_github_nlohmann_json//:json", "@com_google_googleapis//google/api:http_cc_proto", + "@nlohmann_json//:json", ], ) diff --git a/source/extensions/filters/http/jwt_authn/BUILD b/source/extensions/filters/http/jwt_authn/BUILD index bebc573f0f610..77fb16012ea76 100644 --- a/source/extensions/filters/http/jwt_authn/BUILD +++ b/source/extensions/filters/http/jwt_authn/BUILD @@ -17,7 +17,7 @@ envoy_cc_library( "//envoy/runtime:runtime_interface", "//source/common/http:header_utility_lib", "//source/common/http:utility_lib", - "@com_google_absl//absl/container:btree", + "@abseil-cpp//absl/container:btree", "@envoy_api//envoy/extensions/filters/http/jwt_authn/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/mcp_router/BUILD b/source/extensions/filters/http/mcp_router/BUILD index 2442c15e594b9..fc50063b05803 100644 --- a/source/extensions/filters/http/mcp_router/BUILD +++ b/source/extensions/filters/http/mcp_router/BUILD @@ -15,10 +15,10 @@ envoy_cc_library( hdrs = ["session_codec.h"], deps = [ "//source/common/common:base64_lib", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", ], ) @@ -29,7 +29,7 @@ envoy_cc_library( deps = [ "//envoy/server:filter_config_interface", "//source/extensions/filters/common/mcp:filter_state_lib", - "@com_google_absl//absl/types:variant", + "@abseil-cpp//absl/types:variant", "@envoy_api//envoy/extensions/filters/http/mcp_router/v3:pkg_cc_proto", ], ) @@ -55,10 +55,10 @@ envoy_cc_library( "//source/common/json:json_loader_lib", "//source/common/json:json_streamer_lib", "//source/common/protobuf:utility_lib", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", ], ) diff --git a/source/extensions/filters/http/proto_api_scrubber/BUILD b/source/extensions/filters/http/proto_api_scrubber/BUILD index e6547335cfca0..e5213849f0cff 100644 --- a/source/extensions/filters/http/proto_api_scrubber/BUILD +++ b/source/extensions/filters/http/proto_api_scrubber/BUILD @@ -21,10 +21,10 @@ envoy_cc_extension( "//source/common/http/matching:data_impl_lib", "//source/common/matcher:matcher_lib", "//source/common/protobuf:utility_lib", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/http/proto_api_scrubber/v3:pkg_cc_proto", "@xds//xds/type/matcher/v3:pkg_cc_proto", diff --git a/source/extensions/filters/http/proto_message_extraction/BUILD b/source/extensions/filters/http/proto_message_extraction/BUILD index 74916d62ee326..4b4a2f464e756 100644 --- a/source/extensions/filters/http/proto_message_extraction/BUILD +++ b/source/extensions/filters/http/proto_message_extraction/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( hdrs = ["extractor.h"], external_deps = ["grpc_transcoding"], deps = [ - "@com_google_absl//absl/status", + "@abseil-cpp//absl/status", "@envoy_api//envoy/extensions/filters/http/proto_message_extraction/v3:pkg_cc_proto", "@proto-field-extraction//:all_libs", ], @@ -29,13 +29,13 @@ envoy_cc_library( "//source/common/common:minimal_logger_lib", "//source/common/protobuf", "//source/extensions/filters/http/proto_message_extraction/extraction_util:proto_extractor", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/log", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:string_view", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/log", + "@abseil-cpp//absl/log:check", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:string_view", "@envoy_api//envoy/extensions/filters/http/proto_message_extraction/v3:pkg_cc_proto", "@proto-converter//:all", "@proto-field-extraction//:all_libs", @@ -52,9 +52,9 @@ envoy_cc_extension( ":extractor_impl", "//source/common/grpc:common_lib", "//source/extensions/filters/http/common:factory_base_lib", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/log", - "@com_google_absl//absl/strings:string_view", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/log", + "@abseil-cpp//absl/strings:string_view", "@envoy_api//envoy/extensions/filters/http/proto_message_extraction/v3:pkg_cc_proto", "@proto-converter//:all", "@proto-field-extraction//:all_libs", diff --git a/source/extensions/filters/http/proto_message_extraction/extraction_util/BUILD b/source/extensions/filters/http/proto_message_extraction/extraction_util/BUILD index a774397715ce0..aa9dd62f73063 100644 --- a/source/extensions/filters/http/proto_message_extraction/extraction_util/BUILD +++ b/source/extensions/filters/http/proto_message_extraction/extraction_util/BUILD @@ -15,7 +15,7 @@ envoy_cc_library( ], deps = [ "//source/common/protobuf", - "@com_google_absl//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_map", "@proto-field-extraction//:all_libs", ], ) diff --git a/source/extensions/filters/network/common/redis/BUILD b/source/extensions/filters/network/common/redis/BUILD index a2d56ec918ec0..30a72d2abac90 100644 --- a/source/extensions/filters/network/common/redis/BUILD +++ b/source/extensions/filters/network/common/redis/BUILD @@ -56,8 +56,8 @@ envoy_cc_library( hdrs = ["supported_commands.h"], deps = [ "//source/common/common:macros", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", ], ) diff --git a/source/extensions/filters/network/dubbo_proxy/BUILD b/source/extensions/filters/network/dubbo_proxy/BUILD index e63e99e7364e3..9484771c014e8 100644 --- a/source/extensions/filters/network/dubbo_proxy/BUILD +++ b/source/extensions/filters/network/dubbo_proxy/BUILD @@ -121,7 +121,7 @@ envoy_cc_library( ":message_lib", "//source/common/buffer:buffer_lib", "//source/common/http:header_map_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/source/extensions/filters/network/generic_proxy/BUILD b/source/extensions/filters/network/generic_proxy/BUILD index 3de4683a60384..0fa396f6f3c49 100644 --- a/source/extensions/filters/network/generic_proxy/BUILD +++ b/source/extensions/filters/network/generic_proxy/BUILD @@ -180,9 +180,9 @@ envoy_cc_library( "//envoy/common:pure_lib", "//envoy/tracing:trace_context_interface", "//source/extensions/filters/network/generic_proxy/interface:stream_interface", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/source/extensions/filters/network/generic_proxy/router/BUILD b/source/extensions/filters/network/generic_proxy/router/BUILD index d3e4d60b729c2..f5cb5f4151407 100644 --- a/source/extensions/filters/network/generic_proxy/router/BUILD +++ b/source/extensions/filters/network/generic_proxy/router/BUILD @@ -31,8 +31,8 @@ envoy_cc_library( "//source/extensions/filters/network/generic_proxy:tracing_lib", "//source/extensions/filters/network/generic_proxy/interface:codec_interface", "//source/extensions/filters/network/generic_proxy/interface:filter_interface", - "@com_github_google_quiche//:quiche_common_lib", "@envoy_api//envoy/extensions/filters/network/generic_proxy/router/v3:pkg_cc_proto", + "@quiche//:quiche_common_lib", ], ) diff --git a/source/extensions/filters/network/redis_proxy/BUILD b/source/extensions/filters/network/redis_proxy/BUILD index 2a6646f120ed8..20c58574449f7 100644 --- a/source/extensions/filters/network/redis_proxy/BUILD +++ b/source/extensions/filters/network/redis_proxy/BUILD @@ -83,7 +83,7 @@ envoy_cc_library( "//source/extensions/filters/network/common/redis:fault_lib", "//source/extensions/filters/network/common/redis:supported_commands_lib", "//source/extensions/filters/network/common/redis:utility_lib", - "@com_google_absl//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_map", ], ) diff --git a/source/extensions/filters/network/thrift_proxy/BUILD b/source/extensions/filters/network/thrift_proxy/BUILD index 85ca7b672bd18..2f80e26c8786f 100644 --- a/source/extensions/filters/network/thrift_proxy/BUILD +++ b/source/extensions/filters/network/thrift_proxy/BUILD @@ -92,7 +92,7 @@ envoy_cc_library( "//source/common/stats:timespan_lib", "//source/common/stream_info:stream_info_lib", "//source/extensions/filters/network/thrift_proxy/router:router_interface", - "@com_google_absl//absl/types:any", + "@abseil-cpp//absl/types:any", ], ) @@ -145,14 +145,14 @@ envoy_cc_library( "//envoy/buffer:buffer_interface", "//source/common/common:macros", "//source/common/http:header_map_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) envoy_cc_library( name = "tracing_interface", hdrs = ["tracing.h"], - deps = ["@com_google_absl//absl/types:optional"], + deps = ["@abseil-cpp//absl/types:optional"], ) envoy_cc_library( @@ -185,7 +185,7 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/config:utility_lib", "//source/common/singleton:const_singleton", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) @@ -238,7 +238,7 @@ envoy_cc_library( ":protocol_interface", "//source/common/common:macros", "//source/common/runtime:runtime_features_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], alwayslink = 1, ) @@ -283,7 +283,7 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/config:utility_lib", "//source/common/singleton:const_singleton", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/source/extensions/filters/network/thrift_proxy/router/BUILD b/source/extensions/filters/network/thrift_proxy/router/BUILD index 9bf5cd3547912..a77324a194a00 100644 --- a/source/extensions/filters/network/thrift_proxy/router/BUILD +++ b/source/extensions/filters/network/thrift_proxy/router/BUILD @@ -36,7 +36,7 @@ envoy_cc_library( "//source/extensions/filters/network/thrift_proxy:metadata_lib", "//source/extensions/filters/network/thrift_proxy:protocol_converter_lib", "//source/extensions/filters/network/thrift_proxy:protocol_options_config_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/source/extensions/filters/udp/dns_filter/BUILD b/source/extensions/filters/udp/dns_filter/BUILD index f50c88d4eb3fd..b2cb5f668113f 100644 --- a/source/extensions/filters/udp/dns_filter/BUILD +++ b/source/extensions/filters/udp/dns_filter/BUILD @@ -48,7 +48,7 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/common/runtime:runtime_lib", "//source/common/upstream:cluster_manager_lib", - "@com_github_cares_cares//:ares", + "@c-ares//:ares", "@envoy_api//envoy/extensions/filters/udp/dns_filter/v3:pkg_cc_proto", "@envoy_api//envoy/type/matcher/v3:pkg_cc_proto", ], diff --git a/source/extensions/filters/udp/udp_proxy/session_filters/http_capsule/BUILD b/source/extensions/filters/udp/udp_proxy/session_filters/http_capsule/BUILD index bc9302c3fff09..497c6081f063f 100644 --- a/source/extensions/filters/udp/udp_proxy/session_filters/http_capsule/BUILD +++ b/source/extensions/filters/udp/udp_proxy/session_filters/http_capsule/BUILD @@ -17,9 +17,9 @@ envoy_cc_library( "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:hex_lib", - "@com_github_google_quiche//:quiche_common_capsule_lib", - "@com_github_google_quiche//:quiche_common_connect_udp_datagram_payload_lib", "@envoy_api//envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3:pkg_cc_proto", + "@quiche//:quiche_common_capsule_lib", + "@quiche//:quiche_common_connect_udp_datagram_payload_lib", ], ) diff --git a/source/extensions/formatter/cel/BUILD b/source/extensions/formatter/cel/BUILD index f6386177a8ef0..e45ac071674b7 100644 --- a/source/extensions/formatter/cel/BUILD +++ b/source/extensions/formatter/cel/BUILD @@ -27,8 +27,8 @@ envoy_cc_library( { "//bazel:windows_x86_64": [], "//conditions:default": [ - "@com_google_cel_cpp//eval/public:value_export_util", - "@com_google_cel_cpp//parser", + "@cel-cpp//eval/public:value_export_util", + "@cel-cpp//parser", ], }, ), @@ -56,7 +56,7 @@ envoy_cc_extension( { "//bazel:windows_x86_64": [], "//conditions:default": [ - "@com_google_cel_cpp//parser", + "@cel-cpp//parser", ], }, ), diff --git a/source/extensions/http/cache/file_system_http_cache/BUILD b/source/extensions/http/cache/file_system_http_cache/BUILD index 00210bdd84017..de7bd8785d393 100644 --- a/source/extensions/http/cache/file_system_http_cache/BUILD +++ b/source/extensions/http/cache/file_system_http_cache/BUILD @@ -49,9 +49,9 @@ envoy_cc_extension( "//source/common/protobuf", "//source/extensions/common/async_files", "//source/extensions/filters/http/cache:http_cache_lib", - "@com_google_absl//absl/base", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/extensions/http/cache/file_system_http_cache/v3:pkg_cc_proto", ], ) @@ -66,8 +66,8 @@ envoy_cc_library( "//source/common/buffer:buffer_lib", "//source/common/common:macros", "//source/extensions/filters/http/cache:http_cache_lib", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/strings", ], ) @@ -77,6 +77,6 @@ envoy_cc_library( hdrs = ["cache_file_fixed_block.h"], deps = [ "//envoy/buffer:buffer_interface", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) diff --git a/source/extensions/http/cache_v2/file_system_http_cache/BUILD b/source/extensions/http/cache_v2/file_system_http_cache/BUILD index 65b89ce93cb87..80b3a5e5cdfeb 100644 --- a/source/extensions/http/cache_v2/file_system_http_cache/BUILD +++ b/source/extensions/http/cache_v2/file_system_http_cache/BUILD @@ -52,9 +52,9 @@ envoy_cc_extension( "//source/extensions/common/async_files", "//source/extensions/filters/http/cache_v2:cache_sessions_impl_lib", "//source/extensions/filters/http/cache_v2:http_cache_lib", - "@com_google_absl//absl/base", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/extensions/http/cache_v2/file_system_http_cache/v3:pkg_cc_proto", ], ) @@ -69,8 +69,8 @@ envoy_cc_library( "//source/common/buffer:buffer_lib", "//source/common/common:macros", "//source/extensions/filters/http/cache_v2:http_cache_lib", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/strings", ], ) @@ -80,6 +80,6 @@ envoy_cc_library( hdrs = ["cache_file_fixed_block.h"], deps = [ "//envoy/buffer:buffer_interface", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) diff --git a/source/extensions/http/ext_proc/processing_request_modifiers/mapped_attribute_builder/BUILD b/source/extensions/http/ext_proc/processing_request_modifiers/mapped_attribute_builder/BUILD index 76655c29c816f..e4ca22b172130 100644 --- a/source/extensions/http/ext_proc/processing_request_modifiers/mapped_attribute_builder/BUILD +++ b/source/extensions/http/ext_proc/processing_request_modifiers/mapped_attribute_builder/BUILD @@ -26,7 +26,7 @@ envoy_cc_extension( "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/ext_proc:matching_utils_lib", "//source/extensions/filters/http/ext_proc:processing_request_modifier_interface", - "@com_google_absl//absl/strings:string_view", + "@abseil-cpp//absl/strings:string_view", "@envoy_api//envoy/extensions/http/ext_proc/processing_request_modifiers/mapped_attribute_builder/v3:pkg_cc_proto", "@envoy_api//envoy/service/ext_proc/v3:pkg_cc_proto", ], diff --git a/source/extensions/http/ext_proc/response_processors/save_processing_response/BUILD b/source/extensions/http/ext_proc/response_processors/save_processing_response/BUILD index 13826fae867d4..5a9b28a0df781 100644 --- a/source/extensions/http/ext_proc/response_processors/save_processing_response/BUILD +++ b/source/extensions/http/ext_proc/response_processors/save_processing_response/BUILD @@ -23,7 +23,7 @@ envoy_cc_extension( "//envoy/server:factory_context_interface", "//envoy/stream_info:stream_info_interface", "//source/extensions/filters/http/ext_proc:on_processing_response_interface", - "@com_google_absl//absl/strings:string_view", + "@abseil-cpp//absl/strings:string_view", "@envoy_api//envoy/extensions/http/ext_proc/response_processors/save_processing_response/v3:pkg_cc_proto", "@envoy_api//envoy/service/ext_proc/v3:pkg_cc_proto", ], diff --git a/source/extensions/http/header_validators/envoy_default/BUILD b/source/extensions/http/header_validators/envoy_default/BUILD index a2b1bd1fe5f89..53bbf8dd6e47c 100644 --- a/source/extensions/http/header_validators/envoy_default/BUILD +++ b/source/extensions/http/header_validators/envoy_default/BUILD @@ -27,8 +27,8 @@ envoy_cc_library( "//envoy/http:header_validator_errors", "//envoy/http:header_validator_interface", "//source/common/http:headers_lib", - "@com_google_absl//absl/container:node_hash_map", - "@com_google_absl//absl/container:node_hash_set", + "@abseil-cpp//absl/container:node_hash_map", + "@abseil-cpp//absl/container:node_hash_set", "@envoy_api//envoy/extensions/http/header_validators/envoy_default/v3:pkg_cc_proto", ], ) @@ -102,8 +102,8 @@ envoy_cc_library( "//source/common/http:header_utility_lib", "//source/common/http:headers_lib", "//source/common/http:utility_lib", - "@com_google_absl//absl/container:node_hash_set", - "@com_google_absl//absl/functional:bind_front", + "@abseil-cpp//absl/container:node_hash_set", + "@abseil-cpp//absl/functional:bind_front", ], ) @@ -128,9 +128,9 @@ envoy_cc_library( "//source/common/http:header_utility_lib", "//source/common/http:headers_lib", "//source/common/http:utility_lib", - "@com_google_absl//absl/container:node_hash_map", - "@com_google_absl//absl/container:node_hash_set", - "@com_google_absl//absl/functional:bind_front", + "@abseil-cpp//absl/container:node_hash_map", + "@abseil-cpp//absl/container:node_hash_set", + "@abseil-cpp//absl/functional:bind_front", ], ) diff --git a/source/extensions/load_balancing_policies/common/BUILD b/source/extensions/load_balancing_policies/common/BUILD index 630c58ed6015a..1851533511e31 100644 --- a/source/extensions/load_balancing_policies/common/BUILD +++ b/source/extensions/load_balancing_policies/common/BUILD @@ -29,7 +29,7 @@ envoy_cc_library( "//source/common/config:well_known_names", "//source/common/http:hash_policy_lib", "//source/common/http:headers_lib", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/synchronization", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/load_balancing_policies/override_host/BUILD b/source/extensions/load_balancing_policies/override_host/BUILD index 20b9c31be08f6..43ed34a1e7b29 100644 --- a/source/extensions/load_balancing_policies/override_host/BUILD +++ b/source/extensions/load_balancing_policies/override_host/BUILD @@ -27,8 +27,8 @@ envoy_cc_extension( "//source/common/protobuf", "//source/common/protobuf:utility_lib_header", "//source/common/upstream:load_balancer_factory_base_lib", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/status:statusor", + "@abseil-cpp//absl/log:check", + "@abseil-cpp//absl/status:statusor", "@envoy_api//envoy/extensions/load_balancing_policies/override_host/v3:pkg_cc_proto", ], ) @@ -53,12 +53,12 @@ envoy_cc_library( "//source/common/config:metadata_lib", "//source/common/config:utility_lib", "//source/common/protobuf", - "@com_google_absl//absl/container:inlined_vector", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/container:inlined_vector", + "@abseil-cpp//absl/log:check", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/load_balancing_policies/override_host/v3:pkg_cc_proto", ], diff --git a/source/extensions/load_balancing_policies/ring_hash/BUILD b/source/extensions/load_balancing_policies/ring_hash/BUILD index be9df9c2d2c5d..01c60d547354d 100644 --- a/source/extensions/load_balancing_policies/ring_hash/BUILD +++ b/source/extensions/load_balancing_policies/ring_hash/BUILD @@ -17,7 +17,7 @@ envoy_cc_library( "//envoy/upstream:load_balancer_interface", "//source/common/common:minimal_logger_lib", "//source/extensions/load_balancing_policies/common:thread_aware_lb_lib", - "@com_google_absl//absl/container:inlined_vector", + "@abseil-cpp//absl/container:inlined_vector", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/load_balancing_policies/ring_hash/v3:pkg_cc_proto", ], diff --git a/source/extensions/local_address_selectors/filter_state_override/BUILD b/source/extensions/local_address_selectors/filter_state_override/BUILD index a1e3779694d1a..38bcb31c91e84 100644 --- a/source/extensions/local_address_selectors/filter_state_override/BUILD +++ b/source/extensions/local_address_selectors/filter_state_override/BUILD @@ -16,7 +16,7 @@ envoy_cc_extension( "//envoy/registry", "//envoy/upstream:upstream_interface", "//source/common/upstream:default_local_address_selector_factory", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/extensions/local_address_selectors/filter_state_override/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/network/dns_resolver/cares/BUILD b/source/extensions/network/dns_resolver/cares/BUILD index f40080176a73d..2b37b32ce4de2 100644 --- a/source/extensions/network/dns_resolver/cares/BUILD +++ b/source/extensions/network/dns_resolver/cares/BUILD @@ -25,6 +25,6 @@ envoy_cc_extension( "//source/common/network:utility_lib", "//source/common/network/dns_resolver:dns_factory_util_lib", "//source/common/runtime:runtime_features_lib", - "@com_github_cares_cares//:ares", + "@c-ares//:ares", ], ) diff --git a/source/extensions/path/uri_template_lib/BUILD b/source/extensions/path/uri_template_lib/BUILD index 1f7760519d09f..2d0448177496c 100644 --- a/source/extensions/path/uri_template_lib/BUILD +++ b/source/extensions/path/uri_template_lib/BUILD @@ -22,10 +22,10 @@ envoy_cc_library( deps = [ ":uri_template_internal_cc", "//source/common/http:path_utility_lib", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_googlesource_code_re2//:re2", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@re2", ], ) @@ -36,14 +36,14 @@ envoy_cc_library( deps = [ "//source/common/common:fmt_lib", "//source/common/runtime:runtime_features_lib", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/flags:flag", - "@com_google_absl//absl/functional:function_ref", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:variant", - "@com_googlesource_code_re2//:re2", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/flags:flag", + "@abseil-cpp//absl/functional:function_ref", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:variant", + "@re2", ], ) diff --git a/source/extensions/quic/connection_debug_visitor/basic/BUILD b/source/extensions/quic/connection_debug_visitor/basic/BUILD index 0ed81c7a68668..a8e347bf9fe69 100644 --- a/source/extensions/quic/connection_debug_visitor/basic/BUILD +++ b/source/extensions/quic/connection_debug_visitor/basic/BUILD @@ -29,10 +29,10 @@ envoy_cc_library( "//source/common/common:minimal_logger_lib", "//source/common/protobuf:utility_lib", "//source/common/quic:envoy_quic_connection_debug_visitor_factory_interface", - "@com_github_google_quiche//:quic_core_connection_lib", - "@com_github_google_quiche//:quic_core_frames_frames_lib", - "@com_github_google_quiche//:quic_core_session_lib", - "@com_github_google_quiche//:quic_core_types_lib", + "@quiche//:quic_core_connection_lib", + "@quiche//:quic_core_frames_frames_lib", + "@quiche//:quic_core_session_lib", + "@quiche//:quic_core_types_lib", "@envoy_api//envoy/extensions/quic/connection_debug_visitor/v3:pkg_cc_proto", ]), alwayslink = LEGACY_ALWAYSLINK, diff --git a/source/extensions/quic/connection_id_generator/quic_lb/BUILD b/source/extensions/quic/connection_id_generator/quic_lb/BUILD index 0c185fedefa51..67e75a38e7f1a 100644 --- a/source/extensions/quic/connection_id_generator/quic_lb/BUILD +++ b/source/extensions/quic/connection_id_generator/quic_lb/BUILD @@ -23,9 +23,9 @@ envoy_cc_library( "//source/common/config:datasource_lib", "//source/common/quic:envoy_quic_connection_id_generator_factory_interface", "//source/common/quic:envoy_quic_utils_lib", - "@com_github_google_quiche//:quic_load_balancer_config_lib", - "@com_github_google_quiche//:quic_load_balancer_encoder_lib", - "@com_github_google_quiche//:quic_load_balancer_server_id_lib", + "@quiche//:quic_load_balancer_config_lib", + "@quiche//:quic_load_balancer_encoder_lib", + "@quiche//:quic_load_balancer_server_id_lib", "@envoy_api//envoy/extensions/quic/connection_id_generator/quic_lb/v3:pkg_cc_proto", ]), ) diff --git a/source/extensions/rate_limit_descriptors/expr/BUILD b/source/extensions/rate_limit_descriptors/expr/BUILD index 35c818a82cd4a..9baad9de8d12f 100644 --- a/source/extensions/rate_limit_descriptors/expr/BUILD +++ b/source/extensions/rate_limit_descriptors/expr/BUILD @@ -28,7 +28,7 @@ envoy_cc_extension( { "//bazel:windows_x86_64": [], "//conditions:default": [ - "@com_google_cel_cpp//parser", + "@cel-cpp//parser", ], }, ), diff --git a/source/extensions/resource_monitors/cgroup_memory/BUILD b/source/extensions/resource_monitors/cgroup_memory/BUILD index f529cddc91193..e322f0fc7649f 100644 --- a/source/extensions/resource_monitors/cgroup_memory/BUILD +++ b/source/extensions/resource_monitors/cgroup_memory/BUILD @@ -16,7 +16,7 @@ envoy_cc_library( "//envoy/common:pure_lib", "//envoy/filesystem:filesystem_interface", "//source/common/common:assert_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -31,7 +31,7 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/common:fmt_lib", "//source/common/common:thread_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) diff --git a/source/extensions/resource_monitors/cpu_utilization/BUILD b/source/extensions/resource_monitors/cpu_utilization/BUILD index 89aaf923b78be..e26e9a9b4f28a 100644 --- a/source/extensions/resource_monitors/cpu_utilization/BUILD +++ b/source/extensions/resource_monitors/cpu_utilization/BUILD @@ -15,7 +15,7 @@ envoy_cc_library( tags = ["skip_on_windows"], deps = [ "//envoy/filesystem:filesystem_interface", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -51,7 +51,7 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/common:logger_lib", "//source/common/common:thread_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", "@envoy_api//envoy/extensions/resource_monitors/cpu_utilization/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/stat_sinks/open_telemetry/BUILD b/source/extensions/stat_sinks/open_telemetry/BUILD index c1f10d3e46c08..133140aa0ef2f 100644 --- a/source/extensions/stat_sinks/open_telemetry/BUILD +++ b/source/extensions/stat_sinks/open_telemetry/BUILD @@ -35,8 +35,8 @@ envoy_cc_library( "//source/common/stats:stat_match_input_lib", "//source/extensions/tracers/opentelemetry/resource_detectors:resource_detector_lib", "@envoy_api//envoy/extensions/stat_sinks/open_telemetry/v3:pkg_cc_proto", - "@opentelemetry_proto//:metrics_proto_cc", - "@opentelemetry_proto//:metrics_service_proto_cc", + "@opentelemetry-proto//:metrics_proto_cc", + "@opentelemetry-proto//:metrics_service_proto_cc", ], ) diff --git a/source/extensions/tracers/datadog/BUILD b/source/extensions/tracers/datadog/BUILD index 6be9d466ce4f9..507ac9ad90dfe 100644 --- a/source/extensions/tracers/datadog/BUILD +++ b/source/extensions/tracers/datadog/BUILD @@ -48,8 +48,8 @@ envoy_cc_library( "//source/common/upstream:cluster_update_tracker_lib", "//source/common/version:version_lib", "//source/extensions/tracers/common:factory_base_lib", - "@com_github_datadog_dd_trace_cpp//:dd_trace_cpp", - "@com_github_nlohmann_json//:json", + "@dd-trace-cpp//:dd_trace_cpp", + "@nlohmann_json//:json", ], ) diff --git a/source/extensions/tracers/opentelemetry/BUILD b/source/extensions/tracers/opentelemetry/BUILD index 7d74e954af0a9..384a844f365f8 100644 --- a/source/extensions/tracers/opentelemetry/BUILD +++ b/source/extensions/tracers/opentelemetry/BUILD @@ -50,8 +50,8 @@ envoy_cc_library( "//source/extensions/tracers/opentelemetry/samplers:sampler_lib", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", "@opentelemetry-cpp//api", - "@opentelemetry_proto//:trace_proto_cc", - "@opentelemetry_proto//:trace_service_proto_cc", + "@opentelemetry-proto//:trace_proto_cc", + "@opentelemetry-proto//:trace_service_proto_cc", ], ) @@ -81,7 +81,7 @@ envoy_cc_library( "//source/common/version:version_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@opentelemetry-cpp//api", - "@opentelemetry_proto//:trace_proto_cc", - "@opentelemetry_proto//:trace_service_proto_cc", + "@opentelemetry-proto//:trace_proto_cc", + "@opentelemetry-proto//:trace_service_proto_cc", ], ) diff --git a/source/extensions/tracers/opentelemetry/samplers/BUILD b/source/extensions/tracers/opentelemetry/samplers/BUILD index 5d4a5cf686663..a3fbe506800b8 100644 --- a/source/extensions/tracers/opentelemetry/samplers/BUILD +++ b/source/extensions/tracers/opentelemetry/samplers/BUILD @@ -20,6 +20,6 @@ envoy_cc_library( "//envoy/server:tracer_config_interface", "//source/common/common:logger_lib", "//source/common/config:utility_lib", - "@opentelemetry_proto//:trace_proto_cc", + "@opentelemetry-proto//:trace_proto_cc", ], ) diff --git a/source/extensions/tracers/opentelemetry/samplers/dynatrace/BUILD b/source/extensions/tracers/opentelemetry/samplers/dynatrace/BUILD index 776bff1002944..43ed5d2629424 100644 --- a/source/extensions/tracers/opentelemetry/samplers/dynatrace/BUILD +++ b/source/extensions/tracers/opentelemetry/samplers/dynatrace/BUILD @@ -43,7 +43,7 @@ envoy_cc_library( "//source/common/config:datasource_lib", "//source/extensions/tracers/opentelemetry:opentelemetry_tracer_lib", "//source/extensions/tracers/opentelemetry/samplers:sampler_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/tracers/opentelemetry/samplers/v3:pkg_cc_proto", ], diff --git a/source/extensions/tracers/zipkin/BUILD b/source/extensions/tracers/zipkin/BUILD index 8604a416d1466..3ae314908e11c 100644 --- a/source/extensions/tracers/zipkin/BUILD +++ b/source/extensions/tracers/zipkin/BUILD @@ -55,8 +55,8 @@ envoy_cc_library( "//source/common/tracing:http_tracer_lib", "//source/common/upstream:cluster_update_tracker_lib", "//source/extensions/tracers/opentelemetry:opentelemetry_tracer_lib", + "@abseil-cpp//absl/types:optional", "@com_github_openzipkin_zipkinapi//:zipkin_cc_proto", - "@com_google_absl//absl/types:optional", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/transport_sockets/alts/BUILD b/source/extensions/transport_sockets/alts/BUILD index cd32ac0ca87bf..af984d32d78c1 100644 --- a/source/extensions/transport_sockets/alts/BUILD +++ b/source/extensions/transport_sockets/alts/BUILD @@ -40,7 +40,7 @@ envoy_cc_extension( "//envoy/registry", "//envoy/server:transport_socket_config_interface", "//source/common/grpc:google_grpc_context_lib", - "@com_google_absl//absl/container:node_hash_set", + "@abseil-cpp//absl/container:node_hash_set", "@envoy_api//envoy/extensions/transport_sockets/alts/v3:pkg_cc_proto", ], ) @@ -115,7 +115,7 @@ envoy_cc_library( hdrs = ["alts_channel_pool.h"], external_deps = ["grpc"], deps = [ - "@com_google_absl//absl/random", + "@abseil-cpp//absl/random", ], ) @@ -131,9 +131,9 @@ envoy_cc_library( external_deps = ["grpc"], deps = [ ":handshaker_cc_grpc", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", ], ) @@ -146,7 +146,7 @@ envoy_cc_library( ":alts_proxy", ":handshaker_cc_grpc", ":tsi_frame_protector", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/status", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/status", ], ) diff --git a/source/extensions/transport_sockets/starttls/BUILD b/source/extensions/transport_sockets/starttls/BUILD index ec4bbbe5d5f77..3189f9d4215c7 100644 --- a/source/extensions/transport_sockets/starttls/BUILD +++ b/source/extensions/transport_sockets/starttls/BUILD @@ -40,8 +40,8 @@ envoy_cc_library( "//source/common/common:minimal_logger_lib", "//source/common/common:thread_annotations", "//source/common/network:transport_socket_options_lib", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/synchronization", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/extensions/transport_sockets/starttls/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD b/source/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD index 1c2027fac2f74..4c97bb91e4737 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD +++ b/source/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD @@ -33,8 +33,8 @@ envoy_cc_extension( "//source/common/tls:stats_lib", "//source/common/tls:utility_lib", "//source/common/tls/cert_validator:cert_validator_lib", - "@com_google_absl//absl/base", - "@com_google_absl//absl/hash", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/hash", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/upstreams/http/udp/BUILD b/source/extensions/upstreams/http/udp/BUILD index f8dd3a223e7d3..e06c0cd6c1dfe 100644 --- a/source/extensions/upstreams/http/udp/BUILD +++ b/source/extensions/upstreams/http/udp/BUILD @@ -49,7 +49,7 @@ envoy_cc_library( "//source/common/router:router_lib", "//source/common/upstream:load_balancer_context_base_lib", "//source/extensions/common/proxy_protocol:proxy_protocol_header_lib", - "@com_github_google_quiche//:quiche_common_capsule_lib", - "@com_github_google_quiche//:quiche_common_connect_udp_datagram_payload_lib", + "@quiche//:quiche_common_capsule_lib", + "@quiche//:quiche_common_connect_udp_datagram_payload_lib", ], ) diff --git a/source/extensions/watchdog/profile_action/BUILD b/source/extensions/watchdog/profile_action/BUILD index e8fccf32187d1..441c1e0582e89 100644 --- a/source/extensions/watchdog/profile_action/BUILD +++ b/source/extensions/watchdog/profile_action/BUILD @@ -22,7 +22,7 @@ envoy_cc_library( "//source/common/profiler:profiler_lib", "//source/common/protobuf:utility_lib", "//source/common/stats:symbol_table_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/extensions/watchdog/profile_action/v3:pkg_cc_proto", ], ) diff --git a/source/server/BUILD b/source/server/BUILD index c0246b1758b5e..662cdb5123a42 100644 --- a/source/server/BUILD +++ b/source/server/BUILD @@ -18,8 +18,8 @@ envoy_cc_library( deps = [ "//source/common/common:minimal_logger_lib", "//source/common/version:version_lib", - "@com_google_absl//absl/debugging:stacktrace", - "@com_google_absl//absl/debugging:symbolize", + "@abseil-cpp//absl/debugging:stacktrace", + "@abseil-cpp//absl/debugging:symbolize", ], ) @@ -146,7 +146,7 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/common/stats:symbol_table_lib", "//source/common/watchdog:abort_action_config", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/watchdog/v3:pkg_cc_proto", ], @@ -239,8 +239,8 @@ envoy_cc_library( "//envoy/filesystem:filesystem_interface", "//source/common/common:logger_lib", "//source/common/filesystem:filesystem_lib", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:optional", ], ) @@ -301,9 +301,9 @@ envoy_cc_library( "//source/common/stats:stats_lib", "//source/common/stats:tag_utility_lib", "//source/common/version:version_lib", - "@com_github_mirror_tclap//:tclap", "@envoy_api//envoy/admin/v3:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", + "@tclap", ], ) @@ -329,7 +329,7 @@ envoy_cc_library( "//source/common/event:scaled_range_timer_manager_lib", "//source/common/stats:symbol_table_lib", "//source/server:resource_monitor_config_lib", - "@com_google_absl//absl/container:node_hash_set", + "@abseil-cpp//absl/container:node_hash_set", "@envoy_api//envoy/config/overload/v3:pkg_cc_proto", ], ) @@ -442,8 +442,8 @@ envoy_cc_library( "//source/common/upstream:cluster_manager_lib", "//source/common/version:version_lib", "//source/server/admin:admin_lib", - "@com_google_absl//absl/container:node_hash_map", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/container:node_hash_map", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/admin/v3:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", ], diff --git a/source/server/admin/BUILD b/source/server/admin/BUILD index 07d8cedb8b052..f0b25b40b1385 100644 --- a/source/server/admin/BUILD +++ b/source/server/admin/BUILD @@ -169,7 +169,7 @@ envoy_cc_library( "//source/common/http:header_map_lib", "//source/common/stats:histogram_lib", "//source/common/upstream:host_utility_lib", - "@com_google_absl//absl/container:btree", + "@abseil-cpp//absl/container:btree", ], ) diff --git a/source/server/config_validation/BUILD b/source/server/config_validation/BUILD index 5b679879aa9c9..0e58322209efb 100644 --- a/source/server/config_validation/BUILD +++ b/source/server/config_validation/BUILD @@ -97,7 +97,7 @@ envoy_cc_library( "//source/server:server_lib", "//source/server:utils_lib", "//source/server/admin:admin_factory_context", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", diff --git a/test/BUILD b/test/BUILD index f1c598cecd5e9..2a507f16ea598 100644 --- a/test/BUILD +++ b/test/BUILD @@ -107,13 +107,13 @@ envoy_pch_library( "//test/mocks/server:factory_context_mocks", "//test/mocks/server:instance_mocks", "//test/mocks/stats:stats_mocks", - "@com_github_gabime_spdlog//:spdlog", - "@com_google_googletest//:gtest", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", + "@googletest//:gtest", + "@spdlog", ], ) diff --git a/test/benchmark/BUILD b/test/benchmark/BUILD index 73b358abb308f..646f9ba32a284 100644 --- a/test/benchmark/BUILD +++ b/test/benchmark/BUILD @@ -18,7 +18,7 @@ envoy_cc_test_library( "//test/test_common:environment_lib", "//test/test_common:printers_lib", "//test/test_common:test_runtime_lib", - "@com_github_google_benchmark//:benchmark", - "@com_github_mirror_tclap//:tclap", + "@benchmark", + "@tclap", ], ) diff --git a/test/common/buffer/BUILD b/test/common/buffer/BUILD index e004b893f22ab..b3d1d147ff3d4 100644 --- a/test/common/buffer/BUILD +++ b/test/common/buffer/BUILD @@ -129,7 +129,7 @@ envoy_cc_benchmark_binary( deps = [ "//source/common/buffer:buffer_lib", "//source/common/buffer:watermark_buffer_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", "@envoy_api//envoy/config/overload/v3:pkg_cc_proto", ], ) diff --git a/test/common/common/BUILD b/test/common/common/BUILD index 327bdd09a3551..5156fff0721da 100644 --- a/test/common/common/BUILD +++ b/test/common/common/BUILD @@ -62,7 +62,7 @@ envoy_cc_test( "//source/common/common:assert_lib", "//test/test_common:logging_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/base", + "@abseil-cpp//absl/base", ], ) @@ -230,7 +230,7 @@ envoy_cc_benchmark_binary( rbe_pool = "6gig", deps = [ "//source/common/common:minimal_logger_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) @@ -322,7 +322,7 @@ envoy_cc_test( "//test/test_common:simulated_time_system_lib", "//test/test_common:test_time_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -424,8 +424,8 @@ envoy_cc_benchmark_binary( deps = [ "//source/common/common:assert_lib", "//source/common/common:utility_lib", - "@com_github_google_benchmark//:benchmark", - "@com_googlesource_code_re2//:re2", + "@benchmark", + "@re2", ], ) @@ -436,8 +436,8 @@ envoy_cc_benchmark_binary( deps = [ "//source/common/common:assert_lib", "//source/common/common:utility_lib", - "@com_github_google_benchmark//:benchmark", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", + "@benchmark", ], ) @@ -452,8 +452,8 @@ envoy_cc_benchmark_binary( rbe_pool = "6gig", deps = [ "//source/common/common:radix_tree_lib", - "@com_github_google_benchmark//:benchmark", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", + "@benchmark", ], ) @@ -469,8 +469,8 @@ envoy_cc_benchmark_binary( deps = [ "//source/common/common:radix_tree_lib", "//source/common/http:headers_lib", - "@com_github_google_benchmark//:benchmark", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", + "@benchmark", ], ) @@ -485,7 +485,7 @@ envoy_cc_benchmark_binary( rbe_pool = "6gig", deps = [ "//source/common/common:assert_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) @@ -511,7 +511,7 @@ envoy_cc_test( deps = [ "//source/common/common:thread_lib", "//test/test_common:thread_factory_for_test_lib", - "@com_google_absl//absl/hash:hash_testing", + "@abseil-cpp//absl/hash:hash_testing", ], ) @@ -541,7 +541,7 @@ envoy_cc_test( rbe_pool = "6gig", deps = [ "//source/common/version:version_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -625,7 +625,7 @@ envoy_cc_benchmark_binary( rbe_pool = "6gig", deps = [ "//source/common/common:inline_map", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) diff --git a/test/common/config/BUILD b/test/common/config/BUILD index 49ba568ab5a60..1b226f9a99965 100644 --- a/test/common/config/BUILD +++ b/test/common/config/BUILD @@ -147,7 +147,7 @@ envoy_cc_test( "//test/test_common:status_utility_lib", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", diff --git a/test/common/formatter/BUILD b/test/common/formatter/BUILD index 7e413229d4905..49addff9e7d8f 100644 --- a/test/common/formatter/BUILD +++ b/test/common/formatter/BUILD @@ -106,7 +106,7 @@ envoy_cc_benchmark_binary( "//test/mocks/http:http_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:printers_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) diff --git a/test/common/grpc/BUILD b/test/common/grpc/BUILD index 22af6be0054d3..40b134ecc05d2 100644 --- a/test/common/grpc/BUILD +++ b/test/common/grpc/BUILD @@ -248,7 +248,7 @@ envoy_cc_benchmark_binary( "//test/mocks/upstream:cluster_priority_set_mocks", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], diff --git a/test/common/http/BUILD b/test/common/http/BUILD index 0ff27c836222a..0e9b73b53c16f 100644 --- a/test/common/http/BUILD +++ b/test/common/http/BUILD @@ -121,7 +121,7 @@ envoy_proto_library( "//test/mocks/network:network_mocks", "//test/mocks/server:overload_manager_mocks", "//test/test_common:test_runtime_lib", - "@com_github_google_quiche//:quiche_common_platform_test", + "@quiche//:quiche_common_platform_test", ], ) for http_protocol in [ @@ -190,7 +190,7 @@ envoy_cc_benchmark_binary( "//source/common/http:codes_lib", "//source/common/stats:isolated_store_lib", "//source/common/stats:stats_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) @@ -386,7 +386,7 @@ envoy_cc_benchmark_binary( rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) @@ -729,7 +729,7 @@ envoy_cc_test( "//test/mocks/server:factory_context_mocks", "//test/test_common:status_utility_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/status", + "@abseil-cpp//absl/status", "@ocp-diag-core//ocpdiag/core/testing:status_matchers", ], ) diff --git a/test/common/http/http2/BUILD b/test/common/http/http2/BUILD index 7e3c797abcd0e..27c164501ecc7 100644 --- a/test/common/http/http2/BUILD +++ b/test/common/http/http2/BUILD @@ -44,7 +44,7 @@ envoy_cc_test( "//test/test_common:registry_lib", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", - "@com_github_google_quiche//:http2_adapter", + "@quiche//:http2_adapter", ], ) @@ -55,8 +55,8 @@ envoy_cc_test_library( "//source/common/http/http2:codec_lib", "//test/mocks:common_lib", "//test/mocks/server:overload_manager_mocks", - "@com_github_google_quiche//:http2_adapter", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", + "@quiche//:http2_adapter", ], ) @@ -94,7 +94,7 @@ envoy_cc_test_library( "//source/common/common:assert_lib", "//source/common/common:hex_lib", "//source/common/common:macros", - "@com_github_google_quiche//:http2_hpack_hpack_lib", + "@quiche//:http2_hpack_hpack_lib", ], ) @@ -147,8 +147,8 @@ envoy_cc_test( "//test/test_common:logging_lib", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", - "@com_github_google_quiche//:http2_adapter", - "@com_github_google_quiche//:http2_adapter_mock_http2_visitor", + "@quiche//:http2_adapter", + "@quiche//:http2_adapter_mock_http2_visitor", ], ) diff --git a/test/common/listener_manager/BUILD b/test/common/listener_manager/BUILD index 52dfb47f91f96..9594507a51cb4 100644 --- a/test/common/listener_manager/BUILD +++ b/test/common/listener_manager/BUILD @@ -203,8 +203,8 @@ envoy_cc_benchmark_binary( "//test/mocks/stream_info:stream_info_mocks", # tranport socket config registration "//source/extensions/transport_sockets/tls:config", - "@com_github_google_benchmark//:benchmark", - "@com_google_googletest//:gtest", + "@benchmark", + "@googletest//:gtest", "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", ], ) diff --git a/test/common/network/BUILD b/test/common/network/BUILD index bb1e74b5471fc..1b9824055578a 100644 --- a/test/common/network/BUILD +++ b/test/common/network/BUILD @@ -55,7 +55,7 @@ envoy_cc_benchmark_binary( rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) @@ -73,7 +73,7 @@ envoy_cc_benchmark_binary( "//source/common/network:lc_trie_lib", "//source/common/network:utility_lib", "//test/test_common:utility_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) @@ -313,7 +313,7 @@ envoy_cc_test( "//test/test_common:network_utility_lib", "//test/test_common:threadsafe_singleton_injector_lib", "//test/test_common:utility_lib", - "@com_github_google_quiche//:quic_test_tools_mock_syscall_wrapper_lib", + "@quiche//:quic_test_tools_mock_syscall_wrapper_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ]), ) @@ -373,7 +373,7 @@ envoy_cc_test( "//test/mocks/network:network_mocks", "//test/test_common:environment_lib", "//test/test_common:threadsafe_singleton_injector_lib", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/strings:str_format", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -458,7 +458,7 @@ envoy_cc_benchmark_binary( deps = [ "//source/common/network:lc_trie_lib", "//source/common/network:utility_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) @@ -488,7 +488,7 @@ envoy_cc_benchmark_binary( "//source/common/common:utility_lib", "//source/common/network:address_lib", "//test/test_common:network_utility_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) diff --git a/test/common/orca/BUILD b/test/common/orca/BUILD index 3e03b3e2b742f..3c88b751cfb6c 100644 --- a/test/common/orca/BUILD +++ b/test/common/orca/BUILD @@ -19,9 +19,9 @@ envoy_cc_test( "//source/common/upstream:upstream_lib", "//test/test_common:status_utility_lib", "//test/test_common:utility_lib", - "@com_github_fmtlib_fmt//:fmt", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", + "@fmt", "@xds//xds/data/orca/v3:pkg_cc_proto", ], ) @@ -35,9 +35,9 @@ envoy_cc_test( "//source/common/orca:orca_parser", "//test/test_common:status_utility_lib", "//test/test_common:utility_lib", - "@com_github_fmtlib_fmt//:fmt", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", + "@fmt", "@xds//xds/data/orca/v3:pkg_cc_proto", ], ) @@ -63,9 +63,9 @@ envoy_cc_fuzz_test( "//test/fuzz:utility_lib", "//test/test_common:status_utility_lib", "//test/test_common:utility_lib", - "@com_github_fmtlib_fmt//:fmt", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", + "@fmt", "@xds//xds/data/orca/v3:pkg_cc_proto", ], ) diff --git a/test/common/protobuf/BUILD b/test/common/protobuf/BUILD index 81bda34ca6fa1..6b0a980a266d5 100644 --- a/test/common/protobuf/BUILD +++ b/test/common/protobuf/BUILD @@ -112,7 +112,7 @@ envoy_cc_benchmark_binary( ":deterministic_hash_test_proto_cc_proto", "//source/common/protobuf:utility_lib", "//test/test_common:test_runtime_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) diff --git a/test/common/quic/BUILD b/test/common/quic/BUILD index 1843959532369..883a1eb0d14d4 100644 --- a/test/common/quic/BUILD +++ b/test/common/quic/BUILD @@ -22,7 +22,7 @@ envoy_cc_test( "//source/common/quic:envoy_quic_clock_lib", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", - "@com_github_google_quiche//:quic_platform", + "@quiche//:quic_platform", ]), ) @@ -49,7 +49,7 @@ envoy_cc_test( "//test/mocks/api:api_mocks", "//test/mocks/network:network_mocks", "//test/test_common:threadsafe_singleton_injector_lib", - "@com_github_google_quiche//:quic_platform", + "@quiche//:quic_platform", ]), ) @@ -67,9 +67,9 @@ envoy_cc_test( "//test/mocks/server:server_factory_context_mocks", "//test/mocks/ssl:ssl_mocks", "//test/test_common:test_runtime_lib", - "@com_github_google_quiche//:quic_core_versions_lib", - "@com_github_google_quiche//:quic_platform", - "@com_github_google_quiche//:quic_test_tools_test_certificates_lib", + "@quiche//:quic_core_versions_lib", + "@quiche//:quic_platform", + "@quiche//:quic_test_tools_test_certificates_lib", ]), ) @@ -82,7 +82,7 @@ envoy_cc_test( "//test/mocks/event:event_mocks", "//test/mocks/network:network_mocks", "//test/test_common:utility_lib", - "@com_github_google_quiche//:quic_test_tools_test_utils_lib", + "@quiche//:quic_test_tools_test_utils_lib", ]), ) @@ -111,8 +111,8 @@ envoy_cc_test( "//test/mocks/event:event_mocks", "//test/mocks/server:server_factory_context_mocks", "//test/mocks/ssl:ssl_mocks", - "@com_github_google_quiche//:quic_platform", - "@com_github_google_quiche//:quic_test_tools_test_certificates_lib", + "@quiche//:quic_platform", + "@quiche//:quic_test_tools_test_certificates_lib", ]), ) @@ -132,9 +132,9 @@ envoy_cc_test( "//test/mocks/http:stream_decoder_mock", "//test/mocks/network:network_mocks", "//test/test_common:utility_lib", - "@com_github_google_quiche//:quic_core_http_spdy_session_lib", - "@com_github_google_quiche//:quic_test_tools_qpack_qpack_test_utils_lib", - "@com_github_google_quiche//:quic_test_tools_session_peer_lib", + "@quiche//:quic_core_http_spdy_session_lib", + "@quiche//:quic_test_tools_qpack_qpack_test_utils_lib", + "@quiche//:quic_test_tools_session_peer_lib", ]), ) @@ -154,8 +154,8 @@ envoy_cc_test( "//test/mocks/network:network_mocks", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", - "@com_github_google_quiche//:quic_core_http_spdy_session_lib", - "@com_github_google_quiche//:quic_test_tools_qpack_qpack_test_utils_lib", + "@quiche//:quic_core_http_spdy_session_lib", + "@quiche//:quic_test_tools_qpack_qpack_test_utils_lib", ]), ) @@ -182,10 +182,10 @@ envoy_cc_test( "//test/test_common:global_lib", "//test/test_common:logging_lib", "//test/test_common:simulated_time_system_lib", - "@com_github_google_quiche//:quic_test_tools_config_peer_lib", - "@com_github_google_quiche//:quic_test_tools_stream_peer_lib", - "@com_github_google_quiche//:quic_test_tools_server_session_base_peer", - "@com_github_google_quiche//:quic_test_tools_test_utils_lib", + "@quiche//:quic_test_tools_config_peer_lib", + "@quiche//:quic_test_tools_stream_peer_lib", + "@quiche//:quic_test_tools_server_session_base_peer", + "@quiche//:quic_test_tools_test_utils_lib", ]), ) @@ -213,7 +213,7 @@ envoy_cc_test( "//test/test_common:simulated_time_system_lib", "//test/test_common:test_runtime_lib", "//test/test_common:threadsafe_singleton_injector_lib", - "@com_github_google_quiche//:quic_test_tools_session_peer_lib", + "@quiche//:quic_test_tools_session_peer_lib", ]), ) @@ -240,7 +240,7 @@ envoy_cc_test( "//test/test_common:network_utility_lib", "//test/test_common:simulated_time_system_lib", "//test/test_common:test_runtime_lib", - "@com_github_google_quiche//:quic_test_tools_crypto_server_config_peer_lib", + "@quiche//:quic_test_tools_crypto_server_config_peer_lib", "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", ]), ) @@ -279,7 +279,7 @@ envoy_cc_test_library( deps = envoy_select_enable_http3([ "//source/common/quic:envoy_quic_proof_source_base_lib", "//test/mocks/network:network_mocks", - "@com_github_google_quiche//:quic_test_tools_test_certificates_lib", + "@quiche//:quic_test_tools_test_certificates_lib", ]), ) @@ -338,7 +338,7 @@ envoy_cc_test( "//source/common/runtime:runtime_lib", "//test/mocks/api:api_mocks", "//test/test_common:threadsafe_singleton_injector_lib", - "@com_github_google_quiche//:quic_test_tools_test_utils_lib", + "@quiche//:quic_test_tools_test_utils_lib", ]), ) @@ -361,9 +361,9 @@ envoy_cc_test_library( "//source/common/quic:envoy_quic_server_connection_lib", "//source/common/quic:quic_filter_manager_connection_lib", "//test/common/config:dummy_config_proto_cc_proto", - "@com_github_google_quiche//:quic_core_http_spdy_session_lib", - "@com_github_google_quiche//:quic_test_tools_first_flight_lib", - "@com_github_google_quiche//:quic_test_tools_qpack_qpack_test_utils_lib", + "@quiche//:quic_core_http_spdy_session_lib", + "@quiche//:quic_test_tools_first_flight_lib", + "@quiche//:quic_test_tools_qpack_qpack_test_utils_lib", ]) + [ "//envoy/stream_info:stream_info_interface", "//source/common/quic:envoy_quic_network_observer_registry_factory_lib", @@ -398,7 +398,7 @@ envoy_cc_test( "//source/common/quic:http_datagram_handler", "//test/mocks/buffer:buffer_mocks", "//test/test_common:utility_lib", - "@com_github_google_quiche//:quic_test_tools_test_utils_lib", + "@quiche//:quic_test_tools_test_utils_lib", ]), ) @@ -424,7 +424,7 @@ envoy_cc_test( deps = envoy_select_enable_http3([ ":connection_id_matchers", "//source/common/quic:envoy_deterministic_connection_id_generator_lib", - "@com_github_google_quiche//:quic_test_tools_test_utils_lib", + "@quiche//:quic_test_tools_test_utils_lib", ]), ) @@ -441,7 +441,7 @@ envoy_cc_test_library( deps = [ ":envoy_quic_h3_fuzz_proto_cc_proto", "//source/common/common:assert_lib", - "@com_github_google_quiche//:quic_test_tools_test_utils_lib", + "@quiche//:quic_test_tools_test_utils_lib", ], ) diff --git a/test/common/quic/platform/BUILD b/test/common/quic/platform/BUILD index 7346266e83182..3002bfe2a3a22 100644 --- a/test/common/quic/platform/BUILD +++ b/test/common/quic/platform/BUILD @@ -34,15 +34,15 @@ envoy_cc_test( "//test/test_common:logging_lib", "//test/test_common:threadsafe_singleton_injector_lib", "//test/test_common:utility_lib", - "@com_github_google_quiche//:quic_core_error_codes_lib", - "@com_github_google_quiche//:quic_core_types_lib", - "@com_github_google_quiche//:quic_platform", - "@com_github_google_quiche//:quic_platform_expect_bug", - "@com_github_google_quiche//:quic_platform_test", - "@com_github_google_quiche//:quic_platform_test_output", - "@com_github_google_quiche//:quic_platform_thread", - "@com_github_google_quiche//:quiche_common_mem_slice_storage", - "@com_github_google_quiche//:quiche_common_platform_system_event_loop", + "@quiche//:quic_core_error_codes_lib", + "@quiche//:quic_core_types_lib", + "@quiche//:quic_platform", + "@quiche//:quic_platform_expect_bug", + "@quiche//:quic_platform_test", + "@quiche//:quic_platform_test_output", + "@quiche//:quic_platform_thread", + "@quiche//:quiche_common_mem_slice_storage", + "@quiche//:quiche_common_platform_system_event_loop", ], ) @@ -50,7 +50,7 @@ envoy_quiche_platform_impl_cc_test_library( name = "quiche_expect_bug_impl_lib", hdrs = ["quiche_expect_bug_impl.h"], deps = [ - "@com_github_google_quiche//:quic_platform_base", + "@quiche//:quic_platform_base", ], ) @@ -70,8 +70,8 @@ envoy_quiche_platform_impl_cc_test_library( hdrs = ["quiche_test_output_impl.h"], deps = [ "//test/test_common:file_system_for_test_lib", - "@com_github_google_quiche//:quic_platform_base", - "@com_github_google_quiche//:quiche_common_platform", + "@quiche//:quic_platform_base", + "@quiche//:quiche_common_platform", ], ) @@ -80,7 +80,7 @@ envoy_quiche_platform_impl_cc_test_library( hdrs = ["quiche_test_impl.h"], deps = [ "//source/common/common:assert_lib", - "@com_github_google_quiche//:quiche_common_platform", + "@quiche//:quiche_common_platform", ], ) diff --git a/test/common/quic/platform/quiche_test_impl.h b/test/common/quic/platform/quiche_test_impl.h index 1af2864b02b2b..04823416d780e 100644 --- a/test/common/quic/platform/quiche_test_impl.h +++ b/test/common/quic/platform/quiche_test_impl.h @@ -38,7 +38,7 @@ template using QuicTestWithParamImpl = QuicheTestWithParamImpl; // NOLINTNEXTLINE(readability-identifier-naming) inline std::string QuicheGetCommonSourcePathImpl() { std::string test_srcdir(getenv("TEST_SRCDIR")); - return absl::StrCat(test_srcdir, "/external/com_github_google_quiche/quiche/common"); + return absl::StrCat(test_srcdir, "/external/quiche/quiche/common"); } class QuicheScopedDisableExitOnDFatalImpl { diff --git a/test/common/router/BUILD b/test/common/router/BUILD index 2f08c468d4a42..033864cc0d7a8 100644 --- a/test/common/router/BUILD +++ b/test/common/router/BUILD @@ -77,7 +77,7 @@ envoy_cc_benchmark_binary( "//source/common/router:config_lib", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", ], ) @@ -150,7 +150,7 @@ envoy_cc_test( "//source/common/router:scoped_config_lib", "//test/mocks/router:router_mocks", "//test/test_common:utility_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", ], @@ -180,7 +180,7 @@ envoy_cc_test( "//test/test_common:simulated_time_system_lib", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", "@envoy_api//envoy/admin/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", @@ -438,7 +438,7 @@ envoy_cc_test( "//test/mocks/server:factory_context_mocks", "//test/mocks/ssl:ssl_mocks", "//test/test_common:utility_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/accesslog/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/http/router/v3:pkg_cc_proto", @@ -579,7 +579,7 @@ envoy_cc_benchmark_binary( "//test/mocks/server:instance_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:utility_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", ], ) @@ -596,7 +596,7 @@ envoy_cc_benchmark_binary( deps = [ "//source/common/router:router_lib", "//test/common/stream_info:test_util", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) diff --git a/test/common/stats/BUILD b/test/common/stats/BUILD index 2f6805c39a709..2c241ffccca6b 100644 --- a/test/common/stats/BUILD +++ b/test/common/stats/BUILD @@ -84,7 +84,7 @@ envoy_cc_benchmark_binary( "//source/common/common:utility_lib", "//source/common/runtime:runtime_lib", "//source/common/stats:recent_lookups_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) @@ -129,7 +129,7 @@ envoy_cc_test_library( "//source/common/stats:isolated_store_lib", "//test/common/memory:memory_test_utility_lib", "//test/test_common:global_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -177,7 +177,7 @@ envoy_cc_test( "//test/mocks/stats:stats_mocks", "//test/test_common:logging_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/hash:hash_testing", + "@abseil-cpp//absl/hash:hash_testing", ], ) @@ -240,8 +240,8 @@ envoy_cc_benchmark_binary( "//test/mocks/stats:stats_mocks", "//test/test_common:logging_lib", "//test/test_common:utility_lib", - "@com_github_google_benchmark//:benchmark", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", + "@benchmark", ], ) @@ -271,7 +271,7 @@ envoy_cc_benchmark_binary( "//source/common/stats:isolated_store_lib", "//source/common/stats:symbol_table_lib", "//source/exe:process_wide_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) @@ -298,8 +298,8 @@ envoy_cc_benchmark_binary( "//test/mocks/server:server_factory_context_mocks", "//test/test_common:logging_lib", "//test/test_common:utility_lib", - "@com_github_google_benchmark//:benchmark", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", + "@benchmark", "@envoy_api//envoy/config/metrics/v3:pkg_cc_proto", "@envoy_api//envoy/type/matcher/v3:pkg_cc_proto", ], @@ -341,7 +341,7 @@ envoy_cc_benchmark_binary( rbe_pool = "6gig", deps = [ "//source/common/stats:tag_producer_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", "@envoy_api//envoy/config/metrics/v3:pkg_cc_proto", ], ) @@ -391,8 +391,8 @@ envoy_cc_benchmark_binary( "//test/test_common:simulated_time_system_lib", "//test/test_common:test_time_lib", "//test/test_common:utility_lib", - "@com_github_google_benchmark//:benchmark", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", + "@benchmark", "@envoy_api//envoy/config/metrics/v3:pkg_cc_proto", ], ) diff --git a/test/common/tls/BUILD b/test/common/tls/BUILD index bd5867e46ee10..4c044f0fb5f88 100644 --- a/test/common/tls/BUILD +++ b/test/common/tls/BUILD @@ -305,7 +305,7 @@ envoy_cc_benchmark_binary( tags = ["skip_on_windows"], deps = [ "//source/common/buffer:buffer_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index 1d4f27d22ca3d..94421b30310da 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -95,7 +95,7 @@ envoy_cc_test( "//test/mocks/config:config_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/base", + "@abseil-cpp//absl/base", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -168,7 +168,7 @@ envoy_cc_test( "//test/mocks/upstream:load_balancer_context_mock", "//test/mocks/upstream:thread_aware_load_balancer_mocks", "//test/test_common:status_utility_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/admin/v3:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", @@ -480,7 +480,7 @@ envoy_cc_test( "//test/mocks/upstream:host_set_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/data/cluster/v3:pkg_cc_proto", ], @@ -755,7 +755,7 @@ envoy_cc_benchmark_binary( deps = [ "//source/common/common:random_generator_lib", "//source/common/upstream:scheduler_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) @@ -800,7 +800,7 @@ envoy_cc_test_library( ], deps = [ "//envoy/upstream:upstream_interface", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/test/common/watchdog/BUILD b/test/common/watchdog/BUILD index b433aff8e7963..a00228475fa64 100644 --- a/test/common/watchdog/BUILD +++ b/test/common/watchdog/BUILD @@ -20,7 +20,7 @@ envoy_cc_test( "//source/common/watchdog:abort_action_lib", "//test/common/stats:stat_test_utility_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/synchronization", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/watchdog/v3:pkg_cc_proto", ], diff --git a/test/extensions/access_loggers/open_telemetry/BUILD b/test/extensions/access_loggers/open_telemetry/BUILD index e079ff07c1ff3..0e3d4067c9a12 100644 --- a/test/extensions/access_loggers/open_telemetry/BUILD +++ b/test/extensions/access_loggers/open_telemetry/BUILD @@ -25,8 +25,8 @@ envoy_extension_cc_test( "//test/mocks/local_info:local_info_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:utility_lib", - "@opentelemetry_proto//:logs_proto_cc", - "@opentelemetry_proto//:logs_service_proto_cc", + "@opentelemetry-proto//:logs_proto_cc", + "@opentelemetry-proto//:logs_service_proto_cc", ], ) @@ -45,8 +45,8 @@ envoy_extension_cc_test( "//test/mocks/thread_local:thread_local_mocks", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/access_loggers/grpc/v3:pkg_cc_proto", - "@opentelemetry_proto//:logs_proto_cc", - "@opentelemetry_proto//:logs_service_proto_cc", + "@opentelemetry-proto//:logs_proto_cc", + "@opentelemetry-proto//:logs_service_proto_cc", ], ) @@ -87,8 +87,8 @@ envoy_extension_cc_test( "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/data/accesslog/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/access_loggers/grpc/v3:pkg_cc_proto", - "@opentelemetry_proto//:logs_proto_cc", - "@opentelemetry_proto//:logs_service_proto_cc", + "@opentelemetry-proto//:logs_proto_cc", + "@opentelemetry-proto//:logs_service_proto_cc", ], ) @@ -126,8 +126,8 @@ envoy_extension_cc_test( "@envoy_api//envoy/extensions/access_loggers/grpc/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/access_loggers/open_telemetry/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", - "@opentelemetry_proto//:logs_proto_cc", - "@opentelemetry_proto//:logs_service_proto_cc", + "@opentelemetry-proto//:logs_proto_cc", + "@opentelemetry-proto//:logs_service_proto_cc", ], ) @@ -157,12 +157,12 @@ envoy_extension_cc_test( "//test/mocks/stream_info:stream_info_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/test_common:utility_lib", - "@opentelemetry_proto//:logs_proto_cc", + "@opentelemetry-proto//:logs_proto_cc", ] + select( { "//bazel:windows_x86_64": [], "//conditions:default": [ - "@com_google_cel_cpp//parser", + "@cel-cpp//parser", ], }, ), @@ -179,8 +179,8 @@ envoy_cc_benchmark_binary( "//source/extensions/access_loggers/open_telemetry:substitution_formatter_lib", "//test/common/stream_info:test_util", "//test/mocks/stream_info:stream_info_mocks", - "@com_github_google_benchmark//:benchmark", - "@opentelemetry_proto//:common_proto_cc", + "@benchmark", + "@opentelemetry-proto//:common_proto_cc", ], ) diff --git a/test/extensions/access_loggers/wasm/test_data/BUILD b/test/extensions/access_loggers/wasm/test_data/BUILD index b724acef18e74..eaf2a849af807 100644 --- a/test/extensions/access_loggers/wasm/test_data/BUILD +++ b/test/extensions/access_loggers/wasm/test_data/BUILD @@ -21,7 +21,7 @@ envoy_cc_test_library( "//source/common/common:c_smart_ptr_lib", "//source/extensions/common/wasm:wasm_hdr", "//source/extensions/common/wasm:wasm_lib", - "@com_google_absl//absl/container:node_hash_map", + "@abseil-cpp//absl/container:node_hash_map", ], ) diff --git a/test/extensions/bootstrap/wasm/BUILD b/test/extensions/bootstrap/wasm/BUILD index 0db406465ac70..9369812d1207f 100644 --- a/test/extensions/bootstrap/wasm/BUILD +++ b/test/extensions/bootstrap/wasm/BUILD @@ -45,7 +45,7 @@ envoy_extension_cc_test( "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", "//test/test_common:simulated_time_system_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) @@ -114,7 +114,7 @@ envoy_extension_cc_test_binary( "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", "//test/test_common:simulated_time_system_lib", - "@com_github_google_benchmark//:benchmark", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", + "@benchmark", ], ) diff --git a/test/extensions/bootstrap/wasm/test_data/BUILD b/test/extensions/bootstrap/wasm/test_data/BUILD index 53f36ba5ab34f..874d182027f54 100644 --- a/test/extensions/bootstrap/wasm/test_data/BUILD +++ b/test/extensions/bootstrap/wasm/test_data/BUILD @@ -30,7 +30,7 @@ envoy_cc_test_library( "//source/common/common:assert_lib", "//source/common/common:c_smart_ptr_lib", "//source/extensions/common/wasm:wasm_lib", - "@com_google_absl//absl/container:node_hash_map", + "@abseil-cpp//absl/container:node_hash_map", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -47,7 +47,7 @@ envoy_cc_test_library( "//source/common/common:c_smart_ptr_lib", "//source/extensions/common/wasm:wasm_hdr", "//source/extensions/common/wasm:wasm_lib", - "@com_google_absl//absl/container:node_hash_map", + "@abseil-cpp//absl/container:node_hash_map", ], ) @@ -63,7 +63,7 @@ envoy_cc_test_library( "//source/common/common:c_smart_ptr_lib", "//source/extensions/common/wasm:wasm_hdr", "//source/extensions/common/wasm:wasm_lib", - "@com_google_absl//absl/container:node_hash_map", + "@abseil-cpp//absl/container:node_hash_map", ], ) diff --git a/test/extensions/clusters/eds/BUILD b/test/extensions/clusters/eds/BUILD index 5042f6b9b0536..ba43b15e5ae29 100644 --- a/test/extensions/clusters/eds/BUILD +++ b/test/extensions/clusters/eds/BUILD @@ -68,7 +68,7 @@ envoy_cc_benchmark_binary( "//test/mocks/upstream:cluster_manager_mocks", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", diff --git a/test/extensions/common/aws/signers/BUILD b/test/extensions/common/aws/signers/BUILD index ee3c190e67dbb..cf0567a9bd0e1 100644 --- a/test/extensions/common/aws/signers/BUILD +++ b/test/extensions/common/aws/signers/BUILD @@ -27,7 +27,7 @@ envoy_cc_test( envoy_cc_test( name = "sigv4_signer_corpus_test", srcs = ["sigv4_signer_corpus_test.cc"], - data = ["@com_github_awslabs_aws_c_auth//:sigv4_tests"], + data = ["@aws-c-auth-testdata//:sigv4_tests"], rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", @@ -44,7 +44,7 @@ envoy_cc_test( envoy_cc_test( name = "sigv4a_signer_corpus_test", srcs = ["sigv4a_signer_corpus_test.cc"], - data = ["@com_github_awslabs_aws_c_auth//:sigv4a_tests"], + data = ["@aws-c-auth-testdata//:sigv4a_tests"], rbe_pool = "4core", deps = [ "//source/common/buffer:buffer_lib", diff --git a/test/extensions/common/aws/signers/sigv4_signer_corpus_test.cc b/test/extensions/common/aws/signers/sigv4_signer_corpus_test.cc index a3cabb1d3f9b7..6cc6761017b01 100644 --- a/test/extensions/common/aws/signers/sigv4_signer_corpus_test.cc +++ b/test/extensions/common/aws/signers/sigv4_signer_corpus_test.cc @@ -23,7 +23,7 @@ std::vector directoryListing() { std::vector directories; for (auto const& entry : std::filesystem::directory_iterator( TestEnvironment::runfilesDirectory() + - "/external/com_github_awslabs_aws_c_auth/tests/aws-signing-test-suite/v4/")) { + "/external/aws-c-auth-testdata/tests/aws-signing-test-suite/v4/")) { directories.push_back(entry.path().string()); } return directories; diff --git a/test/extensions/common/aws/signers/sigv4a_signer_corpus_test.cc b/test/extensions/common/aws/signers/sigv4a_signer_corpus_test.cc index 4ab2480495cc3..9bc55a8581ead 100644 --- a/test/extensions/common/aws/signers/sigv4a_signer_corpus_test.cc +++ b/test/extensions/common/aws/signers/sigv4a_signer_corpus_test.cc @@ -25,7 +25,7 @@ std::vector directoryListing() { std::vector directories; for (auto const& entry : std::filesystem::directory_iterator( TestEnvironment::runfilesDirectory() + - "/external/com_github_awslabs_aws_c_auth/tests/aws-signing-test-suite/v4a")) { + "/external/aws-c-auth-testdata/tests/aws-signing-test-suite/v4a")) { directories.push_back(entry.path().string()); } return directories; diff --git a/test/extensions/common/wasm/BUILD b/test/extensions/common/wasm/BUILD index b683a7bd635ba..e40dfd6258832 100644 --- a/test/extensions/common/wasm/BUILD +++ b/test/extensions/common/wasm/BUILD @@ -63,7 +63,7 @@ envoy_cc_test( "//test/test_common:simulated_time_system_lib", "//test/test_common:test_runtime_lib", "//test/test_common:wasm_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) @@ -90,8 +90,8 @@ envoy_cc_test_binary( "//test/mocks/server:server_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", - "@com_github_google_benchmark//:benchmark", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", + "@benchmark", ], ) diff --git a/test/extensions/common/wasm/test_data/BUILD b/test/extensions/common/wasm/test_data/BUILD index 65484f577334e..c0160b6229ed9 100644 --- a/test/extensions/common/wasm/test_data/BUILD +++ b/test/extensions/common/wasm/test_data/BUILD @@ -29,7 +29,7 @@ envoy_cc_test_library( "//source/common/common:c_smart_ptr_lib", "//source/extensions/common/wasm:wasm_hdr", "//source/extensions/common/wasm:wasm_lib", - "@com_google_absl//absl/container:node_hash_map", + "@abseil-cpp//absl/container:node_hash_map", ], ) @@ -46,7 +46,7 @@ envoy_cc_test_library( "//source/extensions/common/wasm:wasm_hdr", "//source/extensions/common/wasm:wasm_lib", "//source/extensions/common/wasm/ext:envoy_null_plugin", - "@com_google_absl//absl/container:node_hash_map", + "@abseil-cpp//absl/container:node_hash_map", ], ) @@ -63,7 +63,7 @@ envoy_cc_test_library( "//source/extensions/common/wasm:wasm_hdr", "//source/extensions/common/wasm:wasm_lib", "//source/extensions/common/wasm/ext:envoy_null_plugin", - "@com_google_absl//absl/container:node_hash_map", + "@abseil-cpp//absl/container:node_hash_map", ], ) diff --git a/test/extensions/config_subscription/grpc/BUILD b/test/extensions/config_subscription/grpc/BUILD index 8533660464716..e1e090f64aacb 100644 --- a/test/extensions/config_subscription/grpc/BUILD +++ b/test/extensions/config_subscription/grpc/BUILD @@ -155,7 +155,7 @@ envoy_cc_test( "//test/mocks/runtime:runtime_mocks", "//test/test_common:logging_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/container:flat_hash_set", + "@abseil-cpp//absl/container:flat_hash_set", "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/common/expr/BUILD b/test/extensions/filters/common/expr/BUILD index 02c408555a867..d535efb5e0b33 100644 --- a/test/extensions/filters/common/expr/BUILD +++ b/test/extensions/filters/common/expr/BUILD @@ -51,7 +51,7 @@ envoy_extension_cc_test( "//source/extensions/filters/common/expr:evaluator_lib", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:utility_lib", - "@com_google_cel_cpp//eval/public/structs:cel_proto_wrapper", + "@cel-cpp//eval/public/structs:cel_proto_wrapper", ], ) @@ -112,7 +112,7 @@ envoy_cc_benchmark_binary( "//test/mocks/upstream:host_mocks", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) diff --git a/test/extensions/filters/http/cache/BUILD b/test/extensions/filters/http/cache/BUILD index 9cce4811ed0ed..3dfc678e2dbfc 100644 --- a/test/extensions/filters/http/cache/BUILD +++ b/test/extensions/filters/http/cache/BUILD @@ -93,8 +93,8 @@ envoy_extension_cc_test( "//test/test_common:simulated_time_system_lib", "//test/test_common:status_utility_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", ], ) @@ -166,7 +166,7 @@ envoy_extension_cc_test_library( "//test/mocks/server:factory_context_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/status", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/synchronization", ], ) diff --git a/test/extensions/filters/http/cache_v2/BUILD b/test/extensions/filters/http/cache_v2/BUILD index f5cbad5ba8113..41eb5f4ea9c28 100644 --- a/test/extensions/filters/http/cache_v2/BUILD +++ b/test/extensions/filters/http/cache_v2/BUILD @@ -105,8 +105,8 @@ envoy_extension_cc_test( "//test/test_common:simulated_time_system_lib", "//test/test_common:status_utility_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", ], ) @@ -195,7 +195,7 @@ envoy_extension_cc_test_library( "//test/mocks/server:factory_context_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/status", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/synchronization", ], ) diff --git a/test/extensions/filters/http/compressor/BUILD b/test/extensions/filters/http/compressor/BUILD index 8182d09aec131..7d7b4f2f8a05e 100644 --- a/test/extensions/filters/http/compressor/BUILD +++ b/test/extensions/filters/http/compressor/BUILD @@ -100,9 +100,9 @@ envoy_cc_benchmark_binary( "//test/mocks/runtime:runtime_mocks", "//test/test_common:printers_lib", "//test/test_common:utility_lib", - "@com_github_google_benchmark//:benchmark", - "@com_google_googletest//:gtest", + "@benchmark", "@envoy_api//envoy/extensions/filters/http/compressor/v3:pkg_cc_proto", + "@googletest//:gtest", ], ) diff --git a/test/extensions/filters/http/custom_response/BUILD b/test/extensions/filters/http/custom_response/BUILD index e3395a1f49dc5..cd798a37eb4b1 100644 --- a/test/extensions/filters/http/custom_response/BUILD +++ b/test/extensions/filters/http/custom_response/BUILD @@ -24,7 +24,7 @@ envoy_extension_cc_test_library( "//source/extensions/filters/http/custom_response:custom_response_filter", "//source/extensions/filters/http/custom_response:policy_interface", "//source/extensions/http/custom_response/redirect_policy:redirect_policy_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", "@envoy_api//envoy/extensions/filters/http/custom_response/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/http/custom_response/local_response_policy/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/http/custom_response/redirect_policy/v3:pkg_cc_proto", diff --git a/test/extensions/filters/http/ext_proc/BUILD b/test/extensions/filters/http/ext_proc/BUILD index a41100c747b2d..b3c6294256e24 100644 --- a/test/extensions/filters/http/ext_proc/BUILD +++ b/test/extensions/filters/http/ext_proc/BUILD @@ -70,8 +70,8 @@ envoy_extension_cc_test_library( "//test/test_common:simulated_time_system_lib", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/service/ext_proc/v3:pkg_cc_proto", ], ) @@ -180,8 +180,8 @@ envoy_extension_cc_test( "//test/test_common:registry_lib", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/service/ext_proc/v3:pkg_cc_proto", ], ) @@ -208,7 +208,7 @@ envoy_extension_cc_test( "//test/common/http:common_lib", "//test/mocks/event:event_mocks", "//test/test_common:utility_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/service/ext_proc/v3:pkg_cc_proto", ], ) @@ -236,7 +236,7 @@ envoy_extension_cc_test( "//source/extensions/filters/http/ext_proc", "//test/common/http:common_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/service/ext_proc/v3:pkg_cc_proto", ], ) @@ -386,7 +386,7 @@ envoy_extension_cc_test_library( "//test/test_common:registry_lib", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", "@envoy_api//envoy/config/common/matcher/v3:pkg_cc_proto", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/access_loggers/file/v3:pkg_cc_proto", @@ -584,7 +584,7 @@ envoy_extension_cc_test( "//test/integration:http_integration_lib", "//test/mocks/http:http_mocks", "//test/test_common:utility_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", "@envoy_api//envoy/extensions/filters/http/ext_proc/v3:pkg_cc_proto", "@envoy_api//envoy/service/ext_proc/v3:pkg_cc_proto", ], @@ -667,7 +667,7 @@ envoy_extension_cc_test( "//test/common/http:common_lib", "//test/integration:http_integration_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/strings:str_format", "@envoy_api//envoy/extensions/filters/http/ext_proc/v3:pkg_cc_proto", "@envoy_api//envoy/service/ext_proc/v3:pkg_cc_proto", ], @@ -682,8 +682,8 @@ envoy_extension_cc_test_library( deps = [ "//envoy/network:address_interface", "//test/test_common:network_utility_lib", + "@abseil-cpp//absl/strings:str_format", "@com_github_grpc_grpc//:grpc++", - "@com_google_absl//absl/strings:str_format", "@envoy_api//envoy/service/ext_proc/v3:pkg_cc_grpc", "@envoy_api//envoy/service/ext_proc/v3:pkg_cc_proto", ], @@ -714,9 +714,9 @@ envoy_extension_cc_test_library( "//source/common/protobuf", "//source/extensions/filters/http/ext_proc:on_processing_response_interface", "//test/test_common:utility_lib", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings:str_format", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -800,7 +800,7 @@ envoy_extension_cc_test( "//test/integration:http_integration_lib", "//test/test_common:environment_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", "@envoy_api//envoy/extensions/filters/http/ext_proc/v3:pkg_cc_proto", "@envoy_api//envoy/service/ext_proc/v3:pkg_cc_proto", ], diff --git a/test/extensions/filters/http/grpc_field_extraction/BUILD b/test/extensions/filters/http/grpc_field_extraction/BUILD index 70621c98a2171..19d4b70ffe96a 100644 --- a/test/extensions/filters/http/grpc_field_extraction/BUILD +++ b/test/extensions/filters/http/grpc_field_extraction/BUILD @@ -63,6 +63,6 @@ envoy_extension_cc_test( "//test/extensions/filters/http/grpc_field_extraction/message_converter:message_converter_test_lib", "//test/integration:http_protocol_integration_lib", "//test/proto:apikeys_proto_cc_proto", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/strings:str_format", ], ) diff --git a/test/extensions/filters/http/grpc_json_reverse_transcoder/BUILD b/test/extensions/filters/http/grpc_json_reverse_transcoder/BUILD index 519c2587bdc23..f5f3348925080 100644 --- a/test/extensions/filters/http/grpc_json_reverse_transcoder/BUILD +++ b/test/extensions/filters/http/grpc_json_reverse_transcoder/BUILD @@ -19,7 +19,7 @@ envoy_extension_cc_test( deps = [ "//source/common/http:utility_lib", "//source/extensions/filters/http/grpc_json_reverse_transcoder:utils", - "@com_github_nlohmann_json//:json", + "@nlohmann_json//:json", ], ) diff --git a/test/extensions/filters/http/header_mutation/BUILD b/test/extensions/filters/http/header_mutation/BUILD index b1d2c35993b5a..efb65286af738 100644 --- a/test/extensions/filters/http/header_mutation/BUILD +++ b/test/extensions/filters/http/header_mutation/BUILD @@ -57,6 +57,6 @@ envoy_extension_cc_test( "//test/mocks/server:instance_mocks", "//test/test_common:registry_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/strings:str_format", ], ) diff --git a/test/extensions/filters/http/proto_api_scrubber/BUILD b/test/extensions/filters/http/proto_api_scrubber/BUILD index e65cba1ab9fb9..f7077f29bd199 100644 --- a/test/extensions/filters/http/proto_api_scrubber/BUILD +++ b/test/extensions/filters/http/proto_api_scrubber/BUILD @@ -53,7 +53,7 @@ envoy_cc_test( "//test/test_common:environment_lib", "//test/test_common:status_utility_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/status", + "@abseil-cpp//absl/status", "@envoy_api//envoy/extensions/filters/http/proto_api_scrubber/v3:pkg_cc_proto", "@xds//xds/type/matcher/v3:pkg_cc_proto", ], @@ -87,8 +87,8 @@ envoy_cc_test( "//test/test_common:environment_lib", "//test/test_common:logging_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/log", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/log", + "@abseil-cpp//absl/strings", ], ) @@ -117,8 +117,8 @@ envoy_extension_cc_test( "//test/integration:http_protocol_integration_lib", "//test/proto:apikeys_proto_cc_proto", "//test/test_common:registry_lib", - "@com_google_absl//absl/strings:str_format", - "@com_google_cel_cpp//parser", + "@abseil-cpp//absl/strings:str_format", + "@cel-cpp//parser", "@envoy_api//envoy/extensions/filters/http/proto_api_scrubber/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/matching/common_inputs/network/v3:pkg_cc_proto", "@envoy_api//envoy/type/matcher/v3:pkg_cc_proto", @@ -145,7 +145,7 @@ envoy_cc_benchmark_binary( "//test/mocks/server:factory_context_mocks", "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", - "@com_google_cel_cpp//parser", + "@cel-cpp//parser", "@envoy_api//envoy/extensions/filters/http/proto_api_scrubber/v3:pkg_cc_proto", "@xds//xds/type/matcher/v3:pkg_cc_proto", ], diff --git a/test/extensions/filters/http/proto_message_extraction/BUILD b/test/extensions/filters/http/proto_message_extraction/BUILD index 0dc34841ceedd..309af62ead1f1 100644 --- a/test/extensions/filters/http/proto_message_extraction/BUILD +++ b/test/extensions/filters/http/proto_message_extraction/BUILD @@ -65,6 +65,6 @@ envoy_extension_cc_test( "//test/extensions/filters/http/grpc_field_extraction/message_converter:message_converter_test_lib", "//test/integration:http_protocol_integration_lib", "//test/proto:apikeys_proto_cc_proto", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/strings:str_format", ], ) diff --git a/test/extensions/filters/http/proto_message_extraction/extraction_util/BUILD b/test/extensions/filters/http/proto_message_extraction/extraction_util/BUILD index 1658d47d22d90..525c22c841824 100644 --- a/test/extensions/filters/http/proto_message_extraction/extraction_util/BUILD +++ b/test/extensions/filters/http/proto_message_extraction/extraction_util/BUILD @@ -21,9 +21,9 @@ envoy_cc_test( "//test/proto:extraction_proto_cc_proto", "//test/test_common:environment_lib", "//test/test_common:status_utility_lib", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/log:check", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", "@com_google_protobuf//:protobuf", "@ocp-diag-core//ocpdiag/core/testing:parse_text_proto", "@ocp-diag-core//ocpdiag/core/testing:status_matchers", diff --git a/test/extensions/filters/http/transform/BUILD b/test/extensions/filters/http/transform/BUILD index ad75fc23cf936..7e38aec87d7de 100644 --- a/test/extensions/filters/http/transform/BUILD +++ b/test/extensions/filters/http/transform/BUILD @@ -58,6 +58,6 @@ envoy_extension_cc_test( "//test/mocks/server:instance_mocks", "//test/test_common:registry_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/strings:str_format", ], ) diff --git a/test/extensions/filters/http/wasm/test_data/BUILD b/test/extensions/filters/http/wasm/test_data/BUILD index 5c074b3ea658e..3fc28d3b23e8d 100644 --- a/test/extensions/filters/http/wasm/test_data/BUILD +++ b/test/extensions/filters/http/wasm/test_data/BUILD @@ -136,7 +136,7 @@ envoy_cc_test_library( "//source/extensions/common/wasm:wasm_lib", "//source/extensions/common/wasm/ext:envoy_null_plugin", "//source/extensions/common/wasm/ext:sign_cc_proto", - "@com_google_absl//absl/container:node_hash_map", + "@abseil-cpp//absl/container:node_hash_map", "@proxy_wasm_cpp_sdk//contrib:contrib_lib", ], ) diff --git a/test/extensions/filters/listener/tls_inspector/BUILD b/test/extensions/filters/listener/tls_inspector/BUILD index b8e639653b858..2e25b2976816d 100644 --- a/test/extensions/filters/listener/tls_inspector/BUILD +++ b/test/extensions/filters/listener/tls_inspector/BUILD @@ -101,7 +101,7 @@ envoy_extension_cc_benchmark_binary( "//test/mocks/network:network_mocks", "//test/mocks/stats:stats_mocks", "//test/test_common:threadsafe_singleton_injector_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) diff --git a/test/extensions/filters/network/common/fuzz/BUILD b/test/extensions/filters/network/common/fuzz/BUILD index 7f1e0277fe969..146ce314339cb 100644 --- a/test/extensions/filters/network/common/fuzz/BUILD +++ b/test/extensions/filters/network/common/fuzz/BUILD @@ -98,7 +98,7 @@ envoy_cc_fuzz_test( "//source/common/http:rds_lib", "//test/config:utility_lib", "//test/test_common:test_runtime_lib", - "@com_github_google_libprotobuf_mutator//:libprotobuf_mutator", + "@libprotobuf-mutator//:libprotobuf_mutator", ] + envoy_filters_from_selected(READFILTER_FUZZ_FILTERS), ) diff --git a/test/extensions/filters/network/redis_proxy/BUILD b/test/extensions/filters/network/redis_proxy/BUILD index 9a2555cff228b..5f173a7364106 100644 --- a/test/extensions/filters/network/redis_proxy/BUILD +++ b/test/extensions/filters/network/redis_proxy/BUILD @@ -170,7 +170,7 @@ envoy_extension_cc_benchmark_binary( "//test/mocks/network:network_mocks", "//test/test_common:printers_lib", "//test/test_common:simulated_time_system_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) @@ -229,7 +229,7 @@ envoy_extension_cc_benchmark_binary( "//source/extensions/filters/network/redis_proxy:router_lib", "//test/test_common:printers_lib", "//test/test_common:simulated_time_system_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) diff --git a/test/extensions/filters/network/wasm/test_data/BUILD b/test/extensions/filters/network/wasm/test_data/BUILD index 5767f8ba518ad..261505e7fa2ef 100644 --- a/test/extensions/filters/network/wasm/test_data/BUILD +++ b/test/extensions/filters/network/wasm/test_data/BUILD @@ -59,7 +59,7 @@ envoy_cc_test_library( "//source/common/common:c_smart_ptr_lib", "//source/extensions/common/wasm:wasm_hdr", "//source/extensions/common/wasm:wasm_lib", - "@com_google_absl//absl/container:node_hash_map", + "@abseil-cpp//absl/container:node_hash_map", ], ) diff --git a/test/extensions/filters/udp/dns_filter/BUILD b/test/extensions/filters/udp/dns_filter/BUILD index 9ac39a7597c08..a68788984f726 100644 --- a/test/extensions/filters/udp/dns_filter/BUILD +++ b/test/extensions/filters/udp/dns_filter/BUILD @@ -24,7 +24,7 @@ envoy_extension_cc_test_library( "//source/common/network:utility_lib", "//source/extensions/filters/udp/dns_filter:dns_filter_lib", "//test/test_common:environment_lib", - "@com_github_cares_cares//:ares", + "@c-ares//:ares", ], ) diff --git a/test/extensions/formatter/cel/BUILD b/test/extensions/formatter/cel/BUILD index b44c354a2ceaa..62dbe733d6e41 100644 --- a/test/extensions/formatter/cel/BUILD +++ b/test/extensions/formatter/cel/BUILD @@ -37,7 +37,7 @@ envoy_extension_cc_test( { "//bazel:windows_x86_64": [], "//conditions:default": [ - "@com_google_cel_cpp//parser", + "@cel-cpp//parser", ], }, ), diff --git a/test/extensions/load_balancing_policies/common/BUILD b/test/extensions/load_balancing_policies/common/BUILD index 71249aca2029e..b6374b1c2db55 100644 --- a/test/extensions/load_balancing_policies/common/BUILD +++ b/test/extensions/load_balancing_policies/common/BUILD @@ -22,7 +22,7 @@ envoy_cc_test_library( "//test/mocks/upstream:cluster_info_mocks", "//test/test_common:printers_lib", "//test/test_common:simulated_time_system_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], ) diff --git a/test/extensions/load_balancing_policies/override_host/BUILD b/test/extensions/load_balancing_policies/override_host/BUILD index b958ac30c6e5e..8d5c0759a2354 100644 --- a/test/extensions/load_balancing_policies/override_host/BUILD +++ b/test/extensions/load_balancing_policies/override_host/BUILD @@ -60,7 +60,7 @@ envoy_extension_cc_test( "//test/mocks/upstream:load_balancer_context_mock", "//test/mocks/upstream:priority_set_mocks", "//test/test_common:utility_lib", - "@com_google_absl//absl/strings:string_view", + "@abseil-cpp//absl/strings:string_view", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/load_balancing_policies/override_host/v3:pkg_cc_proto", ], @@ -84,8 +84,8 @@ envoy_extension_cc_test( "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/strings:string_view", + "@abseil-cpp//absl/types:span", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", ], ) @@ -114,9 +114,9 @@ envoy_cc_test_library( "//source/common/protobuf", "//source/common/protobuf:utility_lib_header", "//source/common/upstream:load_balancer_factory_base_lib", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/log:check", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", ], ) diff --git a/test/extensions/load_balancing_policies/subset/BUILD b/test/extensions/load_balancing_policies/subset/BUILD index 8bf236205a6b9..5efc1fd25af22 100644 --- a/test/extensions/load_balancing_policies/subset/BUILD +++ b/test/extensions/load_balancing_policies/subset/BUILD @@ -92,7 +92,7 @@ envoy_extension_cc_benchmark_binary( "//test/extensions/load_balancing_policies/common:benchmark_base_tester_lib", "//test/mocks/server:factory_context_mocks", "//test/mocks/upstream:load_balancer_mocks", - "@com_github_google_benchmark//:benchmark", + "@benchmark", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/load_balancing_policies/random/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/load_balancing_policies/subset/v3:pkg_cc_proto", diff --git a/test/extensions/network/dns_resolver/apple/BUILD b/test/extensions/network/dns_resolver/apple/BUILD index eeb8430838baa..df829a76c3556 100644 --- a/test/extensions/network/dns_resolver/apple/BUILD +++ b/test/extensions/network/dns_resolver/apple/BUILD @@ -30,7 +30,7 @@ envoy_cc_test( "//test/test_common:network_utility_lib", "//test/test_common:threadsafe_singleton_injector_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/synchronization", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ] + select({ "//bazel:apple": [ diff --git a/test/extensions/path/uri_template_lib/BUILD b/test/extensions/path/uri_template_lib/BUILD index f30d748afc31e..4ca5005a50ebe 100644 --- a/test/extensions/path/uri_template_lib/BUILD +++ b/test/extensions/path/uri_template_lib/BUILD @@ -18,9 +18,9 @@ envoy_cc_test( deps = [ "//source/extensions/path/uri_template_lib", "//test/test_common:status_utility_lib", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", ], ) @@ -32,10 +32,10 @@ envoy_cc_test( "//source/extensions/path/uri_template_lib:uri_template_internal_cc", "//test/test_common:status_utility_lib", "//test/test_common:test_runtime_lib", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_googlesource_code_re2//:re2", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@re2", ], ) diff --git a/test/extensions/quic/connection_id_generator/quic_lb/BUILD b/test/extensions/quic/connection_id_generator/quic_lb/BUILD index e52da315db8c0..44d7e2b2347d7 100644 --- a/test/extensions/quic/connection_id_generator/quic_lb/BUILD +++ b/test/extensions/quic/connection_id_generator/quic_lb/BUILD @@ -20,7 +20,7 @@ envoy_extension_cc_test( deps = envoy_select_enable_http3([ "//source/extensions/quic/connection_id_generator/quic_lb:quic_lb_lib", "//test/mocks/server:factory_context_mocks", - "@com_github_google_quiche//:quic_test_tools_test_utils_lib", + "@quiche//:quic_test_tools_test_utils_lib", ]), ) diff --git a/test/extensions/resource_monitors/cpu_utilization/BUILD b/test/extensions/resource_monitors/cpu_utilization/BUILD index 9a0f288816e1b..39f09b366a718 100644 --- a/test/extensions/resource_monitors/cpu_utilization/BUILD +++ b/test/extensions/resource_monitors/cpu_utilization/BUILD @@ -19,7 +19,7 @@ envoy_extension_cc_test( deps = [ "//source/extensions/resource_monitors/cpu_utilization:cpu_utilization_monitor", "//source/extensions/resource_monitors/cpu_utilization:linux_cpu_stats_reader", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/extensions/resource_monitors/cpu_utilization/v3:pkg_cc_proto", ], ) @@ -35,7 +35,7 @@ envoy_extension_cc_test( "//test/mocks/event:event_mocks", "//test/mocks/server:options_mocks", "//test/test_common:environment_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/test/extensions/resource_monitors/downstream_connections/BUILD b/test/extensions/resource_monitors/downstream_connections/BUILD index f4bbba859d37c..0d5c1004ff073 100644 --- a/test/extensions/resource_monitors/downstream_connections/BUILD +++ b/test/extensions/resource_monitors/downstream_connections/BUILD @@ -19,7 +19,7 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/resource_monitors/downstream_connections:downstream_connections_monitor", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/extensions/resource_monitors/downstream_connections/v3:pkg_cc_proto", ], ) diff --git a/test/extensions/resource_monitors/fixed_heap/BUILD b/test/extensions/resource_monitors/fixed_heap/BUILD index cae3a3361b914..bc7f429d7b9d1 100644 --- a/test/extensions/resource_monitors/fixed_heap/BUILD +++ b/test/extensions/resource_monitors/fixed_heap/BUILD @@ -19,7 +19,7 @@ envoy_extension_cc_test( deps = [ "//source/extensions/resource_monitors/fixed_heap:fixed_heap_monitor", "//test/test_common:test_runtime_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/extensions/resource_monitors/fixed_heap/v3:pkg_cc_proto", ], ) diff --git a/test/extensions/stats_sinks/wasm/BUILD b/test/extensions/stats_sinks/wasm/BUILD index 3392680ce34ba..d82a35e1b9e2f 100644 --- a/test/extensions/stats_sinks/wasm/BUILD +++ b/test/extensions/stats_sinks/wasm/BUILD @@ -50,6 +50,6 @@ envoy_extension_cc_test( "//test/extensions/stats_sinks/wasm/test_data:test_context_cpp_plugin", "//test/mocks/stats:stats_mocks", "//test/test_common:wasm_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", ], ) diff --git a/test/extensions/tracers/datadog/BUILD b/test/extensions/tracers/datadog/BUILD index 8ea42b2aaae5f..f9fb7d7862d65 100644 --- a/test/extensions/tracers/datadog/BUILD +++ b/test/extensions/tracers/datadog/BUILD @@ -54,8 +54,8 @@ envoy_extension_cc_test( "//test/mocks/upstream:cluster_manager_mocks", "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:utility_lib", - "@com_github_datadog_dd_trace_cpp//:dd_trace_cpp", - "@com_github_nlohmann_json//:json", + "@dd-trace-cpp//:dd_trace_cpp", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", + "@nlohmann_json//:json", ], ) diff --git a/test/extensions/tracers/opentelemetry/BUILD b/test/extensions/tracers/opentelemetry/BUILD index bb9fd387610b0..01995ab3b50fa 100644 --- a/test/extensions/tracers/opentelemetry/BUILD +++ b/test/extensions/tracers/opentelemetry/BUILD @@ -46,7 +46,7 @@ envoy_extension_cc_test( "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@opentelemetry-cpp//api", ], ) diff --git a/test/extensions/tracers/zipkin/BUILD b/test/extensions/tracers/zipkin/BUILD index eb34d6390cf32..0f66bc183e94c 100644 --- a/test/extensions/tracers/zipkin/BUILD +++ b/test/extensions/tracers/zipkin/BUILD @@ -41,7 +41,7 @@ envoy_extension_cc_test( "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", ], ) diff --git a/test/extensions/transport_sockets/alts/BUILD b/test/extensions/transport_sockets/alts/BUILD index 944db420da714..e5b9993193d33 100644 --- a/test/extensions/transport_sockets/alts/BUILD +++ b/test/extensions/transport_sockets/alts/BUILD @@ -56,10 +56,10 @@ envoy_extension_cc_test( "//test/test_common:network_utility_lib", "//test/test_common:status_utility_lib", "//test/test_common:utility_lib", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/synchronization", "@com_github_grpc_grpc//:grpc++", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", ], ) @@ -77,10 +77,10 @@ envoy_extension_cc_test( "//test/test_common:network_utility_lib", "//test/test_common:status_utility_lib", "//test/test_common:utility_lib", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/synchronization", "@com_github_grpc_grpc//:grpc++", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", ], ) @@ -113,9 +113,9 @@ envoy_extension_cc_test( "//test/test_common:network_utility_lib", "//test/test_common:status_utility_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/synchronization", ], ) diff --git a/test/extensions/watchdog/profile_action/BUILD b/test/extensions/watchdog/profile_action/BUILD index 7ed2f9f2a5ecd..1165b42350617 100644 --- a/test/extensions/watchdog/profile_action/BUILD +++ b/test/extensions/watchdog/profile_action/BUILD @@ -29,7 +29,7 @@ envoy_extension_cc_test( "//test/test_common:environment_lib", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/synchronization", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/watchdog/profile_action/v3:pkg_cc_proto", ], diff --git a/test/fuzz/BUILD b/test/fuzz/BUILD index 4064029320319..da576dac59b27 100644 --- a/test/fuzz/BUILD +++ b/test/fuzz/BUILD @@ -43,7 +43,7 @@ envoy_cc_test_library( "//test:test_listener_lib", "//test/test_common:environment_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/synchronization", ] + envoy_select_signal_trace(["//source/common/signal:sigaction_lib"]), ) @@ -60,7 +60,7 @@ envoy_cc_test_library( "//source/common/http/http2:codec_lib", "//source/exe:process_wide_lib", "//test/test_common:environment_lib", - "@com_github_google_libprotobuf_mutator//:libprotobuf_mutator", + "@libprotobuf-mutator//:libprotobuf_mutator", ], ) @@ -80,8 +80,8 @@ envoy_cc_test_library( "//test/mocks/ssl:ssl_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", - "@com_github_google_quiche//:http2_adapter", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", + "@quiche//:http2_adapter", ], ) @@ -94,7 +94,7 @@ envoy_cc_test_library( "//source/common/protobuf:message_validator_lib", "//source/common/protobuf:utility_lib_header", "//source/common/protobuf:visitor_lib", - "@com_google_absl//absl/cleanup", + "@abseil-cpp//absl/cleanup", "@xds//udpa/type/v1:pkg_cc_proto", "@xds//xds/type/v3:pkg_cc_proto", ], @@ -108,7 +108,7 @@ envoy_cc_test_library( "//test/fuzz:mutable_visitor_lib", "//test/fuzz:random_lib", "@com_envoyproxy_protoc_gen_validate//validate:cc_validate", - "@com_github_google_libprotobuf_mutator//:libprotobuf_mutator", + "@libprotobuf-mutator//:libprotobuf_mutator", "@xds//udpa/type/v1:pkg_cc_proto", "@xds//xds/type/v3:pkg_cc_proto", ], diff --git a/test/integration/BUILD b/test/integration/BUILD index 0c9f68a70ac31..f4e5b10f266b8 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -474,7 +474,7 @@ envoy_cc_test_binary( "//source/extensions/load_balancing_policies/ring_hash:config", "//source/extensions/load_balancing_policies/round_robin:config", "//source/extensions/transport_sockets/tls:config", - "@com_google_absl//absl/debugging:symbolize", + "@abseil-cpp//absl/debugging:symbolize", ], ) @@ -491,7 +491,7 @@ envoy_cc_test_binary( "//source/exe:stripped_main_base_lib", "//source/extensions/listener_managers/validation_listener_manager:validation_listener_manager_lib", "//source/extensions/transport_sockets/tls:config", - "@com_google_absl//absl/debugging:symbolize", + "@abseil-cpp//absl/debugging:symbolize", ], ) @@ -628,7 +628,7 @@ envoy_cc_test( "//test/integration/filters:set_response_code_filter_lib", "//test/mocks/http:http_mocks", "//test/test_common:utility_lib", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/synchronization", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", @@ -670,7 +670,7 @@ envoy_cc_test( "//test/mocks/upstream:retry_priority_mocks", "//test/test_common:status_utility_lib", "//test/test_common:utility_lib", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/synchronization", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", @@ -803,7 +803,7 @@ envoy_cc_test_library( ], deps = [ "//test/integration/filters:test_socket_interface_lib", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/synchronization", ], ) @@ -1334,7 +1334,7 @@ envoy_cc_test_library( "//source/common/quic:active_quic_listener_lib", "//source/common/quic:quic_client_factory_lib", "//source/common/quic:quic_server_factory_lib", - "@com_github_google_quiche//:quic_test_tools_session_peer_lib", + "@quiche//:quic_test_tools_session_peer_lib", ]) + envoy_select_envoy_mobile_listener([ "//source/common/listener_manager:listener_manager_lib", ]), @@ -1481,7 +1481,7 @@ envoy_cc_test_library( "//test/test_common:simulated_time_system_lib", "//test/test_common:test_time_lib", "//test/test_common:test_time_system_interface", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/synchronization", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/http/header_validators/envoy_default/v3:pkg_cc_proto", @@ -2735,8 +2735,8 @@ envoy_cc_test_library( "//test/integration/filters:stream_info_to_headers_filter_lib", "//test/integration/filters:test_listener_filter_lib", "//test/integration/filters:test_network_filter_lib", - "@com_github_google_quiche//:quic_test_tools_session_peer_lib", - "@com_github_google_quiche//:quic_test_tools_test_utils_lib", + "@quiche//:quic_test_tools_session_peer_lib", + "@quiche//:quic_test_tools_test_utils_lib", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/overload/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", @@ -2915,7 +2915,7 @@ envoy_cc_test( "//test/common/grpc:grpc_client_integration_lib", "//test/config:v2_link_hacks", "//test/test_common:registry_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", "@envoy_api//envoy/service/runtime/v3:pkg_cc_proto", ], @@ -2943,7 +2943,7 @@ envoy_cc_test( "//test/common/grpc:grpc_client_integration_lib", "//test/config:v2_link_hacks", "//test/test_common:registry_lib", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", "@envoy_api//envoy/service/runtime/v3:pkg_cc_proto", diff --git a/test/integration/admin_html/BUILD b/test/integration/admin_html/BUILD index e9d7912b2bef2..a486b71a5521f 100644 --- a/test/integration/admin_html/BUILD +++ b/test/integration/admin_html/BUILD @@ -21,7 +21,7 @@ envoy_cc_test_binary( "//source/extensions/clusters/dns:dns_cluster_lib", "//source/extensions/clusters/static:static_cluster_lib", "//source/server/admin:admin_html_util", - "@com_google_absl//absl/debugging:symbolize", + "@abseil-cpp//absl/debugging:symbolize", ], ) diff --git a/test/integration/filters/BUILD b/test/integration/filters/BUILD index 93d95fbe7bd7c..71b7e01f80420 100644 --- a/test/integration/filters/BUILD +++ b/test/integration/filters/BUILD @@ -45,7 +45,7 @@ envoy_cc_test_library( "//envoy/server:filter_config_interface", "//source/common/router:string_accessor_lib", "//source/common/stream_info:uint32_accessor_lib", - "@com_github_google_quiche//:quic_core_packets_lib", + "@quiche//:quic_core_packets_lib", ], ) @@ -173,7 +173,7 @@ envoy_cc_test_library( "//source/common/http:header_map_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/synchronization", ], ) @@ -832,7 +832,7 @@ envoy_cc_test_library( "//source/common/network:address_lib", "//source/common/network:default_socket_interface_lib", "//test/test_common:network_utility_lib", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/extensions/network/socket_interface/v3:pkg_cc_proto", ], ) @@ -961,7 +961,7 @@ envoy_cc_test_library( "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/strings:str_format", ], ) diff --git a/test/mocks/http/BUILD b/test/mocks/http/BUILD index af75f948d3445..00e49cb9827ba 100644 --- a/test/mocks/http/BUILD +++ b/test/mocks/http/BUILD @@ -75,7 +75,7 @@ envoy_cc_mock( "//test/mocks/stream_info:stream_info_mocks", "//test/mocks/tracing:tracing_mocks", "//test/mocks/upstream:host_mocks", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) diff --git a/test/mocks/network/BUILD b/test/mocks/network/BUILD index 5791d5176013b..5deeb74a64bfd 100644 --- a/test/mocks/network/BUILD +++ b/test/mocks/network/BUILD @@ -77,7 +77,7 @@ envoy_cc_mock( "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", ] + envoy_select_enable_http3([ - "@com_github_google_quiche//:quic_platform_socket_address", + "@quiche//:quic_platform_socket_address", ]), ) @@ -91,6 +91,6 @@ envoy_cc_mock( "//source/common/network:listen_socket_lib", "//source/common/network:utility_lib", ] + envoy_select_enable_http3([ - "@com_github_google_quiche//:quic_client_crypto_crypto_handshake_lib", + "@quiche//:quic_client_crypto_crypto_handshake_lib", ]), ) diff --git a/test/mocks/runtime/BUILD b/test/mocks/runtime/BUILD index 87b8a4884409e..81966f4fe7f84 100644 --- a/test/mocks/runtime/BUILD +++ b/test/mocks/runtime/BUILD @@ -17,7 +17,7 @@ envoy_cc_mock( "//envoy/upstream:cluster_manager_interface", "//test/mocks:common_lib", "//test/mocks/stats:stats_mocks", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/types:optional", "@envoy_api//envoy/type/v3:pkg_cc_proto", ], ) diff --git a/test/server/BUILD b/test/server/BUILD index eb1e38cac2cb3..10c348bba4f69 100644 --- a/test/server/BUILD +++ b/test/server/BUILD @@ -465,7 +465,7 @@ envoy_cc_benchmark_binary( "//source/server:server_lib", "//test/mocks/upstream:cluster_manager_mocks", "//test/test_common:simulated_time_system_lib", - "@com_github_google_benchmark//:benchmark", + "@benchmark", ], ) diff --git a/test/test_common/BUILD b/test/test_common/BUILD index 64e79954a6b37..4f688ae05ffce 100644 --- a/test/test_common/BUILD +++ b/test/test_common/BUILD @@ -29,8 +29,8 @@ envoy_cc_test_library( "//source/common/json:json_loader_lib", "//source/common/network:utility_lib", "//source/server:options_base", - "@com_google_absl//absl/debugging:symbolize", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/debugging:symbolize", + "@abseil-cpp//absl/types:optional", ] + envoy_select_signal_trace(["//source/common/signal:sigaction_lib"]) + envoy_select_enable_exceptions([ "//source/server:options_lib", ]), @@ -155,7 +155,7 @@ envoy_cc_test_library( "//source/common/protobuf:utility_lib", "//source/common/stats:stats_lib", "//test/mocks/stats:stats_mocks", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", diff --git a/test/tools/router_check/BUILD b/test/tools/router_check/BUILD index 07a5c7178d4c0..afef5a1bece6e 100644 --- a/test/tools/router_check/BUILD +++ b/test/tools/router_check/BUILD @@ -55,11 +55,11 @@ envoy_cc_test_library( "//test/test_common:printers_lib", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", - "@com_github_mirror_tclap//:tclap", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/http/set_metadata/v3:pkg_cc_proto", "@envoy_api//envoy/type/v3:pkg_cc_proto", + "@tclap", ], ) diff --git a/test/tools/schema_validator/BUILD b/test/tools/schema_validator/BUILD index 607a118e172d0..1491d856fe0f4 100644 --- a/test/tools/schema_validator/BUILD +++ b/test/tools/schema_validator/BUILD @@ -35,10 +35,10 @@ envoy_cc_test_library( "//source/common/version:version_lib", "//source/extensions/filters/http/match_delegate:config", "//test/test_common:utility_lib", - "@com_github_mirror_tclap//:tclap", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", + "@tclap", ], ) diff --git a/tools/code/BUILD b/tools/code/BUILD index 87cfa0ee5bf40..87b8ae3d1d01a 100644 --- a/tools/code/BUILD +++ b/tools/code/BUILD @@ -34,7 +34,7 @@ py_console_script_binary( "--extensions_build_config=$(location :extensions_build_config)", "--extensions_fuzzed_count=%s" % FUZZ_FILTER_COUNT, "--path=%s" % PATH, - "-b shellcheck:$(location @com_github_aignas_rules_shellcheck//:shellcheck)", + "-b shellcheck:$(location @shellcheck)", "-b gofmt:$(location @go_sdk//:bin/gofmt)", "-x bazel/repo.bzl", ], @@ -42,8 +42,8 @@ py_console_script_binary( ":extensions_build_config", "//:CODEOWNERS", "//:OWNERS.md", - "@com_github_aignas_rules_shellcheck//:shellcheck", "@go_sdk//:bin/gofmt", + "@shellcheck", ], pkg = "@base_pip3//envoy_code_check", script = "envoy.code.check", @@ -64,7 +64,7 @@ genrule( --extensions_build_config=$(location :extensions_build_config) \ --extensions_fuzzed_count=%s \ --path=%s \ - -b shellcheck:$(location @com_github_aignas_rules_shellcheck//:shellcheck) \ + -b shellcheck:$(location @shellcheck) \ -b gofmt:$(location @go_sdk//:bin/gofmt) \ > $@ 2>&1 || : """ % ( @@ -78,8 +78,8 @@ genrule( "//:CODEOWNERS", "//:OWNERS.md", "//bazel:volatile-scm-hash", - "@com_github_aignas_rules_shellcheck//:shellcheck", "@go_sdk//:bin/gofmt", + "@shellcheck", ], ) diff --git a/tools/code_format/BUILD b/tools/code_format/BUILD index a5009c2e8ab84..b919f4d5da18d 100644 --- a/tools/code_format/BUILD +++ b/tools/code_format/BUILD @@ -20,14 +20,14 @@ py_binary( args = [ "--path=%s" % PATH, "--clang_format_path=$(location //tools/clang-format)", - "--buildifier_path=$(location @com_github_bazelbuild_buildtools//buildifier)", - "--buildozer_path=$(location @com_github_bazelbuild_buildtools//buildozer)", + "--buildifier_path=$(location @buildtools//buildifier)", + "--buildozer_path=$(location @buildtools//buildozer)", ], data = [ ":config.yaml", "//tools/clang-format", - "@com_github_bazelbuild_buildtools//buildifier", - "@com_github_bazelbuild_buildtools//buildozer", + "@buildtools//buildifier", + "@buildtools//buildozer", ], deps = [ requirement("pyyaml"), diff --git a/tools/type_whisperer/BUILD b/tools/type_whisperer/BUILD index 56e7a8b2f5bcb..2bc28fac2dc41 100644 --- a/tools/type_whisperer/BUILD +++ b/tools/type_whisperer/BUILD @@ -101,7 +101,7 @@ envoy_cc_library( deps = [ "//source/common/protobuf", "//tools/type_whisperer:api_type_db_proto_cc_proto", - "@com_google_absl//absl/container:node_hash_map", + "@abseil-cpp//absl/container:node_hash_map", "@xds//udpa/annotations:pkg_cc_proto", ], ) From 84151cee0470c592852a75e4510386ba7d4c839f Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Tue, 3 Feb 2026 10:37:40 +0000 Subject: [PATCH 2/8] api: remove unused Signed-off-by: Ryan Northey --- api/MODULE.bazel | 1 - 1 file changed, 1 deletion(-) diff --git a/api/MODULE.bazel b/api/MODULE.bazel index bdf4b13061ab0..46fd52700c969 100644 --- a/api/MODULE.bazel +++ b/api/MODULE.bazel @@ -8,7 +8,6 @@ module( # Core dependencies from Bazel Central Registry bazel_dep(name = "abseil-cpp", version = "20250814.1") bazel_dep(name = "bazel_skylib", version = "1.8.2") -bazel_dep(name = "cel-spec", version = "0.25.1", repo_name = "dev_cel") bazel_dep(name = "gazelle", version = "0.47.0", repo_name = "gazelle") bazel_dep(name = "googleapis", version = "0.0.0-20251003-2193a2bf") bazel_dep(name = "googleapis-cc", version = "1.0.0") From ed9f5ffe4034c22992ecead074c03f220c860a9d Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Tue, 3 Feb 2026 11:04:11 +0000 Subject: [PATCH 3/8] zipkin-cleanups Signed-off-by: Ryan Northey --- api/MODULE.bazel | 5 +---- api/bazel/deps.yaml | 2 +- api/bazel/repositories.bzl | 10 ++++++++-- api/bazel/repository_locations.bzl | 2 +- source/extensions/tracers/zipkin/BUILD | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/api/MODULE.bazel b/api/MODULE.bazel index 46fd52700c969..3705a4fd7108a 100644 --- a/api/MODULE.bazel +++ b/api/MODULE.bazel @@ -25,10 +25,7 @@ bazel_dep(name = "rules_jvm_external", version = "6.8") bazel_dep(name = "rules_proto", version = "7.1.0") bazel_dep(name = "rules_python", version = "1.6.0") bazel_dep(name = "xds", version = "0.0.0-20240423-555b57e") -bazel_dep(name = "zipkin-api", version = "1.0.0", repo_name = "com_github_openzipkin_zipkinapi") - -# Bump google_benchmark to avoid rules_foreign_cc -bazel_dep(name = "google_benchmark", version = "1.9.2") +bazel_dep(name = "zipkin-api", version = "1.0.0") # Test dependencies from Bazel Central Registry bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True) diff --git a/api/bazel/deps.yaml b/api/bazel/deps.yaml index e0682db4927f4..beb6bcaaa7e98 100644 --- a/api/bazel/deps.yaml +++ b/api/bazel/deps.yaml @@ -42,7 +42,7 @@ xds: - api license: "Apache-2.0" license_url: "https://github.com/cncf/xds/blob/{version}/LICENSE" -com_github_openzipkin_zipkinapi: +zipkin_api: project_name: "Zipkin API" project_desc: "Zipkin's language independent model and HTTP Api Definitions" project_url: "https://github.com/openzipkin/zipkin-api" diff --git a/api/bazel/repositories.bzl b/api/bazel/repositories.bzl index f20864222a270..c93daba62e729 100644 --- a/api/bazel/repositories.bzl +++ b/api/bazel/repositories.bzl @@ -54,7 +54,8 @@ def api_dependencies(bzlmod = False): name = "rules_proto", ) external_http_archive( - name = "com_github_openzipkin_zipkinapi", + name = "zipkin-api", + location_name = "zipkin_api", build_file_content = ZIPKINAPI_BUILD_CONTENT, ) external_http_archive( @@ -99,7 +100,6 @@ api_cc_py_proto_library( "zipkin-jsonv2.proto", "zipkin.proto", ], - visibility = ["//visibility:public"], ) go_proto_library( @@ -107,6 +107,12 @@ go_proto_library( proto = ":zipkin", visibility = ["//visibility:public"], ) + +alias( + name = "zipkin-api", + actual = ":zipkin_cc_proto", + visibility = ["//visibility:public"], +) """ # Aligned target names with https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/opentelemetry-proto diff --git a/api/bazel/repository_locations.bzl b/api/bazel/repository_locations.bzl index 4e83108d1d004..53d3a57a4f23e 100644 --- a/api/bazel/repository_locations.bzl +++ b/api/bazel/repository_locations.bzl @@ -24,7 +24,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "xds-{version}", urls = ["https://github.com/cncf/xds/archive/{version}.tar.gz"], ), - com_github_openzipkin_zipkinapi = dict( + zipkin_api = dict( version = "1.0.0", sha256 = "6c8ee2014cf0746ba452e5f2c01f038df60e85eb2d910b226f9aa27ddc0e44cf", strip_prefix = "zipkin-api-{version}", diff --git a/source/extensions/tracers/zipkin/BUILD b/source/extensions/tracers/zipkin/BUILD index 3ae314908e11c..2f9ad9778c748 100644 --- a/source/extensions/tracers/zipkin/BUILD +++ b/source/extensions/tracers/zipkin/BUILD @@ -56,8 +56,8 @@ envoy_cc_library( "//source/common/upstream:cluster_update_tracker_lib", "//source/extensions/tracers/opentelemetry:opentelemetry_tracer_lib", "@abseil-cpp//absl/types:optional", - "@com_github_openzipkin_zipkinapi//:zipkin_cc_proto", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", + "@zipkin-api", ], ) From 3f286a1fafa027344dcd4be6e719acaca885d997 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Tue, 3 Feb 2026 11:59:50 +0000 Subject: [PATCH 4/8] deps-tooling Signed-off-by: Ryan Northey --- bazel/foreign_cc/BUILD | 4 ++-- bazel/repositories.bzl | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bazel/foreign_cc/BUILD b/bazel/foreign_cc/BUILD index 63c1b0337446e..7cd494b368ad5 100644 --- a/bazel/foreign_cc/BUILD +++ b/bazel/foreign_cc/BUILD @@ -113,7 +113,7 @@ configure_make( "//bazel:windows_dbg_build": {"WINDOWS_DBG_BUILD": "debug"}, "//conditions:default": {}, }), - lib_source = "@luajit//:all", + lib_source = "@luajit", out_include_dir = "include/luajit-2.1", out_static_libs = select({ "//bazel:windows_x86_64": ["lua51.lib"], @@ -291,7 +291,7 @@ envoy_cmake( "-G", "Ninja", ], - lib_source = "@libevent//:all", + lib_source = "@libevent", out_static_libs = select({ # macOS organization of libevent is different from Windows/Linux. # Including libevent_core is a requirement on those platforms, but diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 1096b6d97f5c9..dc7190c10400d 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -476,9 +476,10 @@ def _yaml_cpp(): ) def _libevent(): + LIBEVENT_BUILD_CONTENT = """%s\nalias(name = "libevent", actual = ":all")""" % BUILD_ALL_CONTENT external_http_archive( name = "libevent", - build_file_content = BUILD_ALL_CONTENT, + build_file_content = LIBEVENT_BUILD_CONTENT, ) def _colm(): @@ -841,9 +842,10 @@ def _emsdk(): ) def _luajit(): + LUAJIT_BUILD_CONTENT = """%s\nalias(name = "luajit", actual = ":all")""" % BUILD_ALL_CONTENT external_http_archive( name = "luajit", - build_file_content = BUILD_ALL_CONTENT, + build_file_content = LUAJIT_BUILD_CONTENT, patches = ["@envoy//bazel/foreign_cc:luajit.patch"], patch_args = ["-p1"], ) @@ -964,7 +966,8 @@ def _thrift(): ) def _libmaxminddb(): + LIBMAXMINDDB_BUILD_CONTENT = """%s\nalias(name = "libmaxminddb", actual = ":all")""" % BUILD_ALL_CONTENT external_http_archive( name = "libmaxminddb", - build_file_content = BUILD_ALL_CONTENT, + build_file_content = LIBMAXMINDDB_BUILD_CONTENT, ) From 7e2d1f1a3e6d8ca36dfbe31e4a602431ab346777 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Tue, 3 Feb 2026 15:17:42 +0000 Subject: [PATCH 5/8] visibility Signed-off-by: Ryan Northey --- bazel/repositories.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index dc7190c10400d..03704163a04fb 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -476,7 +476,7 @@ def _yaml_cpp(): ) def _libevent(): - LIBEVENT_BUILD_CONTENT = """%s\nalias(name = "libevent", actual = ":all")""" % BUILD_ALL_CONTENT + LIBEVENT_BUILD_CONTENT = """%s\nalias(name = "libevent", actual = ":all", visibility = ["visibility//public"])""" % BUILD_ALL_CONTENT external_http_archive( name = "libevent", build_file_content = LIBEVENT_BUILD_CONTENT, @@ -842,7 +842,7 @@ def _emsdk(): ) def _luajit(): - LUAJIT_BUILD_CONTENT = """%s\nalias(name = "luajit", actual = ":all")""" % BUILD_ALL_CONTENT + LUAJIT_BUILD_CONTENT = """%s\nalias(name = "luajit", actual = ":all", visibility = ["visibility//public"])""" % BUILD_ALL_CONTENT external_http_archive( name = "luajit", build_file_content = LUAJIT_BUILD_CONTENT, @@ -966,7 +966,7 @@ def _thrift(): ) def _libmaxminddb(): - LIBMAXMINDDB_BUILD_CONTENT = """%s\nalias(name = "libmaxminddb", actual = ":all")""" % BUILD_ALL_CONTENT + LIBMAXMINDDB_BUILD_CONTENT = """%s\nalias(name = "libmaxminddb", actual = ":all", visibility = ["visibility//public"])""" % BUILD_ALL_CONTENT external_http_archive( name = "libmaxminddb", build_file_content = LIBMAXMINDDB_BUILD_CONTENT, From 7de98c5abedfb81dc348542fa89152a15130e9fa Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Tue, 3 Feb 2026 15:49:11 +0000 Subject: [PATCH 6/8] fix Signed-off-by: Ryan Northey --- bazel/repositories.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 03704163a04fb..d5efd7dcf6ab9 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -476,7 +476,7 @@ def _yaml_cpp(): ) def _libevent(): - LIBEVENT_BUILD_CONTENT = """%s\nalias(name = "libevent", actual = ":all", visibility = ["visibility//public"])""" % BUILD_ALL_CONTENT + LIBEVENT_BUILD_CONTENT = """%s\nalias(name = "libevent", actual = ":all", visibility = ["//visibility:public"])""" % BUILD_ALL_CONTENT external_http_archive( name = "libevent", build_file_content = LIBEVENT_BUILD_CONTENT, @@ -842,7 +842,7 @@ def _emsdk(): ) def _luajit(): - LUAJIT_BUILD_CONTENT = """%s\nalias(name = "luajit", actual = ":all", visibility = ["visibility//public"])""" % BUILD_ALL_CONTENT + LUAJIT_BUILD_CONTENT = """%s\nalias(name = "luajit", actual = ":all", visibility = ["//visibility:public"])""" % BUILD_ALL_CONTENT external_http_archive( name = "luajit", build_file_content = LUAJIT_BUILD_CONTENT, @@ -966,7 +966,7 @@ def _thrift(): ) def _libmaxminddb(): - LIBMAXMINDDB_BUILD_CONTENT = """%s\nalias(name = "libmaxminddb", actual = ":all", visibility = ["visibility//public"])""" % BUILD_ALL_CONTENT + LIBMAXMINDDB_BUILD_CONTENT = """%s\nalias(name = "libmaxminddb", actual = ":all", visibility = ["//visibility:public"])""" % BUILD_ALL_CONTENT external_http_archive( name = "libmaxminddb", build_file_content = LIBMAXMINDDB_BUILD_CONTENT, From 25bdd4ea4aaf8a76606dba329627b3558f760f4a Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Tue, 3 Feb 2026 16:13:30 +0000 Subject: [PATCH 7/8] mobile/ Signed-off-by: Ryan Northey --- mobile/bazel/envoy_mobile_repositories.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/bazel/envoy_mobile_repositories.bzl b/mobile/bazel/envoy_mobile_repositories.bzl index 0d253371e40c9..ac722581de95e 100644 --- a/mobile/bazel/envoy_mobile_repositories.bzl +++ b/mobile/bazel/envoy_mobile_repositories.bzl @@ -20,7 +20,7 @@ def upstream_envoy_overrides(): urls = ["https://github.com/libevent/libevent/archive/0d7d85c2083f7a4c9efe01c061486f332b576d28.tar.gz"], strip_prefix = "libevent-0d7d85c2083f7a4c9efe01c061486f332b576d28", sha256 = "549d34065eb2485dfad6c8de638caaa6616ed130eec36dd978f73b6bdd5af113", - build_file_content = """filegroup(name = "all", srcs = glob(["**"]), visibility = ["//visibility:public"])""", + build_file_content = """filegroup(name = "libevent", srcs = glob(["**"]), visibility = ["//visibility:public"])""", ) def swift_repos(): From 1a0fc1a7063c2db981e22be58d05595855ed1764 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Wed, 4 Feb 2026 19:58:50 +0000 Subject: [PATCH 8/8] fix-merge Signed-off-by: Ryan Northey --- source/common/json/BUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/common/json/BUILD b/source/common/json/BUILD index 97a3ac47aacc4..5535afe208b49 100644 --- a/source/common/json/BUILD +++ b/source/common/json/BUILD @@ -92,9 +92,9 @@ envoy_cc_library( "//source/common/common:logger_lib", "//source/common/protobuf", "//source/common/protobuf:utility_lib", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", ], )