feat(multicloud): 补齐上线前的多云管理缺口(适配器/动作层/DNS/定时同步)
评估发现项目只有台账能力,缺失真正的多云管理链路。本次按缺口逐项补齐: 适配层 - 新增 aws / linode / namesilo 适配器,registry 登记;阿里云、腾讯云补 list_domains 与 get_account 余额 - NormalizedVPS 补 expiry_date + charge_type:此前云端同步进来的 VPS 拿不到 到期日,永远进不了续费提醒——而续费提醒正是这套台账存在的理由 - base.py 统一云端错误可读化(http_error_message / cloud_error_text):各厂商 把原因放的位置都不同(Linode errors[].reason、Cloudflare errors[].message、 腾讯 Response.Error.Message、AWS XML),此前直接 str(e) 会把 httpx 的多行文本 连同 MDN 链接弹给用户 动作层与 DNS - 新增 /api/actions:实例启停/重启/续费,写操作全部二次确认 + 审计 - 新增 Cloudflare DNS 记录的增删改查 定时同步 - scripts/sync_all_assets.py + /api/sync/assets + vps-sync-assets.timer(08:30) - 08:30 而非随机时刻:必须早于 09:00 的续费检查,否则提醒读到上一天的旧到期日 - sync_all_assets 修正计数:每一项子同步都失败时不再计为「成功」,否则凭证过期 会显示「成功 1」,用户以为数据拉到了、实际一条没有 数据一致性 - AssetRead 输出 external_id(只出不进):前端「云操作」「DNS」按钮靠它渲染, 缺了则所有按钮永远出不来 - import_assets 落库 external_id:导出带了去重键而导入丢弃,会让迁移后首次同步 把所有云端资产当新增再建一份 - _align_preset_providers 取代 _backfill_provider_services:库里声明但注册表未 实现的 sdk_type 清空(声明支持却不支持,比明说不支持更糟),services 只增量 补标签不覆盖,用户自建平台不动 前端如实展示 - cost 为 0 统一显示「未填」而非「0 USD」:0 既可能是没填、也可能是云端不返回 价格,而汇总处又把 0 当「无费用」排除,两处口径不一致 - 总览「本年支出」增加 year_cost_missing,把合计的覆盖缺口说出来 - DNS 弹窗补 MX/SRV 优先级与备注;列表请求失败时 provider 用资产自带 slug 兜底, 否则 Cloudflare 代理勾选框永远不出现 测试:257 -> 309 passed
This commit is contained in:
@@ -2,6 +2,9 @@
|
||||
|
||||
API 文档:https://docs.digitalocean.com/reference/api/
|
||||
所需配置:{"api_key": "..."}
|
||||
支持功能:Droplet 清单、账户余额、域名清单、启停/重启、DNS 记录管理
|
||||
DNS 的 zone_id 即域名本身(DO 用域名字符串定位)。
|
||||
DO 为按小时计费的订阅制,无「续费」概念,故不实现 renew_instance。
|
||||
"""
|
||||
|
||||
import httpx
|
||||
@@ -9,6 +12,7 @@ import httpx
|
||||
from app.adapters.base import (
|
||||
AccountInfo,
|
||||
BaseAdapter,
|
||||
NormalizedDNSRecord,
|
||||
NormalizedDomain,
|
||||
NormalizedVPS,
|
||||
parse_iso_date,
|
||||
@@ -24,11 +28,14 @@ class DigitalOceanAdapter(BaseAdapter):
|
||||
def _headers(self) -> dict:
|
||||
return {"Authorization": f"Bearer {self.config.get('api_key', '')}"}
|
||||
|
||||
def _get(self, path: str) -> dict:
|
||||
def _request(self, method: str, path: str, json_body: dict = None) -> dict:
|
||||
with httpx.Client(timeout=30) as client:
|
||||
resp = client.get(self.BASE + path, headers=self._headers())
|
||||
resp = client.request(method, self.BASE + path, headers=self._headers(), json=json_body)
|
||||
resp.raise_for_status()
|
||||
return resp.json()
|
||||
return resp.json() if resp.content else {}
|
||||
|
||||
def _get(self, path: str) -> dict:
|
||||
return self._request("GET", path)
|
||||
|
||||
def test_connection(self) -> dict:
|
||||
try:
|
||||
@@ -73,7 +80,10 @@ class DigitalOceanAdapter(BaseAdapter):
|
||||
memory_gb=round(mem_mb / 1024, 1) if mem_mb else None,
|
||||
disk_gb=d.get("disk"),
|
||||
status="active" if d.get("status") == "active" else (d.get("status") or "unknown"),
|
||||
# size.price_monthly 是官方规格月价,比留空让台账自己猜准得多
|
||||
monthly_cost=(d.get("size", {}) or {}).get("price_monthly"),
|
||||
currency="USD",
|
||||
charge_type="postpaid",
|
||||
raw=d,
|
||||
)
|
||||
)
|
||||
@@ -102,3 +112,119 @@ class DigitalOceanAdapter(BaseAdapter):
|
||||
break
|
||||
page += 1
|
||||
return result
|
||||
|
||||
# ---------------- 实例管理动作 ----------------
|
||||
|
||||
def _droplet_action(self, external_id: str, action_type: str, label: str) -> dict:
|
||||
try:
|
||||
data = self._request(
|
||||
"POST", f"/droplets/{external_id}/actions", {"type": action_type}
|
||||
)
|
||||
return {
|
||||
"ok": True,
|
||||
"message": f"{label}指令已下发",
|
||||
"raw": data.get("action", {}),
|
||||
}
|
||||
except httpx.HTTPStatusError as e:
|
||||
return {"ok": False, "message": f"HTTP {e.response.status_code}:{label}失败"}
|
||||
except Exception as e: # noqa: BLE001
|
||||
return {"ok": False, "message": f"{label}失败:{e}"}
|
||||
|
||||
def start_instance(self, external_id: str) -> dict:
|
||||
return self._droplet_action(external_id, "power_on", "开机")
|
||||
|
||||
def stop_instance(self, external_id: str) -> dict:
|
||||
# shutdown 是优雅关机;power_off 等同拔电源,有丢数据风险,不默认使用
|
||||
return self._droplet_action(external_id, "shutdown", "关机")
|
||||
|
||||
def reboot_instance(self, external_id: str) -> dict:
|
||||
return self._droplet_action(external_id, "reboot", "重启")
|
||||
|
||||
# ---------------- DNS 记录管理 ----------------
|
||||
|
||||
def list_dns_records(self, zone_id: str) -> list:
|
||||
result = []
|
||||
page = 1
|
||||
while True:
|
||||
data = self._get(f"/domains/{zone_id}/records?per_page=100&page={page}")
|
||||
for r in data.get("domain_records", []):
|
||||
sub = r.get("name") or "@"
|
||||
result.append(
|
||||
NormalizedDNSRecord(
|
||||
record_id=str(r.get("id")),
|
||||
zone_id=zone_id,
|
||||
name=self._fqdn(sub, zone_id),
|
||||
type=r.get("type"),
|
||||
content=r.get("data"),
|
||||
ttl=r.get("ttl"),
|
||||
priority=r.get("priority"),
|
||||
raw=r,
|
||||
)
|
||||
)
|
||||
if not data.get("links", {}).get("pages", {}).get("next"):
|
||||
break
|
||||
page += 1
|
||||
return result
|
||||
|
||||
@staticmethod
|
||||
def _fqdn(sub: str, zone_id: str) -> str:
|
||||
"""DO 存的是子域(name,如 www / @),拼成完整域名供台账展示"""
|
||||
if not sub or sub == "@":
|
||||
return zone_id
|
||||
return f"{sub}.{zone_id}"
|
||||
|
||||
@staticmethod
|
||||
def _sub(name: str, zone_id: str) -> str:
|
||||
if name == zone_id:
|
||||
return "@"
|
||||
suffix = f".{zone_id}"
|
||||
return name[: -len(suffix)] if name.endswith(suffix) else name
|
||||
|
||||
def _record_body(self, zone_id: str, record: dict) -> dict:
|
||||
body = {
|
||||
"name": self._sub(record.get("name", ""), zone_id),
|
||||
"type": record.get("type", "A"),
|
||||
"data": record.get("content", ""),
|
||||
"ttl": record.get("ttl") or 1800,
|
||||
}
|
||||
if record.get("priority") is not None:
|
||||
body["priority"] = record["priority"]
|
||||
return body
|
||||
|
||||
def create_dns_record(self, zone_id: str, record: dict) -> dict:
|
||||
try:
|
||||
data = self._request(
|
||||
"POST", f"/domains/{zone_id}/records", self._record_body(zone_id, record)
|
||||
)
|
||||
return {
|
||||
"ok": True,
|
||||
"message": "记录已创建",
|
||||
"record_id": str(data.get("domain_record", {}).get("id", "")),
|
||||
"raw": data,
|
||||
}
|
||||
except httpx.HTTPStatusError as e:
|
||||
return {"ok": False, "message": f"HTTP {e.response.status_code}:创建失败"}
|
||||
except Exception as e: # noqa: BLE001
|
||||
return {"ok": False, "message": f"创建失败:{e}"}
|
||||
|
||||
def update_dns_record(self, zone_id: str, record_id: str, record: dict) -> dict:
|
||||
try:
|
||||
self._request(
|
||||
"PUT",
|
||||
f"/domains/{zone_id}/records/{record_id}",
|
||||
self._record_body(zone_id, record),
|
||||
)
|
||||
return {"ok": True, "message": "记录已更新"}
|
||||
except httpx.HTTPStatusError as e:
|
||||
return {"ok": False, "message": f"HTTP {e.response.status_code}:更新失败"}
|
||||
except Exception as e: # noqa: BLE001
|
||||
return {"ok": False, "message": f"更新失败:{e}"}
|
||||
|
||||
def delete_dns_record(self, zone_id: str, record_id: str) -> dict:
|
||||
try:
|
||||
self._request("DELETE", f"/domains/{zone_id}/records/{record_id}")
|
||||
return {"ok": True, "message": "记录已删除"}
|
||||
except httpx.HTTPStatusError as e:
|
||||
return {"ok": False, "message": f"HTTP {e.response.status_code}:删除失败"}
|
||||
except Exception as e: # noqa: BLE001
|
||||
return {"ok": False, "message": f"删除失败:{e}"}
|
||||
|
||||
Reference in New Issue
Block a user