merge conflicts

Author: evanevanevanevannnn

ydb/core/external_sources/external_source_factory.cpp

@@ -83,22 +83,6 @@ IExternalSourceFactory::TPtr CreateExternalSourceFactory(const std::vector<TStri
         {
             ToString(NYql::EDatabaseType::Solomon),
             CreateExternalDataSource(TString{NYql::SolomonProviderName}, {"NONE", "TOKEN"}, {"use_ssl", "grpc_location", "project", "cluster"}, hostnamePatternsRegEx)
-        },
-        {
-            ToString(NYql::EDatabaseType::Iceberg),
-            BuildIcebergSource(hostnamePatternsRegEx)
-        },
-        {
-            ToString(NYql::EDatabaseType::Redis),
-            CreateExternalDataSource(TString{NYql::GenericProviderName}, {"BASIC"}, {"database_name", "use_tls"}, hostnamePatternsRegEx)
-        },
-        {
-            ToString(NYql::EDatabaseType::Prometheus),
-            CreateExternalDataSource(TString{NYql::GenericProviderName}, {"BASIC"}, {"protocol", "use_tls"}, hostnamePatternsRegEx)
-        },
-        {
-            ToString(NYql::EDatabaseType::MongoDB),
-            CreateExternalDataSource(TString{NYql::GenericProviderName}, {"BASIC"}, {"database_name", "use_tls", "reading_mode", "unexpected_type_display_mode", "unsupported_type_display_mode"}, hostnamePatternsRegEx)
         }
     }); 
 }

ydb/core/kqp/gateway/behaviour/external_data_source/manager.cpp

@@ -87,9 +87,6 @@ TString GetOrEmpty(const NYql::TCreateObjectSettings& container, const TString&
         "service_name", // oracle
         "folder_id", // logging
         "use_ssl", // solomon
-        "reading_mode", // mongodb
-        "unexpected_type_display_mode", // mongodb
-        "unsupported_type_display_mode", // mongodb
         "grpc_location", // solomon
         "project", // solomon
         "cluster" // solomon