BlockStorage/repertory
1
0
Fork 0
Code Issues 4 Pull Requests Releases 8 Wiki Activity

fix
Some checks reported errors
BlockStorage/repertory/pipeline/head Something is wrong with the build of this commit
Details

Browse Source
This commit is contained in:
Scott E. Graves
2025-09-03 14:27:26 -05:00
parent 5ac94667f9
commit ad8feafa5c
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
repertory/librepertory/src/app_config.cpp
View File

@@ -64,8 +64,7 @@ auto app_config::get_stop_requested() -> bool { return stop_requested.load(); }
void app_config::set_stop_requested() { stop_requested.store(true); } void app_config::set_stop_requested() { stop_requested.store(true); }
app_config::app_config(provider_type prov, app_config::app_config(provider_type prov, std::string_view data_directory)
std::string_view data_directory)
: prov_(prov), : prov_(prov),
api_password_(utils::generate_random_string(default_api_password_size)), api_password_(utils::generate_random_string(default_api_password_size)),
api_port_(default_rpc_port), api_port_(default_rpc_port),
@@ -230,6 +229,8 @@ app_config::app_config(provider_type prov,
[this]() { return get_s3_config().bucket; }}, [this]() { return get_s3_config().bucket; }},
{fmt::format("{}.{}", JSON_S3_CONFIG, JSON_ENCRYPTION_TOKEN), {fmt::format("{}.{}", JSON_S3_CONFIG, JSON_ENCRYPTION_TOKEN),
[this]() { return get_s3_config().encryption_token; }}, [this]() { return get_s3_config().encryption_token; }},
{fmt::format("{}.{}", JSON_S3_CONFIG, JSON_FORCE_LEGACY_ENCRYPTION),
[this]() { return get_s3_config().force_legacy_encryption; }},
{fmt::format("{}.{}", JSON_S3_CONFIG, JSON_REGION), {fmt::format("{}.{}", JSON_S3_CONFIG, JSON_REGION),
[this]() { return get_s3_config().region; }}, [this]() { return get_s3_config().region; }},
{fmt::format("{}.{}", JSON_S3_CONFIG, JSON_SECRET_KEY), {fmt::format("{}.{}", JSON_S3_CONFIG, JSON_SECRET_KEY),
@@ -602,6 +603,16 @@ app_config::app_config(provider_type prov,
return get_s3_config().encryption_token; return get_s3_config().encryption_token;
}, },
}, },
{
fmt::format("{}.{}", JSON_S3_CONFIG, JSON_FORCE_LEGACY_ENCRYPTION),
[this](const std::string &value) {
auto cfg = get_s3_config();
cfg.force_legacy_encryption = utils::string::to_bool(value);
set_s3_config(cfg);
return utils::string::from_bool(
get_s3_config().force_legacy_encryption);
},
},
{ {
fmt::format("{}.{}", JSON_S3_CONFIG, JSON_REGION), fmt::format("{}.{}", JSON_S3_CONFIG, JSON_REGION),
[this](const std::string &value) { [this](const std::string &value) {
@@ -723,16 +734,14 @@ auto app_config::get_root_data_directory() -> std::string {
return data_directory; return data_directory;
} }
auto app_config::default_data_directory(provider_type prov) auto app_config::default_data_directory(provider_type prov) -> std::string {
-> std::string {
return utils::path::combine(app_config::get_root_data_directory(), return utils::path::combine(app_config::get_root_data_directory(),
{ {
app_config::get_provider_name(prov), app_config::get_provider_name(prov),
}); });
} }
auto app_config::default_remote_api_port(provider_type prov) auto app_config::default_remote_api_port(provider_type prov) -> std::uint16_t {
-> std::uint16_t {
static const std::array<std::uint16_t, static const std::array<std::uint16_t,
static_cast<std::size_t>(provider_type::unknown)> static_cast<std::size_t>(provider_type::unknown)>
PROVIDER_REMOTE_PORTS = { PROVIDER_REMOTE_PORTS = {
@@ -929,8 +938,7 @@ auto app_config::get_preferred_download_type() const -> download_type {
return preferred_download_type_; return preferred_download_type_;
} }
auto app_config::get_provider_display_name(provider_type prov) auto app_config::get_provider_display_name(provider_type prov) -> std::string {
-> std::string {
static const std::array<std::string, static const std::array<std::string,
static_cast<std::size_t>(provider_type::unknown) + 1U> static_cast<std::size_t>(provider_type::unknown) + 1U>
PROVIDER_DISPLAY_NAMES = { PROVIDER_DISPLAY_NAMES = {