aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniil Cherednik <dan.cherednik@gmail.com>2022-05-05 13:28:34 +0300
committerDaniil Cherednik <dan.cherednik@gmail.com>2022-05-05 13:28:34 +0300
commitef5630e88d8bf4b5ecc3854c7dc8a802adbad1a5 (patch)
tree25dd727b4f340aca4a32bad1b88a3d707f5b4931
parentd49c3fc6676e6888ffc0a320f7519744b8e3957f (diff)
downloadydb-ef5630e88d8bf4b5ecc3854c7dc8a802adbad1a5.tar.gz
Default implementation for GetClientIdentity method. KIKIMR-14859
ref:eca69d16086599e9a8a2537a457ea43762f30417
-rw-r--r--ydb/library/yql/providers/common/token_accessor/client/token_accessor_client_factory.cpp4
-rw-r--r--ydb/public/sdk/cpp/client/ydb_types/credentials/credentials.cpp5
-rw-r--r--ydb/public/sdk/cpp/client/ydb_types/credentials/credentials.h2
-rw-r--r--ydb/public/sdk/cpp/client/ydb_types/credentials/login.cpp5
-rw-r--r--ydb/services/ydb/sdk_credprovider_ut/dummy_provider_ut.cpp4
5 files changed, 6 insertions, 14 deletions
diff --git a/ydb/library/yql/providers/common/token_accessor/client/token_accessor_client_factory.cpp b/ydb/library/yql/providers/common/token_accessor/client/token_accessor_client_factory.cpp
index 49ae1aab4ff..65ed25856fb 100644
--- a/ydb/library/yql/providers/common/token_accessor/client/token_accessor_client_factory.cpp
+++ b/ydb/library/yql/providers/common/token_accessor/client/token_accessor_client_factory.cpp
@@ -28,10 +28,6 @@ public:
{
}
- TString GetClientIdentity() const override {
- return "TOKEN_ACCESSOR_CLIENT" + ToString((ui64)this);
- }
-
std::shared_ptr<NYdb::ICredentialsProvider> CreateProvider() const override {
return CreateTokenAccessorCredentialsProvider(TokenAccessorEndpoint, UseSsl, SslCaCert, ServiceAccountId, ServiceAccountIdSignature, RefreshPeriod, RequestTimeout);
}
diff --git a/ydb/public/sdk/cpp/client/ydb_types/credentials/credentials.cpp b/ydb/public/sdk/cpp/client/ydb_types/credentials/credentials.cpp
index 679634450f4..3d0ff1b3d97 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/credentials/credentials.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_types/credentials/credentials.cpp
@@ -1,4 +1,5 @@
#include "credentials.h"
+#include <util/string/cast.h>
namespace NYdb {
@@ -16,6 +17,10 @@ public:
}
};
+TStringType ICredentialsProviderFactory::GetClientIdentity() const {
+ return ToString((ui64)this);
+}
+
class TInsecureCredentialsProviderFactory : public ICredentialsProviderFactory {
public:
TInsecureCredentialsProviderFactory()
diff --git a/ydb/public/sdk/cpp/client/ydb_types/credentials/credentials.h b/ydb/public/sdk/cpp/client/ydb_types/credentials/credentials.h
index 75b86933ce3..a2274d1a8c7 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/credentials/credentials.h
+++ b/ydb/public/sdk/cpp/client/ydb_types/credentials/credentials.h
@@ -25,7 +25,7 @@ public:
Y_UNUSED(facility);
return CreateProvider();
}
- virtual TStringType GetClientIdentity() const = 0;
+ virtual TStringType GetClientIdentity() const;
};
using TCredentialsProviderFactoryPtr = std::shared_ptr<ICredentialsProviderFactory>;
diff --git a/ydb/public/sdk/cpp/client/ydb_types/credentials/login.cpp b/ydb/public/sdk/cpp/client/ydb_types/credentials/login.cpp
index ff251ad79e7..dc197d01099 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/credentials/login.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_types/credentials/login.cpp
@@ -187,7 +187,6 @@ public:
TLoginCredentialsProviderFactory(TLoginCredentialsParams params);
virtual std::shared_ptr<ICredentialsProvider> CreateProvider() const override;
virtual std::shared_ptr<ICredentialsProvider> CreateProvider(std::weak_ptr<ICoreFacility> facility) const override;
- virtual TStringType GetClientIdentity() const override;
private:
TLoginCredentialsParams Params_;
@@ -206,10 +205,6 @@ std::shared_ptr<ICredentialsProvider> TLoginCredentialsProviderFactory::CreatePr
return std::make_shared<TLoginCredentialsProvider>(std::move(facility), Params_);
}
-TStringType TLoginCredentialsProviderFactory::GetClientIdentity() const {
- return "YDB_LOGIN_PROVIDER" + ToString((ui64)this);
-}
-
std::shared_ptr<ICredentialsProviderFactory> CreateLoginCredentialsProviderFactory(TLoginCredentialsParams params) {
return std::make_shared<TLoginCredentialsProviderFactory>(std::move(params));
}
diff --git a/ydb/services/ydb/sdk_credprovider_ut/dummy_provider_ut.cpp b/ydb/services/ydb/sdk_credprovider_ut/dummy_provider_ut.cpp
index 17cc284573b..af34937c500 100644
--- a/ydb/services/ydb/sdk_credprovider_ut/dummy_provider_ut.cpp
+++ b/ydb/services/ydb/sdk_credprovider_ut/dummy_provider_ut.cpp
@@ -74,10 +74,6 @@ public:
return std::make_shared<TExampleDummyProvider>(std::move(facility), RunCnt);
}
- TStringType GetClientIdentity() const override {
- return ToString((ui64)this);
- }
-
// Just for compatibility with old interface
std::shared_ptr<ICredentialsProvider> CreateProvider() const override {
Y_FAIL();