Replace proto map

ref:ad31bb9cf4b54a7b7aa7daddafeedbdf49741c3d

2 files changed, 16 insertions, 9 deletions

diff --git a/ydb/core/yq/libs/config/protos/control_plane_storage.proto b/ydb/core/yq/libs/config/protos/control_plane_storage.proto
index 086d980ccf1..6ed1169fae2 100644
--- a/ydb/core/yq/libs/config/protos/control_plane_storage.proto
+++ b/ydb/core/yq/libs/config/protos/control_plane_storage.proto
@@ -8,10 +8,15 @@ import "ydb/core/yq/libs/config/protos/storage.proto";
 
 ////////////////////////////////////////////////////////////
 
+message TMapItem {
+    string Key = 1;
+    string Value = 2;
+}
+
 message TQueryMapping {
-    map<string, string> CloudIdToTenantName  = 1;
-    map<string, string> ScopeToTenantName = 2;
-    repeated string CommonTenantName        = 3;
+    repeated TMapItem CloudIdToTenantName  = 1;
+    repeated TMapItem ScopeToTenantName    = 2;
+    repeated string CommonTenantName       = 3;
 }
 
 message TControlPlaneStorageConfig {
diff --git a/ydb/core/yq/libs/control_plane_storage/ydb_control_plane_storage_queries.cpp b/ydb/core/yq/libs/control_plane_storage/ydb_control_plane_storage_queries.cpp
index 1c6957443aa..cec2f1b7fb6 100644
--- a/ydb/core/yq/libs/control_plane_storage/ydb_control_plane_storage_queries.cpp
+++ b/ydb/core/yq/libs/control_plane_storage/ydb_control_plane_storage_queries.cpp
@@ -44,16 +44,18 @@ TString TYdbControlPlaneStorageActor::AssignTenantName(const TString& cloudId, c
     const auto& mapping = Config.Proto.GetMapping();
 
     if (scope) {
-        const auto it = mapping.GetScopeToTenantName().find(scope);
-        if (it != mapping.GetScopeToTenantName().end()) {
-            return it->second;
+        for (const auto& scopeToTenant: mapping.GetScopeToTenantName()) {
+            if (scopeToTenant.GetKey() == scope) {
+                return scopeToTenant.GetValue();
+            }
         }
     }
 
     if (cloudId) {
-        const auto it = mapping.GetCloudIdToTenantName().find(cloudId);
-        if (it != mapping.GetCloudIdToTenantName().end()) {
-            return it->second;
+        for (const auto& cloudToTenant: mapping.GetCloudIdToTenantName()) {
+            if (cloudToTenant.GetKey() == cloudId) {
+                return cloudToTenant.GetValue();
+            }
         }
     }