Take Server::Options instead of OptionsImpl (#15002)

Use the interface instead of the impl since only the interface methods are needed. Signed-off-by: Alex Konradi <[email protected]>
envoyproxy · Feb 10, 2021 · e0b2b29 · e0b2b29
1 parent d84dbd8
commit e0b2b29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/source/exe/main_common.cc b/source/exe/main_common.cc
@@ -42,7 +42,7 @@ Runtime::LoaderPtr ProdComponentFactory::createRuntime(Server::Instance& server,
   return Server::InstanceUtil::createRuntime(server, config);
 }
 
-MainCommonBase::MainCommonBase(const OptionsImpl& options, Event::TimeSystem& time_system,
+MainCommonBase::MainCommonBase(const Server::Options& options, Event::TimeSystem& time_system,
                                ListenerHooks& listener_hooks,
                                Server::ComponentFactory& component_factory,
                                std::unique_ptr<Random::RandomGenerator>&& random_generator,

diff --git a/source/exe/main_common.h b/source/exe/main_common.h
@@ -36,7 +36,7 @@ class MainCommonBase {
 public:
   // Consumer must guarantee that all passed references are alive until this object is
   // destructed.
-  MainCommonBase(const OptionsImpl& options, Event::TimeSystem& time_system,
+  MainCommonBase(const Server::Options& options, Event::TimeSystem& time_system,
                  ListenerHooks& listener_hooks, Server::ComponentFactory& component_factory,
                  std::unique_ptr<Random::RandomGenerator>&& random_generator,
                  Thread::ThreadFactory& thread_factory, Filesystem::Instance& file_system,
@@ -71,7 +71,7 @@ class MainCommonBase {
   // an ifdef in a header file exposed in a C++ library. It is too easy to have
   // the ifdef be inconsistent across build-system boundaries.
   Grpc::GoogleGrpcContext google_grpc_context_;
-  const Envoy::OptionsImpl& options_;
+  const Envoy::Server::Options& options_;
   Server::ComponentFactory& component_factory_;
   Thread::ThreadFactory& thread_factory_;
   Filesystem::Instance& file_system_;