feat: Vultr/DO/Cloudflare适配器分页处理(避免多VPS/域名同步遗漏)+ 分页测试

This commit is contained in:
gouki
2026-08-02 17:59:51 +00:00
parent 8ba58caaa8
commit 3ef84180b4
4 changed files with 135 additions and 68 deletions
+7 -1
View File
@@ -42,8 +42,10 @@ class CloudflareAdapter(BaseAdapter):
return {"ok": False, "message": str(e)}
def list_domains(self) -> list:
data = self._get("/zones?per_page=50")
result = []
page = 1
while True:
data = self._get(f"/zones?per_page=50&page={page}")
for z in data.get("result", []):
result.append(
NormalizedDomain(
@@ -54,4 +56,8 @@ class CloudflareAdapter(BaseAdapter):
raw=z,
)
)
info = data.get("result_info", {})
if page >= info.get("total_pages", 1):
break
page += 1
return result
+17 -5
View File
@@ -52,8 +52,10 @@ class DigitalOceanAdapter(BaseAdapter):
return None
def list_vps(self) -> list:
data = self._get("/droplets")
result = []
page = 1
while True:
data = self._get(f"/droplets?per_page=100&page={page}")
for d in data.get("droplets", []):
image = d.get("image", {})
os_name = f"{image.get('distribution', '')} {image.get('name', '')}".strip()
@@ -74,16 +76,26 @@ class DigitalOceanAdapter(BaseAdapter):
raw=d,
)
)
if not data.get("links", {}).get("pages", {}).get("next"):
break
page += 1
return result
def list_domains(self) -> list:
data = self._get("/domains")
return [
result = []
page = 1
while True:
data = self._get(f"/domains?per_page=100&page={page}")
for d in data.get("domains", []):
result.append(
NormalizedDomain(
external_id=d.get("name"),
domain_name=d.get("name"),
registrar="digitalocean",
raw=d,
)
for d in data.get("domains", [])
]
)
if not data.get("links", {}).get("pages", {}).get("next"):
break
page += 1
return result
+23 -5
View File
@@ -49,8 +49,13 @@ class VultrAdapter(BaseAdapter):
)
def list_vps(self) -> list:
data = self._get("/instances")
result = []
cursor = ""
while True:
path = "/instances?per_page=100"
if cursor:
path += f"&cursor={cursor}"
data = self._get(path)
for inst in data.get("instances", []):
ram_mb = inst.get("ram") or 0
result.append(
@@ -69,16 +74,29 @@ class VultrAdapter(BaseAdapter):
raw=inst,
)
)
cursor = data.get("meta", {}).get("links", {}).get("next") or ""
if not cursor:
break
return result
def list_domains(self) -> list:
data = self._get("/domains")
return [
result = []
cursor = ""
while True:
path = "/domains?per_page=100"
if cursor:
path += f"&cursor={cursor}"
data = self._get(path)
for d in data.get("domains", []):
result.append(
NormalizedDomain(
external_id=d.get("domain"),
domain_name=d.get("domain"),
registrar="vultr",
raw=d,
)
for d in data.get("domains", [])
]
)
cursor = data.get("meta", {}).get("links", {}).get("next") or ""
if not cursor:
break
return result
+31
View File
@@ -220,3 +220,34 @@ def test_ai_capabilities_account_only():
def test_registry_supports_ai_types():
for t in ["deepseek-api", "moonshot-api", "openai-api", "minimax-api"]:
assert registry.is_supported(t), f"{t} 应被支持"
# --------------------------- 分页处理 --------------------------- #
def test_vultr_pagination_cursor():
adapter = VultrAdapter({"api_key": "x"})
page1 = {"instances": [{"id": "a", "label": "a", "ram": 1024}], "meta": {"links": {"next": "cursor2"}}}
page2 = {"instances": [{"id": "b", "label": "b", "ram": 2048}], "meta": {"links": {"next": ""}}}
with patch.object(VultrAdapter, "_get", side_effect=[page1, page2]):
result = adapter.list_vps()
assert len(result) == 2
assert {v.external_id for v in result} == {"a", "b"}
def test_do_pagination_page():
adapter = DigitalOceanAdapter({"api_key": "x"})
page1 = {"droplets": [{"id": 1, "name": "d1", "memory": 1024, "networks": {"v4": []}}], "links": {"pages": {"next": "x"}}}
page2 = {"droplets": [{"id": 2, "name": "d2", "memory": 1024, "networks": {"v4": []}}], "links": {}}
with patch.object(DigitalOceanAdapter, "_get", side_effect=[page1, page2]):
result = adapter.list_vps()
assert len(result) == 2
assert {v.external_id for v in result} == {"1", "2"}
def test_cloudflare_pagination_result_info():
adapter = CloudflareAdapter({"api_token": "x"})
page1 = {"result": [{"id": "z1", "name": "a.com", "status": "active"}], "result_info": {"total_pages": 2, "page": 1}}
page2 = {"result": [{"id": "z2", "name": "b.com", "status": "active"}], "result_info": {"total_pages": 2, "page": 2}}
with patch.object(CloudflareAdapter, "_get", side_effect=[page1, page2]):
result = adapter.list_domains()
assert len(result) == 2
assert {d.domain_name for d in result} == {"a.com", "b.com"}