feat(admin): add fenced expired editorial run recovery control
Deploy Canina / deploy (push) Successful in 4m46s
Deploy Canina / deploy (push) Successful in 4m46s
This commit is contained in:
1 parent
f4add07780
commit
4712433903
9 files changed
+174
-5
No files matched your search
@@ -0,0 +1,21 @@
|
||||
import {PrepareWorkflowService} from './prepare-workflow.service';
|
||||
const sha='a'.repeat(40),runId='run';
|
||||
const task=()=>({id:'task',key:'editorial-v1:'+'a'.repeat(64),title:'Editorial research: Test',department:'CONTENT',operationMode:'PREPARE',budgetLimitCents:20,state:'RUNNING',version:6,metadata:{createdBy:'pmo',workflowScope:'STAGE_PREPARE',environment:'staging',commitSha:sha,scope:'EDITORIAL_KIND',acceptanceCriteria:['Research']},runs:[{id:runId,taskId:'task',status:'RUNNING',environment:'staging',commitSha:sha,artifacts:[]}],budgetLedger:[{id:'reserve',taskId:'task',actorId:'pmo',kind:'RESERVE',amountCents:20,idempotencyKey:'prepare-reserve:run'}]});
|
||||
// Use the real canonical proposal marker, not a permissive admission mock.
|
||||
import {EDITORIAL_PILOT_KIND} from '../orchestration-worker/editorial-bridge';
|
||||
describe('safe editorial recovery detail hint',()=>{
|
||||
let service:any,row:any,db:any,outbox:any;
|
||||
beforeEach(()=>{row=task();row.metadata.scope=EDITORIAL_PILOT_KIND+'\nTopic: Test\nResearch and evidence-backed brief only. No publication, release, production changes or execution authorization.';outbox={taskId:'task',status:'PENDING',runId,leaseOwner:'pmo',leaseToken:'NEVER_EXPOSE',leaseUntil:new Date(Date.now()-1000),reservationId:'reserve'};db={prepareWorkflowOutbox:{findUnique:jest.fn(async()=>outbox)}};service=Object.create(PrepareWorkflowService.prototype);service.db=db;service.config={reviewerIds:['owner']};});
|
||||
it('returns only matching run id to an independent reviewer',async()=>{expect(await service.editorialRecovery(row,{id:'owner',role:'SUPER_ADMIN'})).toEqual({runId});});
|
||||
it.each(['active','mismatch','artifact','reconciled','other-task','wrong-commit','wrong-mode'])('denies %s',async mode=>{
|
||||
if(mode==='active')outbox.leaseUntil=new Date(Date.now()+100000);
|
||||
if(mode==='mismatch')outbox.runId='other';
|
||||
if(mode==='artifact')row.runs[0].artifacts=[{id:'qa'}];
|
||||
if(mode==='reconciled')row.budgetLedger.push({kind:'RECONCILE',amountCents:0});
|
||||
if(mode==='other-task')row.runs[0].taskId='other';
|
||||
if(mode==='wrong-commit')row.runs[0].commitSha='b'.repeat(40);
|
||||
if(mode==='wrong-mode')row.operationMode='MUTATE_PRODUCTION';
|
||||
expect(await service.editorialRecovery(row,{id:'owner',role:'SUPER_ADMIN'})).toBeUndefined();
|
||||
});
|
||||
it('denies ordinary admin and creator',async()=>{expect(await service.editorialRecovery(row,{id:'admin',role:'Admin'})).toBeUndefined();expect(await service.editorialRecovery(row,{id:'pmo',role:'SUPER_ADMIN'})).toBeUndefined();});
|
||||
});
|
||||
@@ -130,7 +130,10 @@ export class OrchestrationController {
|
||||
);
|
||||
}
|
||||
@Get('tasks/:id') async one(@Param('id') id: string, @Req() req: any) {
|
||||
return this.safe(await this.service.findOne(id), req);
|
||||
const row = await this.service.findOne(id);
|
||||
const editorialRecovery = this.workflow
|
||||
? await this.workflow.editorialRecovery(row, this.actor(req)) : undefined;
|
||||
return { ...this.safe(row, req), ...(editorialRecovery ? { editorialRecovery } : {}) };
|
||||
}
|
||||
@Get('overview') async overview() {
|
||||
const tasks = await this.service.findAll();
|
||||
|
||||
@@ -22,6 +22,7 @@ describe('bounded workflow HTTP contracts', () => {
|
||||
},
|
||||
};
|
||||
const workflow = {
|
||||
editorialRecovery: jest.fn(async () => undefined as undefined | {runId:string}),
|
||||
create: jest.fn(async () => t),
|
||||
transition: jest.fn(async () => t),
|
||||
decide: jest.fn(async () => t),
|
||||
@@ -90,6 +91,15 @@ describe('bounded workflow HTTP contracts', () => {
|
||||
expect(task.availableActions).toEqual(['SUBMIT_GATE1']);
|
||||
}
|
||||
});
|
||||
it('adds only the safe recovery hint to detail, never the list', async () => {
|
||||
workflow.editorialRecovery.mockResolvedValueOnce({runId:'registered-run'});
|
||||
const detail=await request(app.getHttpServer()).get('/admin/orchestration/tasks/t').set('Authorization','SUPER_ADMIN').expect(200);
|
||||
expect(detail.body.editorialRecovery).toEqual({runId:'registered-run'});
|
||||
expect(workflow.editorialRecovery).toHaveBeenCalledWith(t,{id:'verified-subject',role:'SUPER_ADMIN'});
|
||||
const list=await request(app.getHttpServer()).get('/admin/orchestration/tasks').set('Authorization','SUPER_ADMIN').expect(200);
|
||||
expect(list.body[0].editorialRecovery).toBeUndefined();
|
||||
expect(JSON.stringify(detail.body)).not.toContain('secret');
|
||||
});
|
||||
it('denies ordinary users before workflow projection', async () => {
|
||||
workflow.project.mockClear();
|
||||
for (const path of ['tasks', 'tasks/t', 'overview']) {
|
||||
|
||||
@@ -517,6 +517,20 @@ export class PrepareWorkflowService {
|
||||
);
|
||||
});
|
||||
}
|
||||
/** Detail-only eligibility hint. No lease credentials leave this service. Command rechecks atomically. */
|
||||
async editorialRecovery(t: any, a: WorkflowIdentity) {
|
||||
const { admittedEditorialTask } = require('../orchestration-worker/editorial-execution');
|
||||
if (!this.reviewer(a) || t.metadata?.createdBy === a.id || t.state !== 'RUNNING' || !admittedEditorialTask(t)) return undefined;
|
||||
const o = await (this.db as any).prepareWorkflowOutbox.findUnique({ where: { taskId: t.id } });
|
||||
if (!o || o.status !== 'PENDING' || o.leaseOwner !== 'pmo' || !o.leaseUntil || !Number.isFinite(new Date(o.leaseUntil).getTime()) || new Date(o.leaseUntil).getTime() > Date.now()) return undefined;
|
||||
const r = t.runs?.find((r: any) => r.id === o.runId);
|
||||
const ledger = t.budgetLedger ?? [];
|
||||
const reserve = ledger.find((b: any) => b.id === o.reservationId);
|
||||
if (!r || r.taskId !== t.id || r.status !== 'RUNNING' || r.environment !== 'staging' || r.commitSha !== t.metadata.commitSha || !Array.isArray(r.artifacts) || r.artifacts.length ||
|
||||
!reserve || reserve.actorId !== 'pmo' || reserve.kind !== 'RESERVE' || reserve.amountCents !== 20 || reserve.idempotencyKey !== `prepare-reserve:${r.id}` ||
|
||||
ledger.some((b: any) => b.kind === 'RECONCILE') || ledger.reduce((n: number, b: any) => n + b.amountCents, 0) !== 20) return undefined;
|
||||
return { runId: r.id };
|
||||
}
|
||||
/** Stop only; never turns unknown spend into free retry capacity. */
|
||||
async editorialFailure(id: string, dto: any, a: WorkflowIdentity) {
|
||||
const held = dto.leaseToken !== undefined;
|
||||
|
||||
Reference in new issue
Block a user