move cm_client to yndx

ref:319c1a4f8db730e7f870c6224e6c5578d3e4fc26

21 files changed, 27 insertions, 324 deletions

diff --git a/CMakeLists.darwin.txt b/CMakeLists.darwin.txt
index e70ca42a06..2055426f20 100644
--- a/CMakeLists.darwin.txt
+++ b/CMakeLists.darwin.txt
@@ -693,7 +693,7 @@ add_subdirectory(ydb/library/yql/providers/common/dq)
 add_subdirectory(ydb/library/yql/providers/common/http_gateway)
 add_subdirectory(ydb/library/yql/providers/common/comp_nodes)
 add_subdirectory(ydb/library/yql/providers/dq/provider/exec)
-add_subdirectory(ydb/library/yql/providers/pq/cm_client/interface)
+add_subdirectory(ydb/library/yql/providers/pq/cm_client)
 add_subdirectory(ydb/library/yql/providers/pq/provider)
 add_subdirectory(ydb/library/yql/providers/pq/common)
 add_subdirectory(ydb/library/yql/providers/pq/expr_nodes)
diff --git a/CMakeLists.linux.txt b/CMakeLists.linux.txt
index e2fe7e6fda..29ef80d31b 100644
--- a/CMakeLists.linux.txt
+++ b/CMakeLists.linux.txt
@@ -773,7 +773,7 @@ add_subdirectory(ydb/library/yql/providers/common/dq)
 add_subdirectory(ydb/library/yql/providers/common/http_gateway)
 add_subdirectory(ydb/library/yql/providers/common/comp_nodes)
 add_subdirectory(ydb/library/yql/providers/dq/provider/exec)
-add_subdirectory(ydb/library/yql/providers/pq/cm_client/interface)
+add_subdirectory(ydb/library/yql/providers/pq/cm_client)
 add_subdirectory(ydb/library/yql/providers/pq/provider)
 add_subdirectory(ydb/library/yql/providers/pq/common)
 add_subdirectory(ydb/library/yql/providers/pq/expr_nodes)
diff --git a/ydb/core/driver_lib/run/CMakeLists.txt b/ydb/core/driver_lib/run/CMakeLists.txt
index dd1326dc76..d2a0b6d61d 100644
--- a/ydb/core/driver_lib/run/CMakeLists.txt
+++ b/ydb/core/driver_lib/run/CMakeLists.txt
@@ -109,6 +109,7 @@ target_link_libraries(run PUBLIC
   ydb-library-security
   yql-minikql-comp_nodes
   yql-minikql-computation
+  providers-pq-cm_client
   udf-service-exception_policy
   public-lib-base
   lib-deprecated-client
diff --git a/ydb/core/driver_lib/run/factories.h b/ydb/core/driver_lib/run/factories.h
index 76ca0a91d9..1be49a906e 100644
--- a/ydb/core/driver_lib/run/factories.h
+++ b/ydb/core/driver_lib/run/factories.h
@@ -16,7 +16,7 @@
 #include <ydb/core/yq/libs/config/protos/audit.pb.h>
 
 #include <ydb/library/yql/minikql/computation/mkql_computation_node.h>
-#include <ydb/library/yql/providers/pq/cm_client/interface/client.h>
+#include <ydb/library/yql/providers/pq/cm_client/client.h>
 
 #include <library/cpp/actors/core/actorsystem.h>
 
diff --git a/ydb/core/yq/libs/actors/CMakeLists.txt b/ydb/core/yq/libs/actors/CMakeLists.txt
index 15f5092aae..01c3558e76 100644
--- a/ydb/core/yq/libs/actors/CMakeLists.txt
+++ b/ydb/core/yq/libs/actors/CMakeLists.txt
@@ -67,7 +67,7 @@ target_link_libraries(yq-libs-actors PUBLIC
   providers-dq-provider
   dq-provider-exec
   dq-worker_manager-interface
-  pq-cm_client-interface
+  providers-pq-cm_client
   providers-pq-provider
   providers-pq-task_meta
   providers-s3-provider
diff --git a/ydb/core/yq/libs/actors/proxy.h b/ydb/core/yq/libs/actors/proxy.h
index f8d176c475..6c441ff229 100644
--- a/ydb/core/yq/libs/actors/proxy.h
+++ b/ydb/core/yq/libs/actors/proxy.h
@@ -14,7 +14,7 @@
 #include <ydb/library/yql/providers/dq/worker_manager/interface/counters.h>
 #include <ydb/library/yql/providers/dq/actors/proto_builder.h>
 #include <ydb/library/yql/providers/common/http_gateway/yql_http_gateway.h>
-#include <ydb/library/yql/providers/pq/cm_client/interface/client.h>
+#include <ydb/library/yql/providers/pq/cm_client/client.h>
 
 #include <library/cpp/actors/core/actorsystem.h>
 #include <library/cpp/time_provider/time_provider.h>
diff --git a/ydb/core/yq/libs/actors/run_actor_params.h b/ydb/core/yq/libs/actors/run_actor_params.h
index fdc63ce8df..facba0a16c 100644
--- a/ydb/core/yq/libs/actors/run_actor_params.h
+++ b/ydb/core/yq/libs/actors/run_actor_params.h
@@ -10,7 +10,7 @@
 #include <ydb/library/yql/providers/dq/provider/yql_dq_gateway.h>
 #include <ydb/library/yql/providers/dq/worker_manager/interface/counters.h>
 #include <ydb/library/yql/providers/solomon/provider/yql_solomon_gateway.h>
-#include <ydb/library/yql/providers/pq/cm_client/interface/client.h>
+#include <ydb/library/yql/providers/pq/cm_client/client.h>
 
 #include <library/cpp/actors/core/actorsystem.h>
 #include <library/cpp/time_provider/time_provider.h>
diff --git a/ydb/core/yq/libs/init/CMakeLists.txt b/ydb/core/yq/libs/init/CMakeLists.txt
index 37ac2281e8..272bb515f0 100644
--- a/ydb/core/yq/libs/init/CMakeLists.txt
+++ b/ydb/core/yq/libs/init/CMakeLists.txt
@@ -48,7 +48,7 @@ target_link_libraries(yq-libs-init PUBLIC
   providers-dq-worker_manager
   dq-worker_manager-interface
   providers-pq-async_io
-  pq-cm_client-interface
+  providers-pq-cm_client
   pq-gateway-native
   providers-pq-provider
   providers-s3-actors
diff --git a/ydb/core/yq/libs/init/init.h b/ydb/core/yq/libs/init/init.h
index f826d0398f..9d4059d211 100644
--- a/ydb/core/yq/libs/init/init.h
+++ b/ydb/core/yq/libs/init/init.h
@@ -11,7 +11,7 @@
 #include <ydb/library/folder_service/proto/config.pb.h>
 #include <ydb/core/yq/libs/config/protos/audit.pb.h>
 
-#include <ydb/library/yql/providers/pq/cm_client/interface/client.h>
+#include <ydb/library/yql/providers/pq/cm_client/client.h>
 
 #include <library/cpp/actors/core/actor.h>
 
diff --git a/ydb/core/yq/libs/test_connection/CMakeLists.txt b/ydb/core/yq/libs/test_connection/CMakeLists.txt
index adf2dec96f..a31f965504 100644
--- a/ydb/core/yq/libs/test_connection/CMakeLists.txt
+++ b/ydb/core/yq/libs/test_connection/CMakeLists.txt
@@ -20,6 +20,7 @@ target_link_libraries(yq-libs-test_connection PUBLIC
   libs-config-protos
   yq-libs-control_plane_storage
   libs-test_connection-events
+  providers-pq-cm_client
   providers-solomon-async_io
 )
 target_sources(yq-libs-test_connection PRIVATE
diff --git a/ydb/core/yq/libs/test_connection/test_connection.h b/ydb/core/yq/libs/test_connection/test_connection.h
index 258b6f86ac..c273ef6027 100644
--- a/ydb/core/yq/libs/test_connection/test_connection.h
+++ b/ydb/core/yq/libs/test_connection/test_connection.h
@@ -7,7 +7,7 @@
 #include <ydb/core/yq/libs/shared_resources/shared_resources.h>
 #include <ydb/core/yq/libs/signer/signer.h>
 #include <ydb/library/yql/providers/common/token_accessor/client/factory.h>
-#include <ydb/library/yql/providers/pq/cm_client/interface/client.h>
+#include <ydb/library/yql/providers/pq/cm_client/client.h>
 #include <ydb/public/api/protos/yq.pb.h>
 
 #include <library/cpp/actors/core/actor.h>
diff --git a/ydb/library/yql/providers/pq/cm_client/interface/CMakeLists.txt b/ydb/library/yql/providers/pq/cm_client/CMakeLists.txt
index 401d2d6ff5..cfc6e6549d 100644
--- a/ydb/library/yql/providers/pq/cm_client/interface/CMakeLists.txt
+++ b/ydb/library/yql/providers/pq/cm_client/CMakeLists.txt
@@ -7,20 +7,20 @@
 
 
 
-add_library(pq-cm_client-interface)
-target_link_libraries(pq-cm_client-interface PUBLIC
+add_library(providers-pq-cm_client)
+target_link_libraries(providers-pq-cm_client PUBLIC
   contrib-libs-cxxsupp
   yutil
   cpp-threading-future
-  client-ydb_types-credentials
   yql-public-issue
+  client-ydb_types-credentials
   tools-enum_parser-enum_serialization_runtime
 )
-target_sources(pq-cm_client-interface PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/pq/cm_client/interface/client.cpp
+target_sources(providers-pq-cm_client PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/pq/cm_client/client.cpp
 )
-generate_enum_serilization(pq-cm_client-interface
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/pq/cm_client/interface/client.h
+generate_enum_serilization(providers-pq-cm_client
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/pq/cm_client/client.h
   INCLUDE_HEADERS
-  ydb/library/yql/providers/pq/cm_client/interface/client.h
+  ydb/library/yql/providers/pq/cm_client/client.h
 )
diff --git a/ydb/library/yql/providers/pq/cm_client/interface/client.cpp b/ydb/library/yql/providers/pq/cm_client/client.cpp
index 66901f465f..1c124ab128 100644
--- a/ydb/library/yql/providers/pq/cm_client/interface/client.cpp
+++ b/ydb/library/yql/providers/pq/cm_client/client.cpp
@@ -1,8 +1,4 @@
 #include "client.h"
 
-#include <util/string/cast.h>
-
-#include <cstring>
-
 namespace NPq::NConfigurationManager {
 } // namespace NPq::NConfigurationManager
diff --git a/ydb/library/yql/providers/pq/cm_client/interface/client.h b/ydb/library/yql/providers/pq/cm_client/client.h
index 368d2f2039..368d2f2039 100644
--- a/ydb/library/yql/providers/pq/cm_client/interface/client.h
+++ b/ydb/library/yql/providers/pq/cm_client/client.h
diff --git a/ydb/library/yql/providers/pq/cm_client/lib/client.cpp b/ydb/library/yql/providers/pq/cm_client/lib/client.cpp
deleted file mode 100644
index 71d878f5e5..0000000000
--- a/ydb/library/yql/providers/pq/cm_client/lib/client.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-#include "client.h"
-
-#include <ydb/library/yql/public/issue/yql_issue_message.h>
-
-#include <logbroker/public/api/grpc/config_manager.grpc.pb.h>
-
-#include <library/cpp/grpc/client/grpc_client_low.h>
-
-#include <util/string/builder.h>
-
-#include <exception>
-
-namespace NPq::NConfigurationManager {
-
-class TConnections::TImpl : public TAtomicRefCount<TConnections::TImpl> {
-public:
-    explicit TImpl(size_t numWorkerThreads)
-        : Client(numWorkerThreads)
-    {
-    }
-
-    void Stop(bool wait = false) {
-        Client.Stop(wait);
-    }
-
-    NGrpc::TGRpcClientLow& GetClient() {
-        return Client;
-    }
-
-private:
-    NGrpc::TGRpcClientLow Client;
-};
-
-EStatus ToStatus(const NGrpc::TGrpcStatus& status) {
-    if (status.InternalError) {
-        return EStatus::INTERNAL_ERROR;
-    }
-
-    switch (status.GRpcStatusCode) {
-    case grpc::StatusCode::OK:
-        return EStatus::SUCCESS;
-    case grpc::StatusCode::CANCELLED:
-        return EStatus::CANCELLED;
-    case grpc::StatusCode::UNKNOWN:
-        return EStatus::UNDETERMINED;
-    case grpc::StatusCode::INVALID_ARGUMENT:
-        return EStatus::BAD_REQUEST;
-    case grpc::StatusCode::DEADLINE_EXCEEDED:
-        return EStatus::TIMEOUT;
-    case grpc::StatusCode::NOT_FOUND:
-        return EStatus::NOT_FOUND;
-    case grpc::StatusCode::ALREADY_EXISTS:
-        return EStatus::ALREADY_EXISTS;
-    case grpc::StatusCode::PERMISSION_DENIED:
-        return EStatus::UNAUTHORIZED;
-    case grpc::StatusCode::UNAUTHENTICATED:
-        return EStatus::UNAUTHORIZED;
-    case grpc::StatusCode::RESOURCE_EXHAUSTED:
-        return EStatus::SESSION_BUSY;
-    case grpc::StatusCode::FAILED_PRECONDITION:
-        return EStatus::BAD_REQUEST;
-    case grpc::StatusCode::ABORTED:
-        return EStatus::ABORTED;
-    case grpc::StatusCode::OUT_OF_RANGE:
-        return EStatus::GENERIC_ERROR;
-    case grpc::StatusCode::UNIMPLEMENTED:
-        return EStatus::UNSUPPORTED;
-    case grpc::StatusCode::INTERNAL:
-        return EStatus::INTERNAL_ERROR;
-    case grpc::StatusCode::UNAVAILABLE:
-        return EStatus::UNAVAILABLE;
-    case grpc::StatusCode::DATA_LOSS:
-        return EStatus::GENERIC_ERROR;
-    default:
-        return EStatus::STATUS_CODE_UNSPECIFIED;
-    }
-}
-
-EStatus ToStatus(Ydb::StatusIds::StatusCode status) {
-    switch (status) {
-    case Ydb::StatusIds::SUCCESS:
-        return EStatus::SUCCESS;
-    case Ydb::StatusIds::BAD_REQUEST:
-        return EStatus::BAD_REQUEST;
-    case Ydb::StatusIds::UNAUTHORIZED:
-        return EStatus::UNAUTHORIZED;
-    case Ydb::StatusIds::INTERNAL_ERROR:
-        return EStatus::INTERNAL_ERROR;
-    case Ydb::StatusIds::ABORTED:
-        return EStatus::ABORTED;
-    case Ydb::StatusIds::UNAVAILABLE:
-        return EStatus::UNAVAILABLE;
-    case Ydb::StatusIds::OVERLOADED:
-        return EStatus::OVERLOADED;
-    case Ydb::StatusIds::SCHEME_ERROR:
-        return EStatus::SCHEME_ERROR;
-    case Ydb::StatusIds::GENERIC_ERROR:
-        return EStatus::GENERIC_ERROR;
-    case Ydb::StatusIds::TIMEOUT:
-        return EStatus::TIMEOUT;
-    case Ydb::StatusIds::BAD_SESSION:
-        return EStatus::BAD_SESSION;
-    case Ydb::StatusIds::PRECONDITION_FAILED:
-        return EStatus::PRECONDITION_FAILED;
-    case Ydb::StatusIds::ALREADY_EXISTS:
-        return EStatus::ALREADY_EXISTS;
-    case Ydb::StatusIds::NOT_FOUND:
-        return EStatus::NOT_FOUND;
-    case Ydb::StatusIds::SESSION_EXPIRED:
-        return EStatus::SESSION_EXPIRED;
-    case Ydb::StatusIds::CANCELLED:
-        return EStatus::CANCELLED;
-    case Ydb::StatusIds::UNDETERMINED:
-        return EStatus::UNDETERMINED;
-    case Ydb::StatusIds::UNSUPPORTED:
-        return EStatus::UNSUPPORTED;
-    case Ydb::StatusIds::SESSION_BUSY:
-        return EStatus::SESSION_BUSY;
-    default:
-        return EStatus::STATUS_CODE_UNSPECIFIED;
-    }
-}
-
-TString MakeErrorText(const Ydb::Operations::Operation& operation) {
-    NYql::TIssues issues;
-    IssuesFromMessage(operation.issues(), issues);
-    return issues.ToString();
-}
-
-ui64 GetValue(const NLogBroker::IntOrDefaultValue& value) {
-    if (value.user_defined()) {
-        return value.user_defined();
-    } else {
-        return value.default_();
-    }
-}
-
-class TClient : public IClient {
-public:
-    TClient(const TClientOptions& options, TIntrusivePtr<TConnections::TImpl> connections)
-        : Options(options)
-        , Connections(std::move(connections))
-        , Connection(Connections->GetClient().CreateGRpcServiceConnection<NLogBroker::ConfigurationManagerService>(MakeConnectionConfig()))
-    {
-    }
-
-    template <class TDescriptionType, class TObjectProps>
-    static TDescribePathResult MakeCommonResult(const NLogBroker::DescribePathResult& result, const TObjectProps& props) {
-        TDescribePathResult ret = TDescribePathResult::Make<TDescriptionType>(result.path().path());
-        TDescriptionType& desc = std::get<TDescriptionType>(ret.GetDescriptionVariant());
-        for (const auto& kv : props.metadata()) {
-            desc.Metadata[kv.key()] = kv.value();
-        }
-        return ret;
-    }
-
-    static TDescribePathResult MakeResult(const NLogBroker::DescribePathResult& result, const NLogBroker::DescribeAccountResult& props) {
-        TDescribePathResult ret = MakeCommonResult<TAccountDescription>(result, props);
-        return ret;
-    }
-
-    static TDescribePathResult MakeResult(const NLogBroker::DescribePathResult& result, const NLogBroker::DescribeDirectoryResult& props) {
-        TDescribePathResult ret = MakeCommonResult<TPathDescription>(result, props);
-        return ret;
-    }
-
-    static TDescribePathResult MakeResult(const NLogBroker::DescribePathResult& result, const NLogBroker::DescribeTopicResult& props) {
-        TDescribePathResult ret = MakeCommonResult<TTopicDescription>(result, props);
-        std::get<TTopicDescription>(ret.GetDescriptionVariant()).PartitionsCount = static_cast<size_t>(GetValue(props.properties().partitions_count()));
-        return ret;
-    }
-
-    static TDescribePathResult MakeResult(const NLogBroker::DescribePathResult& result, const NLogBroker::DescribeConsumerResult& props) {
-        TDescribePathResult ret = MakeCommonResult<TConsumerDescription>(result, props);
-        return ret;
-    }
-
-    static auto DescribePathResultCallback(const NThreading::TPromise<TDescribePathResult>& promise, const TString& path) {
-        return [promise = promise, path = path](NGrpc::TGrpcStatus&& status,
-                                                NLogBroker::DescribePathResponse&& response) mutable {
-            if (!status.Ok()) {
-                promise.SetException(
-                    std::make_exception_ptr(
-                        TException(ToStatus(status))
-                            << "Failed to describe path '" << path << "'. Grpc status: " << status.GRpcStatusCode << " (" << status.Msg << ")"));
-                return;
-            }
-            if (response.operation().status() != Ydb::StatusIds::SUCCESS) {
-                promise.SetException(
-                    std::make_exception_ptr(
-                        TException(ToStatus(response.operation().status()))
-                            << "Failed to describe path '" << path << "'. Ydb status: " << Ydb::StatusIds::StatusCode_Name(response.operation().status())
-                            << " (" << MakeErrorText(response.operation()) << ")"));
-                return;
-            }
-            NLogBroker::DescribePathResult result;
-            response.operation().result().UnpackTo(&result);
-
-            switch (result.result_case()) {
-            case NLogBroker::DescribePathResult::RESULT_NOT_SET:
-                {
-                    promise.SetException(
-                        std::make_exception_ptr(
-                            TException(EStatus::INTERNAL_ERROR)
-                                << "Failed to describe path '" << path << "': object type for path is not set by logbroker configuration manager"));
-                    break;
-                }
-            case NLogBroker::DescribePathResult::kAccount:
-                {
-                    promise.SetValue(MakeResult(result, result.account()));
-                    break;
-                }
-            case NLogBroker::DescribePathResult::kDirectory:
-                {
-                    promise.SetValue(MakeResult(result, result.directory()));
-                    break;
-                }
-            case NLogBroker::DescribePathResult::kTopic:
-                {
-                    promise.SetValue(MakeResult(result, result.topic()));
-                    break;
-                }
-            case NLogBroker::DescribePathResult::kConsumer:
-                {
-                    promise.SetValue(MakeResult(result, result.consumer()));
-                    break;
-                }
-            }
-        };
-    }
-
-    TAsyncDescribePathResult DescribePath(const TString& path) const override {
-        NLogBroker::DescribePathRequest describeRequest;
-        describeRequest.set_token(Options.GetCredentialsProviderFactory()->CreateProvider()->GetAuthInfo());
-        describeRequest.mutable_path()->set_path(path);
-
-        NThreading::TPromise<TDescribePathResult> promise = NThreading::NewPromise<TDescribePathResult>();
-        Connection->DoRequest<NLogBroker::DescribePathRequest, NLogBroker::DescribePathResponse>(
-            describeRequest,
-            DescribePathResultCallback(promise, path),
-            &NLogBroker::ConfigurationManagerService::Stub::AsyncDescribePath);
-        return promise.GetFuture();
-    }
-
-private:
-    NGrpc::TGRpcClientConfig MakeConnectionConfig() const {
-        NGrpc::TGRpcClientConfig cfg(Options.GetEndpoint(), Options.GetRequestTimeout());
-        cfg.CompressionAlgoritm = GRPC_COMPRESS_GZIP;
-        cfg.EnableSsl = Options.GetEnableSsl();
-        return cfg;
-    }
-
-private:
-    const TClientOptions Options;
-    TIntrusivePtr<TConnections::TImpl> Connections;
-    std::shared_ptr<NGrpc::TServiceConnection<NLogBroker::ConfigurationManagerService>> Connection;
-};
-
-TConnections::TConnections(size_t numWorkerThreads)
-    : Impl(MakeIntrusive<TImpl>(numWorkerThreads))
-{
-}
-
-TConnections::~TConnections() = default;
-
-void TConnections::Stop(bool wait) {
-    Impl->Stop(wait);
-}
-
-IClient::TPtr TConnections::GetClient(const TClientOptions& options) {
-    return MakeIntrusive<TClient>(options, Impl);
-}
-
-} // namespace NPq::NConfigurationManager
diff --git a/ydb/library/yql/providers/pq/cm_client/lib/client.h b/ydb/library/yql/providers/pq/cm_client/lib/client.h
deleted file mode 100644
index 1cc01b1a96..0000000000
--- a/ydb/library/yql/providers/pq/cm_client/lib/client.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <ydb/library/yql/providers/pq/cm_client/interface/client.h>
-
-namespace NPq::NConfigurationManager {
-
-struct TConnections : public IConnections {
-    class TImpl;
-
-    explicit TConnections(size_t numWorkerThreads = 2);
-    ~TConnections();
-
-    void Stop(bool wait = false) override;
-
-    IClient::TPtr GetClient(const TClientOptions& = {}) override;
-
-private:
-    TIntrusivePtr<TImpl> Impl;
-};
-
-} // namespace NPq::NConfigurationManager
diff --git a/ydb/library/yql/providers/pq/gateway/native/CMakeLists.txt b/ydb/library/yql/providers/pq/gateway/native/CMakeLists.txt
index 3c8f646c99..90777c0e19 100644
--- a/ydb/library/yql/providers/pq/gateway/native/CMakeLists.txt
+++ b/ydb/library/yql/providers/pq/gateway/native/CMakeLists.txt
@@ -12,14 +12,14 @@ target_link_libraries(pq-gateway-native PUBLIC
   contrib-libs-cxxsupp
   yutil
   common-token_accessor-client
+  providers-common-metrics
+  providers-common-proto
+  providers-pq-cm_client
+  providers-pq-provider
   library-yql-utils
   cpp-client-ydb_datastreams
   cpp-client-ydb_driver
   cpp-client-ydb_persqueue_core
-  providers-common-metrics
-  providers-common-proto
-  pq-cm_client-interface
-  providers-pq-provider
 )
 target_sources(pq-gateway-native PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.cpp
diff --git a/ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.h b/ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.h
index 29f05d1e95..483a484ffe 100644
--- a/ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.h
+++ b/ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ydb/library/yql/providers/common/metrics/metrics_registry.h>
-#include <ydb/library/yql/providers/pq/cm_client/interface/client.h>
+#include <ydb/library/yql/providers/pq/cm_client/client.h>
 #include <ydb/library/yql/providers/pq/provider/yql_pq_gateway.h>
 
 #include <ydb/library/yql/providers/common/token_accessor/client/factory.h>
diff --git a/ydb/library/yql/providers/pq/gateway/native/yql_pq_session.h b/ydb/library/yql/providers/pq/gateway/native/yql_pq_session.h
index 9ab98b22e0..f72b631f05 100644
--- a/ydb/library/yql/providers/pq/gateway/native/yql_pq_session.h
+++ b/ydb/library/yql/providers/pq/gateway/native/yql_pq_session.h
@@ -5,7 +5,7 @@
 
 #include <ydb/library/yql/providers/common/proto/gateways_config.pb.h>
 #include <ydb/library/yql/providers/common/token_accessor/client/factory.h>
-#include <ydb/library/yql/providers/pq/cm_client/interface/client.h>
+#include <ydb/library/yql/providers/pq/cm_client/client.h>
 #include <ydb/library/yql/providers/pq/provider/yql_pq_gateway.h>
 
 
diff --git a/ydb/library/yql/providers/pq/provider/CMakeLists.txt b/ydb/library/yql/providers/pq/provider/CMakeLists.txt
index fb8c9a5df2..dd2277617c 100644
--- a/ydb/library/yql/providers/pq/provider/CMakeLists.txt
+++ b/ydb/library/yql/providers/pq/provider/CMakeLists.txt
@@ -37,7 +37,7 @@ target_link_libraries(providers-pq-provider PUBLIC
   providers-dq-expr_nodes
   providers-dq-interface
   dq-provider-exec
-  pq-cm_client-interface
+  providers-pq-cm_client
   providers-pq-common
   providers-pq-expr_nodes
   providers-pq-proto
diff --git a/ydb/library/yql/providers/pq/provider/yql_pq_gateway.h b/ydb/library/yql/providers/pq/provider/yql_pq_gateway.h
index cee8cfffac..bb9ac32ff0 100644
--- a/ydb/library/yql/providers/pq/provider/yql_pq_gateway.h
+++ b/ydb/library/yql/providers/pq/provider/yql_pq_gateway.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <ydb/library/yql/providers/common/proto/gateways_config.pb.h>
-#include <ydb/library/yql/providers/pq/cm_client/interface/client.h>
+#include <ydb/library/yql/providers/pq/cm_client/client.h>
 #include <ydb/public/sdk/cpp/client/ydb_datastreams/datastreams.h>
 
 #include <library/cpp/threading/future/core/future.h>