Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Configs Refactor] Deprecate old yaml_config_parser #1876

Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ydb/core/driver_lib/cli_utils/cli_cmds_config.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <ydb/core/protos/blobstorage.pb.h>
#include <ydb/core/protos/config.pb.h>
#include <ydb/library/yaml_config/yaml_config_parser.h>
#include <ydb/library/yaml_config/deprecated/yaml_config_parser.h>
#include "cli.h"
#include "cli_cmds.h"
#include "proto_common.h"
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <ydb/core/base/path.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/library/yaml_config/deprecated/yaml_config_parser.h>
#include <ydb/public/lib/deprecated/kicli/kicli.h>
#include <util/digest/city.h>
#include <util/random/random.h>
Expand Down
1 change: 1 addition & 0 deletions ydb/core/driver_lib/cli_utils/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions ydb/library/yaml_config/deprecated/ya.make
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
LIBRARY()

SRCS(
yaml_config_parser.cpp
yaml_config_parser.h
)

PEERDIR(
ydb/library/yaml_config
)

END()
9 changes: 4 additions & 5 deletions ydb/library/yaml_config/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yaml_config/yaml_config.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "yaml_config.h"

#include "yaml_config_parser.h"
#include <ydb/library/yaml_config/deprecated/yaml_config_parser.h>

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

Expand Down
3 changes: 2 additions & 1 deletion ydb/library/yaml_config/yaml_config_ut.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "yaml_config.h"
#include "yaml_config_parser.h"

#include <ydb/library/yaml_config/deprecated/yaml_config_parser.h>

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

Expand Down
Loading