format

Signed-off-by: Alyssa Wilk <[email protected]>
envoyproxy · Jul 3, 2024 · c7e9d9c · c7e9d9c
1 parent 5080559
commit c7e9d9c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/test/integration/server.cc b/test/integration/server.cc
@@ -27,13 +27,13 @@
 namespace Envoy {
 namespace Server {
 
-OptionsImpl createTestOptionsImpl(const std::string& config_path, const std::string& config_yaml,
-                                  Network::Address::IpVersion ip_version,
-                                  FieldValidationConfig validation_config, uint32_t concurrency,
-                                  std::chrono::seconds drain_time,
-                                  Server::DrainStrategy drain_strategy,
-                                  bool use_bootstrap_node_metadata,
-                                  std::unique_ptr<envoy::config::bootstrap::v3::Bootstrap>&& config_proto) {
+OptionsImpl
+createTestOptionsImpl(const std::string& config_path, const std::string& config_yaml,
+                      Network::Address::IpVersion ip_version,
+                      FieldValidationConfig validation_config, uint32_t concurrency,
+                      std::chrono::seconds drain_time, Server::DrainStrategy drain_strategy,
+                      bool use_bootstrap_node_metadata,
+                      std::unique_ptr<envoy::config::bootstrap::v3::Bootstrap>&& config_proto) {
   // Empty string values mean the Bootstrap node metadata won't be overridden.
   const std::string service_cluster = use_bootstrap_node_metadata ? "" : "cluster_name";
   const std::string service_node = use_bootstrap_node_metadata ? "" : "node_name";
@@ -71,8 +71,8 @@ IntegrationTestServerPtr IntegrationTestServer::create(
     Buffer::WatermarkFactorySharedPtr watermark_factory, bool use_real_stats,
     bool use_bootstrap_node_metadata,
     std::unique_ptr<envoy::config::bootstrap::v3::Bootstrap>&& config_proto) {
-  IntegrationTestServerPtr server{
-      std::make_unique<IntegrationTestServerImpl>(time_system, api, config_path, use_real_stats, std::move(config_proto))};
+  IntegrationTestServerPtr server{std::make_unique<IntegrationTestServerImpl>(
+      time_system, api, config_path, use_real_stats, std::move(config_proto))};
   if (server_ready_function != nullptr) {
     server->setOnServerReadyCb(server_ready_function);
   }
@@ -196,9 +196,9 @@ void IntegrationTestServer::threadRoutine(
     ProcessObjectOptRef process_object, Server::FieldValidationConfig validation_config,
     uint32_t concurrency, std::chrono::seconds drain_time, Server::DrainStrategy drain_strategy,
     Buffer::WatermarkFactorySharedPtr watermark_factory, bool use_bootstrap_node_metadata) {
-  OptionsImpl options(Server::createTestOptionsImpl(config_path_, "", version, validation_config,
-                                                    concurrency, drain_time, drain_strategy,
-                                                    use_bootstrap_node_metadata, std::move(config_proto_)));
+  OptionsImpl options(Server::createTestOptionsImpl(
+      config_path_, "", version, validation_config, concurrency, drain_time, drain_strategy,
+      use_bootstrap_node_metadata, std::move(config_proto_)));
   Thread::MutexBasicLockable lock;
 
   Random::RandomGeneratorPtr random_generator;
@@ -214,10 +214,9 @@ void IntegrationTestServer::threadRoutine(
                           watermark_factory);
 }
 
-IntegrationTestServerImpl::IntegrationTestServerImpl(Event::TestTimeSystem& time_system,
-                                                     Api::Api& api, const std::string& config_path,
-                                                     bool use_real_stats,
-                                                     std::unique_ptr<envoy::config::bootstrap::v3::Bootstrap>&& config_proto)
+IntegrationTestServerImpl::IntegrationTestServerImpl(
+    Event::TestTimeSystem& time_system, Api::Api& api, const std::string& config_path,
+    bool use_real_stats, std::unique_ptr<envoy::config::bootstrap::v3::Bootstrap>&& config_proto)
     : IntegrationTestServer(time_system, api, config_path, std::move(config_proto)) {
   stats_allocator_ =
       (use_real_stats ? std::make_unique<Stats::AllocatorImpl>(symbol_table_)

diff --git a/test/integration/server.h b/test/integration/server.h
@@ -553,7 +553,8 @@ class IntegrationTestServer : public Logger::Loggable<Logger::Id::testing>,
   IntegrationTestServer(Event::TestTimeSystem& time_system, Api::Api& api,
                         const std::string& config_path,
                         std::unique_ptr<envoy::config::bootstrap::v3::Bootstrap>&& config_proto)
-      : time_system_(time_system), api_(api), config_path_(config_path), config_proto_(std::move(config_proto)) {}
+      : time_system_(time_system), api_(api), config_path_(config_path),
+        config_proto_(std::move(config_proto)) {}
 
   // Create the running envoy server. This function will call serverReady() when the virtual
   // functions server(), statStore(), and adminAddress() may be called, but before the server
@@ -604,9 +605,10 @@ class IntegrationTestServer : public Logger::Loggable<Logger::Id::testing>,
 // Default implementation of IntegrationTestServer
 class IntegrationTestServerImpl : public IntegrationTestServer {
 public:
-  IntegrationTestServerImpl(Event::TestTimeSystem& time_system, Api::Api& api,
-                            const std::string& config_path, bool real_stats = false,
-                            std::unique_ptr<envoy::config::bootstrap::v3::Bootstrap>&& config_proto = nullptr);
+  IntegrationTestServerImpl(
+      Event::TestTimeSystem& time_system, Api::Api& api, const std::string& config_path,
+      bool real_stats = false,
+      std::unique_ptr<envoy::config::bootstrap::v3::Bootstrap>&& config_proto = nullptr);
 
   ~IntegrationTestServerImpl() override;