fix(test): внедрять позднее изменение ACME после COMMIT аудита намерения
Устаревший тест, не дефект продукта. Аудит configuration.intent теперь пишется через requestAccountingWrite (транзакционный клиент), а не через pool.query, поэтому перехват pool.query в режиме late-intent не срабатывал: конкурентное изменение не внедрялось и запись законно завершалась applied. Сценарий переведён на общий фикстур afterConfigurationIntentCommit (как в mcp-acme-test.ts): изменение updated_at после фиксации намерения ловит fence перед SQL, запись не отправляется, итог unknown без повтора. Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
1 parent
ad0162d4a2
commit
c70e55d5d4
1 file changed
+5
-4
@@ -11,6 +11,7 @@ import { decryptSecret, encryptSecret } from "../modules/mcp/security.js"
|
||||
import { findMcpService } from "../modules/mcp/service-registry.js"
|
||||
import { ACME_CLOUDFLARE_SECRET_PURPOSE } from "../modules/mcp/acme-settings-actions.js"
|
||||
import certificatesRoutes from "../routes/certificates.js"
|
||||
import { afterConfigurationIntentCommit } from "./fixtures/configuration-audit-commit.js"
|
||||
|
||||
/** Isolated SQL/HTTP fixture only. No ACME account, Cloudflare, DNS or RouterOS requests. */
|
||||
export async function verifyMcpAcmeSettings(actor: AuthUser) {
|
||||
@@ -104,11 +105,10 @@ export async function verifyMcpAcmeSettings(actor: AuthUser) {
|
||||
for(const mode of ["late-intent","ignored","partial","lost"]) {
|
||||
const plan = await prepare({secretRef,settings:{defaultZoneId:"desired-"+mode}}); await approvePlan(plan.planId,owner,true)
|
||||
let fired = false, writes = 0
|
||||
// The intent audit commits on a transaction client, so drift is injected after that COMMIT.
|
||||
const drift = mode === "late-intent" ? afterConfigurationIntentCommit("acme-settings", () => originalQuery("UPDATE acme_settings SET updated_at=updated_at+interval '1 second' WHERE id=1")) : undefined
|
||||
pool.query = ((...args: unknown[]) => {
|
||||
const sql = typeof args[0] === "string" ? args[0] : (args[0] as {text?: string})?.text, params = args[1] as unknown[] | undefined
|
||||
if (!fired && mode === "late-intent" && sql?.startsWith("INSERT INTO mcp_audit") && params?.[1] === "configuration.intent" && String(params?.[3]).includes('"kind":"acme-settings"')) {
|
||||
fired = true; return (originalQuery as (...a: unknown[]) => Promise<unknown>)(...args).then(async value => {await originalQuery("UPDATE acme_settings SET updated_at=updated_at+interval '1 second' WHERE id=1");return value})
|
||||
}
|
||||
if(sql?.startsWith("UPDATE acme_settings SET directory_url=$1") && sql.includes("RETURNING id")) {
|
||||
writes++; fired = true
|
||||
if(mode === "ignored") return Promise.resolve({rows:[{id:1}],rowCount:1})
|
||||
@@ -119,13 +119,14 @@ export async function verifyMcpAcmeSettings(actor: AuthUser) {
|
||||
}) as typeof pool.query
|
||||
try {
|
||||
const key = randomUUID(), op = await applyPlan(principal,plan.planId,key), outcome = await wait(op.id)
|
||||
if (drift) fired = drift.fired()
|
||||
assert.equal(outcome.state,mode === "ignored" || mode === "partial" ? "partial" : "unknown"); assert.equal(fired,true); assert.equal(writes,mode === "late-intent"?0:1)
|
||||
if(mode === "lost") {
|
||||
assert.equal((await read()).default_zone_id,"desired-lost"); assert.equal((await read()).cloudflare_api_token,replacement)
|
||||
assert.deepEqual(await service.reconcile!(await internal(plan.planId),async()=>{}),{matchesDesiredState:false,matchesOriginalState:false})
|
||||
}
|
||||
await applyPlan(principal,plan.planId,key); assert.equal(writes,mode === "late-intent"?0:1)
|
||||
} finally { pool.query = originalQuery as typeof pool.query }
|
||||
} finally { pool.query = originalQuery as typeof pool.query; drift?.restore() }
|
||||
}
|
||||
const cancelled = new AbortController(); cancelled.abort(); await assert.rejects(invokeMcpTool(principal,"mm_acme_settings_update_plan",{},cancelled.signal))
|
||||
const paused = await prepare({settings:{defaultZoneId:"revoked"}}); await approvePlan(paused.planId,owner,true)
|
||||
|
||||
Reference in new issue
Block a user