diff options
author | innokentii <innokentii@yandex-team.com> | 2023-07-26 17:45:33 +0300 |
---|---|---|
committer | innokentii <innokentii@yandex-team.com> | 2023-07-26 17:45:33 +0300 |
commit | 74f9db80058e8292af239e50237370199ad2664e (patch) | |
tree | 6661e50aafec3aafe1afa36e66dc00fd8d67a9b2 | |
parent | 732af3036d7c8921f80eeb7127a8d817611224ab (diff) | |
download | ydb-74f9db80058e8292af239e50237370199ad2664e.tar.gz |
Move dynconfig tools to library
move dynconfig tools
39 files changed, 130 insertions, 239 deletions
diff --git a/ydb/core/cms/console/CMakeLists.darwin-x86_64.txt b/ydb/core/cms/console/CMakeLists.darwin-x86_64.txt index 65e0ecacc9b..1e2a1778eae 100644 --- a/ydb/core/cms/console/CMakeLists.darwin-x86_64.txt +++ b/ydb/core/cms/console/CMakeLists.darwin-x86_64.txt @@ -9,7 +9,6 @@ add_subdirectory(ut) add_subdirectory(util) add_subdirectory(validators) -add_subdirectory(yaml_config) add_library(core-cms-console) target_link_libraries(core-cms-console PUBLIC @@ -23,7 +22,6 @@ target_link_libraries(core-cms-console PUBLIC core-blobstorage-base core-blobstorage-groupinfo cms-console-validators - cms-console-yaml_config ydb-core-control core-engine-minikql ydb-core-mind @@ -33,6 +31,7 @@ target_link_libraries(core-cms-console PUBLIC ydb-core-tablet_flat ydb-core-util ydb-library-aclib + ydb-library-yaml_config api-protos public-lib-operation_id ) diff --git a/ydb/core/cms/console/CMakeLists.linux-aarch64.txt b/ydb/core/cms/console/CMakeLists.linux-aarch64.txt index 4a2b2a0008a..a7137b190a4 100644 --- a/ydb/core/cms/console/CMakeLists.linux-aarch64.txt +++ b/ydb/core/cms/console/CMakeLists.linux-aarch64.txt @@ -9,7 +9,6 @@ add_subdirectory(ut) add_subdirectory(util) add_subdirectory(validators) -add_subdirectory(yaml_config) add_library(core-cms-console) target_link_libraries(core-cms-console PUBLIC @@ -24,7 +23,6 @@ target_link_libraries(core-cms-console PUBLIC core-blobstorage-base core-blobstorage-groupinfo cms-console-validators - cms-console-yaml_config ydb-core-control core-engine-minikql ydb-core-mind @@ -34,6 +32,7 @@ target_link_libraries(core-cms-console PUBLIC ydb-core-tablet_flat ydb-core-util ydb-library-aclib + ydb-library-yaml_config api-protos public-lib-operation_id ) diff --git a/ydb/core/cms/console/CMakeLists.linux-x86_64.txt b/ydb/core/cms/console/CMakeLists.linux-x86_64.txt index 4a2b2a0008a..a7137b190a4 100644 --- a/ydb/core/cms/console/CMakeLists.linux-x86_64.txt +++ b/ydb/core/cms/console/CMakeLists.linux-x86_64.txt @@ -9,7 +9,6 @@ add_subdirectory(ut) add_subdirectory(util) add_subdirectory(validators) -add_subdirectory(yaml_config) add_library(core-cms-console) target_link_libraries(core-cms-console PUBLIC @@ -24,7 +23,6 @@ target_link_libraries(core-cms-console PUBLIC core-blobstorage-base core-blobstorage-groupinfo cms-console-validators - cms-console-yaml_config ydb-core-control core-engine-minikql ydb-core-mind @@ -34,6 +32,7 @@ target_link_libraries(core-cms-console PUBLIC ydb-core-tablet_flat ydb-core-util ydb-library-aclib + ydb-library-yaml_config api-protos public-lib-operation_id ) diff --git a/ydb/core/cms/console/CMakeLists.windows-x86_64.txt b/ydb/core/cms/console/CMakeLists.windows-x86_64.txt index 65e0ecacc9b..1e2a1778eae 100644 --- a/ydb/core/cms/console/CMakeLists.windows-x86_64.txt +++ b/ydb/core/cms/console/CMakeLists.windows-x86_64.txt @@ -9,7 +9,6 @@ add_subdirectory(ut) add_subdirectory(util) add_subdirectory(validators) -add_subdirectory(yaml_config) add_library(core-cms-console) target_link_libraries(core-cms-console PUBLIC @@ -23,7 +22,6 @@ target_link_libraries(core-cms-console PUBLIC core-blobstorage-base core-blobstorage-groupinfo cms-console-validators - cms-console-yaml_config ydb-core-control core-engine-minikql ydb-core-mind @@ -33,6 +31,7 @@ target_link_libraries(core-cms-console PUBLIC ydb-core-tablet_flat ydb-core-util ydb-library-aclib + ydb-library-yaml_config api-protos public-lib-operation_id ) diff --git a/ydb/core/cms/console/configs_dispatcher.cpp b/ydb/core/cms/console/configs_dispatcher.cpp index 21c6d39a647..4385b5c0473 100644 --- a/ydb/core/cms/console/configs_dispatcher.cpp +++ b/ydb/core/cms/console/configs_dispatcher.cpp @@ -6,8 +6,8 @@ #include "util.h" #include <ydb/core/cms/console/util/config_index.h> -#include <ydb/core/cms/console/yaml_config/util.h> -#include <ydb/core/cms/console/yaml_config/yaml_config.h> +#include <ydb/library/yaml_config/util.h> +#include <ydb/library/yaml_config/yaml_config.h> #include <ydb/core/mind/tenant_pool.h> #include <ydb/core/mon/mon.h> diff --git a/ydb/core/cms/console/console.h b/ydb/core/cms/console/console.h index 53997b63bce..8d0e172372f 100644 --- a/ydb/core/cms/console/console.h +++ b/ydb/core/cms/console/console.h @@ -1,7 +1,7 @@ #pragma once #include "defs.h" -#include <ydb/core/cms/console/yaml_config/yaml_config.h> +#include <ydb/library/yaml_config/yaml_config.h> #include <ydb/core/base/blobstorage.h> #include <ydb/core/protos/console.pb.h> diff --git a/ydb/core/cms/console/ya.make b/ydb/core/cms/console/ya.make index 722a02e0701..5ce434ac26d 100644 --- a/ydb/core/cms/console/ya.make +++ b/ydb/core/cms/console/ya.make @@ -81,7 +81,6 @@ PEERDIR( ydb/core/blobstorage/base ydb/core/blobstorage/groupinfo ydb/core/cms/console/validators - ydb/core/cms/console/yaml_config ydb/core/control ydb/core/engine/minikql ydb/core/mind @@ -91,6 +90,7 @@ PEERDIR( ydb/core/tablet_flat ydb/core/util ydb/library/aclib + ydb/library/yaml_config ydb/public/api/protos ydb/public/lib/operation_id ) @@ -100,7 +100,6 @@ END() RECURSE( util validators - yaml_config ) RECURSE_FOR_TESTS( diff --git a/ydb/core/cms/console/yaml_config/CMakeLists.darwin-x86_64.txt b/ydb/core/cms/console/yaml_config/CMakeLists.darwin-x86_64.txt deleted file mode 100644 index 6bab24b1d61..00000000000 --- a/ydb/core/cms/console/yaml_config/CMakeLists.darwin-x86_64.txt +++ /dev/null @@ -1,27 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - -find_package(OpenSSL REQUIRED) -add_subdirectory(ut) - -add_library(cms-console-yaml_config) -target_link_libraries(cms-console-yaml_config PUBLIC - contrib-libs-cxxsupp - yutil - OpenSSL::OpenSSL - cpp-actors-core - cpp-protobuf-json - cpp-yaml-fyamlcpp - cms-console-util - ydb-core-protos - ydb-library-yaml_config -) -target_sources(cms-console-yaml_config PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config/console_dumper.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config/yaml_config.cpp -) diff --git a/ydb/core/cms/console/yaml_config/CMakeLists.linux-aarch64.txt b/ydb/core/cms/console/yaml_config/CMakeLists.linux-aarch64.txt deleted file mode 100644 index d4946fdcfed..00000000000 --- a/ydb/core/cms/console/yaml_config/CMakeLists.linux-aarch64.txt +++ /dev/null @@ -1,28 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - -find_package(OpenSSL REQUIRED) -add_subdirectory(ut) - -add_library(cms-console-yaml_config) -target_link_libraries(cms-console-yaml_config PUBLIC - contrib-libs-linux-headers - contrib-libs-cxxsupp - yutil - OpenSSL::OpenSSL - cpp-actors-core - cpp-protobuf-json - cpp-yaml-fyamlcpp - cms-console-util - ydb-core-protos - ydb-library-yaml_config -) -target_sources(cms-console-yaml_config PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config/console_dumper.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config/yaml_config.cpp -) diff --git a/ydb/core/cms/console/yaml_config/CMakeLists.linux-x86_64.txt b/ydb/core/cms/console/yaml_config/CMakeLists.linux-x86_64.txt deleted file mode 100644 index d4946fdcfed..00000000000 --- a/ydb/core/cms/console/yaml_config/CMakeLists.linux-x86_64.txt +++ /dev/null @@ -1,28 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - -find_package(OpenSSL REQUIRED) -add_subdirectory(ut) - -add_library(cms-console-yaml_config) -target_link_libraries(cms-console-yaml_config PUBLIC - contrib-libs-linux-headers - contrib-libs-cxxsupp - yutil - OpenSSL::OpenSSL - cpp-actors-core - cpp-protobuf-json - cpp-yaml-fyamlcpp - cms-console-util - ydb-core-protos - ydb-library-yaml_config -) -target_sources(cms-console-yaml_config PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config/console_dumper.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config/yaml_config.cpp -) diff --git a/ydb/core/cms/console/yaml_config/CMakeLists.windows-x86_64.txt b/ydb/core/cms/console/yaml_config/CMakeLists.windows-x86_64.txt deleted file mode 100644 index 6bab24b1d61..00000000000 --- a/ydb/core/cms/console/yaml_config/CMakeLists.windows-x86_64.txt +++ /dev/null @@ -1,27 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - -find_package(OpenSSL REQUIRED) -add_subdirectory(ut) - -add_library(cms-console-yaml_config) -target_link_libraries(cms-console-yaml_config PUBLIC - contrib-libs-cxxsupp - yutil - OpenSSL::OpenSSL - cpp-actors-core - cpp-protobuf-json - cpp-yaml-fyamlcpp - cms-console-util - ydb-core-protos - ydb-library-yaml_config -) -target_sources(cms-console-yaml_config PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config/console_dumper.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config/yaml_config.cpp -) diff --git a/ydb/core/cms/console/yaml_config/ut/CMakeLists.txt b/ydb/core/cms/console/yaml_config/ut/CMakeLists.txt deleted file mode 100644 index f8b31df0c11..00000000000 --- a/ydb/core/cms/console/yaml_config/ut/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-aarch64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - include(CMakeLists.darwin-x86_64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) - include(CMakeLists.windows-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) -endif() diff --git a/ydb/core/cms/console/yaml_config/ya.make b/ydb/core/cms/console/yaml_config/ya.make deleted file mode 100644 index 8fd2c5c6906..00000000000 --- a/ydb/core/cms/console/yaml_config/ya.make +++ /dev/null @@ -1,25 +0,0 @@ -LIBRARY() - -SRCS( - console_dumper.cpp - console_dumper.h - yaml_config.cpp - yaml_config.h - yaml_config_impl.h -) - -PEERDIR( - contrib/libs/openssl - library/cpp/actors/core - library/cpp/protobuf/json - library/cpp/yaml/fyamlcpp - ydb/core/cms/console/util - ydb/core/protos - ydb/library/yaml_config -) - -END() - -RECURSE_FOR_TESTS( - ut -) diff --git a/ydb/core/driver_lib/cli_utils/CMakeLists.darwin-x86_64.txt b/ydb/core/driver_lib/cli_utils/CMakeLists.darwin-x86_64.txt index 9283d5e78f1..03879b71cda 100644 --- a/ydb/core/driver_lib/cli_utils/CMakeLists.darwin-x86_64.txt +++ b/ydb/core/driver_lib/cli_utils/CMakeLists.darwin-x86_64.txt @@ -23,7 +23,6 @@ target_link_libraries(cli_utils PUBLIC core-blobstorage-pdisk core-client-minikql_compile core-client-scheme_cache_lib - cms-console-yaml_config cli_base ydb-core-engine ydb-core-erasure diff --git a/ydb/core/driver_lib/cli_utils/CMakeLists.linux-aarch64.txt b/ydb/core/driver_lib/cli_utils/CMakeLists.linux-aarch64.txt index 21aefec97bb..3f62b1934d0 100644 --- a/ydb/core/driver_lib/cli_utils/CMakeLists.linux-aarch64.txt +++ b/ydb/core/driver_lib/cli_utils/CMakeLists.linux-aarch64.txt @@ -24,7 +24,6 @@ target_link_libraries(cli_utils PUBLIC core-blobstorage-pdisk core-client-minikql_compile core-client-scheme_cache_lib - cms-console-yaml_config cli_base ydb-core-engine ydb-core-erasure diff --git a/ydb/core/driver_lib/cli_utils/CMakeLists.linux-x86_64.txt b/ydb/core/driver_lib/cli_utils/CMakeLists.linux-x86_64.txt index 21aefec97bb..3f62b1934d0 100644 --- a/ydb/core/driver_lib/cli_utils/CMakeLists.linux-x86_64.txt +++ b/ydb/core/driver_lib/cli_utils/CMakeLists.linux-x86_64.txt @@ -24,7 +24,6 @@ target_link_libraries(cli_utils PUBLIC core-blobstorage-pdisk core-client-minikql_compile core-client-scheme_cache_lib - cms-console-yaml_config cli_base ydb-core-engine ydb-core-erasure diff --git a/ydb/core/driver_lib/cli_utils/CMakeLists.windows-x86_64.txt b/ydb/core/driver_lib/cli_utils/CMakeLists.windows-x86_64.txt index 9283d5e78f1..03879b71cda 100644 --- a/ydb/core/driver_lib/cli_utils/CMakeLists.windows-x86_64.txt +++ b/ydb/core/driver_lib/cli_utils/CMakeLists.windows-x86_64.txt @@ -23,7 +23,6 @@ target_link_libraries(cli_utils PUBLIC core-blobstorage-pdisk core-client-minikql_compile core-client-scheme_cache_lib - cms-console-yaml_config cli_base ydb-core-engine ydb-core-erasure diff --git a/ydb/core/driver_lib/cli_utils/cli_cmds_console.cpp b/ydb/core/driver_lib/cli_utils/cli_cmds_console.cpp index 59b1f3bca62..5b0fc74b076 100644 --- a/ydb/core/driver_lib/cli_utils/cli_cmds_console.cpp +++ b/ydb/core/driver_lib/cli_utils/cli_cmds_console.cpp @@ -1,7 +1,7 @@ #include "cli.h" #include "cli_cmds.h" -#include <ydb/core/cms/console/yaml_config/console_dumper.h> +#include <ydb/library/yaml_config/console_dumper.h> #include <util/string/type.h> #include <util/string/split.h> diff --git a/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp b/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp index 6226468d514..4c95a5704f0 100644 --- a/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp +++ b/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp @@ -2,7 +2,7 @@ #include "cli_cmds.h" #include <ydb/core/base/location.h> #include <ydb/core/base/path.h> -#include <ydb/core/cms/console/yaml_config/yaml_config.h> +#include <ydb/library/yaml_config/yaml_config.h> #include <ydb/core/driver_lib/run/run.h> #include <ydb/library/yaml_config/yaml_config_parser.h> #include <ydb/public/lib/deprecated/kicli/kicli.h> diff --git a/ydb/core/driver_lib/cli_utils/ya.make b/ydb/core/driver_lib/cli_utils/ya.make index 177978e775b..6caeec10157 100644 --- a/ydb/core/driver_lib/cli_utils/ya.make +++ b/ydb/core/driver_lib/cli_utils/ya.make @@ -44,7 +44,6 @@ PEERDIR( ydb/core/blobstorage/pdisk ydb/core/client/minikql_compile ydb/core/client/scheme_cache_lib - ydb/core/cms/console/yaml_config ydb/core/driver_lib/cli_base ydb/core/engine ydb/core/erasure diff --git a/ydb/library/yaml_config/CMakeLists.darwin-x86_64.txt b/ydb/library/yaml_config/CMakeLists.darwin-x86_64.txt index aea1570e3f0..a46c3ed7d3d 100644 --- a/ydb/library/yaml_config/CMakeLists.darwin-x86_64.txt +++ b/ydb/library/yaml_config/CMakeLists.darwin-x86_64.txt @@ -6,17 +6,26 @@ # original buildsystem will not be accepted. +find_package(OpenSSL REQUIRED) +add_subdirectory(ut) add_library(ydb-library-yaml_config) target_link_libraries(ydb-library-yaml_config PUBLIC contrib-libs-cxxsupp yutil + OpenSSL::OpenSSL contrib-libs-protobuf contrib-libs-yaml-cpp + cpp-actors-core + cpp-protobuf-json + cpp-yaml-fyamlcpp ydb-core-base + cms-console-util ydb-core-erasure ydb-core-protos ) target_sources(ydb-library-yaml_config PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/console_dumper.cpp + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/yaml_config.cpp ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/yaml_config_parser.cpp ) diff --git a/ydb/library/yaml_config/CMakeLists.linux-aarch64.txt b/ydb/library/yaml_config/CMakeLists.linux-aarch64.txt index 92b839a424d..ef9a80b77d2 100644 --- a/ydb/library/yaml_config/CMakeLists.linux-aarch64.txt +++ b/ydb/library/yaml_config/CMakeLists.linux-aarch64.txt @@ -6,18 +6,27 @@ # original buildsystem will not be accepted. +find_package(OpenSSL REQUIRED) +add_subdirectory(ut) add_library(ydb-library-yaml_config) target_link_libraries(ydb-library-yaml_config PUBLIC contrib-libs-linux-headers contrib-libs-cxxsupp yutil + OpenSSL::OpenSSL contrib-libs-protobuf contrib-libs-yaml-cpp + cpp-actors-core + cpp-protobuf-json + cpp-yaml-fyamlcpp ydb-core-base + cms-console-util ydb-core-erasure ydb-core-protos ) target_sources(ydb-library-yaml_config PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/console_dumper.cpp + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/yaml_config.cpp ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/yaml_config_parser.cpp ) diff --git a/ydb/library/yaml_config/CMakeLists.linux-x86_64.txt b/ydb/library/yaml_config/CMakeLists.linux-x86_64.txt index 92b839a424d..ef9a80b77d2 100644 --- a/ydb/library/yaml_config/CMakeLists.linux-x86_64.txt +++ b/ydb/library/yaml_config/CMakeLists.linux-x86_64.txt @@ -6,18 +6,27 @@ # original buildsystem will not be accepted. +find_package(OpenSSL REQUIRED) +add_subdirectory(ut) add_library(ydb-library-yaml_config) target_link_libraries(ydb-library-yaml_config PUBLIC contrib-libs-linux-headers contrib-libs-cxxsupp yutil + OpenSSL::OpenSSL contrib-libs-protobuf contrib-libs-yaml-cpp + cpp-actors-core + cpp-protobuf-json + cpp-yaml-fyamlcpp ydb-core-base + cms-console-util ydb-core-erasure ydb-core-protos ) target_sources(ydb-library-yaml_config PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/console_dumper.cpp + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/yaml_config.cpp ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/yaml_config_parser.cpp ) diff --git a/ydb/library/yaml_config/CMakeLists.windows-x86_64.txt b/ydb/library/yaml_config/CMakeLists.windows-x86_64.txt index aea1570e3f0..a46c3ed7d3d 100644 --- a/ydb/library/yaml_config/CMakeLists.windows-x86_64.txt +++ b/ydb/library/yaml_config/CMakeLists.windows-x86_64.txt @@ -6,17 +6,26 @@ # original buildsystem will not be accepted. +find_package(OpenSSL REQUIRED) +add_subdirectory(ut) add_library(ydb-library-yaml_config) target_link_libraries(ydb-library-yaml_config PUBLIC contrib-libs-cxxsupp yutil + OpenSSL::OpenSSL contrib-libs-protobuf contrib-libs-yaml-cpp + cpp-actors-core + cpp-protobuf-json + cpp-yaml-fyamlcpp ydb-core-base + cms-console-util ydb-core-erasure ydb-core-protos ) target_sources(ydb-library-yaml_config PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/console_dumper.cpp + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/yaml_config.cpp ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/yaml_config_parser.cpp ) diff --git a/ydb/core/cms/console/yaml_config/console_dumper.cpp b/ydb/library/yaml_config/console_dumper.cpp index c9c119e15b6..06d43f36cc8 100644 --- a/ydb/core/cms/console/yaml_config/console_dumper.cpp +++ b/ydb/library/yaml_config/console_dumper.cpp @@ -1,8 +1,8 @@ #include "console_dumper.h" #include "util.h" +#include "yaml_config.h" -#include <ydb/core/cms/console/yaml_config/yaml_config.h> #include <ydb/core/cms/console/util/config_index.h> #include <library/cpp/yaml/fyamlcpp/fyamlcpp.h> diff --git a/ydb/core/cms/console/yaml_config/console_dumper.h b/ydb/library/yaml_config/console_dumper.h index 4c008d7cd20..4c008d7cd20 100644 --- a/ydb/core/cms/console/yaml_config/console_dumper.h +++ b/ydb/library/yaml_config/console_dumper.h diff --git a/ydb/core/cms/console/yaml_config/console_dumper_ut.cpp b/ydb/library/yaml_config/console_dumper_ut.cpp index 758ec195e80..758ec195e80 100644 --- a/ydb/core/cms/console/yaml_config/console_dumper_ut.cpp +++ b/ydb/library/yaml_config/console_dumper_ut.cpp diff --git a/ydb/core/cms/console/yaml_config/ut/CMakeLists.darwin-x86_64.txt b/ydb/library/yaml_config/ut/CMakeLists.darwin-x86_64.txt index deeb889bb78..16d1c98e734 100644 --- a/ydb/core/cms/console/yaml_config/ut/CMakeLists.darwin-x86_64.txt +++ b/ydb/library/yaml_config/ut/CMakeLists.darwin-x86_64.txt @@ -7,40 +7,40 @@ -add_executable(ydb-core-cms-console-yaml_config-ut) -target_include_directories(ydb-core-cms-console-yaml_config-ut PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config +add_executable(ydb-library-yaml_config-ut) +target_include_directories(ydb-library-yaml_config-ut PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config ) -target_link_libraries(ydb-core-cms-console-yaml_config-ut PUBLIC +target_link_libraries(ydb-library-yaml_config-ut PUBLIC contrib-libs-cxxsupp yutil library-cpp-cpuid_check cpp-testing-unittest_main - cms-console-yaml_config + ydb-library-yaml_config ) -target_link_options(ydb-core-cms-console-yaml_config-ut PRIVATE +target_link_options(ydb-library-yaml_config-ut PRIVATE -Wl,-platform_version,macos,11.0,11.0 -fPIC -fPIC -framework CoreFoundation ) -target_sources(ydb-core-cms-console-yaml_config-ut PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config/console_dumper_ut.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config/yaml_config_ut.cpp +target_sources(ydb-library-yaml_config-ut PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/console_dumper_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/yaml_config_ut.cpp ) set_property( TARGET - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut PROPERTY SPLIT_FACTOR 1 ) add_yunittest( NAME - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut TEST_TARGET - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut TEST_ARG --print-before-suite --print-before-test @@ -50,19 +50,19 @@ add_yunittest( ) set_yunittest_property( TEST - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut PROPERTY LABELS SMALL ) set_yunittest_property( TEST - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut PROPERTY PROCESSORS 1 ) -target_allocator(ydb-core-cms-console-yaml_config-ut +target_allocator(ydb-library-yaml_config-ut system_allocator ) -vcs_info(ydb-core-cms-console-yaml_config-ut) +vcs_info(ydb-library-yaml_config-ut) diff --git a/ydb/core/cms/console/yaml_config/ut/CMakeLists.linux-aarch64.txt b/ydb/library/yaml_config/ut/CMakeLists.linux-aarch64.txt index 867c9020e61..dc3cf97eda8 100644 --- a/ydb/core/cms/console/yaml_config/ut/CMakeLists.linux-aarch64.txt +++ b/ydb/library/yaml_config/ut/CMakeLists.linux-aarch64.txt @@ -7,18 +7,18 @@ -add_executable(ydb-core-cms-console-yaml_config-ut) -target_include_directories(ydb-core-cms-console-yaml_config-ut PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config +add_executable(ydb-library-yaml_config-ut) +target_include_directories(ydb-library-yaml_config-ut PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config ) -target_link_libraries(ydb-core-cms-console-yaml_config-ut PUBLIC +target_link_libraries(ydb-library-yaml_config-ut PUBLIC contrib-libs-linux-headers contrib-libs-cxxsupp yutil cpp-testing-unittest_main - cms-console-yaml_config + ydb-library-yaml_config ) -target_link_options(ydb-core-cms-console-yaml_config-ut PRIVATE +target_link_options(ydb-library-yaml_config-ut PRIVATE -ldl -lrt -Wl,--no-as-needed @@ -28,22 +28,22 @@ target_link_options(ydb-core-cms-console-yaml_config-ut PRIVATE -lrt -ldl ) -target_sources(ydb-core-cms-console-yaml_config-ut PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config/console_dumper_ut.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config/yaml_config_ut.cpp +target_sources(ydb-library-yaml_config-ut PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/console_dumper_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/yaml_config_ut.cpp ) set_property( TARGET - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut PROPERTY SPLIT_FACTOR 1 ) add_yunittest( NAME - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut TEST_TARGET - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut TEST_ARG --print-before-suite --print-before-test @@ -53,19 +53,19 @@ add_yunittest( ) set_yunittest_property( TEST - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut PROPERTY LABELS SMALL ) set_yunittest_property( TEST - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut PROPERTY PROCESSORS 1 ) -target_allocator(ydb-core-cms-console-yaml_config-ut +target_allocator(ydb-library-yaml_config-ut cpp-malloc-jemalloc ) -vcs_info(ydb-core-cms-console-yaml_config-ut) +vcs_info(ydb-library-yaml_config-ut) diff --git a/ydb/core/cms/console/yaml_config/ut/CMakeLists.linux-x86_64.txt b/ydb/library/yaml_config/ut/CMakeLists.linux-x86_64.txt index 91bbfb58c5c..7369ea0dd2c 100644 --- a/ydb/core/cms/console/yaml_config/ut/CMakeLists.linux-x86_64.txt +++ b/ydb/library/yaml_config/ut/CMakeLists.linux-x86_64.txt @@ -7,19 +7,19 @@ -add_executable(ydb-core-cms-console-yaml_config-ut) -target_include_directories(ydb-core-cms-console-yaml_config-ut PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config +add_executable(ydb-library-yaml_config-ut) +target_include_directories(ydb-library-yaml_config-ut PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config ) -target_link_libraries(ydb-core-cms-console-yaml_config-ut PUBLIC +target_link_libraries(ydb-library-yaml_config-ut PUBLIC contrib-libs-linux-headers contrib-libs-cxxsupp yutil library-cpp-cpuid_check cpp-testing-unittest_main - cms-console-yaml_config + ydb-library-yaml_config ) -target_link_options(ydb-core-cms-console-yaml_config-ut PRIVATE +target_link_options(ydb-library-yaml_config-ut PRIVATE -ldl -lrt -Wl,--no-as-needed @@ -29,22 +29,22 @@ target_link_options(ydb-core-cms-console-yaml_config-ut PRIVATE -lrt -ldl ) -target_sources(ydb-core-cms-console-yaml_config-ut PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config/console_dumper_ut.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config/yaml_config_ut.cpp +target_sources(ydb-library-yaml_config-ut PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/console_dumper_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/yaml_config_ut.cpp ) set_property( TARGET - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut PROPERTY SPLIT_FACTOR 1 ) add_yunittest( NAME - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut TEST_TARGET - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut TEST_ARG --print-before-suite --print-before-test @@ -54,20 +54,20 @@ add_yunittest( ) set_yunittest_property( TEST - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut PROPERTY LABELS SMALL ) set_yunittest_property( TEST - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut PROPERTY PROCESSORS 1 ) -target_allocator(ydb-core-cms-console-yaml_config-ut +target_allocator(ydb-library-yaml_config-ut cpp-malloc-tcmalloc libs-tcmalloc-no_percpu_cache ) -vcs_info(ydb-core-cms-console-yaml_config-ut) +vcs_info(ydb-library-yaml_config-ut) diff --git a/ydb/core/cms/console/yaml_config/CMakeLists.txt b/ydb/library/yaml_config/ut/CMakeLists.txt index f8b31df0c11..f8b31df0c11 100644 --- a/ydb/core/cms/console/yaml_config/CMakeLists.txt +++ b/ydb/library/yaml_config/ut/CMakeLists.txt diff --git a/ydb/core/cms/console/yaml_config/ut/CMakeLists.windows-x86_64.txt b/ydb/library/yaml_config/ut/CMakeLists.windows-x86_64.txt index 1b729c84678..88e9923821c 100644 --- a/ydb/core/cms/console/yaml_config/ut/CMakeLists.windows-x86_64.txt +++ b/ydb/library/yaml_config/ut/CMakeLists.windows-x86_64.txt @@ -7,33 +7,33 @@ -add_executable(ydb-core-cms-console-yaml_config-ut) -target_include_directories(ydb-core-cms-console-yaml_config-ut PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config +add_executable(ydb-library-yaml_config-ut) +target_include_directories(ydb-library-yaml_config-ut PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config ) -target_link_libraries(ydb-core-cms-console-yaml_config-ut PUBLIC +target_link_libraries(ydb-library-yaml_config-ut PUBLIC contrib-libs-cxxsupp yutil library-cpp-cpuid_check cpp-testing-unittest_main - cms-console-yaml_config + ydb-library-yaml_config ) -target_sources(ydb-core-cms-console-yaml_config-ut PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config/console_dumper_ut.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/cms/console/yaml_config/yaml_config_ut.cpp +target_sources(ydb-library-yaml_config-ut PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/console_dumper_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/library/yaml_config/yaml_config_ut.cpp ) set_property( TARGET - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut PROPERTY SPLIT_FACTOR 1 ) add_yunittest( NAME - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut TEST_TARGET - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut TEST_ARG --print-before-suite --print-before-test @@ -43,19 +43,19 @@ add_yunittest( ) set_yunittest_property( TEST - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut PROPERTY LABELS SMALL ) set_yunittest_property( TEST - ydb-core-cms-console-yaml_config-ut + ydb-library-yaml_config-ut PROPERTY PROCESSORS 1 ) -target_allocator(ydb-core-cms-console-yaml_config-ut +target_allocator(ydb-library-yaml_config-ut system_allocator ) -vcs_info(ydb-core-cms-console-yaml_config-ut) +vcs_info(ydb-library-yaml_config-ut) diff --git a/ydb/core/cms/console/yaml_config/ut/ya.make b/ydb/library/yaml_config/ut/ya.make index 709eb049a3a..dd061733095 100644 --- a/ydb/core/cms/console/yaml_config/ut/ya.make +++ b/ydb/library/yaml_config/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(ydb/core/cms/console/yaml_config) +UNITTEST_FOR(ydb/library/yaml_config) SRCS( console_dumper_ut.cpp diff --git a/ydb/core/cms/console/yaml_config/util.h b/ydb/library/yaml_config/util.h index 30a97705bb4..30a97705bb4 100644 --- a/ydb/core/cms/console/yaml_config/util.h +++ b/ydb/library/yaml_config/util.h diff --git a/ydb/library/yaml_config/ya.make b/ydb/library/yaml_config/ya.make index dd112dacd1d..0fa4761e805 100644 --- a/ydb/library/yaml_config/ya.make +++ b/ydb/library/yaml_config/ya.make @@ -1,13 +1,30 @@ LIBRARY() -SRC(yaml_config_parser.cpp) +SRCS( + console_dumper.cpp + console_dumper.h + yaml_config.cpp + yaml_config.h + yaml_config_impl.h + yaml_config_parser.cpp + yaml_config_parser.h +) PEERDIR( + contrib/libs/openssl contrib/libs/protobuf contrib/libs/yaml-cpp + library/cpp/actors/core + library/cpp/protobuf/json + library/cpp/yaml/fyamlcpp ydb/core/base + ydb/core/cms/console/util ydb/core/erasure ydb/core/protos ) END() + +RECURSE_FOR_TESTS( + ut +) diff --git a/ydb/core/cms/console/yaml_config/yaml_config.cpp b/ydb/library/yaml_config/yaml_config.cpp index 301db5131d2..4a61f10fe71 100644 --- a/ydb/core/cms/console/yaml_config/yaml_config.cpp +++ b/ydb/library/yaml_config/yaml_config.cpp @@ -1,8 +1,8 @@ #include "yaml_config.h" #include "yaml_config_impl.h" +#include "yaml_config_parser.h" #include <ydb/core/base/appdata.h> -#include <ydb/library/yaml_config/yaml_config_parser.h> #include <library/cpp/protobuf/json/json2proto.h> diff --git a/ydb/core/cms/console/yaml_config/yaml_config.h b/ydb/library/yaml_config/yaml_config.h index be34e712c94..be34e712c94 100644 --- a/ydb/core/cms/console/yaml_config/yaml_config.h +++ b/ydb/library/yaml_config/yaml_config.h diff --git a/ydb/core/cms/console/yaml_config/yaml_config_impl.h b/ydb/library/yaml_config/yaml_config_impl.h index 2f9a6f76467..2f9a6f76467 100644 --- a/ydb/core/cms/console/yaml_config/yaml_config_impl.h +++ b/ydb/library/yaml_config/yaml_config_impl.h diff --git a/ydb/core/cms/console/yaml_config/yaml_config_ut.cpp b/ydb/library/yaml_config/yaml_config_ut.cpp index 88854657580..88854657580 100644 --- a/ydb/core/cms/console/yaml_config/yaml_config_ut.cpp +++ b/ydb/library/yaml_config/yaml_config_ut.cpp |