diff options
| author | DMokhnatkin <dmitriy.mokhnatkin@gmail.com> | 2022-07-05 12:31:20 +0300 |
|---|---|---|
| committer | DMokhnatkin <dmitriy.mokhnatkin@gmail.com> | 2022-07-05 12:31:20 +0300 |
| commit | 558576e27224cc633b5e7748f8b8deaa773baa97 (patch) | |
| tree | ee5bcb42f6fb7ba52213e4788683376773f27cf5 | |
| parent | bb3464e625c5a0531ba70e2552050e4d160a425c (diff) | |
| download | ydb-558576e27224cc633b5e7748f8b8deaa773baa97.tar.gz | |
YQ-1055: rename x-yq-scope (v2)
ref:afef8a31fbc1bf75ea47c93016fad2358074874d
| -rw-r--r-- | ydb/core/grpc_services/rpc_yq.cpp | 6 | ||||
| -rw-r--r-- | ydb/core/grpc_services/service_yq.h | 2 | ||||
| -rw-r--r-- | ydb/public/lib/yq/helpers.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ydb/core/grpc_services/rpc_yq.cpp b/ydb/core/grpc_services/rpc_yq.cpp index 094a691ebd1..0179f36cab6 100644 --- a/ydb/core/grpc_services/rpc_yq.cpp +++ b/ydb/core/grpc_services/rpc_yq.cpp @@ -66,19 +66,19 @@ public: } Token = *authToken; - TString scope = Request_->GetPeerMetaValues("x-fq-scope").GetOrElse(""); + TString scope = Request_->GetPeerMetaValues("x-ydb-fq-project").GetOrElse(""); if (scope.empty()) { scope = Request_->GetPeerMetaValues("x-yq-scope").GetOrElse(""); // TODO: remove YQ-1055 } if (!scope.StartsWith("yandexcloud://")) { - ReplyWithStatus("x-fq-scope should start with yandexcloud:// but got " + scope, StatusIds::BAD_REQUEST); + ReplyWithStatus("x-ydb-fq-project should start with yandexcloud:// but got " + scope, StatusIds::BAD_REQUEST); return; } const TVector<TString> path = StringSplitter(scope).Split('/').SkipEmpty(); if (path.size() != 2 && path.size() != 3) { - ReplyWithStatus("x-fq-scope format is invalid. Must be yandexcloud://folder_id, but got " + scope, StatusIds::BAD_REQUEST); + ReplyWithStatus("x-ydb-fq-project format is invalid. Must be yandexcloud://folder_id, but got " + scope, StatusIds::BAD_REQUEST); return; } diff --git a/ydb/core/grpc_services/service_yq.h b/ydb/core/grpc_services/service_yq.h index d64051aec14..612aea4ec7d 100644 --- a/ydb/core/grpc_services/service_yq.h +++ b/ydb/core/grpc_services/service_yq.h @@ -30,7 +30,7 @@ public: } bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult& , ICheckerIface* iface) override { - TString scope = GetPeerMetaValues("x-fq-scope").GetOrElse(""); + TString scope = GetPeerMetaValues("x-ydb-fq-project").GetOrElse(""); if (scope.empty()) { scope = GetPeerMetaValues("x-yq-scope").GetOrElse(""); // TODO: remove YQ-1055 } diff --git a/ydb/public/lib/yq/helpers.h b/ydb/public/lib/yq/helpers.h index 21481d29116..e9baf01da7a 100644 --- a/ydb/public/lib/yq/helpers.h +++ b/ydb/public/lib/yq/helpers.h @@ -11,7 +11,7 @@ T CreateYqSettings(const TScope& scope) T settings; settings.Header_ = { { "x-yq-scope", scope.ToString() }, // TODO: remove YQ-1055 - { "x-fq-scope", scope.ToString() } + { "x-ydb-fq-project", scope.ToString() } }; return settings; } |