cc core: rename some middlewares classes

commit_hash:e49b72da0562eafa0fdff33d52e354a4d5ff4ef4

Author: ArkadyRudenko

core/include/userver/middlewares/impl/middleware_pipeline_config.hpp

@@ -14,17 +14,19 @@ struct BaseMiddlewareConfig final {
     bool enabled{true};
 };
 
-struct BasePipelineConfig final {
-    std::unordered_map<std::string, BaseMiddlewareConfig> middlewares{};
-};
-
 BaseMiddlewareConfig Parse(const yaml_config::YamlConfig& value, formats::parse::To<BaseMiddlewareConfig>);
 
-struct MiddlewarePipelineConfig final {
-    std::unordered_map<std::string, BaseMiddlewareConfig> middlewares{};
+using MiddlewaresMap = std::unordered_map<std::string, BaseMiddlewareConfig>;
+
+struct BuiltInConfig final {
+    MiddlewaresMap middlewares{};
+};
+
+struct MiddlewaresConfig final {
+    MiddlewaresMap middlewares{};
 };
 
-MiddlewarePipelineConfig Parse(const yaml_config::YamlConfig& value, formats::parse::To<MiddlewarePipelineConfig>);
+MiddlewaresConfig Parse(const yaml_config::YamlConfig& value, formats::parse::To<MiddlewaresConfig>);
 
 struct MiddlewareRunnerConfig final {
     std::unordered_map<std::string, yaml_config::YamlConfig> middlewares{};

core/include/userver/middlewares/pipeline.hpp

@@ -22,7 +22,7 @@ namespace middlewares {
 /// @brief The dependency type between middlewares.
 ///
 /// Iff dependency type from 'X' to 'Y' is `kStrong` and 'Y' is disabled, middlewares pipeline will failure when start,
-/// otherwise (in `kWeak`) we ignore this dependency.
+/// otherwise (`kWeak`) we ignore this dependency.
 enum class DependencyType {
     kStrong = 0,
     kWeak = 1,
@@ -84,7 +84,7 @@ class AnyMiddlewarePipelineComponent : public components::ComponentBase {
     AnyMiddlewarePipelineComponent(
         const components::ComponentConfig& config,
         const components::ComponentContext& context,
-        impl::BasePipelineConfig&& base_config
+        impl::BuiltInConfig&& builtin_config
     );
 
     static yaml_config::Schema GetStaticConfigSchema();

core/src/middlewares/impl/middleware_pipeline_config.cpp

@@ -6,9 +6,9 @@ USERVER_NAMESPACE_BEGIN
 
 namespace middlewares::impl {
 
-MiddlewarePipelineConfig Parse(const yaml_config::YamlConfig& value, formats::parse::To<MiddlewarePipelineConfig>) {
-    MiddlewarePipelineConfig config;
-    config.middlewares = value["middlewares"].As<std::unordered_map<std::string, BaseMiddlewareConfig>>({});
+MiddlewaresConfig Parse(const yaml_config::YamlConfig& value, formats::parse::To<MiddlewaresConfig>) {
+    MiddlewaresConfig config;
+    config.middlewares = value["middlewares"].As<decltype(config.middlewares)>({});
     return config;
 }
 

core/src/middlewares/impl/middlewares_graph.cpp

@@ -15,7 +15,7 @@ namespace middlewares::impl {
 
 namespace {
 
-bool IsUserverGroup(const std::string& group) {
+bool IsGroupBoundary(const std::string& group) {
     return utils::text::EndsWith(group, "#end") || utils::text::EndsWith(group, "#begin");
 }
 
@@ -25,7 +25,7 @@ void ValidateConnects(
     const Dependencies& dependencies
 ) {
     for (const auto& con : connects) {
-        if (IsUserverGroup(con.node_name)) {
+        if (IsGroupBoundary(con.node_name)) {
             continue;
         }
 
@@ -49,7 +49,7 @@ void ValidateConnects(
             UINVARIANT(
                 con.type != DependencyType::kStrong,
                 fmt::format(
-                    "Middleware `{}` does not exist and there is a kStrong dependency from {}.",
+                    "Middleware '{}' does not exist and there is a `kStrong` dependency from '{}'.",
                     con.node_name,
                     dep.middleware_name
                 )
@@ -160,11 +160,11 @@ MiddlewareOrderedList BuildPipeline(Dependencies&& dependencies) {
     MiddlewareOrderedList list{};
     list.reserve(nodes.size());
     for (auto& mid : nodes) {
-        if (IsUserverGroup(mid)) {
+        if (IsGroupBoundary(mid)) {
             continue;
         }
         const auto it = dependencies.find(mid);
-        UINVARIANT(it != dependencies.end(), fmt::format("Middleware {} does not exist.", mid));
+        UINVARIANT(it != dependencies.end(), fmt::format("Middleware `{}` does not exist.", mid));
         list.push_back({mid, it->second.enabled});
     }
 

core/src/middlewares/pipeline.cpp

@@ -21,10 +21,10 @@ namespace {
 impl::Dependencies MakeDependencies(
     const components::ComponentConfig& config,
     const components::ComponentContext& context,
-    impl::BasePipelineConfig&& base_config
+    impl::BuiltInConfig&& builtin_config
 ) {
-    auto builtin_middlewares = base_config.middlewares;
-    auto pipeline_config = config.As<impl::MiddlewarePipelineConfig>();
+    auto builtin_middlewares = builtin_config.middlewares;
+    auto pipeline_config = config.As<impl::MiddlewaresConfig>();
     pipeline_config.middlewares.merge(std::move(builtin_middlewares));
 
     impl::Dependencies dependencies{};
@@ -36,7 +36,7 @@ impl::Dependencies MakeDependencies(
             auto dep = middleware->GetMiddlewareDependency(utils::impl::InternalTag{});
             dep.enabled = conf.enabled;
             dependencies.emplace(mname, std::move(dep));
-        } else if (base_config.middlewares.count(mname) != 0) {
+        } else if (builtin_config.middlewares.count(mname) != 0) {
             impl::MiddlewareDependency fake_dep;
             fake_dep.middleware_name = mname;
             fake_dep.enabled = false;
@@ -60,7 +60,7 @@ std::vector<std::string> MiddlewarePipeline::GetPerServiceMiddlewares(const impl
     const auto& per_service_middlewares = config.middlewares;
     for (const auto& [name, enabled] : pipeline_) {
         if (const auto it = per_service_middlewares.find(name); it != per_service_middlewares.end()) {
-            // Per-service enabled is high priority
+            // Per-service `enabled` has a higher priority than a global priority.
             if (it->second.As<BaseMiddlewareConfig>().enabled) {
                 res.push_back(name);
             }
@@ -84,7 +84,7 @@ std::vector<std::string> MiddlewarePipeline::GetPerServiceMiddlewares(const impl
 AnyMiddlewarePipelineComponent::AnyMiddlewarePipelineComponent(
     const components::ComponentConfig& config,
     const components::ComponentContext& context,
-    impl::BasePipelineConfig&& base_config
+    impl::BuiltInConfig&& base_config
 )
     : components::ComponentBase(config, context),
       pipeline_(MakeDependencies(config, context, std::move(base_config))) {}