Easy-peasy library (WIP)

cmake/UserverTestsuite.cmake

@@ -308,6 +308,7 @@ function(userver_testsuite_add_simple)
       CONFIG_VARS_PATH
       DYNAMIC_CONFIG_FALLBACK_PATH
       SECDIST_PATH
+      DUMP_CONFIG
   )
   set(multiValueArgs
       PYTEST_ARGS
@@ -358,9 +359,16 @@ function(userver_testsuite_add_simple)
     set(ARG_TEST_SUFFIX "")
   endif()
 
+  set(DUMP_CONFIG_OPTION "")
+  if (ARG_DUMP_CONFIG)
+    set(DUMP_CONFIG_OPTION "--dump-config")
+  endif()
+
   if(ARG_CONFIG_PATH)
     get_filename_component(config_path "${ARG_CONFIG_PATH}"
         REALPATH BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+  elseif(ARG_DUMP_CONFIG)
+    set(config_path "${CMAKE_CURRENT_BINARY_DIR}/Testing/Temporary/static_config.yaml")
   else()
     foreach(probable_config_path IN ITEMS
         "${CMAKE_CURRENT_SOURCE_DIR}/configs/static_config.yaml"
@@ -460,6 +468,7 @@ function(userver_testsuite_add_simple)
       "--service-config=${config_path}"
       "--service-source-dir=${CMAKE_CURRENT_SOURCE_DIR}"
       "--service-binary=${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}"
+      "${DUMP_CONFIG_OPTION}"
       ${pytest_additional_args}
       ${ARG_PYTEST_ARGS}
       REQUIREMENTS ${ARG_REQUIREMENTS}

cmake/install/userver-easy-config.cmake

@@ -0,0 +1,10 @@
+include_guard(GLOBAL)
+
+if(userver_easy_FOUND)
+  return()
+endif()
+
+find_package(userver REQUIRED COMPONENTS postgresql)
+
+set(userver_easy_FOUND TRUE)
+

core/include/userver/utils/daemon_run.hpp

@@ -5,22 +5,34 @@
 
 #include <userver/components/component_list.hpp>
 
+
+namespace boost::program_options {
+class options_description;
+class variables_map;
+}
+
 USERVER_NAMESPACE_BEGIN
 
 namespace utils {
 
-/// Parses command line arguments and calls components::Run with config file
-/// from --config parameter.
+/// @returns default options of DaemonMain
 ///
-/// Other command line arguments:
+/// List of options:
 /// * --help - show all command line arguments
 /// * --config CONFIG - path to config.yaml
 /// * --config_vars CONFIG_VARS - path to config_vars.yaml
 /// * --config_vars_override CONFIG_VARS - path to config_vars.override.yaml
 /// * --print-config-schema - print config.yaml YAML Schema
 /// * --print-dynamic-config-defaults - print JSON with dynamic config defaults
+boost::program_options::options_description BaseRunOptions();
+
+/// Parses command line arguments and calls components::Run with config file
+/// from --config parameter. See BaseRunOptions() for a list of options
 int DaemonMain(int argc, const char* const argv[], const components::ComponentList& components_list);
 
+/// @overload
+int DaemonMain(const boost::program_options::variables_map& vm, const components::ComponentList& components_list);
+
 }  // namespace utils
 
 USERVER_NAMESPACE_END

core/src/utils/daemon_run.cpp

@@ -15,36 +15,38 @@ namespace utils {
 
 namespace {
 
-std::optional<std::string> ToOptional(std::string&& s) {
-    if (s.empty())
+template <class Value>
+std::optional<std::string> ToOptional(const Value& val) {
+    if (val.empty())
         return {};
     else
-        return {std::move(s)};
+        return {val.template as<std::string>()};
 }
 
 }  // namespace
 
-int DaemonMain(const int argc, const char* const argv[], const components::ComponentList& components_list) {
-    utils::impl::FinishStaticRegistration();
-
+boost::program_options::options_description BaseRunOptions() {
     namespace po = boost::program_options;
-
-    po::variables_map vm;
     po::options_description desc("Allowed options");
-    std::string config_path;
-    std::string config_vars_path;
-    std::string config_vars_override_path;
-
     // clang-format off
-  desc.add_options()
-    ("help,h", "produce this help message")
-    ("print-config-schema", "print config.yaml YAML Schema")
-    ("print-dynamic-config-defaults", "print JSON object with dynamic config defaults")
-    ("config,c", po::value(&config_path)->required(), "path to server config")
-    ("config_vars", po::value(&config_vars_path), "path to config_vars.yaml; if set, config_vars in config.yaml are ignored")
-    ("config_vars_override", po::value(&config_vars_override_path), "path to an additional config_vars.yaml, which overrides vars of config_vars.yaml")
-  ;
+    desc.add_options()
+        ("help,h", "produce this help message")
+        ("print-config-schema", "print config.yaml YAML Schema")
+        ("print-dynamic-config-defaults", "print JSON object with dynamic config defaults")
+        ("config_vars", po::value<std::string>(), "path to config_vars.yaml; if set, config_vars in config.yaml are ignored")
+        ("config_vars_override", po::value<std::string>(), "path to an additional config_vars.yaml, which overrides vars of config_vars.yaml")
+    ;
     // clang-format on
+return desc;
+}
+
+int DaemonMain(const int argc, const char* const argv[], const components::ComponentList& components_list) {
+    namespace po = boost::program_options;
+    po::variables_map vm;
+    auto desc = BaseRunOptions();
+    desc.add_options()
+        ("config,c", po::value<std::string>()->required(), "path to server config")
+    ;
 
     try {
         po::store(po::parse_command_line(argc, argv, desc), vm);
@@ -59,6 +61,12 @@ int DaemonMain(const int argc, const char* const argv[], const components::Compo
         return 0;
     }
 
+    return DaemonMain(vm, components_list);
+}
+
+int DaemonMain(const boost::program_options::variables_map& vm, const components::ComponentList& components_list) {
+    utils::impl::FinishStaticRegistration();
+
     if (vm.count("print-config-schema")) {
         std::cout << components::impl::GetStaticConfigSchema(components_list) << "\n";
         return 0;
@@ -71,9 +79,9 @@ int DaemonMain(const int argc, const char* const argv[], const components::Compo
 
     try {
         components::Run(
-            config_path,
-            ToOptional(std::move(config_vars_path)),
-            ToOptional(std::move(config_vars_override_path)),
+            vm["config"].as<std::string>(),
+            ToOptional(vm["config_vars"]),
+            ToOptional(vm["config_vars_override"]),
             components_list
         );
         return 0;

libraries/CMakeLists.txt

@@ -1,10 +1,18 @@
+option(USERVER_FEATURE_EASY "Build easy HTTP server library" "${USERVER_LIB_ENABLED_DEFAULT}")
 option(USERVER_FEATURE_S3API "Build S3 api client library" "${USERVER_LIB_ENABLED_DEFAULT}")
 option(USERVER_FEATURE_GRPC_REFLECTION "Build grpc reflection library" "${USERVER_LIB_ENABLED_DEFAULT}")
 
 if (USERVER_FEATURE_S3API)
   add_subdirectory(s3api)
 endif()
 
+if (USERVER_FEATURE_EASY)
+  if (NOT USERVER_FEATURE_POSTGRESQL)
+    message(FATAL_ERROR "'USERVER_FEATURE_EASY' requires 'USERVER_FEATURE_POSTGRESQL=ON'")
+  endif()
+  add_subdirectory(easy)
+endif()
+
 if (USERVER_FEATURE_GRPC_REFLECTION)
   if (NOT USERVER_FEATURE_GRPC)
     message(FATAL_ERROR "'USERVER_FEATURE_GRPC_REFLECTION' requires 'USERVER_FEATURE_GRPC=ON'")

libraries/easy/CMakeLists.txt

@@ -0,0 +1,11 @@
+project(userver-easy CXX)
+
+userver_module(easy
+    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
+    LINK_LIBRARIES userver::postgresql
+    UTEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*_test.cpp"
+)
+
+if(USERVER_BUILD_SAMPLES)
+  add_subdirectory(samples)
+endif()