Merge remote-tracking branch 'upstream/main' into add_filter_states

kyessenov · Sep 5, 2023 · 5de14af · 5de14af
2 parents 1586f0c + c92e2ea
commit 5de14af
Show file tree

Hide file tree

Showing 91 changed files with 215 additions and 150 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/mobile/examples/cc/fetch_client/fetch_client.h b/mobile/examples/cc/fetch_client/fetch_client.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include <string>
 #include <vector>
 

diff --git 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 <UIKit/UIKit.h>
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate>

diff --git 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 <Foundation/Foundation.h>
 
 /// 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
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <UIKit/UIKit.h>
 
 @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
@@ -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
@@ -1,3 +1,5 @@
+#pragma once
+
 #include <string>
 
 #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
@@ -1,3 +1,5 @@
+#pragma once
+
 #include <string>
 
 #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
@@ -1,3 +1,5 @@
+#pragma once
+
 #include <string>
 
 #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
@@ -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
@@ -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
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN

diff --git a/mobile/library/objective-c/EnvoyAliases.h b/mobile/library/objective-c/EnvoyAliases.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 #import "library/common/types/c_types.h"

diff --git a/mobile/library/objective-c/EnvoyBridgeUtility.h b/mobile/library/objective-c/EnvoyBridgeUtility.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 #import "library/common/types/c_types.h"

diff --git a/mobile/library/objective-c/EnvoyConfiguration.h b/mobile/library/objective-c/EnvoyConfiguration.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 @class EMODirectResponse;

diff --git a/mobile/library/objective-c/EnvoyEngine.h b/mobile/library/objective-c/EnvoyEngine.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 #import "library/objective-c/EMODirectResponse.h"

diff --git a/mobile/library/objective-c/EnvoyEventTracker.h b/mobile/library/objective-c/EnvoyEventTracker.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 #import "library/objective-c/EnvoyAliases.h"

diff --git a/mobile/library/objective-c/EnvoyHTTPCallbacks.h b/mobile/library/objective-c/EnvoyHTTPCallbacks.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 #import "library/objective-c/EnvoyAliases.h"

diff --git a/mobile/library/objective-c/EnvoyHTTPFilter.h b/mobile/library/objective-c/EnvoyHTTPFilter.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 #import "library/objective-c/EnvoyAliases.h"

diff --git a/mobile/library/objective-c/EnvoyHTTPFilterCallbacksImpl.h b/mobile/library/objective-c/EnvoyHTTPFilterCallbacksImpl.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 #import "library/objective-c/EnvoyEngine.h"

diff --git a/mobile/library/objective-c/EnvoyHTTPFilterFactory.h b/mobile/library/objective-c/EnvoyHTTPFilterFactory.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 @class EnvoyHTTPFilter;

diff --git a/mobile/library/objective-c/EnvoyHTTPStream.h b/mobile/library/objective-c/EnvoyHTTPStream.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 #import "library/objective-c/EnvoyAliases.h"

diff --git a/mobile/library/objective-c/EnvoyKeyValueStore.h b/mobile/library/objective-c/EnvoyKeyValueStore.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN

diff --git 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
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN

diff --git a/mobile/library/objective-c/EnvoyNativeFilterConfig.h b/mobile/library/objective-c/EnvoyNativeFilterConfig.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN

diff --git a/mobile/library/objective-c/EnvoyNetworkMonitor.h b/mobile/library/objective-c/EnvoyNetworkMonitor.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 #import "library/common/types/c_types.h"

diff --git a/mobile/library/objective-c/EnvoyStringAccessor.h b/mobile/library/objective-c/EnvoyStringAccessor.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN

diff --git 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
@@ -1,3 +1,5 @@
+#pragma once
+
 #include <string>
 
 #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
@@ -1,3 +1,5 @@
+#pragma once
+
 #include <string>
 
 #include "source/extensions/filters/http/common/factory_base.h"