Skip to content

YQ added YDB_AUTH_TICKET_HEADER for fq proxy ydb requests #15416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GrigoriyPA merged 1 commit into from
Mar 6, 2025
Merged

YQ added YDB_AUTH_TICKET_HEADER for fq proxy ydb requests #15416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ydb/core/fq/libs/compute/ydb/control_plane/cms_grpc_client_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#include "ydb_grpc_helpers.h"

#include <ydb/public/api/grpc/ydb_cms_v1.grpc.pb.h>

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

void Handle(TEvYdbCompute::TEvListDatabasesRequest::TPtr& ev) {
auto forwardRequest = std::make_unique<TEvPrivate::TEvListDatabasesRequest>();
forwardRequest->Token = CredentialsProvider->GetAuthInfo();
SetYdbRequestToken(*forwardRequest, CredentialsProvider->GetAuthInfo());
TEvPrivate::TEvListDatabasesRequest::TPtr forwardEvent = (NActors::TEventHandle<TEvPrivate::TEvListDatabasesRequest>*)new IEventHandle(SelfId(), SelfId(), forwardRequest.release(), 0, Cookie);
MakeCall<TListDatabasesGrpcRequest>(std::move(forwardEvent));
Requests[Cookie++] = ev;
Expand Down
4 changes: 3 additions & 1 deletion ydb/core/fq/libs/compute/ydb/control_plane/monitoring_grpc_client_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#include "ydb_grpc_helpers.h"

#include <ydb/public/api/grpc/ydb_monitoring_v1.grpc.pb.h>

#include <ydb/core/fq/libs/compute/ydb/events/events.h>
Expand Down Expand Up @@ -64,7 +66,7 @@ class TMonitoringGrpcServiceActor : public NActors::TActor<TMonitoringGrpcServic
void Handle(TEvYdbCompute::TEvCpuLoadRequest::TPtr& ev) {
auto forwardRequest = std::make_unique<TEvPrivate::TEvSelfCheckRequest>();
forwardRequest->Request.set_return_verbose_status(true);
forwardRequest->Token = CredentialsProvider->GetAuthInfo();
SetYdbRequestToken(*forwardRequest, CredentialsProvider->GetAuthInfo());
TEvPrivate::TEvSelfCheckRequest::TPtr forwardEvent = (NActors::TEventHandle<TEvPrivate::TEvSelfCheckRequest>*)new IEventHandle(SelfId(), SelfId(), forwardRequest.release(), 0, Cookie);
MakeCall<TSelfCheckGrpcRequest>(std::move(forwardEvent));
Requests[Cookie++] = ev;
Expand Down
1 change: 1 addition & 0 deletions ydb/core/fq/libs/compute/ydb/control_plane/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ PEERDIR(
ydb/library/yql/utils/actors
ydb/public/api/grpc
ydb/public/api/grpc/draft
ydb/public/sdk/cpp/src/client/resources
ydb/public/sdk/cpp/src/library/operation_id/protos
yql/essentials/public/issue
yql/essentials/utils
Expand Down
16 changes: 16 additions & 0 deletions ydb/core/fq/libs/compute/ydb/control_plane/ydb_grpc_helpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#pragma once

#include <ydb/library/ycloud/api/events.h>
#include <ydb-cpp-sdk/client/resources/ydb_resources.h>

namespace NFq {

template <typename TEv, ui32 TEventType, typename TProtoMessage>
void SetYdbRequestToken(NCloud::TEvGrpcProtoRequest<TEv, TEventType, TProtoMessage>& event, const TString& token) {
if (token) {
event.Token = token;
event.Headers.emplace(NYdb::YDB_AUTH_TICKET_HEADER, token);
}
}

} // namespace NFq
Loading