Skip to content

Commit a22a03f

Browse files
molotkov-andmolotkov-and
authored
Remove msgbus login method (#6523)
1 parent 095ec12 commit a22a03f

File tree

15 files changed

+35
-161
lines changed

15 files changed

+35
-161
lines changed

‎ydb/core/client/server/grpc_server.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,6 @@ void TGRpcService::SetupIncomingRequests() {
453453
ADD_ACTOR_REQUEST(DrainNode, TDrainNodeRequest, MTYPE_CLIENT_DRAIN_NODE)
454454
ADD_ACTOR_REQUEST(InterconnectDebug, TInterconnectDebug, MTYPE_CLIENT_INTERCONNECT_DEBUG)
455455
ADD_ACTOR_REQUEST(TestShardControl, TTestShardControlRequest, MTYPE_CLIENT_TEST_SHARD_CONTROL)
456-
ADD_ACTOR_REQUEST(LoginRequest, TLoginRequest, MTYPE_CLIENT_LOGIN_REQUEST)
457456

458457
// dynamic node registration
459458
ADD_REQUEST(RegisterNode, TNodeRegistrationRequest, TNodeRegistrationResponse, {

‎ydb/core/client/server/msgbus_server.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ class TBusMessageContext::TImplGRpc
124124
MTYPE(TBusFillNode)
125125
MTYPE(TBusDrainNode)
126126
MTYPE(TBusTestShardControlRequest)
127-
MTYPE(TBusLoginRequest)
128127
#undef MTYPE
129128
}
130129

@@ -543,8 +542,6 @@ void TMessageBusServer::OnMessage(TBusMessageContext &msg) {
543542
return ClientActorRequest(CreateMessageBusConsoleRequest, msg);
544543
case MTYPE_CLIENT_TEST_SHARD_CONTROL:
545544
return ClientActorRequest(CreateMessageBusTestShardControl, msg);
546-
case MTYPE_CLIENT_LOGIN_REQUEST:
547-
return ClientActorRequest(CreateMessageBusLoginRequest, msg);
548545
default:
549546
return UnknownMessage(msg);
550547
}

‎ydb/core/client/server/msgbus_server.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@ IActor* CreateMessageBusSqsRequest(TBusMessageContext &msg);
297297
IActor* CreateMessageBusInterconnectDebug(TBusMessageContext& msg);
298298
IActor* CreateMessageBusConsoleRequest(TBusMessageContext &msg);
299299
IActor* CreateMessageBusTestShardControl(TBusMessageContext &msg);
300-
IActor* CreateMessageBusLoginRequest(TBusMessageContext &msg);
301300

302301
TBusResponse* ProposeTransactionStatusToResponse(EResponseStatus status, const NKikimrTxUserProxy::TEvProposeTransactionStatus &result);
303302

‎ydb/core/client/server/msgbus_server_login_request.cpp

Lines changed: 0 additions & 125 deletions
This file was deleted.

‎ydb/core/client/server/ya.make

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ SRCS(
2828
msgbus_server_local_enumerate_tablets.cpp
2929
msgbus_server_local_minikql.cpp
3030
msgbus_server_local_scheme_tx.cpp
31-
msgbus_server_login_request.cpp
3231
msgbus_server_node_registration.cpp
3332
msgbus_server_proxy.cpp
3433
msgbus_server_proxy.h

‎ydb/core/driver_lib/cli_base/cli_kicli.cpp

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
2+
#include <ydb/public/sdk/cpp/client/ydb_types/credentials/credentials.h>
3+
#include <ydb/public/lib/ydb_cli/commands/ydb_sdk_core_access.h>
4+
#include <ydb/core/driver_lib/cli_config_base/config_base.h>
15
#include "cli_kicli.h"
26

37
namespace NKikimr {
@@ -67,17 +71,22 @@ int InvokeThroughKikimr(TClientCommand::TConfig& config, std::function<int(NClie
6771
}
6872

6973
if (!config.StaticCredentials.User.empty()) {
70-
TAutoPtr<NMsgBusProxy::TBusLoginRequest> request = new NMsgBusProxy::TBusLoginRequest();
71-
request.Get()->Record.SetUser(config.StaticCredentials.User);
72-
request.Get()->Record.SetPassword(config.StaticCredentials.Password);
73-
NClient::TResult result = kikimr.ExecuteRequest(request.Release()).GetValueSync();
74-
if (result.GetStatus() == NMsgBusProxy::MSTATUS_OK) {
75-
kikimr.SetSecurityToken(result.GetResponse<NMsgBusProxy::TBusResponse>().Record.GetUserToken());
76-
config.SecurityToken = result.GetResponse<NMsgBusProxy::TBusResponse>().Record.GetUserToken();
77-
} else {
78-
Cerr << result.GetError().GetMessage() << Endl;
74+
NYdb::TDriverConfig driverConfig;
75+
driverConfig.SetEndpoint(TCommandConfig::ParseServerAddress(config.Address).Address);
76+
NYdb::TDriver connection(driverConfig);
77+
NYdb::NConsoleClient::TDummyClient client(connection);
78+
79+
auto credentialsProviderFactory = NYdb::CreateLoginCredentialsProviderFactory(config.StaticCredentials);
80+
auto loginProvider = credentialsProviderFactory->CreateProvider(client.GetCoreFacility());
81+
try {
82+
config.SecurityToken = loginProvider->GetAuthInfo();
83+
} catch (yexception& ex) {
84+
Cerr << ex.what() << Endl;
85+
connection.Stop();
7986
return 1;
8087
}
88+
connection.Stop();
89+
kikimr.SetSecurityToken(config.SecurityToken);
8190
}
8291

8392
return handler(kikimr);

‎ydb/core/driver_lib/cli_base/ya.make

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ PEERDIR(
1414
ydb/public/lib/ydb_cli/common
1515
ydb/public/sdk/cpp/client/resources
1616
ydb/public/sdk/cpp/client/ydb_table
17+
ydb/public/sdk/cpp/client/ydb_driver
18+
ydb/public/sdk/cpp/client/ydb_types/credentials
19+
ydb/public/lib/ydb_cli/commands/sdk_core_access
1720
ydb/public/lib/ydb_cli/commands/ydb_discovery
1821
)
1922

‎ydb/core/protos/grpc.proto

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ service TGRpcServer {
2525
rpc SchemeOperationStatus(TSchemeOperationStatus) returns (TResponse);
2626
// describe
2727
rpc SchemeDescribe(TSchemeDescribe) returns (TResponse);
28-
// login
29-
rpc LoginRequest(TLoginRequest) returns (TResponse);
3028

3129
/////////////////////////////////////////////////////////////////////////////////////////////////
3230
// CHOOSE PROXY INTERFACE

‎ydb/core/protos/msgbus.proto

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,6 @@ message TResponse {
241241
// TChooseProxyRequest
242242
optional string ProxyName = 1050;
243243
optional uint64 ProxyCookie = 1051;
244-
245-
// Login
246-
optional string UserToken = 1102;
247244
}
248245

249246
message TFakeConfigDummy {
@@ -717,10 +714,3 @@ message TTestShardControlRequest {
717714

718715
message TTestShardControlResponse {
719716
}
720-
721-
message TLoginRequest {
722-
optional string Database = 1;
723-
optional string User = 2;
724-
optional string Password = 3;
725-
};
726-

‎ydb/public/lib/base/msgbus.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ enum {
8787
MTYPE_CLIENT_TEST_SHARD_CONTROL = 10481,
8888
MTYPE_CLIENT_DS_LOAD_REQUEST = 10482, // deprecated
8989
MTYPE_CLIENT_DS_LOAD_RESPONSE = 10483, // deprecated
90-
MTYPE_CLIENT_LOGIN_REQUEST = 10484,
90+
/*MTYPE_CLIENT_LOGIN_REQUEST*/ MTYPE_CLIENT_DEPRECATED_10484 = 10484,
9191
};
9292

9393
template <typename InstanceType, class TBufferRecord, int MType>
@@ -136,7 +136,6 @@ struct TBusInterconnectDebug : TBusMessage<TBusInterconnectDebug, NKikimrClient:
136136
struct TBusConsoleRequest : TBusMessage<TBusConsoleRequest, NKikimrClient::TConsoleRequest, MTYPE_CLIENT_CONSOLE_REQUEST> {};
137137
struct TBusConsoleResponse : TBusMessage<TBusConsoleResponse, NKikimrClient::TConsoleResponse, MTYPE_CLIENT_CONSOLE_RESPONSE> {};
138138
struct TBusTestShardControlRequest : TBusMessage<TBusTestShardControlRequest, NKikimrClient::TTestShardControlRequest, MTYPE_CLIENT_TEST_SHARD_CONTROL> {};
139-
struct TBusLoginRequest : TBusMessage<TBusLoginRequest, NKikimrClient::TLoginRequest, MTYPE_CLIENT_LOGIN_REQUEST> {};
140139

141140
class TBusResponseStatus : public TBusResponse {
142141
public:
@@ -218,7 +217,6 @@ class TProtocol : public NBus::TBusBufferProtocol {
218217
RegisterType(new TBusConsoleRequest);
219218
RegisterType(new TBusConsoleResponse);
220219
RegisterType(new TBusTestShardControlRequest);
221-
RegisterType(new TBusLoginRequest);
222220
}
223221

224222
const static ui32 DefaultPort = 2134;

‎ydb/public/lib/deprecated/client/grpc_client.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@ namespace NKikimr {
339339
IMPL_REQUEST(ConsoleRequest, TConsoleRequest, TConsoleResponse)
340340
IMPL_REQUEST(FillNode, TFillNodeRequest, TResponse)
341341
IMPL_REQUEST(DrainNode, TDrainNodeRequest, TResponse)
342-
IMPL_REQUEST(LoginRequest, TLoginRequest, TResponse)
343342

344343
} // NGRpcProxy
345344
} // NKikimr

‎ydb/public/lib/deprecated/client/grpc_client.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ namespace NKikimr {
111111

112112
void FillNode(const NKikimrClient::TFillNodeRequest& request, TResponseCallback callback);
113113
void DrainNode(const NKikimrClient::TDrainNodeRequest& request, TResponseCallback callback);
114-
115-
void LoginRequest(const NKikimrClient::TLoginRequest& request, TResponseCallback callback);
116114
};
117115

118116
} // NGRpcProxy

‎ydb/public/lib/deprecated/kicli/kikimr.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,6 @@ class TKikimr::TGRpcImpl : public TKikimr::TImpl {
276276
return ExecuteGRpcRequest<NMsgBusProxy::TBusDrainNode, NMsgBusProxy::TBusResponse>(&NGRpcProxy::TGRpcClient::DrainNode, promise, request);
277277
case NMsgBusProxy::MTYPE_CLIENT_FILL_NODE:
278278
return ExecuteGRpcRequest<NMsgBusProxy::TBusFillNode, NMsgBusProxy::TBusResponse>(&NGRpcProxy::TGRpcClient::FillNode, promise, request);
279-
case NMsgBusProxy::MTYPE_CLIENT_LOGIN_REQUEST:
280-
return ExecuteGRpcRequest<NMsgBusProxy::TBusLoginRequest, NMsgBusProxy::TBusResponse>(&NGRpcProxy::TGRpcClient::LoginRequest, promise, request);
281279
default:
282280
Y_ABORT("%s", (TStringBuilder() << "unexpected message type# " << type).data());
283281
}

‎ydb/public/lib/ydb_cli/commands/sdk_core_access/ya.make

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
LIBRARY(ydb_sdk_core_access)
2+
3+
SRCS(
4+
../ydb_sdk_core_access.cpp
5+
)
6+
7+
PEERDIR(
8+
ydb/public/sdk/cpp/client/ydb_common_client/impl
9+
ydb/public/sdk/cpp/client/ydb_types
10+
)
11+
12+
END()

‎ydb/public/lib/ydb_cli/commands/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ SRCS(
1111
query_workload.cpp
1212
ydb_admin.cpp
1313
ydb_benchmark.cpp
14-
ydb_sdk_core_access.cpp
1514
ydb_dynamic_config.cpp
1615
ydb_profile.cpp
1716
ydb_root_common.cpp
@@ -48,6 +47,7 @@ PEERDIR(
4847
ydb/public/lib/ydb_cli/commands/topic_workload
4948
ydb/public/lib/ydb_cli/commands/transfer_workload
5049
ydb/public/lib/ydb_cli/commands/ydb_discovery
50+
ydb/public/lib/ydb_cli/commands/sdk_core_access
5151
ydb/public/lib/ydb_cli/dump
5252
ydb/public/lib/ydb_cli/import
5353
ydb/public/lib/ydb_cli/topic

0 commit comments

Comments
 (0)