- R4:封存子进程 SIGTERM 宽限停、libraryctl 信号转 ctx;失败/超时后 agent 再做 有界 recover,恢复失败即降级阻断封存并给出原因;启动先恢复、关闭等恢复完成 - R5:封存闸口以已存 payload 为准,同作业号换范围 409 且不入新队;重放回显真实状态 - R6:作业列表按类型查询(ListByType),不再先取全局再过滤 - R7:根目录 libraryagent 二进制移出版本库,保留运行产物并精确忽略 - UI:发布管理只保留对内/对外两目标,整合快照/完整性/作业/存储;链路未接线项禁用 并标原因;整库版本独立导航并入;文档级旧流程折叠保留
This commit is contained in:
@@ -86,18 +86,25 @@ func TestLibraryCaptureRejectsInvalidRequest(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestLibraryCaptureJobsListsOnlyCaptureJobs(t *testing.T) {
|
||||
store := &fakeJobStore{listResult: []jobs.Job{
|
||||
{ID: "a", Type: libraryCaptureJobType, State: "completed",
|
||||
Payload: json.RawMessage(`{"scope":"internal","capture_job":"lib-internal-1","requested_by":"yaozhanghao"}`),
|
||||
CreatedAt: time.Date(2026, 10, 28, 3, 0, 0, 0, time.UTC)},
|
||||
{ID: "b", Type: "artifact.fetch", State: "completed"},
|
||||
}}
|
||||
func TestLibraryCaptureJobsAsksStoreForItsOwnType(t *testing.T) {
|
||||
// The global queue is busy with unrelated traffic; the capture job must still
|
||||
// be visible because the query is type-scoped, not filtered after the fact.
|
||||
store := &fakeJobStore{
|
||||
listResult: []jobs.Job{{ID: "busy", Type: "artifact.fetch", State: "running"}},
|
||||
listByTypeResult: []jobs.Job{
|
||||
{ID: "a", Type: libraryCaptureJobType, State: "completed",
|
||||
Payload: json.RawMessage(`{"scope":"internal","capture_job":"lib-internal-1","requested_by":"yaozhanghao"}`),
|
||||
CreatedAt: time.Date(2026, 10, 28, 3, 0, 0, 0, time.UTC)},
|
||||
},
|
||||
}
|
||||
recorder := httptest.NewRecorder()
|
||||
libraryCaptureJobs(recorder, httptest.NewRequest(http.MethodGet, "/api/v1/library/captures", nil), Config{Store: store})
|
||||
if recorder.Code != http.StatusOK {
|
||||
t.Fatalf("status=%d", recorder.Code)
|
||||
}
|
||||
if store.listType != libraryCaptureJobType {
|
||||
t.Fatalf("store queried with type %q", store.listType)
|
||||
}
|
||||
var body struct {
|
||||
Available bool `json:"available"`
|
||||
Jobs []map[string]any `json:"jobs"`
|
||||
@@ -109,3 +116,44 @@ func TestLibraryCaptureJobsListsOnlyCaptureJobs(t *testing.T) {
|
||||
t.Fatalf("unexpected body %+v", body)
|
||||
}
|
||||
}
|
||||
|
||||
// Reusing a capture job id with another scope must be refused, and the response
|
||||
// must report the scope that was actually stored.
|
||||
func TestLibraryCaptureRejectsScopeConflictForReusedJob(t *testing.T) {
|
||||
store := &fakeJobStore{enqueueResult: &jobs.Job{ID: "existing-job", Type: libraryCaptureJobType,
|
||||
State: jobs.StateCompleted,
|
||||
Payload: json.RawMessage(`{"scope":"internal","capture_job":"lib-shared","requested_by":"yaozhanghao"}`)}}
|
||||
recorder := httptest.NewRecorder()
|
||||
libraryCaptureEnqueue(recorder, captureRequest(`{"scope":"external","job":"lib-shared"}`),
|
||||
Config{Store: store, LibraryAgentSocket: "/run/library-agent/agent.sock"})
|
||||
if recorder.Code != http.StatusConflict {
|
||||
t.Fatalf("status=%d body=%s", recorder.Code, recorder.Body.String())
|
||||
}
|
||||
var body map[string]any
|
||||
if err := json.Unmarshal(recorder.Body.Bytes(), &body); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if body["code"] != "library_capture_scope_conflict" || body["existing_scope"] != "internal" || body["requested_scope"] != "external" {
|
||||
t.Fatalf("unexpected conflict body %v", body)
|
||||
}
|
||||
}
|
||||
|
||||
// A reused job id with an identical request is answered from the stored row.
|
||||
func TestLibraryCaptureReplayReportsStoredJob(t *testing.T) {
|
||||
store := &fakeJobStore{enqueueResult: &jobs.Job{ID: "existing-job", Type: libraryCaptureJobType,
|
||||
State: jobs.StateCompleted,
|
||||
Payload: json.RawMessage(`{"scope":"internal","capture_job":"lib-shared","requested_by":"yaozhanghao"}`)}}
|
||||
recorder := httptest.NewRecorder()
|
||||
libraryCaptureEnqueue(recorder, captureRequest(`{"scope":"internal","job":"lib-shared"}`),
|
||||
Config{Store: store, LibraryAgentSocket: "/run/library-agent/agent.sock"})
|
||||
if recorder.Code != http.StatusAccepted {
|
||||
t.Fatalf("status=%d body=%s", recorder.Code, recorder.Body.String())
|
||||
}
|
||||
var body map[string]any
|
||||
if err := json.Unmarshal(recorder.Body.Bytes(), &body); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if body["scope"] != "internal" || body["capture_job"] != "lib-shared" || body["reused"] != true || body["job_id"] != "existing-job" {
|
||||
t.Fatalf("unexpected replay body %v", body)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user