已合并
fix(mtls): 证书绑定数据库bug修复&集群删除后绑定逻辑优化 #541
Wal1et创建于 14 天前
fix(mtls): 证书绑定数据库bug修复&集群删除后绑定逻辑优化 #541
已合并
共 4 个文件变更+61-9
| @@ -8,8 +8,13 @@ from typing import Any, Literal | |||
| 8 | 8 | ||
| 9 | from openjiuwen_runtime.foundation.db.handler import DBHandler | 9 | from openjiuwen_runtime.foundation.db.handler import DBHandler |
| 10 | 10 | ||
| 11 | -from manager_server.infrastructure.utils import iso_datetime, new_uuid4, utc_now | 11 | +from manager_server.core.instance.config_host_probe import ( |
| 12 | + require_config_hosts_reachable, | ||
| 13 | +) | ||
| 12 | from manager_server.infrastructure.common import resolve_order_by | 14 | from manager_server.infrastructure.common import resolve_order_by |
| 15 | +from manager_server.infrastructure.utils import iso_datetime, new_uuid4, utc_now | ||
| 16 | +from manager_server.models.instance_models import INSTANCE_INFO_TABLE_DEF | ||
| 17 | +from manager_server.models.link_binding_models import INSTANCE_LINK_BINDING_TABLE_DEF | ||
| 13 | from manager_server.schemas.instance_schemas import ( | 18 | from manager_server.schemas.instance_schemas import ( |
| 14 | CreateInstanceBody, | 19 | CreateInstanceBody, |
| 15 | InstanceDetail, | 20 | InstanceDetail, |
| @@ -17,10 +22,6 @@ from manager_server.schemas.instance_schemas import ( | |||
| 17 | InstanceSummary, | 22 | InstanceSummary, |
| 18 | InstanceUpdateBody, | 23 | InstanceUpdateBody, |
| 19 | ) | 24 | ) |
| 20 | -from manager_server.models.instance_models import INSTANCE_INFO_TABLE_DEF | ||
| 21 | -from manager_server.core.instance.config_host_probe import ( | ||
| 22 | - require_config_hosts_reachable, | ||
| 23 | -) | ||
| 24 | 25 | ||
| 25 | logger = logging.getLogger(__name__) | 26 | logger = logging.getLogger(__name__) |
| 26 | 27 | ||
| @@ -588,6 +589,10 @@ async def list_instance_rows( | |||
| 588 | 589 | ||
| 589 | 590 | ||
| 590 | async def delete_instance_row(handler: DBHandler, jiuwenclaw_id: str) -> None: | 591 | async def delete_instance_row(handler: DBHandler, jiuwenclaw_id: str) -> None: |
| 592 | + await handler.delete( | ||
| 593 | + INSTANCE_LINK_BINDING_TABLE_DEF.table_name, | ||
| 594 | + {"jiuwenclaw_id": jiuwenclaw_id}, | ||
| 595 | + ) | ||
| 591 | await handler.delete(_INSTANCE_TABLE, {"jiuwenclaw_id": jiuwenclaw_id}) | 596 | await handler.delete(_INSTANCE_TABLE, {"jiuwenclaw_id": jiuwenclaw_id}) |
| 592 | from manager_server.security.keys import delete_instance_enc_pubkey | 597 | from manager_server.security.keys import delete_instance_enc_pubkey |
| 593 | 598 | ||