From cfef46fcf2cdddeeaadef49cf68c17cd34691f1d Mon Sep 17 00:00:00 2001 From: Innokentii Mokin Date: Tue, 13 Feb 2024 07:34:22 +0000 Subject: [PATCH 1/2] move old yaml parser to deprecated --- ydb/core/driver_lib/cli_utils/cli_cmds_config.cpp | 2 +- ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp | 2 +- ydb/core/driver_lib/cli_utils/ya.make | 1 + ydb/library/yaml_config/deprecated/ya.make | 12 ++++++++++++ .../{ => deprecated}/yaml_config_parser.cpp | 0 .../{ => deprecated}/yaml_config_parser.h | 0 ydb/library/yaml_config/ya.make | 9 ++++----- ydb/library/yaml_config/yaml_config.cpp | 2 +- ydb/library/yaml_config/yaml_config_ut.cpp | 3 ++- 9 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 ydb/library/yaml_config/deprecated/ya.make rename ydb/library/yaml_config/{ => deprecated}/yaml_config_parser.cpp (100%) rename ydb/library/yaml_config/{ => deprecated}/yaml_config_parser.h (100%) diff --git a/ydb/core/driver_lib/cli_utils/cli_cmds_config.cpp b/ydb/core/driver_lib/cli_utils/cli_cmds_config.cpp index aae54255e919..7fc199dce103 100644 --- a/ydb/core/driver_lib/cli_utils/cli_cmds_config.cpp +++ b/ydb/core/driver_lib/cli_utils/cli_cmds_config.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include "cli.h" #include "cli_cmds.h" #include "proto_common.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 73cd6cf2b7b8..74b6e6154854 100644 --- a/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp +++ b/ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/ydb/core/driver_lib/cli_utils/ya.make b/ydb/core/driver_lib/cli_utils/ya.make index 79d7248a3370..5acad0b35e77 100644 --- a/ydb/core/driver_lib/cli_utils/ya.make +++ b/ydb/core/driver_lib/cli_utils/ya.make @@ -52,6 +52,7 @@ PEERDIR( ydb/library/aclib ydb/library/folder_service/proto ydb/library/yaml_config + ydb/library/yaml_config/deprecated ydb/public/api/grpc ydb/public/api/grpc/draft ydb/public/lib/deprecated/client diff --git a/ydb/library/yaml_config/deprecated/ya.make b/ydb/library/yaml_config/deprecated/ya.make new file mode 100644 index 000000000000..16c8f49508a7 --- /dev/null +++ b/ydb/library/yaml_config/deprecated/ya.make @@ -0,0 +1,12 @@ +LIBRARY() + +SRCS( + yaml_config_parser.cpp + yaml_config_parser.h +) + +PEERDIR( + ydb/library/yaml_config +) + +END() diff --git a/ydb/library/yaml_config/yaml_config_parser.cpp b/ydb/library/yaml_config/deprecated/yaml_config_parser.cpp similarity index 100% rename from ydb/library/yaml_config/yaml_config_parser.cpp rename to ydb/library/yaml_config/deprecated/yaml_config_parser.cpp diff --git a/ydb/library/yaml_config/yaml_config_parser.h b/ydb/library/yaml_config/deprecated/yaml_config_parser.h similarity index 100% rename from ydb/library/yaml_config/yaml_config_parser.h rename to ydb/library/yaml_config/deprecated/yaml_config_parser.h diff --git a/ydb/library/yaml_config/ya.make b/ydb/library/yaml_config/ya.make index d32ff3dc7c2d..0855150a0384 100644 --- a/ydb/library/yaml_config/ya.make +++ b/ydb/library/yaml_config/ya.make @@ -5,30 +5,29 @@ SRCS( console_dumper.h yaml_config.cpp yaml_config.h - yaml_config_parser.cpp - yaml_config_parser.h ) PEERDIR( contrib/libs/openssl contrib/libs/protobuf contrib/libs/yaml-cpp - ydb/library/actors/core library/cpp/protobuf/json - ydb/library/fyamlcpp ydb/core/base ydb/core/cms/console/util ydb/core/erasure ydb/core/protos + ydb/library/actors/core + ydb/library/fyamlcpp ydb/library/yaml_config/public ) END() RECURSE( + deprecated public - validator static_validator + validator ) RECURSE_FOR_TESTS( diff --git a/ydb/library/yaml_config/yaml_config.cpp b/ydb/library/yaml_config/yaml_config.cpp index 38d47cb74e49..35db76b3fd70 100644 --- a/ydb/library/yaml_config/yaml_config.cpp +++ b/ydb/library/yaml_config/yaml_config.cpp @@ -1,6 +1,6 @@ #include "yaml_config.h" -#include "yaml_config_parser.h" +#include #include diff --git a/ydb/library/yaml_config/yaml_config_ut.cpp b/ydb/library/yaml_config/yaml_config_ut.cpp index 0e295df2db70..df64a134b029 100644 --- a/ydb/library/yaml_config/yaml_config_ut.cpp +++ b/ydb/library/yaml_config/yaml_config_ut.cpp @@ -1,5 +1,6 @@ #include "yaml_config.h" -#include "yaml_config_parser.h" + +#include #include From 2642ccd5ed744c0799e33ec3c65943cebd584dcc Mon Sep 17 00:00:00 2001 From: Innokentii Mokin Date: Tue, 13 Feb 2024 09:40:22 +0000 Subject: [PATCH 2/2] fix --- ydb/library/yaml_config/ut/ya.make | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ydb/library/yaml_config/ut/ya.make b/ydb/library/yaml_config/ut/ya.make index dd061733095c..70fbeea18be8 100644 --- a/ydb/library/yaml_config/ut/ya.make +++ b/ydb/library/yaml_config/ut/ya.make @@ -5,4 +5,8 @@ SRCS( yaml_config_ut.cpp ) +PEERDIR( + ydb/library/yaml_config/deprecated +) + END()