Enable grpc kv api on ydbd, KIKIMR-16142

6 files changed, 13 insertions, 0 deletions

diff --git a/ydb/core/driver_lib/run/CMakeLists.darwin-x86_64.txt b/ydb/core/driver_lib/run/CMakeLists.darwin-x86_64.txt
index 93a3f721a1..1c13f29209 100644
--- a/ydb/core/driver_lib/run/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/driver_lib/run/CMakeLists.darwin-x86_64.txt
@@ -130,6 +130,7 @@ target_link_libraries(run PUBLIC
   ydb-services-discovery
   ydb-services-fq
   ydb-services-kesus
+  ydb-services-keyvalue
   ydb-services-local_discovery
   ydb-services-maintenance
   services-metadata-ds_table
diff --git a/ydb/core/driver_lib/run/CMakeLists.linux-aarch64.txt b/ydb/core/driver_lib/run/CMakeLists.linux-aarch64.txt
index 90627a293e..51fac4a558 100644
--- a/ydb/core/driver_lib/run/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/driver_lib/run/CMakeLists.linux-aarch64.txt
@@ -131,6 +131,7 @@ target_link_libraries(run PUBLIC
   ydb-services-discovery
   ydb-services-fq
   ydb-services-kesus
+  ydb-services-keyvalue
   ydb-services-local_discovery
   ydb-services-maintenance
   services-metadata-ds_table
diff --git a/ydb/core/driver_lib/run/CMakeLists.linux-x86_64.txt b/ydb/core/driver_lib/run/CMakeLists.linux-x86_64.txt
index 90627a293e..51fac4a558 100644
--- a/ydb/core/driver_lib/run/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/driver_lib/run/CMakeLists.linux-x86_64.txt
@@ -131,6 +131,7 @@ target_link_libraries(run PUBLIC
   ydb-services-discovery
   ydb-services-fq
   ydb-services-kesus
+  ydb-services-keyvalue
   ydb-services-local_discovery
   ydb-services-maintenance
   services-metadata-ds_table
diff --git a/ydb/core/driver_lib/run/CMakeLists.windows-x86_64.txt b/ydb/core/driver_lib/run/CMakeLists.windows-x86_64.txt
index 93a3f721a1..1c13f29209 100644
--- a/ydb/core/driver_lib/run/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/driver_lib/run/CMakeLists.windows-x86_64.txt
@@ -130,6 +130,7 @@ target_link_libraries(run PUBLIC
   ydb-services-discovery
   ydb-services-fq
   ydb-services-kesus
+  ydb-services-keyvalue
   ydb-services-local_discovery
   ydb-services-maintenance
   services-metadata-ds_table
diff --git a/ydb/core/driver_lib/run/run.cpp b/ydb/core/driver_lib/run/run.cpp
index 20263507e7..3e8a0e3188 100644
--- a/ydb/core/driver_lib/run/run.cpp
+++ b/ydb/core/driver_lib/run/run.cpp
@@ -91,6 +91,7 @@
 #include <ydb/services/fq/grpc_service.h>
 #include <ydb/services/fq/private_grpc.h>
 #include <ydb/services/kesus/grpc_service.h>
+#include <ydb/services/keyvalue/grpc_service.h>
 #include <ydb/services/local_discovery/grpc_service.h>
 #include <ydb/services/maintenance/grpc_service.h>
 #include <ydb/services/monitoring/grpc_service.h>
@@ -638,6 +639,8 @@ void TKikimrRunner::InitializeGRpc(const TKikimrRunConfig& runConfig) {
         names["auth"] = &hasAuth;
         TServiceCfg hasQueryService = services.empty();
         names["query_service"] = &hasQueryService;
+        TServiceCfg hasKeyValue = services.empty();
+        names["keyvalue"] = &hasKeyValue;
 
         std::unordered_set<TString> enabled;
         for (const auto& name : services) {
@@ -896,6 +899,11 @@ void TKikimrRunner::InitializeGRpc(const TKikimrRunConfig& runConfig) {
                 grpcRequestProxies[0], hasLogStore.IsRlAllowed()));
         }
 
+        if (hasKeyValue) {
+            server.AddService(new NGRpcService::TKeyValueGRpcService(ActorSystem.Get(), Counters,
+                grpcRequestProxies[0]));
+        }
+
         if (ModuleFactories) {
             for (const auto& service : ModuleFactories->GrpcServiceFactory.Create(enabled, disabled, ActorSystem.Get(), Counters, grpcRequestProxies[0])) {
                 server.AddService(service);
diff --git a/ydb/core/driver_lib/run/ya.make b/ydb/core/driver_lib/run/ya.make
index 9082c1bd5f..8b0e21d25e 100644
--- a/ydb/core/driver_lib/run/ya.make
+++ b/ydb/core/driver_lib/run/ya.make
@@ -145,6 +145,7 @@ PEERDIR(
     ydb/services/discovery
     ydb/services/fq
     ydb/services/kesus
+    ydb/services/keyvalue
     ydb/services/local_discovery
     ydb/services/maintenance
     ydb/services/metadata/ds_table