summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ydb/public/sdk/cpp/src/client/resources/ya.make1
-rw-r--r--ydb/public/sdk/cpp/src/client/resources/ydb_ca.cpp4
-rw-r--r--ydb/public/sdk/cpp/src/client/resources/ydb_resources.cpp4
-rw-r--r--ydb/public/sdk/cpp/src/client/resources/ydb_sdk_version.txt1
-rw-r--r--ydb/public/sdk/cpp/src/version.h8
5 files changed, 14 insertions, 4 deletions
diff --git a/ydb/public/sdk/cpp/src/client/resources/ya.make b/ydb/public/sdk/cpp/src/client/resources/ya.make
index a281190cd7c..636a7e45bf0 100644
--- a/ydb/public/sdk/cpp/src/client/resources/ya.make
+++ b/ydb/public/sdk/cpp/src/client/resources/ya.make
@@ -6,7 +6,6 @@ SRCS(
)
RESOURCE(
- ydb/public/sdk/cpp/src/client/resources/ydb_sdk_version.txt ydb_sdk_version_dev.txt
ydb/public/sdk/cpp/src/client/resources/ydb_root_ca.pem ydb_root_ca_dev.pem
)
diff --git a/ydb/public/sdk/cpp/src/client/resources/ydb_ca.cpp b/ydb/public/sdk/cpp/src/client/resources/ydb_ca.cpp
index d88d5de59a7..54ed427355a 100644
--- a/ydb/public/sdk/cpp/src/client/resources/ydb_ca.cpp
+++ b/ydb/public/sdk/cpp/src/client/resources/ydb_ca.cpp
@@ -2,10 +2,12 @@
#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/resources/ydb_ca.h>
+#include <ydb/public/sdk/cpp/src/version.h>
+
namespace NYdb::inline Dev {
std::string GetRootCertificate() {
- return NResource::Find("ydb_root_ca_dev.pem");
+ return NResource::Find(YDB_CERTIFICATE_FILE_KEY);
}
} // namespace NYdb
diff --git a/ydb/public/sdk/cpp/src/client/resources/ydb_resources.cpp b/ydb/public/sdk/cpp/src/client/resources/ydb_resources.cpp
index 8f1ee52fd44..c56ee5f07e4 100644
--- a/ydb/public/sdk/cpp/src/client/resources/ydb_resources.cpp
+++ b/ydb/public/sdk/cpp/src/client/resources/ydb_resources.cpp
@@ -2,6 +2,8 @@
#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/resources/ydb_resources.h>
+#include <ydb/public/sdk/cpp/src/version.h>
+
namespace NYdb::inline Dev {
const char* YDB_AUTH_TICKET_HEADER = "x-ydb-auth-ticket";
@@ -29,7 +31,7 @@ const char* YDB_CLIENT_CAPABILITY_SESSION_BALANCER = "session-balancer";
std::string GetSdkSemver() {
- return NResource::Find("ydb_sdk_version_dev.txt");
+ return YDB_SDK_VERSION;
}
} // namespace NYdb
diff --git a/ydb/public/sdk/cpp/src/client/resources/ydb_sdk_version.txt b/ydb/public/sdk/cpp/src/client/resources/ydb_sdk_version.txt
deleted file mode 100644
index acf9bf09db0..00000000000
--- a/ydb/public/sdk/cpp/src/client/resources/ydb_sdk_version.txt
+++ /dev/null
@@ -1 +0,0 @@
-3.2.2 \ No newline at end of file
diff --git a/ydb/public/sdk/cpp/src/version.h b/ydb/public/sdk/cpp/src/version.h
new file mode 100644
index 00000000000..af5ef8048e3
--- /dev/null
+++ b/ydb/public/sdk/cpp/src/version.h
@@ -0,0 +1,8 @@
+#pragma once
+
+namespace NYdb {
+
+inline const char* YDB_SDK_VERSION = "dev";
+inline const char* YDB_CERTIFICATE_FILE_KEY = "ydb_root_ca_dev.pem";
+
+} // namespace NYdb