thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-27 18:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Fix usage of session_token in S3 engine""

Browse Source
This commit is contained in:
Kruglov Pavel 2024-03-14 12:23:32 +01:00 committed by GitHub
parent 0569f44186
commit 56220b5105
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Coordination/KeeperSnapshotManagerS3.cpp
View File

@ -121,7 +121,8 @@ void KeeperSnapshotManagerS3::updateS3Configuration(const Poco::Util::AbstractCo
auth_settings.use_insecure_imds_request.value_or(false), auth_settings.use_insecure_imds_request.value_or(false),
auth_settings.expiration_window_seconds.value_or(S3::DEFAULT_EXPIRATION_WINDOW_SECONDS), auth_settings.expiration_window_seconds.value_or(S3::DEFAULT_EXPIRATION_WINDOW_SECONDS),
auth_settings.no_sign_request.value_or(false), auth_settings.no_sign_request.value_or(false),
}); },
credentials.GetSessionToken());
auto new_client = std::make_shared<KeeperSnapshotManagerS3::S3Configuration>(std::move(new_uri), std::move(auth_settings), std::move(client)); auto new_client = std::make_shared<KeeperSnapshotManagerS3::S3Configuration>(std::move(new_uri), std::move(auth_settings), std::move(client));

3
src/Storages/StorageS3.cpp
View File

@ -1451,7 +1451,8 @@ void StorageS3::Configuration::connect(const ContextPtr & context)
auth_settings.expiration_window_seconds.value_or( auth_settings.expiration_window_seconds.value_or(
context->getConfigRef().getUInt64("s3.expiration_window_seconds", S3::DEFAULT_EXPIRATION_WINDOW_SECONDS)), context->getConfigRef().getUInt64("s3.expiration_window_seconds", S3::DEFAULT_EXPIRATION_WINDOW_SECONDS)),
auth_settings.no_sign_request.value_or(context->getConfigRef().getBool("s3.no_sign_request", false)), auth_settings.no_sign_request.value_or(context->getConfigRef().getBool("s3.no_sign_request", false)),
}); },
credentials.GetSessionToken());
} }
void StorageS3::processNamedCollectionResult(StorageS3::Configuration & configuration, const NamedCollection & collection) void StorageS3::processNamedCollectionResult(StorageS3::Configuration & configuration, const NamedCollection & collection)