File google-cpp-2_25-handling.patch of Package milvus

Overview Repositories Revisions Requests Users Attributes Meta

File google-cpp-2_25-handling.patch of Package milvus (Revision 49c48aa39e2657b0342fe148675fe593)

Currently displaying revision 49c48aa39e2657b0342fe148675fe593 , Show latest

From 887f69d4d559b9a646ee328ba6c58a987356e64b Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.com>
Date: Tue, 13 Aug 2024 10:15:59 +0200
Subject: [PATCH] google-cpp 2_25 handling

Signed-off-by: Christian Goll <cgoll@suse.com>
---
 internal/core/src/storage/AliyunSTSClient.cpp       | 2 ++
 internal/core/src/storage/ChunkManager.cpp          | 3 ++-
 internal/core/src/storage/MinioChunkManager.cpp     | 2 ++
 internal/core/src/storage/MinioChunkManager.h       | 3 +++
 internal/core/src/storage/TencentCloudSTSClient.cpp | 2 +-
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/internal/core/src/storage/AliyunSTSClient.cpp b/internal/core/src/storage/AliyunSTSClient.cpp
index cf54f9d4c..431af268f 100644
--- a/internal/core/src/storage/AliyunSTSClient.cpp
+++ b/internal/core/src/storage/AliyunSTSClient.cpp
@@ -39,10 +39,12 @@ class HttpRequest;
 enum class HttpResponseCode;
 }  // namespace Http
 
+/*
 namespace Client {
 Aws::String
 ComputeUserAgentString();
 }
+*/
 
 namespace Internal {
 
diff --git a/internal/core/src/storage/ChunkManager.cpp b/internal/core/src/storage/ChunkManager.cpp
index c6d890862..a8f3d0003 100644
--- a/internal/core/src/storage/ChunkManager.cpp
+++ b/internal/core/src/storage/ChunkManager.cpp
@@ -122,6 +122,7 @@ GcpChunkManager::GcpChunkManager(const StorageConfig& storage_config) {
     default_bucket_name_ = storage_config.bucket_name;
     remote_root_path_ = storage_config.root_path;
 
+    /*
     if (storage_config.useIAM) {
         sdk_options_.httpOptions.httpClientFactory_create_fn = []() {
             auto credentials = std::make_shared<
@@ -131,7 +132,7 @@ GcpChunkManager::GcpChunkManager(const StorageConfig& storage_config) {
                 GOOGLE_CLIENT_FACTORY_ALLOCATION_TAG, credentials);
         };
     }
-
+    */
     InitSDKAPIDefault(storage_config.log_level);
 
     Aws::Client::ClientConfiguration config = generateConfig(storage_config);
diff --git a/internal/core/src/storage/MinioChunkManager.cpp b/internal/core/src/storage/MinioChunkManager.cpp
index 19c24e86d..7274a1529 100644
--- a/internal/core/src/storage/MinioChunkManager.cpp
+++ b/internal/core/src/storage/MinioChunkManager.cpp
@@ -106,6 +106,7 @@ MinioChunkManager::InitSDKAPI(RemoteStorageType type,
         sigemptyset(&psa.sa_mask);
         sigaddset(&psa.sa_mask, SIGPIPE);
         sigaction(SIGPIPE, &psa, 0);
+        /*
         if (type == RemoteStorageType::GOOGLE_CLOUD && useIAM) {
             sdk_options_.httpOptions.httpClientFactory_create_fn = []() {
                 auto credentials = std::make_shared<
@@ -115,6 +116,7 @@ MinioChunkManager::InitSDKAPI(RemoteStorageType type,
                     GOOGLE_CLIENT_FACTORY_ALLOCATION_TAG, credentials);
             };
         }
+        */
         LOG_INFO("init aws with log level:{}", log_level_str);
         auto get_aws_log_level = [](const std::string& level_str) {
             Aws::Utils::Logging::LogLevel level =
diff --git a/internal/core/src/storage/MinioChunkManager.h b/internal/core/src/storage/MinioChunkManager.h
index 4e2586e29..4bf64d753 100644
--- a/internal/core/src/storage/MinioChunkManager.h
+++ b/internal/core/src/storage/MinioChunkManager.h
@@ -314,6 +314,8 @@ class GoogleHttpClientFactory : public Aws::Http::HttpClientFactory {
             Aws::MakeShared<Aws::Http::Standard::StandardHttpRequest>(
                 GOOGLE_CLIENT_FACTORY_ALLOCATION_TAG, uri, method);
         request->SetResponseStreamFactory(streamFactory);
+        /*
+        This is nasty, and must be removed
         auto auth_header = credentials_->AuthorizationHeader();
         if (!auth_header.ok()) {
             throw SegcoreError(
@@ -324,6 +326,7 @@ class GoogleHttpClientFactory : public Aws::Http::HttpClientFactory {
         request->SetHeaderValue(auth_header->first.c_str(),
                                 auth_header->second.c_str());
 
+        */
         return request;
     }
 
diff --git a/internal/core/src/storage/TencentCloudSTSClient.cpp b/internal/core/src/storage/TencentCloudSTSClient.cpp
index 18915c2bb..81cfdfe3d 100644
--- a/internal/core/src/storage/TencentCloudSTSClient.cpp
+++ b/internal/core/src/storage/TencentCloudSTSClient.cpp
@@ -85,7 +85,7 @@ TencentCloudSTSCredentialsClient::GetAssumeRoleWithWebIdentityCredentials(
             Aws::Http::HttpMethod::HTTP_POST,
             Aws::Utils::Stream::DefaultResponseStreamFactoryMethod));
 
-    httpRequest->SetUserAgent(Aws::Client::ComputeUserAgentString());
+    httpRequest->SetUserAgent(Aws::Client::ComputeUserAgentString(nullptr));
     httpRequest->SetHeaderValue("Authorization", "SKIP");
     httpRequest->SetHeaderValue("Host", "sts.tencentcloudapi.com");
     httpRequest->SetHeaderValue("X-TC-Action", "AssumeRoleWithWebIdentity");
-- 
2.43.0

Places

File google-cpp-2_25-handling.patch of Package milvus (Revision 49c48aa39e2657b0342fe148675fe593)

Places