Make config validation enforcement configurable (#16693)

Author: Enjection

ydb/core/cms/console/console_configs_manager.cpp

@@ -174,15 +174,20 @@ void TConfigsManager::ValidateDatabaseConfig(TUpdateDatabaseConfigOpContext& opC
             auto resolved = NYamlConfig::ResolveAll(tree);
 
             errors.clear();
+
+            auto* csk = AppData()->ConfigSwissKnife;
+
             for (auto& [_, config] : resolved.Configs) {
                 auto cfg = NYamlConfig::YamlToProto(
                     config.second,
                     true,
                     true,
                     unknownFieldsCollector);
-                NKikimr::NConfig::EValidationResult result = NKikimr::NConfig::ValidateConfig(cfg, errors);
-                if (result == NKikimr::NConfig::EValidationResult::Error) {
-                    ythrow yexception() << errors.front();
+                if (csk) {
+                    auto result = csk->ValidateConfig(cfg, errors);
+                    if (result == NYamlConfig::EValidationResult::Error) {
+                        ythrow yexception() << errors.front();
+                    }
                 }
             }
 

ydb/core/config/init/init_impl.h

@@ -1158,15 +1158,14 @@ class TInitialConfiguratorImpl
 
         TenantName = FillTenantPoolConfig(CommonAppOptions);
 
+        FillData(CommonAppOptions);
+
         std::vector<TString> errors;
-        EValidationResult result = ValidateConfig(AppConfig, errors);
-        if (result == EValidationResult::Error) {
+        if (csk && csk->ValidateConfig(AppConfig, errors) == NYamlConfig::EValidationResult::Error) {
             ythrow yexception() << errors.front();
         }
 
         Logger.Out() << "configured" << Endl;
-
-        FillData(CommonAppOptions);
     }
 
     void FillData(const NConfig::TCommonAppOptions& cf) {

ydb/library/yaml_config/ya.make

@@ -18,6 +18,7 @@ PEERDIR(
     library/cpp/protobuf/json
     ydb/core/base
     ydb/core/cms/console/util
+    ydb/core/config/validation
     ydb/core/erasure
     ydb/core/protos
     ydb/core/protos/out

ydb/library/yaml_config/yaml_config.cpp

@@ -7,6 +7,7 @@
 #include <library/cpp/protobuf/json/json2proto.h>
 
 #include <ydb/core/protos/netclassifier.pb.h>
+#include <ydb/core/config/validation/validators.h>
 
 namespace NKikimr::NYamlConfig {
 
@@ -97,8 +98,32 @@ void ReplaceUnmanagedKinds(const NKikimrConfig::TAppConfig& from, NKikimrConfig:
     }
 }
 
+class TLegacyValidators
+    : public IConfigValidator
+{
+public:
+    EValidationResult ValidateConfig(
+        const NKikimrConfig::TAppConfig& config,
+        std::vector<TString>& msg) const override
+    {
+        auto res = NKikimr::NConfig::ValidateConfig(config, msg);
+        switch (res) {
+            case NKikimr::NConfig::EValidationResult::Ok:
+                return EValidationResult::Ok;
+            case NKikimr::NConfig::EValidationResult::Warn:
+                return EValidationResult::Warn;
+            case NKikimr::NConfig::EValidationResult::Error:
+                return EValidationResult::Error;
+        }
+    }
+};
+
 class TDefaultConfigSwissKnife : public IConfigSwissKnife {
 public:
+    TDefaultConfigSwissKnife() {
+        Validators["LegacyValidators"] = MakeSimpleShared<TLegacyValidators>();
+    }
+
     bool VerifyReplaceRequest(const Ydb::Config::ReplaceConfigRequest&, Ydb::StatusIds::StatusCode&, NYql::TIssues&) const override {
         return true;
     }
@@ -117,5 +142,22 @@ std::unique_ptr<IConfigSwissKnife> CreateDefaultConfigSwissKnife() {
     return std::make_unique<TDefaultConfigSwissKnife>();
 }
 
+EValidationResult IConfigSwissKnife::ValidateConfig(
+    const NKikimrConfig::TAppConfig& config,
+    std::vector<TString>& msg) const
+{
+    for (const auto& [name, validator] : GetValidators()) {
+        EValidationResult result = validator->ValidateConfig(config, msg);
+        if (result == EValidationResult::Error) {
+            return EValidationResult::Error;
+        }
+    }
+
+    if (msg.size() > 0) {
+        return EValidationResult::Warn;
+    }
+
+    return EValidationResult::Ok;
+}
 
 } // namespace NKikimr::NYamlConfig

ydb/library/yaml_config/yaml_config.h

@@ -84,18 +84,44 @@ void ResolveAndParseYamlConfig(
     TString* resolvedYamlConfig = nullptr,
     TString* resolvedJsonConfig = nullptr);
 
+enum class EValidationResult {
+    Ok,
+    Warn,
+    Error,
+};
+
+class IConfigValidator {
+public:
+    virtual ~IConfigValidator() = default;
+
+    virtual EValidationResult ValidateConfig(
+        const NKikimrConfig::TAppConfig& config,
+        std::vector<TString>& msg) const = 0;
+};
+
 /**
  * Replaces kinds not managed by yaml config (e.g. NetClassifierConfig) from config 'from' in config 'to'
  * if corresponding configs are presenet in 'from'
  */
 void ReplaceUnmanagedKinds(const NKikimrConfig::TAppConfig& from, NKikimrConfig::TAppConfig& to);
 
+using TValidatorsMap = TMap<TString, TSimpleSharedPtr<IConfigValidator>>;
+
 class IConfigSwissKnife {
 public:
     virtual ~IConfigSwissKnife() = default;
     virtual bool VerifyReplaceRequest(const Ydb::Config::ReplaceConfigRequest& request, Ydb::StatusIds::StatusCode& status, NYql::TIssues& issues) const = 0;
     virtual bool VerifyMainConfig(const TString& config) const = 0;
     virtual bool VerifyStorageConfig(const TString& config) const = 0;
+    virtual EValidationResult ValidateConfig(
+        const NKikimrConfig::TAppConfig& config,
+        std::vector<TString>& msg) const;
+
+    const TMap<TString, TSimpleSharedPtr<IConfigValidator>>& GetValidators() const {
+        return Validators;
+    }
+protected:
+    TMap<TString, TSimpleSharedPtr<IConfigValidator>> Validators;
 };