Move Private Grpc def from public API

13 files changed, 53 insertions, 8 deletions

diff --git a/CMakeLists.darwin.txt b/CMakeLists.darwin.txt
index f311dbf02c..7f861f0a44 100644
--- a/CMakeLists.darwin.txt
+++ b/CMakeLists.darwin.txt
@@ -598,7 +598,6 @@ add_subdirectory(ydb/public/lib/operation_id)
 add_subdirectory(ydb/public/lib/operation_id/protos)
 add_subdirectory(ydb/public/sdk/cpp/client/ydb_proto)
 add_subdirectory(ydb/public/api/grpc/draft)
-add_subdirectory(ydb/core/yq/libs/protos)
 add_subdirectory(ydb/core/blobstorage/vdisk)
 add_subdirectory(ydb/core/blobstorage/vdisk/anubis_osiris)
 add_subdirectory(ydb/core/blobstorage/vdisk/hulldb/barriers)
@@ -690,6 +689,7 @@ add_subdirectory(ydb/library/yql/providers/dq/api/protos)
 add_subdirectory(ydb/library/yql/providers/common/metrics/protos)
 add_subdirectory(ydb/core/yq/libs/checkpoint_storage/events)
 add_subdirectory(ydb/core/yq/libs/events)
+add_subdirectory(ydb/core/yq/libs/protos)
 add_subdirectory(ydb/library/yql/core/facade)
 add_subdirectory(ydb/library/yql/core/extract_predicate)
 add_subdirectory(ydb/library/yql/providers/common/udf_resolve)
@@ -780,6 +780,7 @@ add_subdirectory(ydb/core/yq/libs/db_schema)
 add_subdirectory(ydb/core/yq/libs/shared_resources)
 add_subdirectory(ydb/core/yq/libs/shared_resources/interface)
 add_subdirectory(ydb/library/logger)
+add_subdirectory(ydb/core/yq/libs/grpc)
 add_subdirectory(ydb/core/yq/libs/private_client)
 add_subdirectory(ydb/core/yq/libs/result_formatter)
 add_subdirectory(ydb/core/yq/libs/signer)
diff --git a/CMakeLists.linux.txt b/CMakeLists.linux.txt
index 4b3cdce605..3e776a3744 100644
--- a/CMakeLists.linux.txt
+++ b/CMakeLists.linux.txt
@@ -602,7 +602,6 @@ add_subdirectory(ydb/public/lib/operation_id)
 add_subdirectory(ydb/public/lib/operation_id/protos)
 add_subdirectory(ydb/public/sdk/cpp/client/ydb_proto)
 add_subdirectory(ydb/public/api/grpc/draft)
-add_subdirectory(ydb/core/yq/libs/protos)
 add_subdirectory(ydb/core/blobstorage/vdisk)
 add_subdirectory(ydb/core/blobstorage/vdisk/anubis_osiris)
 add_subdirectory(ydb/core/blobstorage/vdisk/hulldb/barriers)
@@ -694,6 +693,7 @@ add_subdirectory(ydb/library/yql/providers/dq/api/protos)
 add_subdirectory(ydb/library/yql/providers/common/metrics/protos)
 add_subdirectory(ydb/core/yq/libs/checkpoint_storage/events)
 add_subdirectory(ydb/core/yq/libs/events)
+add_subdirectory(ydb/core/yq/libs/protos)
 add_subdirectory(ydb/library/yql/core/facade)
 add_subdirectory(ydb/library/yql/core/extract_predicate)
 add_subdirectory(ydb/library/yql/providers/common/udf_resolve)
@@ -784,6 +784,7 @@ add_subdirectory(ydb/core/yq/libs/db_schema)
 add_subdirectory(ydb/core/yq/libs/shared_resources)
 add_subdirectory(ydb/core/yq/libs/shared_resources/interface)
 add_subdirectory(ydb/library/logger)
+add_subdirectory(ydb/core/yq/libs/grpc)
 add_subdirectory(ydb/core/yq/libs/private_client)
 add_subdirectory(ydb/core/yq/libs/result_formatter)
 add_subdirectory(ydb/core/yq/libs/signer)
diff --git a/ydb/core/yq/libs/actors/CMakeLists.txt b/ydb/core/yq/libs/actors/CMakeLists.txt
index 4c200da59e..3715b5e612 100644
--- a/ydb/core/yq/libs/actors/CMakeLists.txt
+++ b/ydb/core/yq/libs/actors/CMakeLists.txt
@@ -34,6 +34,7 @@ target_link_libraries(yq-libs-actors PUBLIC
   libs-control_plane_storage-events
   yq-libs-db_schema
   yq-libs-events
+  yq-libs-grpc
   yq-libs-private_client
   yq-libs-result_formatter
   yq-libs-shared_resources
diff --git a/ydb/core/yq/libs/events/CMakeLists.txt b/ydb/core/yq/libs/events/CMakeLists.txt
index 086790c594..5edcd4e86b 100644
--- a/ydb/core/yq/libs/events/CMakeLists.txt
+++ b/ydb/core/yq/libs/events/CMakeLists.txt
@@ -17,6 +17,7 @@ target_link_libraries(yq-libs-events PUBLIC
   tools-enum_parser-enum_serialization_runtime
   cpp-actors-core
   libs-graph_params-proto
+  yq-libs-protos
   yql-core-facade
   yql-public-issue
   api-protos
diff --git a/ydb/core/yq/libs/grpc/CMakeLists.txt b/ydb/core/yq/libs/grpc/CMakeLists.txt
new file mode 100644
index 0000000000..4520e2c511
--- /dev/null
+++ b/ydb/core/yq/libs/grpc/CMakeLists.txt
@@ -0,0 +1,41 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_library(yq-libs-grpc)
+set_property(TARGET yq-libs-grpc PROPERTY
+  PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h
+)
+target_link_libraries(yq-libs-grpc PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  contrib-libs-grpc
+  api-protos
+  yq-libs-protos
+  contrib-libs-protobuf
+)
+target_proto_messages(yq-libs-grpc PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/yq/libs/grpc/fq_private_v1.proto
+)
+target_proto_addincls(yq-libs-grpc
+  ./
+  ${CMAKE_SOURCE_DIR}/
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
+)
+target_proto_outs(yq-libs-grpc
+  --cpp_out=${CMAKE_BINARY_DIR}/
+  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
+)
+target_proto_plugin(yq-libs-grpc
+  grpc_cpp
+  grpc_cpp
+)
diff --git a/ydb/public/api/grpc/draft/yql_db_v1.proto b/ydb/core/yq/libs/grpc/fq_private_v1.proto
index cc403e93a4..cc403e93a4 100644
--- a/ydb/public/api/grpc/draft/yql_db_v1.proto
+++ b/ydb/core/yq/libs/grpc/fq_private_v1.proto
diff --git a/ydb/core/yq/libs/mock/CMakeLists.txt b/ydb/core/yq/libs/mock/CMakeLists.txt
index ebeb521be8..35f1693a0d 100644
--- a/ydb/core/yq/libs/mock/CMakeLists.txt
+++ b/ydb/core/yq/libs/mock/CMakeLists.txt
@@ -23,6 +23,7 @@ target_link_libraries(yq-libs-mock PUBLIC
   cpp-yson-node
   ydb-core-base
   ydb-core-protos
+  yq-libs-actors
   yq-libs-common
   yq-libs-db_schema
   libs-shared_resources-interface
diff --git a/ydb/core/yq/libs/private_client/CMakeLists.txt b/ydb/core/yq/libs/private_client/CMakeLists.txt
index 0f5f23c5b4..003da4e746 100644
--- a/ydb/core/yq/libs/private_client/CMakeLists.txt
+++ b/ydb/core/yq/libs/private_client/CMakeLists.txt
@@ -16,9 +16,9 @@ target_link_libraries(yq-libs-private_client PUBLIC
   yutil
   cpp-monlib-dynamic_counters
   cpp-protobuf-json
-  api-grpc-draft
   cpp-client-ydb_table
   libs-control_plane_storage-proto
+  yq-libs-grpc
   yq-libs-shared_resources
   ydb-core-protos
 )
diff --git a/ydb/core/yq/libs/private_client/private_client.h b/ydb/core/yq/libs/private_client/private_client.h
index d697f41752..492104eb68 100644
--- a/ydb/core/yq/libs/private_client/private_client.h
+++ b/ydb/core/yq/libs/private_client/private_client.h
@@ -3,8 +3,8 @@
 #include <library/cpp/monlib/dynamic_counters/counters.h>
 
 #include <ydb/public/sdk/cpp/client/ydb_table/table.h>
-#include <ydb/public/api/grpc/draft/yql_db_v1.grpc.pb.h>
 #include <ydb/core/yq/libs/protos/fq_private.pb.h>
+#include <ydb/core/yq/libs/grpc/fq_private_v1.grpc.pb.h>
 
 namespace NFq {
 
diff --git a/ydb/core/yq/libs/test_connection/CMakeLists.txt b/ydb/core/yq/libs/test_connection/CMakeLists.txt
index a31f965504..914681dcc5 100644
--- a/ydb/core/yq/libs/test_connection/CMakeLists.txt
+++ b/ydb/core/yq/libs/test_connection/CMakeLists.txt
@@ -16,6 +16,7 @@ target_link_libraries(yq-libs-test_connection PUBLIC
   yutil
   library-cpp-lwtrace
   cpp-xml-document
+  yq-libs-actors
   libs-actors-logging
   libs-config-protos
   yq-libs-control_plane_storage
diff --git a/ydb/public/api/grpc/draft/CMakeLists.txt b/ydb/public/api/grpc/draft/CMakeLists.txt
index 2093014f61..c247fe5309 100644
--- a/ydb/public/api/grpc/draft/CMakeLists.txt
+++ b/ydb/public/api/grpc/draft/CMakeLists.txt
@@ -16,7 +16,6 @@ target_link_libraries(api-grpc-draft PUBLIC
   yutil
   contrib-libs-grpc
   api-protos
-  yq-libs-protos
   contrib-libs-protobuf
 )
 target_proto_messages(api-grpc-draft PRIVATE
@@ -29,7 +28,6 @@ target_proto_messages(api-grpc-draft PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_s3_internal_v1.proto
   ${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_long_tx_v1.proto
   ${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/ydb_logstore_v1.proto
-  ${CMAKE_SOURCE_DIR}/ydb/public/api/grpc/draft/yql_db_v1.proto
 )
 target_proto_addincls(api-grpc-draft
   ./
diff --git a/ydb/services/fq/CMakeLists.txt b/ydb/services/fq/CMakeLists.txt
index 75abc50a00..49e20f3cd0 100644
--- a/ydb/services/fq/CMakeLists.txt
+++ b/ydb/services/fq/CMakeLists.txt
@@ -15,8 +15,8 @@ target_link_libraries(ydb-services-fq PUBLIC
   library-cpp-retry
   ydb-core-grpc_services
   core-grpc_services-base
+  yq-libs-grpc
   ydb-library-protobuf_printer
-  api-grpc
 )
 target_sources(ydb-services-fq PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/services/fq/grpc_service.cpp
diff --git a/ydb/services/fq/private_grpc.h b/ydb/services/fq/private_grpc.h
index 758a298d5c..f655b9ddfa 100644
--- a/ydb/services/fq/private_grpc.h
+++ b/ydb/services/fq/private_grpc.h
@@ -2,7 +2,7 @@
 
 #include <library/cpp/actors/core/actorsystem.h>
 #include <library/cpp/grpc/server/grpc_server.h>
-#include <ydb/public/api/grpc/draft/yql_db_v1.grpc.pb.h>
+#include <ydb/core/yq/libs/grpc/fq_private_v1.grpc.pb.h>
 
 namespace NKikimr {
 namespace NGRpcService {