From f39403afa681dfa4510b91b6e45e2b37e348bd1a Mon Sep 17 00:00:00 2001 From: alyssawilk Date: Tue, 5 Sep 2023 15:08:49 -0400 Subject: [PATCH 1/2] pragma once (#29430) Signed-off-by: Alyssa Wilk --- mobile/examples/cc/fetch_client/fetch_client.h | 2 ++ mobile/examples/objective-c/hello_world/AppDelegate.h | 2 ++ mobile/examples/objective-c/hello_world/Result.h | 2 ++ mobile/examples/objective-c/hello_world/ViewController.h | 2 ++ .../common/extensions/cert_validator/platform_bridge/config.h | 2 ++ .../library/common/extensions/filters/http/local_error/config.h | 2 ++ .../extensions/filters/http/network_configuration/config.h | 2 ++ .../library/common/extensions/filters/http/socket_tag/config.h | 2 ++ mobile/library/common/extensions/key_value/platform/config.h | 2 ++ mobile/library/common/jni/jni_support.h | 2 ++ mobile/library/objective-c/EMODirectResponse.h | 2 ++ mobile/library/objective-c/EnvoyAliases.h | 2 ++ mobile/library/objective-c/EnvoyBridgeUtility.h | 2 ++ mobile/library/objective-c/EnvoyConfiguration.h | 2 ++ mobile/library/objective-c/EnvoyEngine.h | 2 ++ mobile/library/objective-c/EnvoyEventTracker.h | 2 ++ mobile/library/objective-c/EnvoyHTTPCallbacks.h | 2 ++ mobile/library/objective-c/EnvoyHTTPFilter.h | 2 ++ mobile/library/objective-c/EnvoyHTTPFilterCallbacksImpl.h | 2 ++ mobile/library/objective-c/EnvoyHTTPFilterFactory.h | 2 ++ mobile/library/objective-c/EnvoyHTTPStream.h | 2 ++ mobile/library/objective-c/EnvoyKeyValueStore.h | 2 ++ mobile/library/objective-c/EnvoyKeyValueStoreBridgeImpl.h | 2 ++ mobile/library/objective-c/EnvoyLogger.h | 2 ++ mobile/library/objective-c/EnvoyNativeFilterConfig.h | 2 ++ mobile/library/objective-c/EnvoyNetworkMonitor.h | 2 ++ mobile/library/objective-c/EnvoyStringAccessor.h | 2 ++ mobile/library/swift/EnvoyCxxSwiftInterop/cxx_swift_interop.h | 2 ++ mobile/test/common/http/filters/route_cache_reset/config.h | 2 ++ mobile/test/common/http/filters/test_remote_response/config.h | 2 ++ mobile/test/common/mocks/common/mocks.h | 2 ++ mobile/test/objective-c/EnvoyTestServer.h | 2 ++ mobile/test/swift/integration/TestExtensions.h | 1 + 33 files changed, 65 insertions(+) diff --git a/mobile/examples/cc/fetch_client/fetch_client.h b/mobile/examples/cc/fetch_client/fetch_client.h index 3b58c0aec96e..453b2d844d1a 100644 --- a/mobile/examples/cc/fetch_client/fetch_client.h +++ b/mobile/examples/cc/fetch_client/fetch_client.h @@ -1,3 +1,5 @@ +#pragma once + #include #include diff --git a/mobile/examples/objective-c/hello_world/AppDelegate.h b/mobile/examples/objective-c/hello_world/AppDelegate.h index a5a8b38522b6..6d0301604fa8 100644 --- a/mobile/examples/objective-c/hello_world/AppDelegate.h +++ b/mobile/examples/objective-c/hello_world/AppDelegate.h @@ -1,3 +1,5 @@ +#pragma once + #import @interface AppDelegate : UIResponder diff --git a/mobile/examples/objective-c/hello_world/Result.h b/mobile/examples/objective-c/hello_world/Result.h index 86dd0ceea0af..07b70a5bb3e9 100644 --- a/mobile/examples/objective-c/hello_world/Result.h +++ b/mobile/examples/objective-c/hello_world/Result.h @@ -1,3 +1,5 @@ +#pragma once + #import /// Represents a response from the server or an error. diff --git a/mobile/examples/objective-c/hello_world/ViewController.h b/mobile/examples/objective-c/hello_world/ViewController.h index 1ec50dffe1c5..4a7e775b2a07 100644 --- a/mobile/examples/objective-c/hello_world/ViewController.h +++ b/mobile/examples/objective-c/hello_world/ViewController.h @@ -1,3 +1,5 @@ +#pragma once + #import @interface ViewController : UITableViewController diff --git a/mobile/library/common/extensions/cert_validator/platform_bridge/config.h b/mobile/library/common/extensions/cert_validator/platform_bridge/config.h index 6155381a882f..87ac174c6af4 100644 --- a/mobile/library/common/extensions/cert_validator/platform_bridge/config.h +++ b/mobile/library/common/extensions/cert_validator/platform_bridge/config.h @@ -1,3 +1,5 @@ +#pragma once + #include "envoy/registry/registry.h" #include "source/extensions/transport_sockets/tls/cert_validator/factory.h" diff --git a/mobile/library/common/extensions/filters/http/local_error/config.h b/mobile/library/common/extensions/filters/http/local_error/config.h index 5132e5e79768..74a919475332 100644 --- a/mobile/library/common/extensions/filters/http/local_error/config.h +++ b/mobile/library/common/extensions/filters/http/local_error/config.h @@ -1,3 +1,5 @@ +#pragma once + #include #include "source/extensions/filters/http/common/factory_base.h" diff --git a/mobile/library/common/extensions/filters/http/network_configuration/config.h b/mobile/library/common/extensions/filters/http/network_configuration/config.h index 9a0592bfafb9..c12c56c83304 100644 --- a/mobile/library/common/extensions/filters/http/network_configuration/config.h +++ b/mobile/library/common/extensions/filters/http/network_configuration/config.h @@ -1,3 +1,5 @@ +#pragma once + #include #include "source/extensions/filters/http/common/factory_base.h" diff --git a/mobile/library/common/extensions/filters/http/socket_tag/config.h b/mobile/library/common/extensions/filters/http/socket_tag/config.h index ae69bd672209..207f117e3c9a 100644 --- a/mobile/library/common/extensions/filters/http/socket_tag/config.h +++ b/mobile/library/common/extensions/filters/http/socket_tag/config.h @@ -1,3 +1,5 @@ +#pragma once + #include #include "source/extensions/filters/http/common/factory_base.h" diff --git a/mobile/library/common/extensions/key_value/platform/config.h b/mobile/library/common/extensions/key_value/platform/config.h index 661f6c524ceb..1000f2690183 100644 --- a/mobile/library/common/extensions/key_value/platform/config.h +++ b/mobile/library/common/extensions/key_value/platform/config.h @@ -1,3 +1,5 @@ +#pragma once + #include "envoy/common/key_value_store.h" #include "envoy/registry/registry.h" diff --git a/mobile/library/common/jni/jni_support.h b/mobile/library/common/jni/jni_support.h index 42d5c15b3513..41b493c3ef1c 100644 --- a/mobile/library/common/jni/jni_support.h +++ b/mobile/library/common/jni/jni_support.h @@ -1,3 +1,5 @@ +#pragma once + #include "library/common/jni/import/jni_import.h" // NOLINT(namespace-envoy) diff --git a/mobile/library/objective-c/EMODirectResponse.h b/mobile/library/objective-c/EMODirectResponse.h index be2be6a0d7b8..504016fc6883 100644 --- a/mobile/library/objective-c/EMODirectResponse.h +++ b/mobile/library/objective-c/EMODirectResponse.h @@ -1,3 +1,5 @@ +#pragma once + #import NS_ASSUME_NONNULL_BEGIN diff --git a/mobile/library/objective-c/EnvoyAliases.h b/mobile/library/objective-c/EnvoyAliases.h index 22d49a138d11..8e8b218576e5 100644 --- a/mobile/library/objective-c/EnvoyAliases.h +++ b/mobile/library/objective-c/EnvoyAliases.h @@ -1,3 +1,5 @@ +#pragma once + #import #import "library/common/types/c_types.h" diff --git a/mobile/library/objective-c/EnvoyBridgeUtility.h b/mobile/library/objective-c/EnvoyBridgeUtility.h index 23e23d02d2dd..942a39dcc391 100644 --- a/mobile/library/objective-c/EnvoyBridgeUtility.h +++ b/mobile/library/objective-c/EnvoyBridgeUtility.h @@ -1,3 +1,5 @@ +#pragma once + #import #import "library/common/types/c_types.h" diff --git a/mobile/library/objective-c/EnvoyConfiguration.h b/mobile/library/objective-c/EnvoyConfiguration.h index 1b8f0a3b51bf..0f9fb7d43cb5 100644 --- a/mobile/library/objective-c/EnvoyConfiguration.h +++ b/mobile/library/objective-c/EnvoyConfiguration.h @@ -1,3 +1,5 @@ +#pragma once + #import @class EMODirectResponse; diff --git a/mobile/library/objective-c/EnvoyEngine.h b/mobile/library/objective-c/EnvoyEngine.h index 9b7740472fdf..9578f07988e2 100644 --- a/mobile/library/objective-c/EnvoyEngine.h +++ b/mobile/library/objective-c/EnvoyEngine.h @@ -1,3 +1,5 @@ +#pragma once + #import #import "library/objective-c/EMODirectResponse.h" diff --git a/mobile/library/objective-c/EnvoyEventTracker.h b/mobile/library/objective-c/EnvoyEventTracker.h index 1c884d34cab2..6fd921e14aa9 100644 --- a/mobile/library/objective-c/EnvoyEventTracker.h +++ b/mobile/library/objective-c/EnvoyEventTracker.h @@ -1,3 +1,5 @@ +#pragma once + #import #import "library/objective-c/EnvoyAliases.h" diff --git a/mobile/library/objective-c/EnvoyHTTPCallbacks.h b/mobile/library/objective-c/EnvoyHTTPCallbacks.h index ee2b1c8b0073..7d53ad59f582 100644 --- a/mobile/library/objective-c/EnvoyHTTPCallbacks.h +++ b/mobile/library/objective-c/EnvoyHTTPCallbacks.h @@ -1,3 +1,5 @@ +#pragma once + #import #import "library/objective-c/EnvoyAliases.h" diff --git a/mobile/library/objective-c/EnvoyHTTPFilter.h b/mobile/library/objective-c/EnvoyHTTPFilter.h index 1b7d5374cf8b..51eb521ee371 100644 --- a/mobile/library/objective-c/EnvoyHTTPFilter.h +++ b/mobile/library/objective-c/EnvoyHTTPFilter.h @@ -1,3 +1,5 @@ +#pragma once + #import #import "library/objective-c/EnvoyAliases.h" diff --git a/mobile/library/objective-c/EnvoyHTTPFilterCallbacksImpl.h b/mobile/library/objective-c/EnvoyHTTPFilterCallbacksImpl.h index 68fc5975d4aa..268dc2b6827c 100644 --- a/mobile/library/objective-c/EnvoyHTTPFilterCallbacksImpl.h +++ b/mobile/library/objective-c/EnvoyHTTPFilterCallbacksImpl.h @@ -1,3 +1,5 @@ +#pragma once + #import #import "library/objective-c/EnvoyEngine.h" diff --git a/mobile/library/objective-c/EnvoyHTTPFilterFactory.h b/mobile/library/objective-c/EnvoyHTTPFilterFactory.h index 25b7509e1737..8f1148020b37 100644 --- a/mobile/library/objective-c/EnvoyHTTPFilterFactory.h +++ b/mobile/library/objective-c/EnvoyHTTPFilterFactory.h @@ -1,3 +1,5 @@ +#pragma once + #import @class EnvoyHTTPFilter; diff --git a/mobile/library/objective-c/EnvoyHTTPStream.h b/mobile/library/objective-c/EnvoyHTTPStream.h index c2a425618c47..8269bd87ca0c 100644 --- a/mobile/library/objective-c/EnvoyHTTPStream.h +++ b/mobile/library/objective-c/EnvoyHTTPStream.h @@ -1,3 +1,5 @@ +#pragma once + #import #import "library/objective-c/EnvoyAliases.h" diff --git a/mobile/library/objective-c/EnvoyKeyValueStore.h b/mobile/library/objective-c/EnvoyKeyValueStore.h index 745fb353ced3..9fe53421c8d2 100644 --- a/mobile/library/objective-c/EnvoyKeyValueStore.h +++ b/mobile/library/objective-c/EnvoyKeyValueStore.h @@ -1,3 +1,5 @@ +#pragma once + #import NS_ASSUME_NONNULL_BEGIN diff --git a/mobile/library/objective-c/EnvoyKeyValueStoreBridgeImpl.h b/mobile/library/objective-c/EnvoyKeyValueStoreBridgeImpl.h index 78253ef7aa6e..d0839377f84c 100644 --- a/mobile/library/objective-c/EnvoyKeyValueStoreBridgeImpl.h +++ b/mobile/library/objective-c/EnvoyKeyValueStoreBridgeImpl.h @@ -1,3 +1,5 @@ +#pragma once + #import "library/common/types/c_types.h" #import "library/objective-c/EnvoyKeyValueStore.h" diff --git a/mobile/library/objective-c/EnvoyLogger.h b/mobile/library/objective-c/EnvoyLogger.h index 8c630f5efc4d..971cae92be32 100644 --- a/mobile/library/objective-c/EnvoyLogger.h +++ b/mobile/library/objective-c/EnvoyLogger.h @@ -1,3 +1,5 @@ +#pragma once + #import NS_ASSUME_NONNULL_BEGIN diff --git a/mobile/library/objective-c/EnvoyNativeFilterConfig.h b/mobile/library/objective-c/EnvoyNativeFilterConfig.h index 2f38ecee4619..29d53752ac44 100644 --- a/mobile/library/objective-c/EnvoyNativeFilterConfig.h +++ b/mobile/library/objective-c/EnvoyNativeFilterConfig.h @@ -1,3 +1,5 @@ +#pragma once + #import NS_ASSUME_NONNULL_BEGIN diff --git a/mobile/library/objective-c/EnvoyNetworkMonitor.h b/mobile/library/objective-c/EnvoyNetworkMonitor.h index e09d3807964d..8fb67b0a188c 100644 --- a/mobile/library/objective-c/EnvoyNetworkMonitor.h +++ b/mobile/library/objective-c/EnvoyNetworkMonitor.h @@ -1,3 +1,5 @@ +#pragma once + #import #import "library/common/types/c_types.h" diff --git a/mobile/library/objective-c/EnvoyStringAccessor.h b/mobile/library/objective-c/EnvoyStringAccessor.h index 117c85dc8583..efb2b43c86b6 100644 --- a/mobile/library/objective-c/EnvoyStringAccessor.h +++ b/mobile/library/objective-c/EnvoyStringAccessor.h @@ -1,3 +1,5 @@ +#pragma once + #import NS_ASSUME_NONNULL_BEGIN diff --git a/mobile/library/swift/EnvoyCxxSwiftInterop/cxx_swift_interop.h b/mobile/library/swift/EnvoyCxxSwiftInterop/cxx_swift_interop.h index d6e9e0d4f293..027f75282a2f 100644 --- a/mobile/library/swift/EnvoyCxxSwiftInterop/cxx_swift_interop.h +++ b/mobile/library/swift/EnvoyCxxSwiftInterop/cxx_swift_interop.h @@ -1,3 +1,5 @@ +#pragma once + #include "library/cc/bridge_utility.h" #include "library/cc/direct_response_testing.h" #include "library/cc/engine_builder.h" diff --git a/mobile/test/common/http/filters/route_cache_reset/config.h b/mobile/test/common/http/filters/route_cache_reset/config.h index 6a5734258e37..620b495e58cd 100644 --- a/mobile/test/common/http/filters/route_cache_reset/config.h +++ b/mobile/test/common/http/filters/route_cache_reset/config.h @@ -1,3 +1,5 @@ +#pragma once + #include #include "source/extensions/filters/http/common/factory_base.h" diff --git a/mobile/test/common/http/filters/test_remote_response/config.h b/mobile/test/common/http/filters/test_remote_response/config.h index 09642e21a59d..fe0de58bb16f 100644 --- a/mobile/test/common/http/filters/test_remote_response/config.h +++ b/mobile/test/common/http/filters/test_remote_response/config.h @@ -1,3 +1,5 @@ +#pragma once + #include #include "source/extensions/filters/http/common/factory_base.h" diff --git a/mobile/test/common/mocks/common/mocks.h b/mobile/test/common/mocks/common/mocks.h index 76ac20556474..e4b2d174e25f 100644 --- a/mobile/test/common/mocks/common/mocks.h +++ b/mobile/test/common/mocks/common/mocks.h @@ -1,3 +1,5 @@ +#pragma once + #include "gmock/gmock.h" #include "library/common/common/system_helper.h" diff --git a/mobile/test/objective-c/EnvoyTestServer.h b/mobile/test/objective-c/EnvoyTestServer.h index 651d53f4d245..df61cc4bf06b 100644 --- a/mobile/test/objective-c/EnvoyTestServer.h +++ b/mobile/test/objective-c/EnvoyTestServer.h @@ -1,3 +1,5 @@ +#pragma once + #import // Interface for starting and managing a test server. Calls into to test_server.cc diff --git a/mobile/test/swift/integration/TestExtensions.h b/mobile/test/swift/integration/TestExtensions.h index 6a6d27199841..a83ea65e0199 100644 --- a/mobile/test/swift/integration/TestExtensions.h +++ b/mobile/test/swift/integration/TestExtensions.h @@ -1,3 +1,4 @@ +#pragma once #import From c92e2eacd0805d39842a78cea5e683ed9aa120e0 Mon Sep 17 00:00:00 2001 From: phlax Date: Tue, 5 Sep 2023 21:20:17 +0100 Subject: [PATCH 2/2] deps: Bump `buildifier`/`buildozer` -> 6.3.3 (#29405) Signed-off-by: Ryan Northey --- bazel/external/quiche.BUILD | 6 +++--- bazel/foreign_cc/BUILD | 2 +- bazel/repository_locations.bzl | 8 ++++---- configs/BUILD | 6 +++--- contrib/kafka/filters/network/source/BUILD | 4 ++-- contrib/kafka/filters/network/test/BUILD | 4 ++-- .../network/test/broker/integration_test/BUILD | 4 ++-- .../network/test/mesh/integration_test/BUILD | 4 ++-- .../connection_balance/dlb/source/BUILD | 4 ++-- contrib/qat/BUILD | 2 +- contrib/vcl/source/BUILD | 2 +- distribution/BUILD | 2 +- distribution/binary/BUILD | 2 +- docs/BUILD | 4 ++-- source/common/common/BUILD | 10 +++++----- source/common/filesystem/BUILD | 2 +- source/common/grpc/BUILD | 8 ++++---- source/common/http/match_delegate/BUILD | 8 ++++---- source/common/http/matching/BUILD | 8 ++++---- source/common/network/BUILD | 8 ++++---- source/common/quic/BUILD | 10 +++++----- source/common/router/BUILD | 8 ++++---- source/common/ssl/matching/BUILD | 8 ++++---- source/common/watchdog/BUILD | 8 ++++---- source/exe/BUILD | 10 +++++----- source/extensions/BUILD | 4 ++-- source/extensions/common/wasm/BUILD | 12 ++++++------ .../listener_managers/listener_manager/BUILD | 18 +++++++++--------- .../quic/connection_id_generator/BUILD | 8 ++++---- source/extensions/quic/crypto_stream/BUILD | 8 ++++---- source/extensions/quic/proof_source/BUILD | 8 ++++---- .../quic/server_preferred_address/BUILD | 8 ++++---- source/extensions/udp_packet_writer/gso/BUILD | 2 +- test/config_test/BUILD | 6 +++--- test/extensions/filters/http/common/fuzz/BUILD | 2 +- .../network/thrift_proxy/driver/fbthrift/BUILD | 2 +- .../driver/generated/example/BUILD | 2 +- .../network/dns_resolver/apple/BUILD | 10 +++++----- test/fuzz/BUILD | 8 ++++---- test/server/BUILD | 4 ++-- test/server/config_validation/BUILD | 2 +- test/tools/router_check/BUILD | 2 +- test/tools/schema_validator/BUILD | 2 +- tools/api_proto_breaking_change_detector/BUILD | 2 +- tools/code/BUILD | 6 +++--- tools/code_format/BUILD | 4 ++-- tools/config_validation/BUILD | 2 +- tools/dependency/BUILD | 4 ++-- tools/deprecate_version/BUILD | 2 +- tools/distribution/BUILD | 2 +- tools/docs/BUILD | 4 ++-- tools/github/BUILD | 2 +- tools/gsutil/BUILD | 4 ++-- tools/proto_format/BUILD | 6 +++--- tools/protodoc/BUILD | 4 ++-- tools/protoprint/BUILD | 4 ++-- tools/protoxform/BUILD | 2 +- tools/type_whisperer/BUILD | 2 +- 58 files changed, 150 insertions(+), 150 deletions(-) diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD index 4832d67aa238..e7b05b6ff9d6 100644 --- a/bazel/external/quiche.BUILD +++ b/bazel/external/quiche.BUILD @@ -1,4 +1,3 @@ -load("@rules_proto//proto:defs.bzl", "proto_library") load( "@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", @@ -10,6 +9,7 @@ load( "envoy_quiche_platform_impl_cc_library", "envoy_quiche_platform_impl_cc_test_library", ) +load("@rules_proto//proto:defs.bzl", "proto_library") licenses(["notice"]) # Apache 2 @@ -3553,15 +3553,15 @@ envoy_cc_library( srcs = select({ "@envoy//bazel:windows_x86_64": [], "//conditions:default": [ - "quiche/quic/core/io/event_loop_socket_factory.cc", "quiche/quic/core/io/event_loop_connecting_client_socket.cc", + "quiche/quic/core/io/event_loop_socket_factory.cc", ], }), hdrs = select({ "@envoy//bazel:windows_x86_64": [], "//conditions:default": [ - "quiche/quic/core/io/event_loop_socket_factory.h", "quiche/quic/core/io/event_loop_connecting_client_socket.h", + "quiche/quic/core/io/event_loop_socket_factory.h", ], }), copts = quiche_copts, diff --git a/bazel/foreign_cc/BUILD b/bazel/foreign_cc/BUILD index 67caf394a107..3d3b13d96944 100644 --- a/bazel/foreign_cc/BUILD +++ b/bazel/foreign_cc/BUILD @@ -1,5 +1,5 @@ -load("//bazel:envoy_build_system.bzl", "envoy_cmake", "envoy_package") load("@rules_foreign_cc//foreign_cc:configure.bzl", "configure_make") +load("//bazel:envoy_build_system.bzl", "envoy_cmake", "envoy_package") licenses(["notice"]) # Apache 2 diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 9cb979b2c3fe..440d2afaafc9 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -72,11 +72,11 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "Bazel build tools", project_desc = "Developer tools for working with Google's bazel buildtool.", project_url = "https://github.com/bazelbuild/buildtools", - version = "5.1.0", - sha256 = "e3bb0dc8b0274ea1aca75f1f8c0c835adbe589708ea89bf698069d0790701ea3", - release_date = "2022-04-14", + version = "6.3.3", + sha256 = "42968f9134ba2c75c03bb271bd7bb062afb7da449f9b913c96e5be4ce890030a", + release_date = "2023-08-25", strip_prefix = "buildtools-{version}", - urls = ["https://github.com/bazelbuild/buildtools/archive/{version}.tar.gz"], + urls = ["https://github.com/bazelbuild/buildtools/archive/v{version}.tar.gz"], use_category = ["test_only"], ), rules_fuzzing = dict( diff --git a/configs/BUILD b/configs/BUILD index 17b5cf99b5fd..ab37531ddba9 100644 --- a/configs/BUILD +++ b/configs/BUILD @@ -1,9 +1,9 @@ +load("@base_pip3//:requirements.bzl", "requirement") +load("@rules_python//python:defs.bzl", "py_binary") load( "//bazel:envoy_build_system.bzl", "envoy_package", ) -load("@rules_python//python:defs.bzl", "py_binary") -load("@base_pip3//:requirements.bzl", "requirement") licenses(["notice"]) # Apache 2 @@ -43,8 +43,8 @@ filegroup( "//bazel:disable_admin_functionality": [], "//conditions:default": [ "envoy-demo.yaml", - "freebind/freebind.yaml", "envoy-tap-config.yaml", + "freebind/freebind.yaml", ], }), ) diff --git a/contrib/kafka/filters/network/source/BUILD b/contrib/kafka/filters/network/source/BUILD index e0bf9ebed798..ec50a777c50d 100644 --- a/contrib/kafka/filters/network/source/BUILD +++ b/contrib/kafka/filters/network/source/BUILD @@ -1,11 +1,11 @@ +load("@base_pip3//:requirements.bzl", "requirement") +load("@rules_python//python:defs.bzl", "py_binary", "py_library") load( "//bazel:envoy_build_system.bzl", "envoy_cc_contrib_extension", "envoy_cc_library", "envoy_contrib_package", ) -load("@rules_python//python:defs.bzl", "py_binary", "py_library") -load("@base_pip3//:requirements.bzl", "requirement") licenses(["notice"]) # Apache 2 diff --git a/contrib/kafka/filters/network/test/BUILD b/contrib/kafka/filters/network/test/BUILD index 93b2d2e35a29..f7bf15eba151 100644 --- a/contrib/kafka/filters/network/test/BUILD +++ b/contrib/kafka/filters/network/test/BUILD @@ -1,11 +1,11 @@ +load("@base_pip3//:requirements.bzl", "requirement") +load("@rules_python//python:defs.bzl", "py_binary") load( "//bazel:envoy_build_system.bzl", "envoy_cc_test", "envoy_cc_test_library", "envoy_contrib_package", ) -load("@rules_python//python:defs.bzl", "py_binary") -load("@base_pip3//:requirements.bzl", "requirement") licenses(["notice"]) # Apache 2 diff --git a/contrib/kafka/filters/network/test/broker/integration_test/BUILD b/contrib/kafka/filters/network/test/broker/integration_test/BUILD index dced1baa7909..30444088ecbc 100644 --- a/contrib/kafka/filters/network/test/broker/integration_test/BUILD +++ b/contrib/kafka/filters/network/test/broker/integration_test/BUILD @@ -1,9 +1,9 @@ +load("@base_pip3//:requirements.bzl", "requirement") load( "//bazel:envoy_build_system.bzl", "envoy_contrib_package", "envoy_py_test", ) -load("@base_pip3//:requirements.bzl", "requirement") licenses(["notice"]) # Apache 2 @@ -17,8 +17,8 @@ envoy_py_test( "@kafka_python_client//:all", ], data = [ - "//contrib/exe:envoy-static", "//bazel:remote_jdk11", + "//contrib/exe:envoy-static", "@kafka_server_binary//:all", ] + glob(["*.j2"]), flaky = True, diff --git a/contrib/kafka/filters/network/test/mesh/integration_test/BUILD b/contrib/kafka/filters/network/test/mesh/integration_test/BUILD index 3f0084aa6bc3..3db16d298756 100644 --- a/contrib/kafka/filters/network/test/mesh/integration_test/BUILD +++ b/contrib/kafka/filters/network/test/mesh/integration_test/BUILD @@ -1,9 +1,9 @@ +load("@base_pip3//:requirements.bzl", "requirement") load( "//bazel:envoy_build_system.bzl", "envoy_contrib_package", "envoy_py_test", ) -load("@base_pip3//:requirements.bzl", "requirement") licenses(["notice"]) # Apache 2 @@ -17,8 +17,8 @@ envoy_py_test( "@kafka_python_client//:all", ], data = [ - "//contrib/exe:envoy-static", "//bazel:remote_jdk11", + "//contrib/exe:envoy-static", "@kafka_server_binary//:all", ] + glob(["*.j2"]), flaky = True, diff --git a/contrib/network/connection_balance/dlb/source/BUILD b/contrib/network/connection_balance/dlb/source/BUILD index 4dbf6c997a27..b0952bb65138 100644 --- a/contrib/network/connection_balance/dlb/source/BUILD +++ b/contrib/network/connection_balance/dlb/source/BUILD @@ -1,3 +1,4 @@ +load("@rules_foreign_cc//foreign_cc:defs.bzl", "make") load( "//bazel:envoy_build_system.bzl", "envoy_cc_contrib_extension", @@ -7,7 +8,6 @@ load( "//contrib:all_contrib_extensions.bzl", "envoy_contrib_linux_x86_64_constraints", ) -load("@rules_foreign_cc//foreign_cc:defs.bzl", "make") licenses(["notice"]) # Apache 2 @@ -37,8 +37,8 @@ envoy_cc_contrib_extension( ], }), deps = [ - "//envoy/registry", "//envoy/api:api_interface", + "//envoy/registry", "//envoy/server:factory_context_interface", "//envoy/server:filter_config_interface", "//source/common/common:logger_lib", diff --git a/contrib/qat/BUILD b/contrib/qat/BUILD index c56f6694b89f..d435976e4953 100644 --- a/contrib/qat/BUILD +++ b/contrib/qat/BUILD @@ -1,5 +1,5 @@ -load("//bazel:envoy_build_system.bzl", "envoy_contrib_package") load("@rules_foreign_cc//foreign_cc:configure.bzl", "configure_make") +load("//bazel:envoy_build_system.bzl", "envoy_contrib_package") load( "//contrib:all_contrib_extensions.bzl", "envoy_contrib_linux_x86_64_constraints", diff --git a/contrib/vcl/source/BUILD b/contrib/vcl/source/BUILD index 74b837b27921..ee8caf6184b9 100644 --- a/contrib/vcl/source/BUILD +++ b/contrib/vcl/source/BUILD @@ -1,3 +1,4 @@ +load("@base_pip3//:requirements.bzl", "requirement") load("@rules_cc//cc:defs.bzl", "cc_library") load( "//bazel:envoy_build_system.bzl", @@ -6,7 +7,6 @@ load( "envoy_cmake", "envoy_contrib_package", ) -load("@base_pip3//:requirements.bzl", "requirement") licenses(["notice"]) # Apache 2 diff --git a/distribution/BUILD b/distribution/BUILD index a709fa7dd2cb..b8d95a20e804 100644 --- a/distribution/BUILD +++ b/distribution/BUILD @@ -1,6 +1,6 @@ +load("@envoy_repo//:version.bzl", "VERSION") load("//bazel:envoy_build_system.bzl", "envoy_package") load(":packages.bzl", "envoy_pkg_distros") -load("@envoy_repo//:version.bzl", "VERSION") licenses(["notice"]) # Apache 2 diff --git a/distribution/binary/BUILD b/distribution/binary/BUILD index 0c18f2324712..5d610f0d075d 100644 --- a/distribution/binary/BUILD +++ b/distribution/binary/BUILD @@ -1,6 +1,6 @@ -load("//bazel:envoy_build_system.bzl", "envoy_package") load("@rules_pkg//pkg:mappings.bzl", "pkg_files") load("@rules_pkg//pkg:pkg.bzl", "pkg_tar") +load("//bazel:envoy_build_system.bzl", "envoy_package") load("//distribution/binary:compiler.bzl", "bundled") licenses(["notice"]) # Apache 2 diff --git a/docs/BUILD b/docs/BUILD index c8fddf3935b5..ed23eb4fb2da 100644 --- a/docs/BUILD +++ b/docs/BUILD @@ -1,9 +1,9 @@ +load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files") +load("@rules_pkg//pkg:pkg.bzl", "pkg_tar") load( "//bazel:envoy_build_system.bzl", "envoy_package", ) -load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files") -load("@rules_pkg//pkg:pkg.bzl", "pkg_tar") licenses(["notice"]) # Apache 2 diff --git a/source/common/common/BUILD b/source/common/common/BUILD index e1fea8623f05..14bcf9917df7 100644 --- a/source/common/common/BUILD +++ b/source/common/common/BUILD @@ -1,3 +1,7 @@ +load( + "@envoy_build_config//:extensions_build_config.bzl", + "LEGACY_ALWAYSLINK", +) load( "//bazel:envoy_build_system.bzl", "envoy_basic_cc_library", @@ -8,10 +12,6 @@ load( "envoy_package", "envoy_pch_library", ) -load( - "@envoy_build_config//:extensions_build_config.bzl", - "LEGACY_ALWAYSLINK", -) licenses(["notice"]) # Apache 2 @@ -214,7 +214,7 @@ envoy_cc_library( ":lock_guard_lib", ":macros", ":non_copyable", - "//source/common/protobuf:protobuf", + "//source/common/protobuf", ] + select({ "//bazel:android_logger": ["logger_impl_lib_android"], "//conditions:default": ["logger_impl_lib_standard"], diff --git a/source/common/filesystem/BUILD b/source/common/filesystem/BUILD index 060008a21718..65f8e0c87bd0 100644 --- a/source/common/filesystem/BUILD +++ b/source/common/filesystem/BUILD @@ -118,11 +118,11 @@ envoy_cc_library( deps = [ "//envoy/api:api_interface", "//envoy/event:dispatcher_interface", + "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:linked_object", "//source/common/common:minimal_logger_lib", "//source/common/common:utility_lib", - "//source/common/buffer:buffer_lib", "//source/common/network:default_socket_interface_lib", ] + select({ "//bazel:windows_x86_64": [ diff --git a/source/common/grpc/BUILD b/source/common/grpc/BUILD index 4c03865913af..96d1ed06353d 100644 --- a/source/common/grpc/BUILD +++ b/source/common/grpc/BUILD @@ -1,3 +1,7 @@ +load( + "@envoy_build_config//:extensions_build_config.bzl", + "LEGACY_ALWAYSLINK", +) load( "//bazel:envoy_build_system.bzl", "envoy_cc_library", @@ -5,10 +9,6 @@ load( "envoy_package", "envoy_select_google_grpc", ) -load( - "@envoy_build_config//:extensions_build_config.bzl", - "LEGACY_ALWAYSLINK", -) licenses(["notice"]) # Apache 2 diff --git a/source/common/http/match_delegate/BUILD b/source/common/http/match_delegate/BUILD index f86049878266..4cebb95ee861 100644 --- a/source/common/http/match_delegate/BUILD +++ b/source/common/http/match_delegate/BUILD @@ -1,12 +1,12 @@ +load( + "@envoy_build_config//:extensions_build_config.bzl", + "LEGACY_ALWAYSLINK", +) load( "//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package", ) -load( - "@envoy_build_config//:extensions_build_config.bzl", - "LEGACY_ALWAYSLINK", -) licenses(["notice"]) # Apache 2 diff --git a/source/common/http/matching/BUILD b/source/common/http/matching/BUILD index 1ae2fb53bcb1..0738a6ebbb00 100644 --- a/source/common/http/matching/BUILD +++ b/source/common/http/matching/BUILD @@ -1,12 +1,12 @@ +load( + "@envoy_build_config//:extensions_build_config.bzl", + "LEGACY_ALWAYSLINK", +) load( "//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package", ) -load( - "@envoy_build_config//:extensions_build_config.bzl", - "LEGACY_ALWAYSLINK", -) licenses(["notice"]) # Apache 2 diff --git a/source/common/network/BUILD b/source/common/network/BUILD index c2cdf2954c48..af359e896eda 100644 --- a/source/common/network/BUILD +++ b/source/common/network/BUILD @@ -1,12 +1,12 @@ +load( + "@envoy_build_config//:extensions_build_config.bzl", + "LEGACY_ALWAYSLINK", +) load( "//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package", ) -load( - "@envoy_build_config//:extensions_build_config.bzl", - "LEGACY_ALWAYSLINK", -) licenses(["notice"]) # Apache 2 diff --git a/source/common/quic/BUILD b/source/common/quic/BUILD index 16ebece17039..65f752ec8b99 100644 --- a/source/common/quic/BUILD +++ b/source/common/quic/BUILD @@ -1,13 +1,13 @@ +load( + "@envoy_build_config//:extensions_build_config.bzl", + "LEGACY_ALWAYSLINK", +) load( "//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package", "envoy_select_enable_http_datagrams", ) -load( - "@envoy_build_config//:extensions_build_config.bzl", - "LEGACY_ALWAYSLINK", -) licenses(["notice"]) # Apache 2 @@ -506,8 +506,8 @@ envoy_cc_library( "//bazel:boringssl_fips": [], "//bazel:boringssl_disabled": [], "//conditions:default": [ - ":server_codec_lib", ":quic_transport_socket_factory_lib", + ":server_codec_lib", "//source/extensions/quic/crypto_stream:envoy_quic_crypto_server_stream_lib", "//source/extensions/quic/proof_source:envoy_quic_proof_source_factory_impl_lib", ], diff --git a/source/common/router/BUILD b/source/common/router/BUILD index d3d3d9e512dd..1a0d3c11c5c4 100644 --- a/source/common/router/BUILD +++ b/source/common/router/BUILD @@ -1,12 +1,12 @@ +load( + "@envoy_build_config//:extensions_build_config.bzl", + "LEGACY_ALWAYSLINK", +) load( "//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package", ) -load( - "@envoy_build_config//:extensions_build_config.bzl", - "LEGACY_ALWAYSLINK", -) licenses(["notice"]) # Apache 2 diff --git a/source/common/ssl/matching/BUILD b/source/common/ssl/matching/BUILD index 25de1502208d..983791df12d8 100644 --- a/source/common/ssl/matching/BUILD +++ b/source/common/ssl/matching/BUILD @@ -1,12 +1,12 @@ +load( + "@envoy_build_config//:extensions_build_config.bzl", + "LEGACY_ALWAYSLINK", +) load( "//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package", ) -load( - "@envoy_build_config//:extensions_build_config.bzl", - "LEGACY_ALWAYSLINK", -) licenses(["notice"]) # Apache 2 diff --git a/source/common/watchdog/BUILD b/source/common/watchdog/BUILD index 2481ac8dab53..d0cc4ff462a8 100644 --- a/source/common/watchdog/BUILD +++ b/source/common/watchdog/BUILD @@ -1,12 +1,12 @@ +load( + "@envoy_build_config//:extensions_build_config.bzl", + "LEGACY_ALWAYSLINK", +) load( "//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package", ) -load( - "@envoy_build_config//:extensions_build_config.bzl", - "LEGACY_ALWAYSLINK", -) licenses(["notice"]) # Apache 2 diff --git a/source/exe/BUILD b/source/exe/BUILD index f2b01f7b655d..32fdd616dd26 100644 --- a/source/exe/BUILD +++ b/source/exe/BUILD @@ -10,8 +10,8 @@ load( "envoy_select_enable_http3", "envoy_select_signal_trace", ) -load("//source/extensions:all_extensions.bzl", "envoy_all_core_extensions", "envoy_all_extensions") load("//bazel:repositories.bzl", "PPC_SKIP_TARGETS", "WINDOWS_SKIP_TARGETS") +load("//source/extensions:all_extensions.bzl", "envoy_all_core_extensions", "envoy_all_extensions") licenses(["notice"]) # Apache 2 @@ -40,9 +40,9 @@ envoy_cc_library( "//source/common/stats:stats_lib", "//source/common/stats:thread_local_store_lib", "//source/server:drain_manager_lib", + "//source/server:listener_hooks_lib", "//source/server:options_lib", "//source/server:server_lib", - "//source/server:listener_hooks_lib", ] + select({ "//bazel:windows_x86_64": envoy_all_extensions(WINDOWS_SKIP_TARGETS), "//bazel:linux_ppc": envoy_all_extensions(PPC_SKIP_TARGETS), @@ -71,11 +71,11 @@ envoy_cc_library( ":envoy_common_with_core_extensions_lib", ":platform_impl_lib", ":process_wide_lib", - "//source/common/thread_local:thread_local_lib", "//source/common/api:os_sys_calls_lib", "//source/common/common:compiler_requirements_lib", "//source/common/common:perf_annotation_lib", "//source/common/grpc:google_grpc_context_lib", + "//source/common/thread_local:thread_local_lib", "//source/server:hot_restart_lib", "//source/server:hot_restart_nop_lib", ] + envoy_select_signal_trace([ @@ -141,9 +141,9 @@ envoy_cc_library( "//source/common/stats:stats_lib", "//source/common/stats:thread_local_store_lib", "//source/server:drain_manager_lib", + "//source/server:listener_hooks_lib", "//source/server:options_lib", "//source/server:server_lib", - "//source/server:listener_hooks_lib", ] + envoy_all_core_extensions() + # TODO(rojkov): drop io_uring dependency when it's fully integrated. select({ @@ -266,8 +266,8 @@ envoy_cc_library( ":main_common_lib", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", - "//source/common/common:win32_event_logger_impl_lib", "//source/common/common:thread_lib", + "//source/common/common:win32_event_logger_impl_lib", "//source/common/event:signal_lib", ], "//conditions:default": [], diff --git a/source/extensions/BUILD b/source/extensions/BUILD index 910abeaa4782..152c70189418 100644 --- a/source/extensions/BUILD +++ b/source/extensions/BUILD @@ -1,7 +1,7 @@ -load("//bazel:envoy_build_system.bzl", "envoy_extension_package") load("@envoy_api//bazel:utils.bzl", "json_data") -load(":extensions_build_config.bzl", "EXTENSIONS") +load("//bazel:envoy_build_system.bzl", "envoy_extension_package") load(":all_extensions.bzl", "envoy_all_extensions") +load(":extensions_build_config.bzl", "EXTENSIONS") licenses(["notice"]) # Apache 2 diff --git a/source/extensions/common/wasm/BUILD b/source/extensions/common/wasm/BUILD index 0b9ad7e97628..ba67df990189 100644 --- a/source/extensions/common/wasm/BUILD +++ b/source/extensions/common/wasm/BUILD @@ -78,29 +78,29 @@ envoy_cc_extension( deps = [ ":wasm_hdr", ":wasm_runtime_factory_interface", + "//envoy/server:lifecycle_notifier_interface", "//external:abseil_base", "//external:abseil_node_hash_map", "//external:zlib", - "//envoy/server:lifecycle_notifier_interface", "//source/common/buffer:buffer_lib", "//source/common/common:enum_to_int", "//source/common/common:safe_memcpy_lib", "//source/common/config:remote_data_fetcher_lib", "//source/common/http:message_lib", "//source/common/http:utility_lib", - "//source/common/tracing:http_tracer_lib", "//source/common/network/dns_resolver:dns_factory_util_lib", + "//source/common/tracing:http_tracer_lib", "//source/extensions/common/wasm/ext:declare_property_cc_proto", "//source/extensions/common/wasm/ext:envoy_null_vm_wasm_api", "//source/extensions/filters/common/expr:context_lib", - "@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", "@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", "@envoy_api//envoy/extensions/wasm/v3:pkg_cc_proto", "@proxy_wasm_cpp_host//:base_lib", "@proxy_wasm_cpp_host//:null_lib", diff --git a/source/extensions/listener_managers/listener_manager/BUILD b/source/extensions/listener_managers/listener_manager/BUILD index e5dcae1193ce..ddb413ac5319 100644 --- a/source/extensions/listener_managers/listener_manager/BUILD +++ b/source/extensions/listener_managers/listener_manager/BUILD @@ -28,15 +28,10 @@ envoy_cc_extension( "//test:__subpackages__", ], deps = [ - ":connection_handler_lib", - "//source/server:listener_manager_factory_lib", - "//source/server:api_listener_lib", ":active_raw_udp_listener_config", - "//source/server:configuration_lib", - "//source/server:drain_manager_lib", + ":connection_handler_lib", ":filter_chain_manager_lib", ":lds_api_lib", - "//source/server:transport_socket_config_lib", "//envoy/access_log:access_log_interface", "//envoy/config:typed_metadata_interface", "//envoy/network:connection_interface", @@ -49,8 +44,8 @@ envoy_cc_extension( "//source/common/access_log:access_log_lib", "//source/common/common:basic_resource_lib", "//source/common/common:empty_string", - "//source/common/config:utility_lib", "//source/common/config:metadata_lib", + "//source/common/config:utility_lib", "//source/common/http:conn_manager_lib", "//source/common/init:manager_lib", "//source/common/init:target_lib", @@ -63,11 +58,16 @@ envoy_cc_extension( "//source/common/network:udp_packet_writer_handler_lib", "//source/common/network:utility_lib", "//source/common/protobuf:utility_lib", - "//source/common/stream_info:stream_info_lib", "//source/common/quic:quic_stat_names_lib", + "//source/common/stream_info:stream_info_lib", "//source/extensions/filters/network/http_connection_manager:config", - "//source/extensions/upstreams/http/generic:config", "//source/extensions/udp_packet_writer/default:config", + "//source/extensions/upstreams/http/generic:config", + "//source/server:api_listener_lib", + "//source/server:configuration_lib", + "//source/server:drain_manager_lib", + "//source/server:listener_manager_factory_lib", + "//source/server:transport_socket_config_lib", "@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/extensions/quic/connection_id_generator/BUILD b/source/extensions/quic/connection_id_generator/BUILD index d379daeaea3b..05f6fe972240 100644 --- a/source/extensions/quic/connection_id_generator/BUILD +++ b/source/extensions/quic/connection_id_generator/BUILD @@ -1,13 +1,13 @@ +load( + "@envoy_build_config//:extensions_build_config.bzl", + "LEGACY_ALWAYSLINK", +) load( "//bazel:envoy_build_system.bzl", "envoy_cc_extension", "envoy_cc_library", "envoy_extension_package", ) -load( - "@envoy_build_config//:extensions_build_config.bzl", - "LEGACY_ALWAYSLINK", -) licenses(["notice"]) # Apache 2 diff --git a/source/extensions/quic/crypto_stream/BUILD b/source/extensions/quic/crypto_stream/BUILD index ed5a13caefb7..d358631954bf 100644 --- a/source/extensions/quic/crypto_stream/BUILD +++ b/source/extensions/quic/crypto_stream/BUILD @@ -1,13 +1,13 @@ +load( + "@envoy_build_config//:extensions_build_config.bzl", + "LEGACY_ALWAYSLINK", +) load( "//bazel:envoy_build_system.bzl", "envoy_cc_extension", "envoy_cc_library", "envoy_extension_package", ) -load( - "@envoy_build_config//:extensions_build_config.bzl", - "LEGACY_ALWAYSLINK", -) licenses(["notice"]) # Apache 2 diff --git a/source/extensions/quic/proof_source/BUILD b/source/extensions/quic/proof_source/BUILD index f2d51ed0089a..358e5123af8e 100644 --- a/source/extensions/quic/proof_source/BUILD +++ b/source/extensions/quic/proof_source/BUILD @@ -1,13 +1,13 @@ +load( + "@envoy_build_config//:extensions_build_config.bzl", + "LEGACY_ALWAYSLINK", +) load( "//bazel:envoy_build_system.bzl", "envoy_cc_extension", "envoy_cc_library", "envoy_extension_package", ) -load( - "@envoy_build_config//:extensions_build_config.bzl", - "LEGACY_ALWAYSLINK", -) licenses(["notice"]) # Apache 2 diff --git a/source/extensions/quic/server_preferred_address/BUILD b/source/extensions/quic/server_preferred_address/BUILD index b8a8f65f44b2..9f2a46f28320 100644 --- a/source/extensions/quic/server_preferred_address/BUILD +++ b/source/extensions/quic/server_preferred_address/BUILD @@ -1,13 +1,13 @@ +load( + "@envoy_build_config//:extensions_build_config.bzl", + "LEGACY_ALWAYSLINK", +) load( "//bazel:envoy_build_system.bzl", "envoy_cc_extension", "envoy_cc_library", "envoy_extension_package", ) -load( - "@envoy_build_config//:extensions_build_config.bzl", - "LEGACY_ALWAYSLINK", -) licenses(["notice"]) # Apache 2 diff --git a/source/extensions/udp_packet_writer/gso/BUILD b/source/extensions/udp_packet_writer/gso/BUILD index dbaf963b5499..d16cc337767d 100644 --- a/source/extensions/udp_packet_writer/gso/BUILD +++ b/source/extensions/udp_packet_writer/gso/BUILD @@ -23,8 +23,8 @@ envoy_cc_extension( tags = ["nofips"], deps = [ "//envoy/config:typed_config_interface", - "//envoy/registry", "//envoy/network:udp_packet_writer_handler_interface", + "//envoy/registry", "@envoy_api//envoy/extensions/udp_packet_writer/v3:pkg_cc_proto", ] + envoy_select_enable_http3([ "//source/common/quic:udp_gso_batch_writer_lib", diff --git a/test/config_test/BUILD b/test/config_test/BUILD index 3fa4a6234c2f..63ee81132676 100644 --- a/test/config_test/BUILD +++ b/test/config_test/BUILD @@ -4,8 +4,8 @@ load( "envoy_cc_test_library", "envoy_package", ) -load("//source/extensions:all_extensions.bzl", "envoy_all_extensions") load("//bazel:repositories.bzl", "PPC_SKIP_TARGETS", "WINDOWS_SKIP_TARGETS") +load("//source/extensions:all_extensions.bzl", "envoy_all_extensions") licenses(["notice"]) # Apache 2 @@ -55,12 +55,12 @@ envoy_cc_test_library( "//source/server/config_validation:server_lib", "//test/integration:integration_lib", "//test/mocks/server:instance_mocks", - "//test/mocks/server:worker_factory_mocks", "//test/mocks/server:listener_component_factory_mocks", + "//test/mocks/server:worker_factory_mocks", "//test/mocks/server:worker_mocks", "//test/mocks/ssl:ssl_mocks", - "//test/test_common:threadsafe_singleton_injector_lib", "//test/test_common:simulated_time_system_lib", + "//test/test_common:threadsafe_singleton_injector_lib", ] + select({ "//bazel:windows_x86_64": envoy_all_extensions(WINDOWS_SKIP_TARGETS), "//bazel:linux_ppc": envoy_all_extensions(PPC_SKIP_TARGETS), diff --git a/test/extensions/filters/http/common/fuzz/BUILD b/test/extensions/filters/http/common/fuzz/BUILD index 34b0a26c2e20..121a5be03d8c 100644 --- a/test/extensions/filters/http/common/fuzz/BUILD +++ b/test/extensions/filters/http/common/fuzz/BUILD @@ -74,7 +74,7 @@ envoy_cc_fuzz_test( "//source/common/protobuf:utility_lib", "//source/extensions/upstreams/http/generic:config", "//test/config:utility_lib", - "@envoy_api//envoy/service/auth/v3:pkg_cc_proto", "@envoy_api//envoy/service/auth/v2alpha:pkg_cc_proto", + "@envoy_api//envoy/service/auth/v3:pkg_cc_proto", ] + envoy_all_http_filters(), ) diff --git a/test/extensions/filters/network/thrift_proxy/driver/fbthrift/BUILD b/test/extensions/filters/network/thrift_proxy/driver/fbthrift/BUILD index f3808b7b5606..322e5e8c7566 100644 --- a/test/extensions/filters/network/thrift_proxy/driver/fbthrift/BUILD +++ b/test/extensions/filters/network/thrift_proxy/driver/fbthrift/BUILD @@ -1,6 +1,6 @@ +load("@base_pip3//:requirements.bzl", "requirement") load("@rules_python//python:defs.bzl", "py_library") load("//bazel:envoy_build_system.bzl", "envoy_package") -load("@base_pip3//:requirements.bzl", "requirement") licenses(["notice"]) # Apache 2 diff --git a/test/extensions/filters/network/thrift_proxy/driver/generated/example/BUILD b/test/extensions/filters/network/thrift_proxy/driver/generated/example/BUILD index f7cec3338d58..8ea20105b6a4 100644 --- a/test/extensions/filters/network/thrift_proxy/driver/generated/example/BUILD +++ b/test/extensions/filters/network/thrift_proxy/driver/generated/example/BUILD @@ -1,6 +1,6 @@ +load("@base_pip3//:requirements.bzl", "requirement") load("@rules_python//python:defs.bzl", "py_library") load("//bazel:envoy_build_system.bzl", "envoy_package") -load("@base_pip3//:requirements.bzl", "requirement") licenses(["notice"]) # Apache 2 diff --git a/test/extensions/network/dns_resolver/apple/BUILD b/test/extensions/network/dns_resolver/apple/BUILD index d949920ad9d9..8f0aa1689da3 100644 --- a/test/extensions/network/dns_resolver/apple/BUILD +++ b/test/extensions/network/dns_resolver/apple/BUILD @@ -17,20 +17,20 @@ envoy_cc_test( external_deps = ["abseil_synchronization"], deps = [ "//envoy/event:dispatcher_interface", + "//envoy/event:file_event_interface", "//envoy/network:dns_interface", + "//source/common/common:random_generator_lib", "//source/common/event:dispatcher_includes", - "//envoy/event:file_event_interface", - "//source/common/stats:isolated_store_lib", "//source/common/event:dispatcher_lib", "//source/common/network:address_lib", "//source/common/network/dns_resolver:dns_factory_util_lib", - "//source/common/common:random_generator_lib", + "//source/common/stats:isolated_store_lib", + "//test/mocks/event:event_mocks", "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", + "//test/test_common:threadsafe_singleton_injector_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", - "//test/test_common:threadsafe_singleton_injector_lib", - "//test/mocks/event:event_mocks", ] + select({ "//bazel:apple": [ "//source/extensions/network/dns_resolver/apple:config", diff --git a/test/fuzz/BUILD b/test/fuzz/BUILD index df66c8862a78..a2e921ddab32 100644 --- a/test/fuzz/BUILD +++ b/test/fuzz/BUILD @@ -1,3 +1,7 @@ +load( + "@rules_fuzzing//fuzzing:cc_defs.bzl", + "cc_fuzzing_engine", +) load( "//bazel:envoy_build_system.bzl", "envoy_cc_test", @@ -6,10 +10,6 @@ load( "envoy_proto_library", "envoy_select_signal_trace", ) -load( - "@rules_fuzzing//fuzzing:cc_defs.bzl", - "cc_fuzzing_engine", -) licenses(["notice"]) # Apache 2 diff --git a/test/server/BUILD b/test/server/BUILD index 7f082741ec64..62060da63fa5 100644 --- a/test/server/BUILD +++ b/test/server/BUILD @@ -9,8 +9,8 @@ load( "envoy_select_admin_functionality", "envoy_select_hot_restart", ) -load("//source/extensions:all_extensions.bzl", "envoy_all_extensions") load("//bazel:repositories.bzl", "PPC_SKIP_TARGETS", "WINDOWS_SKIP_TARGETS") +load("//source/extensions:all_extensions.bzl", "envoy_all_extensions") licenses(["notice"]) # Apache 2 @@ -266,8 +266,8 @@ envoy_cc_fuzz_test( "//source/common/thread_local:thread_local_lib", "//source/server:server_lib", "//test/integration:integration_lib", - "//test/mocks/server:options_mocks", "//test/mocks/server:hot_restart_mocks", + "//test/mocks/server:options_mocks", "//test/test_common:environment_lib", ] + select({ "//bazel:windows_x86_64": envoy_all_extensions(WINDOWS_SKIP_TARGETS), diff --git a/test/server/config_validation/BUILD b/test/server/config_validation/BUILD index d53f80fddf53..22184df662cc 100644 --- a/test/server/config_validation/BUILD +++ b/test/server/config_validation/BUILD @@ -1,6 +1,6 @@ load("//bazel:envoy_build_system.bzl", "envoy_cc_fuzz_test", "envoy_cc_test", "envoy_cc_test_library", "envoy_package", "envoy_proto_library") -load("//source/extensions:all_extensions.bzl", "envoy_all_extensions") load("//bazel:repositories.bzl", "PPC_SKIP_TARGETS", "WINDOWS_SKIP_TARGETS") +load("//source/extensions:all_extensions.bzl", "envoy_all_extensions") licenses(["notice"]) # Apache 2 diff --git a/test/tools/router_check/BUILD b/test/tools/router_check/BUILD index 6dedf2221aaa..2cebf70f2512 100644 --- a/test/tools/router_check/BUILD +++ b/test/tools/router_check/BUILD @@ -5,8 +5,8 @@ load( "envoy_package", "envoy_proto_library", ) -load("//source/extensions:all_extensions.bzl", "envoy_all_extensions") load("//bazel:repositories.bzl", "PPC_SKIP_TARGETS", "WINDOWS_SKIP_TARGETS") +load("//source/extensions:all_extensions.bzl", "envoy_all_extensions") licenses(["notice"]) # Apache 2 diff --git a/test/tools/schema_validator/BUILD b/test/tools/schema_validator/BUILD index 50dfb2e8fb35..4ea42313bd22 100644 --- a/test/tools/schema_validator/BUILD +++ b/test/tools/schema_validator/BUILD @@ -4,8 +4,8 @@ load( "envoy_cc_test_library", "envoy_package", ) -load("//source/extensions:all_extensions.bzl", "envoy_all_extensions") load("//bazel:repositories.bzl", "PPC_SKIP_TARGETS", "WINDOWS_SKIP_TARGETS") +load("//source/extensions:all_extensions.bzl", "envoy_all_extensions") licenses(["notice"]) # Apache 2 diff --git a/tools/api_proto_breaking_change_detector/BUILD b/tools/api_proto_breaking_change_detector/BUILD index 7093e55cd751..6e67be896659 100644 --- a/tools/api_proto_breaking_change_detector/BUILD +++ b/tools/api_proto_breaking_change_detector/BUILD @@ -1,5 +1,5 @@ -load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test") load("@base_pip3//:requirements.bzl", "requirement") +load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test") licenses(["notice"]) # Apache 2 diff --git a/tools/code/BUILD b/tools/code/BUILD index 1b800c6a6dee..97f87721da64 100644 --- a/tools/code/BUILD +++ b/tools/code/BUILD @@ -1,12 +1,12 @@ -load("//bazel:envoy_build_system.bzl", "envoy_package") -load("//tools/base:envoy_python.bzl", "envoy_entry_point") -load("@envoy_repo//:path.bzl", "PATH") load("@aspect_bazel_lib//lib:jq.bzl", "jq") +load("@envoy_repo//:path.bzl", "PATH") +load("//bazel:envoy_build_system.bzl", "envoy_package") load( "//test/extensions/filters/network/common/fuzz:config.bzl", "READFILTER_FUZZ_FILTERS", "READFILTER_NOFUZZ_FILTERS", ) +load("//tools/base:envoy_python.bzl", "envoy_entry_point") licenses(["notice"]) # Apache 2 diff --git a/tools/code_format/BUILD b/tools/code_format/BUILD index 79712a5fd6aa..0e3d75117729 100644 --- a/tools/code_format/BUILD +++ b/tools/code_format/BUILD @@ -1,7 +1,7 @@ -load("//bazel:envoy_build_system.bzl", "envoy_package") load("@base_pip3//:requirements.bzl", "requirement") -load("@rules_python//python:defs.bzl", "py_binary") load("@envoy_repo//:path.bzl", "PATH") +load("@rules_python//python:defs.bzl", "py_binary") +load("//bazel:envoy_build_system.bzl", "envoy_package") licenses(["notice"]) # Apache 2 diff --git a/tools/config_validation/BUILD b/tools/config_validation/BUILD index c88a96ca35b3..e2d3636c9abb 100644 --- a/tools/config_validation/BUILD +++ b/tools/config_validation/BUILD @@ -1,5 +1,5 @@ -load("@rules_python//python:defs.bzl", "py_binary") load("@base_pip3//:requirements.bzl", "requirement") +load("@rules_python//python:defs.bzl", "py_binary") licenses(["notice"]) # Apache 2 diff --git a/tools/dependency/BUILD b/tools/dependency/BUILD index 2456d70be13f..e972f02450de 100644 --- a/tools/dependency/BUILD +++ b/tools/dependency/BUILD @@ -1,8 +1,8 @@ +load("@base_pip3//:requirements.bzl", "requirement") +load("@envoy_repo//:path.bzl", "PATH") load("@rules_python//python:defs.bzl", "py_binary") load("//bazel:envoy_build_system.bzl", "envoy_package") load("//tools/base:envoy_python.bzl", "envoy_entry_point") -load("@base_pip3//:requirements.bzl", "requirement") -load("@envoy_repo//:path.bzl", "PATH") licenses(["notice"]) # Apache 2 diff --git a/tools/deprecate_version/BUILD b/tools/deprecate_version/BUILD index 40bb0e4c0927..cefbed0623db 100644 --- a/tools/deprecate_version/BUILD +++ b/tools/deprecate_version/BUILD @@ -1,5 +1,5 @@ -load("@rules_python//python:defs.bzl", "py_binary") load("@base_pip3//:requirements.bzl", "requirement") +load("@rules_python//python:defs.bzl", "py_binary") licenses(["notice"]) # Apache 2 diff --git a/tools/distribution/BUILD b/tools/distribution/BUILD index 64f994ab4648..44e4006cdd98 100644 --- a/tools/distribution/BUILD +++ b/tools/distribution/BUILD @@ -1,6 +1,6 @@ +load("@base_pip3//:requirements.bzl", "requirement") load("//bazel:envoy_build_system.bzl", "envoy_package") load("//tools/base:envoy_python.bzl", "envoy_entry_point") -load("@base_pip3//:requirements.bzl", "requirement") licenses(["notice"]) # Apache 2 diff --git a/tools/docs/BUILD b/tools/docs/BUILD index 63765e15d2c4..edc5c7c2690e 100644 --- a/tools/docs/BUILD +++ b/tools/docs/BUILD @@ -1,7 +1,7 @@ -load("@rules_python//python:defs.bzl", "py_binary") load("@base_pip3//:requirements.bzl", "requirement") -load("//tools/base:envoy_python.bzl", "envoy_entry_point") +load("@rules_python//python:defs.bzl", "py_binary") load("//bazel:envoy_build_system.bzl", "envoy_package") +load("//tools/base:envoy_python.bzl", "envoy_entry_point") licenses(["notice"]) # Apache 2 diff --git a/tools/github/BUILD b/tools/github/BUILD index ae7eae1cf310..f65c1d953e44 100644 --- a/tools/github/BUILD +++ b/tools/github/BUILD @@ -1,5 +1,5 @@ -load("@rules_python//python:defs.bzl", "py_binary") load("@base_pip3//:requirements.bzl", "requirement") +load("@rules_python//python:defs.bzl", "py_binary") licenses(["notice"]) # Apache 2 diff --git a/tools/gsutil/BUILD b/tools/gsutil/BUILD index c02f0f643451..c70e260c4854 100644 --- a/tools/gsutil/BUILD +++ b/tools/gsutil/BUILD @@ -1,7 +1,7 @@ -load("//bazel:envoy_build_system.bzl", "envoy_package") -load("//bazel:repositories_extra.bzl", "PYTHON_MINOR_VERSION") load("@base_pip3//:requirements.bzl", "requirement") load("@rules_python//python:defs.bzl", "py_binary", "py_library") +load("//bazel:envoy_build_system.bzl", "envoy_package") +load("//bazel:repositories_extra.bzl", "PYTHON_MINOR_VERSION") licenses(["notice"]) # Apache 2 diff --git a/tools/proto_format/BUILD b/tools/proto_format/BUILD index 5186e9a0dab6..2b025ebfaf79 100644 --- a/tools/proto_format/BUILD +++ b/tools/proto_format/BUILD @@ -1,10 +1,10 @@ -load("//bazel:envoy_build_system.bzl", "envoy_package") -load("//tools/base:envoy_python.bzl", "envoy_genjson", "envoy_py_data") load("@aspect_bazel_lib//lib:jq.bzl", "jq") load("@envoy_repo//:path.bzl", "PATH") -load("@rules_python//python:defs.bzl", "py_binary") load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix") load("@rules_pkg//pkg:pkg.bzl", "pkg_tar") +load("@rules_python//python:defs.bzl", "py_binary") +load("//bazel:envoy_build_system.bzl", "envoy_package") +load("//tools/base:envoy_python.bzl", "envoy_genjson", "envoy_py_data") licenses(["notice"]) # Apache 2 diff --git a/tools/protodoc/BUILD b/tools/protodoc/BUILD index 8c1f8ac65295..01ce510978c0 100644 --- a/tools/protodoc/BUILD +++ b/tools/protodoc/BUILD @@ -1,9 +1,9 @@ +load("@base_pip3//:requirements.bzl", "requirement") load("@com_google_protobuf//:protobuf.bzl", "py_proto_library") load("@rules_python//python:defs.bzl", "py_binary", "py_library") -load("@base_pip3//:requirements.bzl", "requirement") load("//bazel:envoy_build_system.bzl", "envoy_package") -load("//tools/protodoc:protodoc.bzl", "protodoc_rule") load("//tools/base:envoy_python.bzl", "envoy_genjson", "envoy_jinja_env", "envoy_py_data") +load("//tools/protodoc:protodoc.bzl", "protodoc_rule") licenses(["notice"]) # Apache 2 diff --git a/tools/protoprint/BUILD b/tools/protoprint/BUILD index 3f670d996ebb..0760d9b0cd74 100644 --- a/tools/protoprint/BUILD +++ b/tools/protoprint/BUILD @@ -1,8 +1,8 @@ -load("//bazel:envoy_build_system.bzl", "envoy_package") load("@base_pip3//:requirements.bzl", "requirement") -load("@rules_python//python:defs.bzl", "py_binary") load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix") load("@rules_pkg//pkg:pkg.bzl", "pkg_tar") +load("@rules_python//python:defs.bzl", "py_binary") +load("//bazel:envoy_build_system.bzl", "envoy_package") load("//tools/base:envoy_python.bzl", "envoy_py_data") load("//tools/protoprint:protoprint.bzl", "protoprint_rule") diff --git a/tools/protoxform/BUILD b/tools/protoxform/BUILD index ed06fae55a9a..73c95708fe52 100644 --- a/tools/protoxform/BUILD +++ b/tools/protoxform/BUILD @@ -1,7 +1,7 @@ load("@aspect_bazel_lib//lib:jq.bzl", "jq") -load("@rules_python//python:defs.bzl", "py_binary", "py_library") load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix") load("@rules_pkg//pkg:pkg.bzl", "pkg_tar") +load("@rules_python//python:defs.bzl", "py_binary", "py_library") load("//tools/protoxform:protoxform.bzl", "protoxform_rule") licenses(["notice"]) # Apache 2 diff --git a/tools/type_whisperer/BUILD b/tools/type_whisperer/BUILD index f83eecb2e3fc..43d4b7cf0eaf 100644 --- a/tools/type_whisperer/BUILD +++ b/tools/type_whisperer/BUILD @@ -2,8 +2,8 @@ load("@rules_python//python:defs.bzl", "py_binary") load("//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package", "envoy_proto_library") load("//tools/type_whisperer:api_build_file.bzl", "api_build_file") load("//tools/type_whisperer:file_descriptor_set_text.bzl", "file_descriptor_set_text") -load("//tools/type_whisperer:type_database.bzl", "type_database") load("//tools/type_whisperer:proto_cc_source.bzl", "proto_cc_source") +load("//tools/type_whisperer:type_database.bzl", "type_database") licenses(["notice"]) # Apache 2