feat: modify delete user secret logic for using system token

cloudforet-io · Oct 25, 2024 · 00030fa · 00030fa
1 parent d6b1684
commit 00030fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/spaceone/secret/manager/user_secret_manager.py b/src/spaceone/secret/manager/user_secret_manager.py
@@ -39,7 +39,7 @@ def _rollback(old_data):
     def delete_user_secret_by_vo(user_secret_vo):
         user_secret_vo.delete()
 
-    def get_user_secret(self, user_secret_id, domain_id, user_id=None):
+    def get_user_secret(self, user_secret_id: str, domain_id: str, user_id: str = None):
         conditions = {
             "user_secret_id": user_secret_id,
             "domain_id": domain_id,

diff --git a/src/spaceone/secret/service/user_secret_service.py b/src/spaceone/secret/service/user_secret_service.py
@@ -113,9 +113,14 @@ def delete(self, params):
         """
 
         user_secret_id = params["user_secret_id"]
-        user_id = params["user_id"]
         domain_id = params["domain_id"]
 
+        role_type = self.transaction.get_meta("role_type")
+        if role_type == "SYSTEM_TOKEN":
+            user_id = None
+        else:
+            user_id = params["user_id"]
+
         user_secret_vo = self.user_secret_mgr.get_user_secret(
             user_secret_id, domain_id, user_id
         )