remove usage scope validations for tenant and node type KIKIMR-14276

ref:a4f5337c25c348bacdb05b7c4d86b6c4ce332f21

4 files changed, 1 insertions, 29 deletions

diff --git a/ydb/core/cms/console/configs_config.cpp b/ydb/core/cms/console/configs_config.cpp
index 562bd1979fb..49447c5cd88 100644
--- a/ydb/core/cms/console/configs_config.cpp
+++ b/ydb/core/cms/console/configs_config.cpp
@@ -14,8 +14,6 @@ void TConfigsConfig::Clear()
 {
     AllowedNodeIdScopeKinds.clear();
     AllowedHostScopeKinds.clear();
-    AllowedTenantScopeKinds.clear();
-    AllowedNodeTypeScopeKinds.clear();
     DisallowedDomainScopeKinds.clear();
 }
 
@@ -27,10 +25,6 @@ void TConfigsConfig::Parse(const NKikimrConsole::TConfigsConfig &config)
         AllowedNodeIdScopeKinds.insert(kind);
     for (auto &kind : config.GetUsageScopeRestrictions().GetAllowedHostUsageScopeKinds())
         AllowedHostScopeKinds.insert(kind);
-    for (auto &kind : config.GetUsageScopeRestrictions().GetAllowedTenantUsageScopeKinds())
-        AllowedTenantScopeKinds.insert(kind);
-    for (auto &kind : config.GetUsageScopeRestrictions().GetAllowedNodeTypeUsageScopeKinds())
-        AllowedNodeTypeScopeKinds.insert(kind);
     for (auto &kind : config.GetUsageScopeRestrictions().GetDisallowedDomainUsageScopeKinds())
         DisallowedDomainScopeKinds.insert(kind);
 
diff --git a/ydb/core/cms/console/configs_config.h b/ydb/core/cms/console/configs_config.h
index ed1f5858c71..f2c139a4a73 100644
--- a/ydb/core/cms/console/configs_config.h
+++ b/ydb/core/cms/console/configs_config.h
@@ -20,8 +20,6 @@ struct TConfigsConfig {
 
     THashSet<ui32> AllowedNodeIdScopeKinds;
     THashSet<ui32> AllowedHostScopeKinds;
-    THashSet<ui32> AllowedTenantScopeKinds;
-    THashSet<ui32> AllowedNodeTypeScopeKinds;
     THashSet<ui32> DisallowedDomainScopeKinds;
 
     NKikimrConsole::EValidationLevel ValidationLevel;
diff --git a/ydb/core/cms/console/console_configs_manager.cpp b/ydb/core/cms/console/console_configs_manager.cpp
index a0415de947b..fdf490870fe 100644
--- a/ydb/core/cms/console/console_configs_manager.cpp
+++ b/ydb/core/cms/console/console_configs_manager.cpp
@@ -171,13 +171,6 @@ bool TConfigsManager::IsConfigItemScopeAllowed(TConfigItem::TPtr item,
                 return false;
         return config.AllowedHostScopeKinds.contains(item->Kind);
     }
-    if (item->UsageScope.Tenant && item->UsageScope.NodeType)
-        return (config.AllowedTenantScopeKinds.contains(item->Kind)
-                && config.AllowedNodeTypeScopeKinds.contains(item->Kind));
-    if (item->UsageScope.Tenant)
-        return config.AllowedTenantScopeKinds.contains(item->Kind);
-    if (item->UsageScope.NodeType)
-        return config.AllowedNodeTypeScopeKinds.contains(item->Kind);
     return !config.DisallowedDomainScopeKinds.contains(item->Kind);
 }
 
diff --git a/ydb/core/cms/console/console_ut_configs.cpp b/ydb/core/cms/console/console_ut_configs.cpp
index 0cb1655281d..8bf533a4c5c 100644
--- a/ydb/core/cms/console/console_ut_configs.cpp
+++ b/ydb/core/cms/console/console_ut_configs.cpp
@@ -2020,10 +2020,6 @@ Y_UNIT_TEST_SUITE(TConsoleConfigTests) {
         config.MutableConfigsConfig()->MutableUsageScopeRestrictions()
             ->AddAllowedHostUsageScopeKinds(NKikimrConsole::TConfigItem::LogConfigItem);
         config.MutableConfigsConfig()->MutableUsageScopeRestrictions()
-            ->AddAllowedTenantUsageScopeKinds(NKikimrConsole::TConfigItem::LogConfigItem);
-        config.MutableConfigsConfig()->MutableUsageScopeRestrictions()
-            ->AddAllowedNodeTypeUsageScopeKinds(NKikimrConsole::TConfigItem::LogConfigItem);
-        config.MutableConfigsConfig()->MutableUsageScopeRestrictions()
             ->ClearDisallowedDomainUsageScopeKinds();
         CheckSetConfig(runtime, config, Ydb::StatusIds::SUCCESS);
 
@@ -2044,16 +2040,7 @@ Y_UNIT_TEST_SUITE(TConsoleConfigTests) {
         CheckSetConfig(runtime, config, Ydb::StatusIds::BAD_REQUEST);
         config.MutableConfigsConfig()->MutableUsageScopeRestrictions()
             ->AddAllowedHostUsageScopeKinds(NKikimrConsole::TConfigItem::LogConfigItem);
-        config.MutableConfigsConfig()->MutableUsageScopeRestrictions()
-            ->ClearAllowedTenantUsageScopeKinds();
-        CheckSetConfig(runtime, config, Ydb::StatusIds::BAD_REQUEST);
-        config.MutableConfigsConfig()->MutableUsageScopeRestrictions()
-            ->AddAllowedTenantUsageScopeKinds(NKikimrConsole::TConfigItem::LogConfigItem);
-        config.MutableConfigsConfig()->MutableUsageScopeRestrictions()
-            ->ClearAllowedNodeTypeUsageScopeKinds();
-        CheckSetConfig(runtime, config, Ydb::StatusIds::BAD_REQUEST);
-        config.MutableConfigsConfig()->MutableUsageScopeRestrictions()
-            ->AddAllowedNodeTypeUsageScopeKinds(NKikimrConsole::TConfigItem::LogConfigItem);
+        CheckSetConfig(runtime, config, Ydb::StatusIds::SUCCESS);
         config.MutableConfigsConfig()->MutableUsageScopeRestrictions()
             ->AddDisallowedDomainUsageScopeKinds(NKikimrConsole::TConfigItem::LogConfigItem);
         CheckSetConfig(runtime, config, Ydb::StatusIds::BAD_REQUEST);