@@ -944,7 +944,8 @@ class TClientCommandServerBase : public TClientCommand {
944
944
const TString &nodeHost,
945
945
const TString &nodeAddress,
946
946
const TString &nodeResolveHost,
947
- const TMaybe<TString>& path) {
947
+ const TMaybe<TString>& path,
948
+ const TString& nodeRegistrationToken) {
948
949
TCommandConfig::TServerEndpoint endpoint = TCommandConfig::ParseServerAddress (addr);
949
950
NYdb::TDriverConfig config;
950
951
if (endpoint.EnableSsl .Defined ()) {
@@ -957,7 +958,9 @@ class TClientCommandServerBase : public TClientCommand {
957
958
config.UseClientCertificate (certificate.c_str (), privateKey.c_str ());
958
959
}
959
960
}
960
- config.SetAuthToken (BUILTIN_ACL_ROOT);
961
+ if (nodeRegistrationToken) {
962
+ config.SetAuthToken (nodeRegistrationToken);
963
+ }
961
964
config.SetEndpoint (endpoint.Address );
962
965
auto connection = NYdb::TDriver (config);
963
966
@@ -1028,13 +1031,13 @@ class TClientCommandServerBase : public TClientCommand {
1028
1031
return {};
1029
1032
}
1030
1033
1031
- NYdb::NDiscovery::TNodeRegistrationResult RegisterDynamicNodeViaDiscoveryService (const TVector<TString>& addrs, const TString& domainName) {
1034
+ NYdb::NDiscovery::TNodeRegistrationResult RegisterDynamicNodeViaDiscoveryService (const TVector<TString>& addrs, const TString& domainName, const TString& nodeRegistrationToken ) {
1032
1035
NYdb::NDiscovery::TNodeRegistrationResult result;
1033
1036
const size_t maxNumberRecivedCallUnimplemented = 5 ;
1034
1037
size_t currentNumberRecivedCallUnimplemented = 0 ;
1035
1038
while (!result.IsSuccess () && currentNumberRecivedCallUnimplemented < maxNumberRecivedCallUnimplemented) {
1036
1039
for (const auto & addr : addrs) {
1037
- result = TryToRegisterDynamicNodeViaDiscoveryService (addr, domainName, NodeHost, NodeAddress, NodeResolveHost, GetSchemePath ());
1040
+ result = TryToRegisterDynamicNodeViaDiscoveryService (addr, domainName, NodeHost, NodeAddress, NodeResolveHost, GetSchemePath (), nodeRegistrationToken );
1038
1041
if (result.IsSuccess ()) {
1039
1042
Cout << " Success. Registered via discovery service as " << result.GetNodeId () << Endl;
1040
1043
Cout << " Node name: " ;
@@ -1217,7 +1220,7 @@ class TClientCommandServerBase : public TClientCommand {
1217
1220
if (!NodeResolveHost)
1218
1221
NodeResolveHost = NodeHost;
1219
1222
1220
- NYdb::NDiscovery::TNodeRegistrationResult result = RegisterDynamicNodeViaDiscoveryService (addrs, domainName);
1223
+ NYdb::NDiscovery::TNodeRegistrationResult result = RegisterDynamicNodeViaDiscoveryService (addrs, domainName, AppConfig. GetAuthConfig (). GetNodeRegistrationToken () );
1221
1224
if (result.IsSuccess ()) {
1222
1225
ProcessRegistrationDynamicNodeResult (result);
1223
1226
} else {
0 commit comments