iam: fix bug (res unbind) (#575)

ideal-world · Jan 4, 2024 · 7bf8401 · 7bf8401
1 parent 09260e7
commit 7bf8401
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/spi/spi-search/src/search_constants.rs b/spi/spi-search/src/search_constants.rs
@@ -2,4 +2,4 @@ pub const DOMAIN_CODE: &str = "spi-search";
 
 pub const EVENT_ADD_SEARCH: &str = "spi-search/add";
 pub const EVENT_MODIFY_SEARCH: &str = "spi-search/modify";
-pub const EVENT_DELETE_SEARCH: &str = "spi-search/delete";
+pub const EVENT_DELETE_SEARCH: &str = "spi-search/delete";
diff --git a/spi/spi-search/src/search_initializer.rs b/spi/spi-search/src/search_initializer.rs
@@ -1,8 +1,9 @@
 use bios_basic::spi::{api::spi_ci_bs_api, dto::spi_bs_dto::SpiBsCertResp, spi_constants, spi_funs::SpiBsInst, spi_initializer};
 use tardis::{
     basic::{dto::TardisContext, result::TardisResult},
+    tokio,
     web::web_server::TardisWebServer,
-    TardisFuns, TardisFunsInst, tokio,
+    TardisFuns, TardisFunsInst,
 };
 
 use crate::{api::ci::search_ci_item_api, search_config::SearchConfig, search_constants::DOMAIN_CODE, serv};

diff --git a/support/iam/src/basic/serv/iam_rel_serv.rs b/support/iam/src/basic/serv/iam_rel_serv.rs
@@ -443,12 +443,16 @@ impl IamRelServ {
                         .filter(|r| r != res_other_id)
                         .collect::<Vec<String>>();
                     // 5) If these associated resources are explicitly associated with API resources, they cannot be removed
+                    let mut res_bound = false;
                     for rel_res_id in rel_res_ids {
                         if rel_api_res_ids.contains(&rel_res_id) {
+                            res_bound = true;
                             break;
                         }
                     }
-                    remove_role_ids.push(rel_role_id);
+                    if !res_bound {
+                        remove_role_ids.push(rel_role_id);
+                    }
                 }
                 // 6) Remove API resources from binding to roles in the cache
                 IamResCacheServ::delete_res_rel(

diff --git a/support/iam/src/console_common/serv/iam_cc_account_task_serv.rs b/support/iam/src/console_common/serv/iam_cc_account_task_serv.rs
@@ -6,7 +6,11 @@ use crate::{
             iam_filer_dto::IamAccountFilterReq,
         },
         serv::{
-            clients::{iam_log_client::LogParamTag, iam_search_client::IamSearchClient}, iam_account_serv::IamAccountServ, iam_platform_serv::IamPlatformServ, iam_rel_serv::IamRelServ, iam_tenant_serv::IamTenantServ,
+            clients::{iam_log_client::LogParamTag, iam_search_client::IamSearchClient},
+            iam_account_serv::IamAccountServ,
+            iam_platform_serv::IamPlatformServ,
+            iam_rel_serv::IamRelServ,
+            iam_tenant_serv::IamTenantServ,
         },
     },
     iam_config::{IamBasicConfigApi, IamConfig},