Skip to content

Commit ec18660

Browse files
authored
[Configs Refactor] Deprecate old yaml_config_parser (#1876)
1 parent df050b2 commit ec18660

File tree

10 files changed

+26
-9
lines changed

10 files changed

+26
-9
lines changed

ydb/core/driver_lib/cli_utils/cli_cmds_config.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <ydb/core/protos/blobstorage.pb.h>
22
#include <ydb/core/protos/config.pb.h>
3-
#include <ydb/library/yaml_config/yaml_config_parser.h>
3+
#include <ydb/library/yaml_config/deprecated/yaml_config_parser.h>
44
#include "cli.h"
55
#include "cli_cmds.h"
66
#include "proto_common.h"

ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <ydb/core/base/path.h>
55
#include <ydb/library/yaml_config/yaml_config.h>
66
#include <ydb/core/driver_lib/run/run.h>
7-
#include <ydb/library/yaml_config/yaml_config_parser.h>
7+
#include <ydb/library/yaml_config/deprecated/yaml_config_parser.h>
88
#include <ydb/public/lib/deprecated/kicli/kicli.h>
99
#include <util/digest/city.h>
1010
#include <util/random/random.h>

ydb/core/driver_lib/cli_utils/ya.make

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ PEERDIR(
5252
ydb/library/aclib
5353
ydb/library/folder_service/proto
5454
ydb/library/yaml_config
55+
ydb/library/yaml_config/deprecated
5556
ydb/public/api/grpc
5657
ydb/public/api/grpc/draft
5758
ydb/public/lib/deprecated/client
+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
LIBRARY()
2+
3+
SRCS(
4+
yaml_config_parser.cpp
5+
yaml_config_parser.h
6+
)
7+
8+
PEERDIR(
9+
ydb/library/yaml_config
10+
)
11+
12+
END()

ydb/library/yaml_config/ut/ya.make

+4
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,8 @@ SRCS(
55
yaml_config_ut.cpp
66
)
77

8+
PEERDIR(
9+
ydb/library/yaml_config/deprecated
10+
)
11+
812
END()

ydb/library/yaml_config/ya.make

+4-5
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,29 @@ SRCS(
55
console_dumper.h
66
yaml_config.cpp
77
yaml_config.h
8-
yaml_config_parser.cpp
9-
yaml_config_parser.h
108
)
119

1210
PEERDIR(
1311
contrib/libs/openssl
1412
contrib/libs/protobuf
1513
contrib/libs/yaml-cpp
16-
ydb/library/actors/core
1714
library/cpp/protobuf/json
18-
ydb/library/fyamlcpp
1915
ydb/core/base
2016
ydb/core/cms/console/util
2117
ydb/core/erasure
2218
ydb/core/protos
19+
ydb/library/actors/core
20+
ydb/library/fyamlcpp
2321
ydb/library/yaml_config/public
2422
)
2523

2624
END()
2725

2826
RECURSE(
27+
deprecated
2928
public
30-
validator
3129
static_validator
30+
validator
3231
)
3332

3433
RECURSE_FOR_TESTS(

ydb/library/yaml_config/yaml_config.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "yaml_config.h"
22

3-
#include "yaml_config_parser.h"
3+
#include <ydb/library/yaml_config/deprecated/yaml_config_parser.h>
44

55
#include <ydb/core/base/appdata.h>
66

ydb/library/yaml_config/yaml_config_ut.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "yaml_config.h"
2-
#include "yaml_config_parser.h"
2+
3+
#include <ydb/library/yaml_config/deprecated/yaml_config_parser.h>
34

45
#include <library/cpp/testing/unittest/registar.h>
56

0 commit comments

Comments
 (0)