Import YDB C++ SDK 22 (#550)

Author: github-actions[bot]

.github/import_generation.txt

@@ -1 +1 @@
-22
+23

.github/last_commit.txt

@@ -1 +1 @@
-a1abe1a8139be6a6188d79503a63aa2e5068c6c1
+9563c7b171619687436257273b34ceba261903ed

examples/auth/ssa_delegation/main.cpp

@@ -0,0 +1,94 @@
+#include <ydb-cpp-sdk/client/query/client.h>
+#include <ydb-cpp-sdk/client/iam/iam.h>
+#include <ydb-cpp-sdk/client/iam_private/iam.h>
+
+#include <library/cpp/getopt/last_getopt.h>
+
+
+int main(int argc, char** argv) {
+    std::string endpoint;
+    std::string database;
+    std::string serviceId;
+    std::string microserviceId;
+    std::string targetServiceAccountId;
+    std::string resourceId;
+    std::string resourceType;
+    std::string iamEndpoint;
+    bool useSsl = false;
+    NLastGetopt::TOpts opts = NLastGetopt::TOpts::Default();
+
+    opts.AddLongOption('e', "endpoint", "YDB endpoint").Required().RequiredArgument("HOST:PORT").StoreResult(&endpoint);
+    opts.AddLongOption('d', "database", "YDB database").Required().RequiredArgument("PATH").StoreResult(&database);
+
+    opts.AddLongOption("ssl", "Use SSL").NoArgument().SetFlag(&useSsl);
+
+    opts.AddLongOption("target-service-account-id", "Target service account id")
+        .Required()
+        .RequiredArgument("ID")
+        .StoreResult(&targetServiceAccountId);
+
+    opts.AddLongOption("service-id", "Service id")
+        .RequiredArgument("ID")
+        .DefaultValue("ydb")
+        .StoreResult(&serviceId);
+
+    opts.AddLongOption("microservice-id", "Microservice id")
+        .RequiredArgument("ID")
+        .DefaultValue("control-plane")
+        .StoreResult(&microserviceId);
+    
+    opts.AddLongOption("resource-id", "Resource id")
+        .Required()
+        .RequiredArgument("ID")
+        .StoreResult(&resourceId);
+
+    opts.AddLongOption("iam-endpoint", "IAM endpoint")
+        .RequiredArgument("HOST")
+        .DefaultValue("iam.api.cloud.yandex.net")
+        .StoreResult(&iamEndpoint);
+
+    opts.AddLongOption("resource-type", "Resource type")
+        .RequiredArgument("STRING")
+        .DefaultValue("resource-manager.cloud")
+        .StoreResult(&resourceType);
+
+    opts.SetFreeArgsMin(0);
+
+    NLastGetopt::TOptsParseResult optsResult(&opts, argc, argv);
+
+    NYdb::TIamServiceParams iamParams{
+        .SystemServiceAccountCredentials = NYdb::CreateIamCredentialsProviderFactory(),
+        .ServiceId = serviceId,
+        .MicroserviceId = microserviceId,
+        .ResourceId = resourceId,
+        .ResourceType = resourceType,
+        .TargetServiceAccountId = targetServiceAccountId,
+    };
+
+    iamParams.Endpoint = iamEndpoint;
+
+    auto config = NYdb::TDriverConfig()
+        .SetEndpoint(endpoint)
+        .SetDatabase(database)
+        .SetCredentialsProviderFactory(NYdb::CreateIamServiceCredentialsProviderFactory(iamParams));
+
+    if (useSsl) {
+        config.UseSecureConnection();
+    }
+
+    NYdb::TDriver driver(config);
+    NYdb::NQuery::TQueryClient client(driver);
+
+    auto result = client.ExecuteQuery("SELECT 1", NYdb::NQuery::TTxControl::NoTx()).ExtractValueSync();
+    if (!result.IsSuccess()) {
+        std::cerr << ToString(static_cast<NYdb::TStatus>(result)) << std::endl;
+        return 1;
+    }
+
+    auto parser = result.GetResultSetParser(0);
+    while (parser.TryNextRow()) {
+        std::cout << parser.ColumnParser(0).GetInt32() << std::endl;
+    }
+
+    return 0;
+}

include/ydb-cpp-sdk/client/arrow/accessor.h

@@ -29,7 +29,10 @@ class TGrpcIamCredentialsProvider : public ICredentialsProvider {
 private:
     class TImpl : public std::enable_shared_from_this<TGrpcIamCredentialsProvider<TRequest, TResponse, TService>::TImpl> {
     public:
-        TImpl(const TIamEndpoint& iamEndpoint, const TRequestFiller& requestFiller, TAsyncRpc rpc)
+        TImpl(const TIamEndpoint& iamEndpoint,
+              const TRequestFiller& requestFiller,
+              TAsyncRpc rpc,
+              TCredentialsProviderPtr authTokenProvider = nullptr)
             : Rpc_(rpc)
             , Ticket_("")
             , NextTicketUpdate_(TInstant::Zero())
@@ -40,6 +43,7 @@ class TGrpcIamCredentialsProvider : public ICredentialsProvider {
             , NeedStop_(false)
             , BackoffTimeout_(BACKOFF_START)
             , Lock_()
+            , AuthTokenProvider_(authTokenProvider)
         {
             std::shared_ptr<grpc::ChannelCredentials> creds = nullptr;
             if (IamEndpoint_.EnableSsl) {
@@ -82,15 +86,18 @@ class TGrpcIamCredentialsProvider : public ICredentialsProvider {
 
             RequestFiller_(req);
 
-            grpc::ClientContext context;
+            Context_ = std::make_unique<grpc::ClientContext>();
 
             auto deadline = gpr_time_add(
                 gpr_now(GPR_CLOCK_MONOTONIC),
                 gpr_time_from_micros(IamEndpoint_.RequestTimeout.MicroSeconds(), GPR_TIMESPAN));
 
-            context.set_deadline(deadline);
+            Context_->set_deadline(deadline);
+            if (AuthTokenProvider_) {
+                Context_->AddMetadata("authorization", "Bearer " + AuthTokenProvider_->GetAuthInfo());
+            }
 
-            (Stub_->async()->*Rpc_)(&context, &req, response.get(), std::move(cb));
+            (Stub_->async()->*Rpc_)(Context_.get(), &req, response.get(), std::move(cb));
 
             if (sync) {
                 resultPromise.GetFuture().Wait(2 * IamEndpoint_.RequestTimeout);
@@ -125,6 +132,7 @@ class TGrpcIamCredentialsProvider : public ICredentialsProvider {
 
     private:
         void ProcessIamResponse(grpc::Status&& status, TResponse&& result, bool sync) {
+            Context_.reset();
             if (!status.ok()) {
                 TDuration sleepDuration;
                 {
@@ -163,6 +171,8 @@ class TGrpcIamCredentialsProvider : public ICredentialsProvider {
         std::shared_ptr<grpc::Channel> Channel_;
         std::shared_ptr<typename TService::Stub> Stub_;
         TAsyncRpc Rpc_;
+        std::unique_ptr<grpc::ClientContext> Context_;
+
         std::string Ticket_;
         TInstant NextTicketUpdate_;
         const TIamEndpoint IamEndpoint_;
@@ -172,11 +182,15 @@ class TGrpcIamCredentialsProvider : public ICredentialsProvider {
         bool NeedStop_;
         TDuration BackoffTimeout_;
         TAdaptiveLock Lock_;
+        TCredentialsProviderPtr AuthTokenProvider_;
     };
 
 public:
-    TGrpcIamCredentialsProvider(const TIamEndpoint& endpoint, const TRequestFiller& requestFiller, TAsyncRpc rpc)
-        : Impl_(std::make_shared<TImpl>(endpoint, requestFiller, rpc))
+    TGrpcIamCredentialsProvider(const TIamEndpoint& endpoint,
+                                const TRequestFiller& requestFiller,
+                                TAsyncRpc rpc,
+                                TCredentialsProviderPtr authTokenProvider = nullptr)
+        : Impl_(std::make_shared<TImpl>(endpoint, requestFiller, rpc, authTokenProvider))
     {
         Impl_->UpdateTicket(true);
     }

include/ydb-cpp-sdk/client/iam/common/generic_provider.h

@@ -8,7 +8,7 @@
 #include <fstream>
 #include <string>
 
-namespace NYdb {
+namespace NYdb::inline V3 {
 namespace NIam {
 
 constexpr std::string_view DEFAULT_ENDPOINT = "iam.api.cloud.yandex.net";

include/ydb-cpp-sdk/client/iam/common/types.h

@@ -5,6 +5,8 @@
 namespace NYdb::inline V3 {
 
 struct TIamServiceParams : TIamEndpoint {
+    TCredentialsProviderFactoryPtr SystemServiceAccountCredentials;
+
     std::string ServiceId;
     std::string MicroserviceId;
     std::string ResourceId;

include/ydb-cpp-sdk/client/iam_private/common/types.h

@@ -52,6 +52,7 @@ enum class ESchemeEntryType : i32 {
     ResourcePool = 21,
     SysView = 22,
     Transfer = 23,
+    StreamingQuery = 24,
 };
 
 struct TVirtualTimestamp {

include/ydb-cpp-sdk/client/scheme/scheme.h

@@ -652,6 +652,7 @@ class TColumnFamilyDescription {
     const std::string& GetName() const;
     std::optional<std::string> GetData() const;
     std::optional<EColumnFamilyCompression> GetCompression() const;
+    std::optional<EColumnFamilyCacheMode> GetCacheMode() const;
     std::optional<bool> GetKeepInMemory() const;
 
 private:
@@ -829,6 +830,7 @@ class TColumnFamilyBuilder {
 
     TColumnFamilyBuilder& SetData(const std::string& media);
     TColumnFamilyBuilder& SetCompression(EColumnFamilyCompression compression);
+    TColumnFamilyBuilder& SetCacheMode(EColumnFamilyCacheMode cacheMode);
     TColumnFamilyBuilder& SetKeepInMemory(bool enabled);
 
     TColumnFamilyDescription Build() const;
@@ -895,6 +897,11 @@ class TTableColumnFamilyBuilder {
         return *this;
     }
 
+    TTableColumnFamilyBuilder& SetCacheMode(EColumnFamilyCacheMode cacheMode) {
+        Builder_.SetCacheMode(cacheMode);
+        return *this;
+    }
+
     TTableColumnFamilyBuilder& SetKeepInMemory(bool enabled) {
         Builder_.SetKeepInMemory(enabled);
         return *this;
@@ -1519,6 +1526,11 @@ class TAlterColumnFamilyBuilder {
         return *this;
     }
 
+    TAlterColumnFamilyBuilder& SetCacheMode(EColumnFamilyCacheMode cacheMode) {
+        Builder_.SetCacheMode(cacheMode);
+        return *this;
+    }
+
     TAlterColumnFamilyBuilder& SetKeepInMemory(bool enabled) {
         Builder_.SetKeepInMemory(enabled);
         return *this;

include/ydb-cpp-sdk/client/table/table.h

@@ -11,6 +11,12 @@ enum class EColumnFamilyCompression {
     LZ4,
 };
 
+//! Column family cache mode
+enum class EColumnFamilyCacheMode {
+    Regular,
+    InMemory,
+};
+
 //! State of build index operation
 enum class EBuildIndexState {
     Unspecified = 0,