Skip to content

Commit faae703

Browse files
authored
merge to yq stable YQ added YDB_AUTH_TICKET_HEADER for fq proxy ydb requests (#15433)
1 parent f5580fd commit faae703

File tree

4 files changed

+24
-3
lines changed

4 files changed

+24
-3
lines changed

ydb/core/fq/libs/compute/ydb/control_plane/cms_grpc_client_actor.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#include "ydb_grpc_helpers.h"
2+
13
#include <ydb/public/api/grpc/ydb_cms_v1.grpc.pb.h>
24

35
#include <ydb/core/fq/libs/compute/ydb/events/events.h>
@@ -78,7 +80,7 @@ class TCmsGrpcServiceActor : public NActors::TActor<TCmsGrpcServiceActor>, NGrpc
7880
auto forwardRequest = std::make_unique<TEvPrivate::TEvCreateDatabaseRequest>();
7981
forwardRequest->Request.mutable_serverless_resources()->set_shared_database_path(request.BasePath);
8082
forwardRequest->Request.set_path(request.Path);
81-
forwardRequest->Token = CredentialsProvider->GetAuthInfo();
83+
SetYdbRequestToken(*forwardRequest, CredentialsProvider->GetAuthInfo());
8284
TEvPrivate::TEvCreateDatabaseRequest::TPtr forwardEvent = (NActors::TEventHandle<TEvPrivate::TEvCreateDatabaseRequest>*)new IEventHandle(SelfId(), SelfId(), forwardRequest.release(), 0, Cookie);
8385
MakeCall<TCreateDatabaseGrpcRequest>(std::move(forwardEvent));
8486
Requests[Cookie++] = ev;
@@ -119,7 +121,7 @@ class TCmsGrpcServiceActor : public NActors::TActor<TCmsGrpcServiceActor>, NGrpc
119121

120122
void Handle(TEvYdbCompute::TEvListDatabasesRequest::TPtr& ev) {
121123
auto forwardRequest = std::make_unique<TEvPrivate::TEvListDatabasesRequest>();
122-
forwardRequest->Token = CredentialsProvider->GetAuthInfo();
124+
SetYdbRequestToken(*forwardRequest, CredentialsProvider->GetAuthInfo());
123125
TEvPrivate::TEvListDatabasesRequest::TPtr forwardEvent = (NActors::TEventHandle<TEvPrivate::TEvListDatabasesRequest>*)new IEventHandle(SelfId(), SelfId(), forwardRequest.release(), 0, Cookie);
124126
MakeCall<TListDatabasesGrpcRequest>(std::move(forwardEvent));
125127
Requests[Cookie++] = ev;

ydb/core/fq/libs/compute/ydb/control_plane/monitoring_grpc_client_actor.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#include "ydb_grpc_helpers.h"
2+
13
#include <ydb/public/api/grpc/ydb_monitoring_v1.grpc.pb.h>
24

35
#include <ydb/core/fq/libs/compute/ydb/events/events.h>
@@ -64,7 +66,7 @@ class TMonitoringGrpcServiceActor : public NActors::TActor<TMonitoringGrpcServic
6466
void Handle(TEvYdbCompute::TEvCpuLoadRequest::TPtr& ev) {
6567
auto forwardRequest = std::make_unique<TEvPrivate::TEvSelfCheckRequest>();
6668
forwardRequest->Request.set_return_verbose_status(true);
67-
forwardRequest->Token = CredentialsProvider->GetAuthInfo();
69+
SetYdbRequestToken(*forwardRequest, CredentialsProvider->GetAuthInfo());
6870
TEvPrivate::TEvSelfCheckRequest::TPtr forwardEvent = (NActors::TEventHandle<TEvPrivate::TEvSelfCheckRequest>*)new IEventHandle(SelfId(), SelfId(), forwardRequest.release(), 0, Cookie);
6971
MakeCall<TSelfCheckGrpcRequest>(std::move(forwardEvent));
7072
Requests[Cookie++] = ev;

ydb/core/fq/libs/compute/ydb/control_plane/ya.make

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ PEERDIR(
2525
ydb/public/api/grpc
2626
ydb/public/api/grpc/draft
2727
ydb/public/lib/operation_id/protos
28+
ydb/public/sdk/cpp/client/resources
2829
yql/essentials/public/issue
2930
yql/essentials/utils
3031
)
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#pragma once
2+
3+
#include <ydb/library/ycloud/api/events.h>
4+
#include <ydb/public/sdk/cpp/client/resources/ydb_resources.h>
5+
6+
namespace NFq {
7+
8+
template <typename TEv, ui32 TEventType, typename TProtoMessage>
9+
void SetYdbRequestToken(NCloud::TEvGrpcProtoRequest<TEv, TEventType, TProtoMessage>& event, const TString& token) {
10+
if (token) {
11+
event.Token = token;
12+
event.Headers.emplace(NYdb::YDB_AUTH_TICKET_HEADER, token);
13+
}
14+
}
15+
16+
} // namespace NFq

0 commit comments

Comments
 (0)