Skip to content

Commit f139635

Browse files
committed
mics secdist: format, includes order
1 parent 4898b42 commit f139635

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

core/include/userver/storages/secdist/component_base.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace components {
3232
class SecdistComponentBase : public LoggableComponentBase {
3333
public:
3434
SecdistComponentBase(const ComponentConfig&, const ComponentContext&,
35-
storages::secdist::SecdistConfig::Settings&&);
35+
storages::secdist::SecdistConfig::Settings&&);
3636

3737
const storages::secdist::SecdistConfig& Get() const;
3838

core/src/storages/secdist/component.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include <userver/components/component.hpp>
44
#include <userver/logging/log.hpp>
5-
#include <userver/storages/secdist/exceptions.hpp>
65
#include <userver/storages/secdist/default_provider.hpp>
6+
#include <userver/storages/secdist/exceptions.hpp>
77
#include <userver/utils/string_to_duration.hpp>
88
#include <userver/yaml_config/merge_schemas.hpp>
99

@@ -30,7 +30,8 @@ storages::secdist::SecdistConfig::Settings ParseSettings(
3030
using Provider = storages::secdist::DefaultProvider;
3131
Provider::Settings provider_settings;
3232
provider_settings.config_path = config["config"].As<std::string>({});
33-
provider_settings.format = FormatFromString(config["format"].As<std::string>({}));
33+
provider_settings.format =
34+
FormatFromString(config["format"].As<std::string>({}));
3435
provider_settings.missing_ok = config["missing-ok"].As<bool>(false);
3536
provider_settings.environment_secrets_key =
3637
config["environment-secrets-key"].As<std::optional<std::string>>();
@@ -51,8 +52,7 @@ storages::secdist::SecdistConfig::Settings ParseSettings(
5152

5253
} // namespace
5354

54-
Secdist::Secdist(const ComponentConfig& config,
55-
const ComponentContext& context)
55+
Secdist::Secdist(const ComponentConfig& config, const ComponentContext& context)
5656
: SecdistComponentBase(config, context, ParseSettings(config, context)) {}
5757

5858
yaml_config::Schema Secdist::GetStaticConfigSchema() {

core/src/storages/secdist/component_base.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,32 @@
22

33
#include <userver/components/component.hpp>
44
#include <userver/logging/log.hpp>
5-
#include <userver/storages/secdist/exceptions.hpp>
65
#include <userver/storages/secdist/default_provider.hpp>
6+
#include <userver/storages/secdist/exceptions.hpp>
77
#include <userver/utils/string_to_duration.hpp>
88
#include <userver/yaml_config/merge_schemas.hpp>
99

1010
USERVER_NAMESPACE_BEGIN
1111

1212
namespace components {
1313

14-
SecdistComponentBase::SecdistComponentBase(const ComponentConfig& config, const ComponentContext& context,
15-
storages::secdist::SecdistConfig::Settings&& settings)
16-
: LoggableComponentBase(config, context),
17-
secdist_(std::move(settings)) {}
14+
SecdistComponentBase::SecdistComponentBase(
15+
const ComponentConfig& config, const ComponentContext& context,
16+
storages::secdist::SecdistConfig::Settings&& settings)
17+
: LoggableComponentBase(config, context), secdist_(std::move(settings)) {}
1818

1919
const storages::secdist::SecdistConfig& SecdistComponentBase::Get() const {
2020
return secdist_.Get();
2121
}
2222

23-
rcu::ReadablePtr<storages::secdist::SecdistConfig> SecdistComponentBase::GetSnapshot()
24-
const {
23+
rcu::ReadablePtr<storages::secdist::SecdistConfig>
24+
SecdistComponentBase::GetSnapshot() const {
2525
return secdist_.GetSnapshot();
2626
}
2727

28-
storages::secdist::Secdist& SecdistComponentBase::GetStorage() { return secdist_; }
28+
storages::secdist::Secdist& SecdistComponentBase::GetStorage() {
29+
return secdist_;
30+
}
2931

3032
yaml_config::Schema SecdistComponentBase::GetStaticConfigSchema() {
3133
auto schema = LoggableComponentBase::GetStaticConfigSchema();

core/src/storages/secdist/default_provider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include <userver/formats/json/serialize.hpp>
77
#include <userver/formats/json/value_builder.hpp>
88
#include <userver/formats/yaml/serialize.hpp>
9-
#include <userver/storages/secdist/exceptions.hpp>
109
#include <userver/storages/secdist/default_provider.hpp>
10+
#include <userver/storages/secdist/exceptions.hpp>
1111
#include <userver/utils/async.hpp>
1212
#include <userver/yaml_config/merge_schemas.hpp>
1313

0 commit comments

Comments
 (0)