mics secdist: format, includes order

userver-framework · May 8, 2024 · f139635 · f139635
1 parent 4898b42
commit f139635
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/core/include/userver/storages/secdist/component_base.hpp b/core/include/userver/storages/secdist/component_base.hpp
@@ -32,7 +32,7 @@ namespace components {
 class SecdistComponentBase : public LoggableComponentBase {
  public:
   SecdistComponentBase(const ComponentConfig&, const ComponentContext&,
-          storages::secdist::SecdistConfig::Settings&&);
+                       storages::secdist::SecdistConfig::Settings&&);
 
   const storages::secdist::SecdistConfig& Get() const;
 

diff --git a/core/src/storages/secdist/component.cpp b/core/src/storages/secdist/component.cpp
@@ -2,8 +2,8 @@
 
 #include <userver/components/component.hpp>
 #include <userver/logging/log.hpp>
-#include <userver/storages/secdist/exceptions.hpp>
 #include <userver/storages/secdist/default_provider.hpp>
+#include <userver/storages/secdist/exceptions.hpp>
 #include <userver/utils/string_to_duration.hpp>
 #include <userver/yaml_config/merge_schemas.hpp>
 
@@ -30,7 +30,8 @@ storages::secdist::SecdistConfig::Settings ParseSettings(
   using Provider = storages::secdist::DefaultProvider;
   Provider::Settings provider_settings;
   provider_settings.config_path = config["config"].As<std::string>({});
-  provider_settings.format = FormatFromString(config["format"].As<std::string>({}));
+  provider_settings.format =
+      FormatFromString(config["format"].As<std::string>({}));
   provider_settings.missing_ok = config["missing-ok"].As<bool>(false);
   provider_settings.environment_secrets_key =
       config["environment-secrets-key"].As<std::optional<std::string>>();
@@ -51,8 +52,7 @@ storages::secdist::SecdistConfig::Settings ParseSettings(
 
 }  // namespace
 
-Secdist::Secdist(const ComponentConfig& config,
-                               const ComponentContext& context)
+Secdist::Secdist(const ComponentConfig& config, const ComponentContext& context)
     : SecdistComponentBase(config, context, ParseSettings(config, context)) {}
 
 yaml_config::Schema Secdist::GetStaticConfigSchema() {

diff --git a/core/src/storages/secdist/component_base.cpp b/core/src/storages/secdist/component_base.cpp
@@ -2,30 +2,32 @@
 
 #include <userver/components/component.hpp>
 #include <userver/logging/log.hpp>
-#include <userver/storages/secdist/exceptions.hpp>
 #include <userver/storages/secdist/default_provider.hpp>
+#include <userver/storages/secdist/exceptions.hpp>
 #include <userver/utils/string_to_duration.hpp>
 #include <userver/yaml_config/merge_schemas.hpp>
 
 USERVER_NAMESPACE_BEGIN
 
 namespace components {
 
-SecdistComponentBase::SecdistComponentBase(const ComponentConfig& config, const ComponentContext& context,
-                 storages::secdist::SecdistConfig::Settings&& settings)
-    : LoggableComponentBase(config, context),
-      secdist_(std::move(settings)) {}
+SecdistComponentBase::SecdistComponentBase(
+    const ComponentConfig& config, const ComponentContext& context,
+    storages::secdist::SecdistConfig::Settings&& settings)
+    : LoggableComponentBase(config, context), secdist_(std::move(settings)) {}
 
 const storages::secdist::SecdistConfig& SecdistComponentBase::Get() const {
   return secdist_.Get();
 }
 
-rcu::ReadablePtr<storages::secdist::SecdistConfig> SecdistComponentBase::GetSnapshot()
-    const {
+rcu::ReadablePtr<storages::secdist::SecdistConfig>
+SecdistComponentBase::GetSnapshot() const {
   return secdist_.GetSnapshot();
 }
 
-storages::secdist::Secdist& SecdistComponentBase::GetStorage() { return secdist_; }
+storages::secdist::Secdist& SecdistComponentBase::GetStorage() {
+  return secdist_;
+}
 
 yaml_config::Schema SecdistComponentBase::GetStaticConfigSchema() {
   auto schema = LoggableComponentBase::GetStaticConfigSchema();

diff --git a/core/src/storages/secdist/default_provider.cpp b/core/src/storages/secdist/default_provider.cpp
@@ -6,8 +6,8 @@
 #include <userver/formats/json/serialize.hpp>
 #include <userver/formats/json/value_builder.hpp>
 #include <userver/formats/yaml/serialize.hpp>
-#include <userver/storages/secdist/exceptions.hpp>
 #include <userver/storages/secdist/default_provider.hpp>
+#include <userver/storages/secdist/exceptions.hpp>
 #include <userver/utils/async.hpp>
 #include <userver/yaml_config/merge_schemas.hpp>