Skip to content

Commit 2f42566

Browse files
committed
feat: add skip condition when try to save duplicated resource
Signed-off-by: ImMin5 <[email protected]>
1 parent 82621aa commit 2f42566

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

src/spaceone/identity/service/job_service.py

+11-2
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ def _create_service_account(
581581
trusted_secret_id: str,
582582
provider: str,
583583
sync_options: dict = None,
584-
) -> ServiceAccount:
584+
) -> Union[ServiceAccount, None]:
585585
domain_id = project_vo.domain_id
586586
workspace_id = project_vo.workspace_id
587587
project_id = project_vo.project_id
@@ -630,7 +630,16 @@ def _create_service_account(
630630
if secret_schema_id:
631631
params["schema_id"] = secret_schema_id
632632

633-
service_account_vo = self.service_account_mgr.create_service_account(params)
633+
# When the same name exists, skip creating service account
634+
try:
635+
service_account_vo = self.service_account_mgr.create_service_account(
636+
params
637+
)
638+
except ERROR_SAVE_UNIQUE_VALUES:
639+
_LOGGER.error(
640+
f"[_create_service_account] Skip => duplicate service account name. reference id: {reference_id}, {provider} {name} {domain_id} {workspace_id}"
641+
)
642+
return
634643

635644
if secret_data:
636645
secret_mgr: SecretManager = self.locator.get_manager("SecretManager")

src/spaceone/identity/service/user_profile_service.py

-3
Original file line numberDiff line numberDiff line change
@@ -373,10 +373,7 @@ def get_workspaces(
373373
role_type=["WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
374374
)
375375

376-
for role_vo in role_vos:
377-
print(role_vo.to_dict())
378376
role_name_map = {role_vo.role_id: role_vo.name for role_vo in role_vos}
379-
print(role_name_map)
380377
role_bindings_info_map = {rb.workspace_id: rb.to_dict() for rb in rb_vos}
381378

382379
workspaces_info = [workspace_vo.to_dict() for workspace_vo in workspace_vos]

0 commit comments

Comments
 (0)