diff --git a/dashboard/src/apiReleaseTasks.ts b/dashboard/src/apiReleaseTasks.ts index bc8652cf..0b5860c4 100644 --- a/dashboard/src/apiReleaseTasks.ts +++ b/dashboard/src/apiReleaseTasks.ts @@ -28,6 +28,23 @@ export function getReleaseTasksPage(filters?: { return request(`/releases/tasks/query${q}`) } +export function getReleaseTaskGateStatus(id: number) { + return request(`/releases/tasks/${id}/gate-status`) +} + export function deployReleaseTask(id: number, data?: { actor?: string; note?: string | null; confirm_phrase?: string | null }) { return request(`/releases/tasks/${id}/deploy`, { method: 'POST', body: JSON.stringify(data || {}) }) } + +export function attachReleaseTaskPrebuiltImage( + id: number, + data: { + service_key: string + image_digest: string + source_commit_sha: string + image_source?: string + build_evidence?: Record + }, +) { + return request(`/releases/tasks/${id}/attach-prebuilt-image`, { method: 'POST', body: JSON.stringify(data) }) +} diff --git a/dashboard/src/pages/ReleaseTaskDetailPanel.tsx b/dashboard/src/pages/ReleaseTaskDetailPanel.tsx index cbe6604e..fe898e9c 100644 --- a/dashboard/src/pages/ReleaseTaskDetailPanel.tsx +++ b/dashboard/src/pages/ReleaseTaskDetailPanel.tsx @@ -1,3 +1,4 @@ +import { useState } from 'react' import { ReleaseTask } from '../api' import { OverlayModal, StateBadge } from '../components/workbench' import { STATUS_LABEL, releaseTone } from './releaseListUi' @@ -124,17 +125,48 @@ export function ReleaseTaskDetailModal({ task, onClose, onRefresh, + onAttachPrebuiltImage, }: Readonly<{ task: ReleaseTask | null onClose: () => void onRefresh: () => void + onAttachPrebuiltImage?: ( + task: ReleaseTask, + payload: { image_digest: string; source_commit_sha: string }, + ) => Promise }>) { + const [prebuiltDigest, setPrebuiltDigest] = useState('') + const [prebuiltCommit, setPrebuiltCommit] = useState('') + const [prebuiltBusy, setPrebuiltBusy] = useState(false) if (!task) return null const hasDeployment = Boolean(task.deployment_record_id) const showFailure = shouldShowReleaseTaskFailure(task) const failureLogExcerpt = showFailure ? releaseTaskFailureLogExcerpt(task) : null const failureLogError = showFailure ? releaseTaskFailureLogError(task) : null const safeMetadata = displayDeploymentMetadata(task) + const taskMetadata = (task as ReleaseTask & { task_metadata?: Record }).task_metadata || {} + const attachedPrebuiltImage = metadataString(taskMetadata, 'prebuiltImageDigest') + const attachedPrebuiltCommit = metadataString(taskMetadata, 'sourceCommitSha') + const canAttachPrebuiltImage = task.environment === 'staging' + && task.project_key === 'synapse-network' + && ['user-front', 'docs-front'].includes(task.service_key || '') + && task.status === 'requested' + && !task.deployment_record_id + && Boolean(onAttachPrebuiltImage) + const submitPrebuiltImage = async () => { + if (!task || !onAttachPrebuiltImage) return + setPrebuiltBusy(true) + try { + await onAttachPrebuiltImage(task, { + image_digest: prebuiltDigest.trim(), + source_commit_sha: prebuiltCommit.trim(), + }) + setPrebuiltDigest('') + setPrebuiltCommit('') + } finally { + setPrebuiltBusy(false) + } + } return ( {task.note} : null} + {task.environment === 'staging' && ['user-front', 'docs-front'].includes(task.service_key || '') ? ( +
+

Prebuilt Image

+ {attachedPrebuiltImage ? ( +
+
Prebuilt image attached. Staging frontend workflow will deploy by immutable digest and skip Cloud Build.
+
{attachedPrebuiltImage}
+ {attachedPrebuiltCommit ?
commit {attachedPrebuiltCommit}
: null} +
+ ) : ( +
+ 可选:先用本地 ephemeral worktree 构建并推送镜像,再把 immutable digest 绑定到此任务。发布时 Actions 会校验 digest 并直接部署。 +
+ )} + {canAttachPrebuiltImage ? ( +
+ + + +
+ ) : null} +
+ ) : null} +

PR Gate

diff --git a/dashboard/src/pages/ReleaseTasksTable.tsx b/dashboard/src/pages/ReleaseTasksTable.tsx new file mode 100644 index 00000000..405aeedd --- /dev/null +++ b/dashboard/src/pages/ReleaseTasksTable.tsx @@ -0,0 +1,268 @@ +import { ReleaseTask } from '../api' +import { EmptyPane, StateBadge } from '../components/workbench' +import { + ReleaseTaskCompactFailure, + ReleaseTaskFailureSnippet, + ReleaseTaskPrGate, + releaseTaskFailureSummary, + shouldShowReleaseTaskFailure, +} from './ReleaseTaskDetailPanel' +import { STATUS_LABEL, releaseTone } from './releaseListUi' + +const SOURCE_LABEL: Record = { + manual: '人工创建', + requirement_flow: '需求流转', +} + +export type GateRequestState = { + status: 'idle' | 'loading' | 'ready' | 'error' + gate?: ReleaseTask['pr_gate'] + error?: string +} + +function formatTime(value: string | null) { + if (!value) return '-' + return new Date(value.endsWith('Z') ? value : `${value}Z`).toLocaleString('zh-CN') +} + +function CompactListText({ value }: Readonly<{ value: string | null | undefined }>) { + const summary = releaseTaskFailureSummary(value, 180) + if (!summary.text) return - + return ( +
+
{summary.text}
+ {summary.truncated ?
详情查看完整内容
: null} +
+ ) +} + +export function ReleaseTasksTable({ + tasks, + total, + limit, + offset, + loading, + busyAction, + gateStatusByTaskId, + onUpdateStatus, + onCreatePr, + onDeployStaging, + onDeployProduction, + onRefreshGate, + onRefresh, + onOpenDetails, + onPage, +}: Readonly<{ + tasks: ReleaseTask[] + total: number + limit: number + offset: number + loading: boolean + busyAction: string | null + gateStatusByTaskId: Record + onUpdateStatus: (task: ReleaseTask, status: 'completed' | 'failed' | 'cancelled') => void + onCreatePr: (task: ReleaseTask) => void + onDeployStaging: (task: ReleaseTask) => void + onDeployProduction: (task: ReleaseTask) => void + onRefreshGate: (task: ReleaseTask) => void + onRefresh: () => void + onOpenDetails: (task: ReleaseTask) => void + onPage: (offset: number) => void +}>) { + const pageNumber = Math.floor(offset / limit) + 1 + const canPrev = offset > 0 + const canNext = offset + limit < total + return ( +
+
+ + + + + + + + + + + + + + + {tasks.map((task) => { + const gateState = gateStatusByTaskId[task.id] + const effectiveTask = gateState?.gate ? { ...task, pr_gate: gateState.gate } : task + const effectiveGate = effectiveTask.pr_gate + const taskMetadata = (task as ReleaseTask & { task_metadata?: Record }).task_metadata || {} + const prebuiltImageDigest = typeof taskMetadata.prebuiltImageDigest === 'string' + ? taskMetadata.prebuiltImageDigest + : '' + const gateLoading = gateState?.status === 'loading' + const gateError = gateState?.status === 'error' + const gateReady = gateState?.status === 'ready' + const shouldCheckGate = task.status === 'requested' && ['staging', 'production'].includes(task.environment) + return ( + + + + + + + + + + + ) + })} + +
来源项目 / 分支环境状态创建 / 执行备注更新时间操作
+ + {SOURCE_LABEL[task.source_type] || task.source_type} + + {task.requirement_id ?
Requirement #{task.requirement_id}
: null} +
+
{task.project_display_name || task.project_key}
+ {task.service_key ?
Service: {task.service_key}
: null} +
{task.branch_name}
+
+ {task.environment} + + {STATUS_LABEL[task.status] || task.status} + {task.deployment_status ? ( +
+ Deploy: {STATUS_LABEL[task.deployment_status] || task.deployment_status} +
+ ) : null} + {task.status === 'deploying' && task.branch_name ? ( +
+ Deploy branch: {task.branch_name} +
+ ) : null} + {prebuiltImageDigest ? ( +
+ Prebuilt image attached +
+ ) : null} + {task.deployment_health_status ?
Health: {STATUS_LABEL[task.deployment_health_status] || task.deployment_health_status}
: null} + {shouldShowReleaseTaskFailure(task) && task.deployment_failure_summary ? ( + + ) : null} + + {shouldCheckGate ? ( + <> + + {gateLoading ? ( +
Gate: 检查中…
+ ) : null} + {gateError ? ( +
+ 检查失败 + +
+ ) : null} + + ) : null} +
+
创建:{task.actor || '-'}
+
执行:{task.operator || '-'}
+
+ + {formatTime(task.updated_at || task.created_at)} + {busyAction?.startsWith(`release-task-${task.id}-`) ? ( +
+ 正在更新发布任务… +
+ ) : null} + {task.status === 'requested' ? ( +
+ + {task.environment === 'staging' && effectiveGate?.can_create_pr ? ( + + ) : null} + {task.environment === 'staging' && effectiveGate?.pr_url ? ( + + 查看 PR + + ) : null} + {task.environment === 'staging' && shouldCheckGate && !gateReady ? ( + + ) : null} + {task.environment === 'staging' && !task.deployment_record_id && gateReady && effectiveGate?.can_deploy_staging ? ( + + ) : null} + {task.environment === 'staging' && gateReady && effectiveGate?.pr_exists && effectiveGate?.checks_status === 'success' && !effectiveGate?.can_deploy_staging ? ( + + ) : null} + {task.environment === 'production' && gateReady && effectiveGate?.can_deploy_production && !task.deployment_record_id ? ( + + ) : task.environment === 'production' && shouldCheckGate && !gateReady ? ( + + ) : task.environment === 'production' ? ( + + {effectiveGate?.blocked_reason || 'Production 需 Human Gate'} + + ) : null} + + + +
+ ) : ( +
+ + {task.status === 'deploying' && task.deployment_external_url ? GitHub Actions : null} + {task.status === 'deploying' ? ( + + ) : null} +
+ )} +
+
+ {!loading && tasks.length === 0 ? ( +
+ 暂无发布任务。点击“新建发布任务”记录一次人工分支发布。 +
+ ) : null} +
+ 第 {pageNumber} 页 · 共 {total} 条发布任务 +
+ + +
+
+
+ ) +} diff --git a/dashboard/src/pages/ReleasesPage.test.tsx b/dashboard/src/pages/ReleasesPage.test.tsx index b5bcc5e6..29763443 100644 --- a/dashboard/src/pages/ReleasesPage.test.tsx +++ b/dashboard/src/pages/ReleasesPage.test.tsx @@ -10,6 +10,7 @@ const apiMock = vi.hoisted(() => ({ getReleaseCandidates: vi.fn(), getReleaseTasks: vi.fn(), getReleaseTasksPage: vi.fn(), + getReleaseTaskGateStatus: vi.fn(), getOnlineReleaseRecords: vi.fn(), createReleaseTask: vi.fn(), getReleaseTaskBranchOptions: vi.fn(), @@ -38,6 +39,7 @@ vi.mock('../api', () => ({ vi.mock('../apiReleaseTasks', () => ({ getReleaseTasksPage: apiMock.getReleaseTasksPage, + getReleaseTaskGateStatus: apiMock.getReleaseTaskGateStatus, })) function candidate(overrides: Record = {}) { @@ -239,6 +241,10 @@ describe('ReleasesPage', () => { const items = await apiMock.getReleaseTasks() return { items, total: items.length, limit: 10, offset: 0 } }) + apiMock.getReleaseTaskGateStatus.mockImplementation(async (id: number) => { + const items = await apiMock.getReleaseTasks() + return (items.find((item: { id: number }) => item.id === id) || items[0] || releaseTask()).pr_gate + }) apiMock.getOnlineReleaseRecords.mockResolvedValue([ onlineRecord(), ]) diff --git a/dashboard/src/pages/ReleasesPage.tsx b/dashboard/src/pages/ReleasesPage.tsx index 43e4e162..b4a93dab 100644 --- a/dashboard/src/pages/ReleasesPage.tsx +++ b/dashboard/src/pages/ReleasesPage.tsx @@ -1,9 +1,10 @@ import { useEffect, useMemo, useState } from 'react' import { useNavigate, useSearchParams } from 'react-router-dom' import { OnlineReleaseRecord, ProjectPolicy, ReleaseBranchOption, ReleaseCandidate, ReleaseTask, api } from '../api' -import { deployReleaseTask, getReleaseTasksPage } from '../apiReleaseTasks' +import { attachReleaseTaskPrebuiltImage, deployReleaseTask, getReleaseTaskGateStatus, getReleaseTasksPage } from '../apiReleaseTasks' import { EmptyPane, FieldLabel, OverlayModal, StateBadge, useToast } from '../components/workbench' -import { ReleaseTaskCompactFailure, ReleaseTaskDetailModal, ReleaseTaskFailureSnippet, ReleaseTaskPrGate, releaseTaskFailureSummary, shouldShowReleaseTaskFailure } from './ReleaseTaskDetailPanel' +import { ReleaseTaskDetailModal } from './ReleaseTaskDetailPanel' +import { ReleaseTasksTable, type GateRequestState } from './ReleaseTasksTable' import { STATUS_LABEL, releaseTone } from './releaseListUi' import SdkPackagesPanel from './SdkPackagesPanel' import ScheduledJobsPanel from './ScheduledJobsPanel' @@ -12,10 +13,6 @@ import ProductionDeployModal from './ProductionDeployModal' type ReleaseTab = 'candidates' | 'tasks' | 'scheduled-jobs' | 'sdk-packages' | 'online' const RELEASE_TABS: ReleaseTab[] = ['candidates', 'tasks', 'scheduled-jobs', 'sdk-packages', 'online'] const RELEASE_TASK_PAGE_SIZE = 10 -const SOURCE_LABEL: Record = { - manual: '人工创建', - requirement_flow: '需求流转', -} const TASK_STATUS_OPTIONS = ['', 'requested', 'deploying', 'completed', 'failed', 'cancelled'] const DEFAULT_RELEASE_TARGETS = [ @@ -86,17 +83,6 @@ function formatTime(value: string | null) { return new Date(value.endsWith('Z') ? value : `${value}Z`).toLocaleString('zh-CN') } -function CompactListText({ value }: Readonly<{ value: string | null | undefined }>) { - const summary = releaseTaskFailureSummary(value, 180) - if (!summary.text) return - - return ( -
-
{summary.text}
- {summary.truncated ?
详情查看完整内容
: null} -
- ) -} - function releaseAction(item: ReleaseCandidate): { key: 'prepare' | 'open-pr' | 'repair-gate' | null; label: string } { const release = item.release if (!release) return { key: 'prepare', label: '准备分支' } @@ -111,6 +97,24 @@ function workflowRunIdFor(item: ReleaseCandidate) { return item.requirement.active_workflow_run_id ?? item.requirement.active_workflow_run_summary?.id ?? null } +function releaseTaskMatchesFilters(task: ReleaseTask, filters: { environment?: string; status?: string; q?: string }) { + if (filters.environment && task.environment !== filters.environment) return false + if (filters.status && task.status !== filters.status) return false + const needle = (filters.q || '').trim().toLowerCase() + if (!needle) return true + return [ + task.project_key, + task.project_display_name || '', + task.service_key || '', + task.branch_name, + task.environment, + task.status, + task.actor || '', + task.operator || '', + task.note || '', + ].join('\n').toLowerCase().includes(needle) +} + function defaultTaskDraft(policies: ProjectPolicy[]) { const fallback = DEFAULT_RELEASE_TARGETS[0] const policy = policies.find((item) => item.project_key === fallback.project_key) @@ -140,6 +144,7 @@ export default function ReleasesPage() { const [tasks, setTasks] = useState([]) const [taskTotal, setTaskTotal] = useState(0) const [taskOffset, setTaskOffset] = useState(0) + const [gateStatusByTaskId, setGateStatusByTaskId] = useState>({}) const [onlineRecords, setOnlineRecords] = useState([]) const [policies, setPolicies] = useState([]) const [loading, setLoading] = useState(true) @@ -192,6 +197,26 @@ export default function ReleasesPage() { setTaskTotal(page.total) } + const refreshTaskGateStatus = async (task: ReleaseTask) => { + setGateStatusByTaskId((current) => ({ + ...current, + [task.id]: { status: 'loading', gate: current[task.id]?.gate }, + })) + try { + const gate = await getReleaseTaskGateStatus(task.id) + setGateStatusByTaskId((current) => ({ + ...current, + [task.id]: { status: 'ready', gate }, + })) + } catch (error) { + const message = error instanceof Error ? error.message : 'Gate 检查失败' + setGateStatusByTaskId((current) => ({ + ...current, + [task.id]: { status: 'error', gate: current[task.id]?.gate, error: message }, + })) + } + } + const load = async () => { setLoading(true) try { @@ -230,6 +255,20 @@ export default function ReleasesPage() { // eslint-disable-next-line react-hooks/exhaustive-deps }, [activeTab, search, taskEnvironmentFilter, taskStatusFilter, taskOffset]) + useEffect(() => { + if (activeTab !== 'tasks') return + const pendingTasks = tasks + .filter((task) => task.status === 'requested' && ['staging', 'production'].includes(task.environment)) + .slice(0, 5) + pendingTasks.forEach((task) => { + const current = gateStatusByTaskId[task.id] + if (!current || current.status === 'idle') { + refreshTaskGateStatus(task).catch(() => {}) + } + }) + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [activeTab, tasks.map((task) => `${task.id}:${task.status}:${task.environment}`).join('|')]) + const filteredCandidates = useMemo(() => { const needle = search.trim().toLowerCase() if (!needle) return candidates @@ -319,7 +358,7 @@ export default function ReleasesPage() { if (taskBusy) return setTaskBusy(true) try { - await api.createReleaseTask({ + const created = await api.createReleaseTask({ project_key: taskDraft.project_key, project_display_name: selectedTarget?.project_display_name || taskDraft.project_display_name || null, service_key: taskDraft.service_key, @@ -331,8 +370,16 @@ export default function ReleasesPage() { toast.success('发布任务已创建') setTaskModalOpen(false) setTaskDraft(defaultTaskDraft(policies)) - await load() selectReleaseTab('tasks') + setGateStatusByTaskId((current) => ({ + ...current, + [created.id]: { status: 'idle' }, + })) + const filters = releaseTaskPageFilters() + if (taskOffset === 0 && releaseTaskMatchesFilters(created, filters)) { + setTasks((current) => [created, ...current].slice(0, RELEASE_TASK_PAGE_SIZE)) + setTaskTotal((current) => current + 1) + } } catch (error) { const message = error instanceof Error ? error.message : '创建发布任务失败' toast.error(message) @@ -383,6 +430,22 @@ export default function ReleasesPage() { } } + const attachPrebuiltImage = async ( + task: ReleaseTask, + payload: { image_digest: string; source_commit_sha: string }, + ) => { + const updated = await attachReleaseTaskPrebuiltImage(task.id, { + service_key: task.service_key || '', + image_digest: payload.image_digest, + source_commit_sha: payload.source_commit_sha, + image_source: 'ephemeral_worktree_local_build', + build_evidence: { attached_from: 'ops_console_release_task_detail' }, + }) + setTasks((current) => current.map((item) => (item.id === updated.id ? updated : item))) + setTaskDetail(updated) + toast.success('Prebuilt image 已绑定到发布任务') + } + const deployTaskToProduction = async () => { if (!productionDeployTask || busyAction) return const busyKey = `release-task-${productionDeployTask.id}-deploy-production` @@ -573,6 +636,7 @@ export default function ReleasesPage() { offset={taskOffset} loading={loading} busyAction={busyAction} + gateStatusByTaskId={gateStatusByTaskId} onUpdateStatus={updateTaskStatus} onCreatePr={createTaskPr} onDeployStaging={deployTaskToStaging} @@ -580,6 +644,7 @@ export default function ReleasesPage() { setProductionConfirmPhrase('') setProductionDeployTask(task) }} + onRefreshGate={(task) => refreshTaskGateStatus(task)} onRefresh={() => load().catch(() => {})} onOpenDetails={(task) => { setTaskModalOpen(false) @@ -719,7 +784,12 @@ export default function ReleasesPage() {
- setTaskDetail(null)} onRefresh={() => load().catch(() => {})} /> + setTaskDetail(null)} + onRefresh={() => load().catch(() => {})} + onAttachPrebuiltImage={attachPrebuiltImage} + /> setOnlineDetail(null)} /> ) @@ -857,256 +927,6 @@ function ReleaseCandidatesTable({ ) } -function ReleaseTasksTable({ - tasks, - total, - limit, - offset, - loading, - busyAction, - onUpdateStatus, - onCreatePr, - onDeployStaging, - onDeployProduction, - onRefresh, - onOpenDetails, - onPage, -}: Readonly<{ - tasks: ReleaseTask[] - total: number - limit: number - offset: number - loading: boolean - busyAction: string | null - onUpdateStatus: (task: ReleaseTask, status: 'completed' | 'failed' | 'cancelled') => void - onCreatePr: (task: ReleaseTask) => void - onDeployStaging: (task: ReleaseTask) => void - onDeployProduction: (task: ReleaseTask) => void - onRefresh: () => void - onOpenDetails: (task: ReleaseTask) => void - onPage: (offset: number) => void -}>) { - const pageNumber = Math.floor(offset / limit) + 1 - const canPrev = offset > 0 - const canNext = offset + limit < total - return ( -
-
- - - - - - - - - - - - - - - {tasks.map((task) => ( - - - - - - - - - - - ))} - -
来源项目 / 分支环境状态创建 / 执行备注更新时间操作
- - {SOURCE_LABEL[task.source_type] || task.source_type} - - {task.requirement_id ?
Requirement #{task.requirement_id}
: null} -
-
{task.project_display_name || task.project_key}
- {task.service_key ?
Service: {task.service_key}
: null} -
{task.branch_name}
-
- {task.environment} - - {STATUS_LABEL[task.status] || task.status} - {task.deployment_status ? ( -
- Deploy: {STATUS_LABEL[task.deployment_status] || task.deployment_status} -
- ) : null} - {task.deployment_health_status ?
Health: {STATUS_LABEL[task.deployment_health_status] || task.deployment_health_status}
: null} - {shouldShowReleaseTaskFailure(task) && task.deployment_failure_summary ? ( - - ) : null} - - {task.environment === 'staging' || task.environment === 'production' ? : null} -
-
创建:{task.actor || '-'}
-
执行:{task.operator || '-'}
-
- - {formatTime(task.updated_at || task.created_at)} - {busyAction?.startsWith(`release-task-${task.id}-`) ? ( -
- 正在更新发布任务… -
- ) : null} - {task.status === 'requested' ? ( -
- - {task.environment === 'staging' && task.pr_gate?.can_create_pr ? ( - - ) : null} - {task.environment === 'staging' && task.pr_gate?.pr_url ? ( - - 查看 PR - - ) : null} - {task.environment === 'staging' && task.pr_gate?.checks_status === 'unknown' ? ( - - ) : null} - {task.environment === 'staging' && !task.deployment_record_id && task.pr_gate?.can_deploy_staging ? ( - - ) : null} - {task.environment === 'staging' && task.pr_gate?.pr_exists && task.pr_gate?.checks_status === 'success' && !task.pr_gate?.can_deploy_staging ? ( - - ) : null} - {task.environment === 'production' && task.pr_gate?.can_deploy_production && !task.deployment_record_id ? ( - - ) : task.environment === 'production' ? ( - - {task.pr_gate?.blocked_reason || 'Production 需 Human Gate'} - - ) : null} - - - -
- ) : ( -
- - {task.status === 'deploying' && task.deployment_external_url ? GitHub Actions : null} - {task.status === 'deploying' ? ( - - ) : null} -
- )} -
-
- - {!loading && tasks.length === 0 && ( -
- 暂无发布任务。点击“新建发布任务”记录一次人工分支发布。 -
- )} -
- 第 {pageNumber} 页 · 共 {total} 条发布任务 -
- - -
-
-
- ) -} - function OnlineRecordsTable({ records, loading, diff --git a/server/database.py b/server/database.py index 074ceb0a..7db92b69 100644 --- a/server/database.py +++ b/server/database.py @@ -569,6 +569,7 @@ class ReleaseTaskRow(Base): actor = Column(Text) operator = Column(Text) note = Column(Text) + metadata_json = Column(Text, nullable=False, default="{}") created_at = Column(DateTime, nullable=False, default=utcnow) updated_at = Column(DateTime, nullable=False, default=utcnow, onupdate=utcnow) requirement = relationship("RequirementRow") @@ -1684,6 +1685,7 @@ def _migrate(engine_): release_task_cols = { "service_key": "TEXT", "target_commit_sha": "TEXT", + "metadata_json": "TEXT DEFAULT '{}'", } for col, col_type in release_task_cols.items(): if col not in existing: diff --git a/server/main.py b/server/main.py index dc6883cc..16f83d04 100644 --- a/server/main.py +++ b/server/main.py @@ -17,7 +17,7 @@ ) from server.logging_utils import bind_context, clear_context, get_logger, log_event, setup_ops_logging from server.schemas import DashboardStats -from server.routers import agents, skills, copilot_auth, requirements, project_policies, project_onboarding, optimization_signals, company_review, recurring_workflows, bugs, releases, errors, projects, workflows, planning, deployments, social +from server.routers import agents, skills, copilot_auth, requirements, project_policies, project_onboarding, optimization_signals, company_review, recurring_workflows, bugs, releases, release_task_prebuilt_images, errors, projects, workflows, planning, deployments, social from server.services.agents.loader import ensure_agents_loaded from server.services.bugs.log_scheduler import BugLogSweepScheduler from server.services.planning.scheduler import GoalPlannerSweepScheduler @@ -121,6 +121,7 @@ async def lifespan(app: FastAPI): app.include_router(copilot_auth.router) app.include_router(requirements.router) app.include_router(releases.router) +app.include_router(release_task_prebuilt_images.router) app.include_router(deployments.router) app.include_router(errors.router) app.include_router(projects.router) diff --git a/server/routers/release_task_prebuilt_images.py b/server/routers/release_task_prebuilt_images.py new file mode 100644 index 00000000..b15d82a6 --- /dev/null +++ b/server/routers/release_task_prebuilt_images.py @@ -0,0 +1,48 @@ +"""Release task prebuilt image endpoints.""" + +from __future__ import annotations + +from typing import Any + +from fastapi import APIRouter, Depends, HTTPException +from pydantic import BaseModel, Field +from sqlalchemy.orm import Session + +from server.database import ReleaseTaskRow, get_db +from server.schemas import ReleaseTaskOut +from server.services.releases.prebuilt_images import attach_prebuilt_image_to_task +from server.services.releases.tasks import _clean, _release_task_to_out + +router = APIRouter(prefix="/api/releases", tags=["releases"]) + + +class ReleaseTaskAttachPrebuiltImageRequest(BaseModel): + service_key: str + image_digest: str + source_commit_sha: str + image_source: str = "ephemeral_worktree_local_build" + build_evidence: dict[str, Any] = Field(default_factory=dict) + + +@router.post("/tasks/{task_id}/attach-prebuilt-image", response_model=ReleaseTaskOut) +def attach_release_task_prebuilt_image_endpoint( + task_id: int, + body: ReleaseTaskAttachPrebuiltImageRequest, + db: Session = Depends(get_db), +): + row = db.get(ReleaseTaskRow, int(task_id)) + if row is None: + raise HTTPException(status_code=404, detail="Release task not found.") + if _clean(row.status).lower() != "requested": + raise HTTPException( + status_code=400, + detail="Only requested release tasks can attach a prebuilt image.", + ) + if row.deployment_record_id is not None: + raise HTTPException( + status_code=400, detail="Release task already has a deployment record." + ) + try: + return _release_task_to_out(attach_prebuilt_image_to_task(db, row, body)) + except ValueError as exc: + raise HTTPException(status_code=400, detail=str(exc)) from exc diff --git a/server/routers/releases.py b/server/routers/releases.py index 1f98bdca..af94a12f 100644 --- a/server/routers/releases.py +++ b/server/routers/releases.py @@ -15,6 +15,7 @@ ReleaseTaskDeployRequest, ReleaseTaskOut, ReleaseTaskPatchRequest, + ReleaseTaskPrGateOut, OnlineReleaseRecordOut, ) from server.services.delivery.deployment_governance import list_online_release_records @@ -57,6 +58,7 @@ update_release_task, ) from server.services.releases.production_tasks import deploy_release_task +from server.services.releases.gate_status import release_task_gate_status from server.services.releases.task_query import query_release_tasks from server.services.releases.task_query_schemas import ReleaseTaskPageOut from server.services.releases.scheduled_jobs import scheduled_job_catalog, scheduled_jobs_status @@ -129,6 +131,16 @@ def query_release_tasks_endpoint( ) +@router.get("/tasks/{task_id}/gate-status", response_model=ReleaseTaskPrGateOut) +def release_task_gate_status_endpoint(task_id: int, db: Session = Depends(get_db)): + try: + return release_task_gate_status(db, task_id) + except ValueError as exc: + detail = str(exc) + status_code = 404 if "not found" in detail.lower() else 400 + raise HTTPException(status_code=status_code, detail=detail) from exc + + @router.get("/branch-options", response_model=list[ReleaseBranchOptionOut]) def list_release_branch_options_endpoint( project_key: str, diff --git a/server/schemas.py b/server/schemas.py index 45e31513..97ee0076 100644 --- a/server/schemas.py +++ b/server/schemas.py @@ -1301,6 +1301,7 @@ class ReleaseTaskOut(BaseModel): deployment_started_at: Optional[datetime] = None deployment_finished_at: Optional[datetime] = None deployment_metadata: dict[str, object] = {} + task_metadata: dict[str, object] = {} pr_gate: ReleaseTaskPrGateOut = Field(default_factory=ReleaseTaskPrGateOut) created_at: Optional[datetime] = None updated_at: Optional[datetime] = None diff --git a/server/services/releases/deployment_success.py b/server/services/releases/deployment_success.py index 58ead2ad..3035c4e9 100644 --- a/server/services/releases/deployment_success.py +++ b/server/services/releases/deployment_success.py @@ -121,7 +121,8 @@ def _apply_deployment_success_state( head_sha: str | None, now: datetime, ) -> bool: - success_note = "staging deploy succeeded; GitHub Actions run passed." + environment = _clean(getattr(record, "environment", None)).lower() or "deployment" + success_note = f"{environment} deploy succeeded; GitHub Actions run passed." record_changed = _apply_record_success_state( record, head_sha=head_sha, now=now, success_note=success_note ) diff --git a/server/services/releases/gate_status.py b/server/services/releases/gate_status.py new file mode 100644 index 00000000..b14bcdd4 --- /dev/null +++ b/server/services/releases/gate_status.py @@ -0,0 +1,37 @@ +"""Read-only live release gate projection.""" + +from __future__ import annotations + +from sqlalchemy.orm import Session + +from server.database import ReleaseTaskRow +from server.schemas import ReleaseTaskPrGateOut +from server.services.releases.production_tasks import release_task_production_gate +from server.services.releases.tasks import ( + _clean, + _policy_for_project, + _release_task_deploy_repo, + _release_task_pr_gate_for, +) + + +def release_task_gate_status(db: Session, task_id: int) -> ReleaseTaskPrGateOut: + """Compute the live gate status without mutating release task rows.""" + + row = db.get(ReleaseTaskRow, int(task_id)) + if row is None: + raise ValueError("Release task not found.") + environment = _clean(row.environment).lower() + if environment not in {"staging", "production"}: + return ReleaseTaskPrGateOut( + blocked_reason="Gate status is only available for staging or production release tasks." + ) + try: + project_key = _clean(row.project_key) + policy = _policy_for_project(db, project_key) + repo_full_name = _release_task_deploy_repo(policy, project_key) + if environment == "production": + return release_task_production_gate(db, row, repo_full_name) + return _release_task_pr_gate_for(row, repo_full_name) + except ValueError as exc: + return ReleaseTaskPrGateOut(blocked_reason=str(exc)) diff --git a/server/services/releases/prebuilt_images.py b/server/services/releases/prebuilt_images.py new file mode 100644 index 00000000..5566f032 --- /dev/null +++ b/server/services/releases/prebuilt_images.py @@ -0,0 +1,196 @@ +"""Prebuilt release image policy for staging frontend tasks.""" + +from __future__ import annotations + +import re +from typing import Any + +from pydantic import BaseModel, Field +from sqlalchemy.orm import Session + +from server.database import ReleaseTaskRow, utcnow +from server.services.delivery.deployment_governance import _json_dump + +PREBUILT_FRONTEND_SERVICES = {"user-front", "docs-front"} +PREBUILT_IMAGE_SOURCE = "ephemeral_worktree_local_build" +STAGING_ARTIFACT_REGISTRY_PREFIX = ( + "us-central1-docker.pkg.dev/fabled-archive-494108-k5/synapse-staging" +) +SYNAPSE_NETWORK_PROJECT_KEY = "synapse-network" +SHA256_IMAGE_RE = re.compile(r"^.+@sha256:[0-9a-f]{64}$") + + +class PrebuiltDeployPlan(BaseModel): + digest: str = "" + commit: str = "" + metadata: dict[str, Any] = Field(default_factory=dict) + inputs: dict[str, str] = Field(default_factory=dict) + + @property + def enabled(self) -> bool: + return bool(self.digest) + + +def _clean(value: Any) -> str: + return str(value or "").strip() + + +def _json_load( + value: str | None, fallback: dict[str, Any] | None = None +) -> dict[str, Any]: + if not value: + return fallback or {} + try: + import json + + payload = json.loads(value) + except Exception: # noqa: BLE001 + return fallback or {} + return payload if isinstance(payload, dict) else (fallback or {}) + + +def prebuilt_image_metadata(row: ReleaseTaskRow) -> dict[str, Any]: + metadata = _json_load(getattr(row, "metadata_json", None), {}) + return metadata if _clean(metadata.get("prebuiltImageDigest")) else {} + + +def prebuilt_deploy_plan( + row: ReleaseTaskRow, *, service_key: str, workflow_file: str +) -> PrebuiltDeployPlan: + metadata = prebuilt_image_metadata(row) + digest = _clean(metadata.get("prebuiltImageDigest")) + if not digest: + return PrebuiltDeployPlan() + commit = _clean(metadata.get("sourceCommitSha")).lower() + if workflow_file != "deploy-staging-frontends.yml": + raise ValueError( + "Prebuilt image deploy is only supported by the staging frontend workflow." + ) + validate_prebuilt_image_for_task( + row, + service_key=service_key, + image_digest=digest, + source_commit_sha=commit, + image_source=_clean(metadata.get("imageSource")) or PREBUILT_IMAGE_SOURCE, + ) + return PrebuiltDeployPlan( + digest=digest, + commit=commit, + metadata={ + "prebuiltImageDigest": digest, + "imageSource": "prebuilt_digest", + "sourceCommitSha": commit, + "buildService": service_key, + "buildEvidence": metadata.get("buildEvidence") + if isinstance(metadata.get("buildEvidence"), dict) + else {}, + }, + inputs={ + "commit_sha": commit, + "source_ref_type": "commit", + "source_ref": commit, + "prebuilt_image_digest": digest, + }, + ) + + +def _validate_task_scope( + row: ReleaseTaskRow, row_service: str, service_key: str +) -> None: + if _clean(row.environment).lower() != "staging": + raise ValueError( + "Prebuilt image attach is only allowed for staging release tasks." + ) + if _clean(row.project_key) != SYNAPSE_NETWORK_PROJECT_KEY: + raise ValueError( + "Prebuilt image attach is only allowed for Synapse-Network frontend tasks." + ) + if row_service not in PREBUILT_FRONTEND_SERVICES: + raise ValueError( + "Prebuilt image attach is only allowed for user-front/docs-front staging tasks." + ) + if service_key != row_service: + raise ValueError( + "Prebuilt image service_key must match the release task service." + ) + + +def _validate_image_identity( + *, row_service: str, image_digest: str, source_commit_sha: str, image_source: str +) -> None: + if image_source != PREBUILT_IMAGE_SOURCE: + raise ValueError(f"image_source must be {PREBUILT_IMAGE_SOURCE}.") + if not SHA256_IMAGE_RE.match(image_digest): + raise ValueError("prebuilt image must be an immutable image@sha256 digest.") + prefix = f"{STAGING_ARTIFACT_REGISTRY_PREFIX}/{row_service}@sha256:" + if not image_digest.startswith(prefix): + raise ValueError( + "prebuilt image digest does not match the staging Artifact Registry service path." + ) + if not re.fullmatch(r"[0-9a-f]{40}", source_commit_sha): + raise ValueError("source_commit_sha must be a full 40-character git SHA.") + + +def validate_prebuilt_image_for_task( + row: ReleaseTaskRow, + *, + service_key: str, + image_digest: str, + source_commit_sha: str, + image_source: str, +) -> None: + row_service = _clean(getattr(row, "service_key", None)).lower() + service_key = _clean(service_key).lower() + image_digest = _clean(image_digest) + source_commit_sha = _clean(source_commit_sha).lower() + _validate_task_scope(row, row_service, service_key) + _validate_image_identity( + row_service=row_service, + image_digest=image_digest, + source_commit_sha=source_commit_sha, + image_source=image_source, + ) + existing_commit = _clean(getattr(row, "target_commit_sha", None)).lower() + if existing_commit and existing_commit != source_commit_sha: + raise ValueError( + "prebuilt image commit does not match the release task target commit." + ) + + +def attach_prebuilt_image_to_task( + db: Session, row: ReleaseTaskRow, body: Any +) -> ReleaseTaskRow: + service_key = _clean(getattr(body, "service_key", "")).lower() + image_digest = _clean(getattr(body, "image_digest", "")) + source_commit_sha = _clean(getattr(body, "source_commit_sha", "")).lower() + image_source = ( + _clean(getattr(body, "image_source", PREBUILT_IMAGE_SOURCE)) + or PREBUILT_IMAGE_SOURCE + ) + validate_prebuilt_image_for_task( + row, + service_key=service_key, + image_digest=image_digest, + source_commit_sha=source_commit_sha, + image_source=image_source, + ) + build_evidence = getattr(body, "build_evidence", {}) or {} + if not isinstance(build_evidence, dict): + build_evidence = {} + metadata = _json_load(getattr(row, "metadata_json", None), {}) + metadata.update( + { + "prebuiltImageDigest": image_digest, + "imageSource": image_source, + "sourceCommitSha": source_commit_sha, + "buildService": service_key, + "buildEvidence": build_evidence, + "prebuiltImageAttachedAt": utcnow().isoformat(), + } + ) + row.metadata_json = _json_dump(metadata) + row.target_commit_sha = source_commit_sha + row.updated_at = utcnow() + db.commit() + db.refresh(row) + return row diff --git a/server/services/releases/production_tasks.py b/server/services/releases/production_tasks.py index c1faa053..4ff8f3a8 100644 --- a/server/services/releases/production_tasks.py +++ b/server/services/releases/production_tasks.py @@ -125,6 +125,14 @@ def release_task_production_gate( gate.blocked_reason = commit_error or "Unable to resolve main commit sha." gate.environment_gate_summary = gate.blocked_reason return gate + if target_commit_sha != current_main_sha: + gate.blocked_reason = ( + "Production target commit is no longer the current origin/main commit." + ) + gate.environment_gate_summary = ( + "Redeploy the current main commit to staging before production." + ) + return gate staging_record = _successful_staging_deployment_for_task( db, project_key=project_key, @@ -137,9 +145,14 @@ def release_task_production_gate( project_key=project_key, service_key=service_key, ) - if staging_record is not None: + if ( + staging_record is not None + and _deployment_commit_sha(staging_record) == current_main_sha + ): target_commit_sha = _deployment_commit_sha(staging_record) gate.resolved_commit_sha = target_commit_sha + else: + staging_record = None if staging_record is None: gate.blocked_reason = ( "No successful staging deployment exists for this service and main commit." @@ -230,8 +243,11 @@ def _production_task_row(db: Session, task_id: int, body: Any) -> ReleaseTaskRow row = db.get(ReleaseTaskRow, int(task_id)) if row is None: raise ValueError("Release task not found.") - if _clean(row.status).lower() != "requested": - raise ValueError("Only requested release tasks can be deployed to production.") + task_status = _clean(row.status).lower() + if task_status not in {"requested", "failed"}: + raise ValueError( + "Only requested or failed release tasks can be deployed to production." + ) if _clean(row.environment).lower() != "production": raise ValueError("Only production release tasks can use production deploy.") if _clean(getattr(body, "confirm_phrase", None)) != PRODUCTION_CONFIRM_PHRASE: @@ -242,8 +258,14 @@ def _production_task_row(db: Session, task_id: int, body: Any) -> ReleaseTaskRow project_key = _clean(row.project_key) if service_key not in _valid_service_keys_for_project(project_key): raise ValueError(_service_key_error_for_project(project_key)) - if row.deployment_record_id is not None: + if task_status == "requested" and row.deployment_record_id is not None: raise ValueError("Release task already has a deployment record.") + if task_status == "failed" and row.deployment_record_id is not None: + record = db.get(DeploymentRecordRow, int(row.deployment_record_id)) + if record is not None and _clean(record.status).lower() != "failed": + raise ValueError( + "Failed release task can only retry after a failed deployment record." + ) return row @@ -338,6 +360,7 @@ def _create_production_deployment_record( row.target_commit_sha = gate.resolved_commit_sha row.status = "deploying" row.operator = actor + row.note = note row.updated_at = utcnow() db.commit() db.refresh(row) @@ -358,10 +381,11 @@ def _production_dispatch_inputs( "commit_sha": commit_sha, "source_ref_type": "branch", "source_ref": "main", - "deploy_scope": service_key, "actor": actor, "trigger_source": "release_task", } + if _clean(getattr(record, "workflow_file", None)) == "deploy-production-frontends.yml": + inputs["deploy_scope"] = service_key callback_url = _callback_url(int(record.id)) if callback_url: inputs["callback_url"] = callback_url diff --git a/server/services/releases/task_query.py b/server/services/releases/task_query.py index 9050165b..7d665048 100644 --- a/server/services/releases/task_query.py +++ b/server/services/releases/task_query.py @@ -6,17 +6,11 @@ from sqlalchemy.orm import Session from server.database import ReleaseTaskRow -from server.schemas import ReleaseTaskPrGateOut from server.services.releases.task_query_schemas import ReleaseTaskPageOut from server.services.releases.tasks import ( _clean, - _policy_for_project, - _release_task_deploy_repo, - _release_task_pr_gate_for, - _release_task_pr_gate_with_row_actions, _release_task_to_out, ) -from server.services.releases.production_tasks import release_task_production_gate def _filtered_query( @@ -56,36 +50,6 @@ def _filtered_query( ) -def _pr_gate_for_row( - db: Session, - row: ReleaseTaskRow, - *, - repo_cache: dict[str, str], - gate_cache: dict[tuple[str, str], ReleaseTaskPrGateOut], -) -> ReleaseTaskPrGateOut | None: - project_key_value = _clean(row.project_key) - branch_name = _clean(row.branch_name) - environment = _clean(row.environment).lower() - if environment not in {"staging", "production"} or not branch_name: - return None - try: - repo_full_name = repo_cache.get(project_key_value) - if repo_full_name is None: - policy = _policy_for_project(db, project_key_value) - repo_full_name = _release_task_deploy_repo(policy, project_key_value) - repo_cache[project_key_value] = repo_full_name - if environment == "production": - return release_task_production_gate(db, row, repo_full_name) - cache_key = (repo_full_name, branch_name) - pr_gate = gate_cache.get(cache_key) - if pr_gate is None: - pr_gate = _release_task_pr_gate_for(row, repo_full_name) - gate_cache[cache_key] = pr_gate - return _release_task_pr_gate_with_row_actions(row, pr_gate) - except ValueError as exc: - return ReleaseTaskPrGateOut(blocked_reason=str(exc)) - - def query_release_tasks( db: Session, *, @@ -117,14 +81,7 @@ def query_release_tasks( .offset(safe_offset) .all() ) - repo_cache: dict[str, str] = {} - gate_cache: dict[tuple[str, str], ReleaseTaskPrGateOut] = {} - items = [] - for row in rows: - pr_gate = _pr_gate_for_row( - db, row, repo_cache=repo_cache, gate_cache=gate_cache - ) - items.append(_release_task_to_out(row, pr_gate=pr_gate)) + items = [_release_task_to_out(row) for row in rows] return ReleaseTaskPageOut( items=items, total=total, limit=safe_limit, offset=safe_offset ) diff --git a/server/services/releases/tasks.py b/server/services/releases/tasks.py index ea1d8314..41c8baa8 100644 --- a/server/services/releases/tasks.py +++ b/server/services/releases/tasks.py @@ -8,7 +8,7 @@ from typing import Any from urllib.parse import quote -from sqlalchemy import and_, or_ +from sqlalchemy import and_, case, or_ from sqlalchemy.orm import Session from server import config @@ -21,6 +21,9 @@ from server.services.releases.github_actions_logs import github_failure_log_result from server.services.releases.pr_gate_projection import release_task_pr_gate_with_row_actions from server.services.releases.deployment_success import _apply_deployment_success_state, _deployment_has_failure_metadata +from server.services.releases.prebuilt_images import ( + prebuilt_deploy_plan, +) from server.services.releases.staging_workflows import staging_workflow_file_for_service from server.services.result_objects import ServiceObjectResult from server.services.releases import github_cli as _github_cli @@ -112,6 +115,7 @@ def _release_task_to_out(row: ReleaseTaskRow, *, db: Session | None = None, pr_g deployment_started_at=getattr(deployment, "started_at", None), deployment_finished_at=getattr(deployment, "finished_at", None), deployment_metadata=_json_load(getattr(deployment, "metadata_json", None), {}), + task_metadata=_json_load(getattr(row, "metadata_json", None), {}), pr_gate=pr_gate or ReleaseTaskPrGateOut(), created_at=row.created_at, updated_at=row.updated_at, @@ -170,6 +174,8 @@ def _merge_metadata(row: DeploymentRecordRow, updates: dict[str, Any]) -> None: row.metadata_json = _json_dump(metadata) + + def _manual_completion_deployment_record(row: ReleaseTaskRow, *, operator: str, note: str | None) -> DeploymentRecordRow: now = utcnow() metadata = { @@ -466,31 +472,7 @@ def list_release_tasks( if _clean(source_type): query = query.filter(ReleaseTaskRow.source_type == _clean(source_type).lower()) rows = query.order_by(ReleaseTaskRow.updated_at.desc(), ReleaseTaskRow.id.desc()).all() - repo_cache: dict[str, str] = {} - gate_cache: dict[tuple[str, str], ReleaseTaskPrGateOut] = {} - results: list[ReleaseTaskOut] = [] - for row in rows: - pr_gate: ReleaseTaskPrGateOut | None = None - project_key_value = _clean(row.project_key) - branch_name = _clean(row.branch_name) - environment = _clean(row.environment).lower() - if environment == "staging" and branch_name: - try: - repo_full_name = repo_cache.get(project_key_value) - if repo_full_name is None: - policy = _policy_for_project(db, project_key_value) - repo_full_name = _release_task_deploy_repo(policy, project_key_value) - repo_cache[project_key_value] = repo_full_name - cache_key = (repo_full_name, branch_name) - cached_gate = gate_cache.get(cache_key) - if cached_gate is None: - cached_gate = _release_task_pr_gate_for(row, repo_full_name) - gate_cache[cache_key] = cached_gate - pr_gate = _release_task_pr_gate_with_row_actions(row, cached_gate) - except ValueError as exc: - pr_gate = ReleaseTaskPrGateOut(blocked_reason=str(exc)) - results.append(_release_task_to_out(row, pr_gate=pr_gate)) - return results + return [_release_task_to_out(row) for row in rows] def create_release_task(db: Session, body: Any) -> ReleaseTaskOut: @@ -533,7 +515,7 @@ def create_release_task(db: Session, body: Any) -> ReleaseTaskOut: db.add(row) db.commit() db.refresh(row) - return _release_task_to_out(row, db=db) + return _release_task_to_out(row) def update_release_task(db: Session, task_id: int, body: Any) -> ReleaseTaskOut: @@ -721,7 +703,7 @@ def _find_recent_actions_run_id(repo_full_name: str, record: DeploymentRecordRow "--limit", "20", "--json", - "databaseId,status,conclusion,createdAt,updatedAt,url,headSha", + "databaseId,status,conclusion,createdAt,updatedAt,url,headSha,displayTitle", ], timeout=30, ) @@ -733,12 +715,19 @@ def _find_recent_actions_run_id(repo_full_name: str, record: DeploymentRecordRow # previous release task to a brand-new DeploymentRecord. earliest = started_at - timedelta(seconds=30) branch = _clean(record.branch_name) + record_token = f"record {int(record.id)}" + plausible_items: list[dict[str, Any]] = [] for item in payload: if not isinstance(item, dict): continue created_at = _parse_github_timestamp(item.get("createdAt")) if created_at is not None and created_at < earliest: continue + plausible_items.append(item) + title = _clean(item.get("displayTitle")).lower() + if record_token in title and item.get("databaseId") is not None: + return str(item.get("databaseId")) + for item in plausible_items: run_id = item.get("databaseId") if run_id is None: continue @@ -936,6 +925,10 @@ def _apply_github_run_to_deployment( def sync_release_task_deployment_statuses(db: Session, *, max_records: int = 50) -> ServiceObjectResult: bounded_limit = max(1, min(int(max_records or 50), 50)) sync_cutoff = utcnow() - timedelta(days=7) + active_status_rank = case( + (DeploymentRecordRow.status.in_(["requested", "running", "pending"]), 0), + else_=1, + ) rows = ( db.query(DeploymentRecordRow) .filter( @@ -954,7 +947,7 @@ def sync_release_task_deployment_statuses(db: Session, *, max_records: int = 50) ), ), ) - .order_by(DeploymentRecordRow.id.asc()) + .order_by(active_status_rank.asc(), DeploymentRecordRow.updated_at.desc(), DeploymentRecordRow.id.desc()) .limit(bounded_limit) .all() ) @@ -1107,16 +1100,18 @@ def deploy_release_task_to_staging(db: Session, task_id: int, body: Any) -> Rele note = _clean(getattr(body, "note", None)) or _clean(row.note) or None deploy_strategy = _deploy_strategy_for_project(project_key) controlled_steps = _controlled_steps_for_project(project_key) + prebuilt_plan = prebuilt_deploy_plan(row, service_key=service_key, workflow_file=workflow_file) deployment_metadata = { "release_task_id": int(row.id), "service_key": service_key, "deploy_repo_full_name": repo_full_name, "deploy_strategy": deploy_strategy, - "sourceRefType": "branch", - "sourceRef": branch_name, + "sourceRefType": "commit" if prebuilt_plan.enabled else "branch", + "sourceRef": prebuilt_plan.commit if prebuilt_plan.enabled else branch_name, "deployScope": service_key, "controlledSteps": controlled_steps, } + deployment_metadata.update(prebuilt_plan.metadata) if deploy_strategy in {"github_actions_gcp_cloudrun", "github_actions_wif_cloudrun"}: deployment_metadata.update({"gcpProject": "fabled-archive-494108-k5", "region": "us-central1"}) if deploy_strategy == "github_actions_wif_cloudrun": @@ -1156,6 +1151,7 @@ def deploy_release_task_to_staging(db: Session, task_id: int, body: Any) -> Rele "actor": actor, "trigger_source": "release_task", } + inputs.update(prebuilt_plan.inputs) if workflow_file == "deploy-staging-gateway.yml": inputs.pop("deploy_scope", None) callback_url = _callback_url(int(record.id)) diff --git a/tests/test_release_actions_log_sync.py b/tests/test_release_actions_log_sync.py index a96a7ef5..c1956103 100644 --- a/tests/test_release_actions_log_sync.py +++ b/tests/test_release_actions_log_sync.py @@ -224,6 +224,53 @@ def test_release_task_deployment_success_clears_stale_actions_failure_metadata( assert "deploymentSyncError" not in metadata +def test_production_release_task_success_note_uses_production_environment( + db_session, +): + record = DeploymentRecordRow( + project_key="synapse-network", + environment="production", + action="deploy", + status="failed", + health_status="failed", + external_run_id="25909566899", + trigger_source="release_task", + notes="GitHub Actions production deploy failure.", + metadata_json=json.dumps({"deploy_repo_full_name": "SynapseNetworkAI/Synapse-Network"}), + ) + db_session.add(record) + db_session.flush() + task = ReleaseTaskRow( + source_type="manual", + project_key="synapse-network", + service_key="gateway", + branch_name="main", + environment="production", + status="failed", + actor="operator", + note="GitHub Actions production deploy failure.", + deployment_record_id=int(record.id), + ) + db_session.add(task) + db_session.commit() + + state = release_tasks_service._apply_github_run_to_deployment( + db_session, + record, + run_id="25909566899", + run_payload={ + "status": "completed", + "conclusion": "success", + "url": "https://github.com/SynapseNetworkAI/Synapse-Network/actions/runs/25909566899", + "headSha": "prod123", + }, + ) + + assert state == "succeeded" + assert task.status == "completed" + assert task.note == "production deploy succeeded; GitHub Actions run passed." + + def test_release_task_deployment_status_sync_cleans_success_with_stale_failure_metadata( db_session, ): diff --git a/tests/test_release_production_tasks_api.py b/tests/test_release_production_tasks_api.py index 85519e8d..d5273b1f 100644 --- a/tests/test_release_production_tasks_api.py +++ b/tests/test_release_production_tasks_api.py @@ -142,6 +142,41 @@ def test_production_workflow_resolver_uses_modular_defaults(): ) +def test_production_dispatch_inputs_match_modular_wrapper_contracts(): + row = ReleaseTaskRow(id=10) + gateway_record = DeploymentRecordRow(id=20, workflow_file="deploy-production-gateway.yml") + gateway_inputs = release_production_tasks_service._production_dispatch_inputs( + row=row, + record=gateway_record, + commit_sha="abc", + service_key="gateway", + actor="operator", + ) + assert "deploy_scope" not in gateway_inputs + + admin_record = DeploymentRecordRow(id=21, workflow_file="deploy-production-admin.yml") + admin_inputs = release_production_tasks_service._production_dispatch_inputs( + row=row, + record=admin_record, + commit_sha="abc", + service_key="gateway-admin", + actor="operator", + ) + assert "deploy_scope" not in admin_inputs + + frontend_record = DeploymentRecordRow( + id=22, workflow_file="deploy-production-frontends.yml" + ) + frontend_inputs = release_production_tasks_service._production_dispatch_inputs( + row=row, + record=frontend_record, + commit_sha="abc", + service_key="docs-front", + actor="operator", + ) + assert frontend_inputs["deploy_scope"] == "docs-front" + + def test_release_task_production_deploy_blocks_without_matching_staging( monkeypatch, synced_client ): @@ -175,7 +210,7 @@ def test_release_task_production_gate_uses_pinned_staging_commit( monkeypatch.setattr( release_production_tasks_service, "_github_branch_commit_sha", - lambda repo, branch: ("new-main-head", None), + lambda repo, branch: ("staged-main-sha", None), ) staging_record = DeploymentRecordRow( project_key="synapse-network", @@ -213,7 +248,7 @@ def test_release_task_production_gate_recovers_legacy_unpinned_task_from_latest_ monkeypatch.setattr( release_production_tasks_service, "_github_branch_commit_sha", - lambda repo, branch: ("new-main-head", None), + lambda repo, branch: ("legacy-staged-sha", None), ) db_session.add( DeploymentRecordRow( @@ -246,6 +281,44 @@ def test_release_task_production_gate_recovers_legacy_unpinned_task_from_latest_ assert "passed staging" in gate.environment_gate_summary +def test_release_task_production_gate_blocks_stale_staging_commit( + monkeypatch, db_session +): + monkeypatch.setattr( + release_production_tasks_service, + "_github_branch_commit_sha", + lambda repo, branch: ("current-main-sha", None), + ) + db_session.add( + DeploymentRecordRow( + project_key="synapse-network", + environment="staging", + action="deploy", + status="succeeded", + health_status="passed", + branch_name="main", + commit_sha="old-staged-main-sha", + metadata_json=json.dumps({"deployScope": "gateway"}), + ) + ) + db_session.commit() + row = ReleaseTaskRow( + project_key="synapse-network", + service_key="gateway", + branch_name="main", + target_commit_sha="old-staged-main-sha", + environment="production", + status="requested", + ) + + gate = release_production_tasks_service.release_task_production_gate( + db_session, row, "SynapseNetworkAI/Synapse-Network" + ) + + assert not gate.can_deploy_production + assert "current origin/main" in gate.blocked_reason + + def test_release_task_production_gate_blocks_invalid_inputs(monkeypatch, db_session): row = ReleaseTaskRow( project_key="synapse-network", @@ -279,6 +352,60 @@ def test_release_task_production_gate_blocks_invalid_inputs(monkeypatch, db_sess assert gate.environment_gate_summary == "main not found" +def test_production_task_row_rejects_non_deployable_status(db_session): + row = ReleaseTaskRow( + project_key="synapse-network", + service_key="gateway", + branch_name="main", + environment="production", + status="completed", + ) + db_session.add(row) + db_session.commit() + body = type("Body", (), {"confirm_phrase": "DEPLOY_PRODUCTION"})() + + try: + release_production_tasks_service._production_task_row( + db_session, int(row.id), body + ) + except ValueError as exc: + assert "Only requested or failed release tasks" in str(exc) + else: + raise AssertionError("Expected completed production task to be rejected") + + +def test_failed_production_task_row_rejects_retry_after_successful_record(db_session): + record = DeploymentRecordRow( + project_key="synapse-network", + environment="production", + action="deploy", + status="succeeded", + health_status="passed", + ) + db_session.add(record) + db_session.flush() + row = ReleaseTaskRow( + project_key="synapse-network", + service_key="gateway", + branch_name="main", + environment="production", + status="failed", + deployment_record_id=int(record.id), + ) + db_session.add(row) + db_session.commit() + body = type("Body", (), {"confirm_phrase": "DEPLOY_PRODUCTION"})() + + try: + release_production_tasks_service._production_task_row( + db_session, int(row.id), body + ) + except ValueError as exc: + assert "after a failed deployment record" in str(exc) + else: + raise AssertionError("Expected retry after successful record to be rejected") + + def test_production_secret_and_branch_helpers(monkeypatch): monkeypatch.setattr(config, "E2E_MODE", True) assert release_production_tasks_service._missing_required_production_deploy_secrets( @@ -404,3 +531,74 @@ def test_release_task_production_dispatch_failure_marks_task_failed( payload = response.json() assert payload["status"] == "failed" assert "dispatch exploded" in payload["note"] + + +def test_failed_production_release_task_can_retry_with_new_deployment_record( + monkeypatch, synced_client, db_session +): + monkeypatch.setattr( + release_production_tasks_service, + "_github_branch_commit_sha", + lambda repo, branch: ("retryprodsha", None), + ) + monkeypatch.setattr( + release_production_tasks_service, + "_missing_required_production_deploy_secrets", + lambda repo: ([], None), + ) + dispatch_calls: list[dict[str, object]] = [] + + def fake_dispatch(**kwargs): + dispatch_calls.append(kwargs) + if len(dispatch_calls) == 1: + raise RuntimeError("first dispatch failed") + return "https://github.com/SynapseNetworkAI/Synapse-Network/actions/runs/9" + + monkeypatch.setattr( + release_production_tasks_service, + "_dispatch_github_workflow", + fake_dispatch, + ) + db_session.add( + DeploymentRecordRow( + project_key="synapse-network", + environment="staging", + action="deploy", + status="succeeded", + health_status="passed", + branch_name="main", + commit_sha="retryprodsha", + metadata_json=json.dumps({"deployScope": "gateway"}), + ) + ) + db_session.commit() + + task = synced_client.post( + "/api/releases/tasks", + json={ + "project_key": "synapse-network", + "service_key": "gateway", + "branch_name": "main", + "environment": "production", + }, + ).json() + first_response = synced_client.post( + f"/api/releases/tasks/{task['id']}/deploy", + json={"confirm_phrase": "DEPLOY_PRODUCTION"}, + ) + assert first_response.status_code == 200 + failed_payload = first_response.json() + assert failed_payload["status"] == "failed" + failed_record_id = failed_payload["deployment_record_id"] + + retry_response = synced_client.post( + f"/api/releases/tasks/{task['id']}/deploy", + json={"confirm_phrase": "DEPLOY_PRODUCTION"}, + ) + + assert retry_response.status_code == 200 + retry_payload = retry_response.json() + assert retry_payload["status"] == "deploying" + assert retry_payload["deployment_record_id"] != failed_record_id + assert len(dispatch_calls) == 2 + assert "deploy_scope" not in dispatch_calls[1]["inputs"] diff --git a/tests/test_release_task_gate_status_api.py b/tests/test_release_task_gate_status_api.py new file mode 100644 index 00000000..9c97b76d --- /dev/null +++ b/tests/test_release_task_gate_status_api.py @@ -0,0 +1,221 @@ +from server.database import ReleaseTaskRow +from server.schemas import ReleaseTaskPrGateOut +from server.services.releases import gate_status as release_gate_status_service +from server.services.releases import tasks as release_tasks_service + + +def test_release_task_list_does_not_compute_live_pr_gate( + monkeypatch, synced_client, db_session +): + calls: list[int] = [] + + def fake_gate(row, repo): + calls.append(int(row.id)) + raise AssertionError("list endpoint must not refresh GitHub PR gate") + + monkeypatch.setattr( + release_gate_status_service, "_release_task_pr_gate_for", fake_gate + ) + for note in ("first", "second"): + db_session.add( + ReleaseTaskRow( + source_type="manual", + project_key="synapse-network", + service_key="gateway", + branch_name="codex/shared-release-branch", + environment="staging", + status="requested", + actor="operator", + note=note, + ) + ) + db_session.commit() + + response = synced_client.get("/api/releases/tasks") + + assert response.status_code == 200 + payload = response.json() + assert len(payload) == 2 + assert calls == [] + assert {item["pr_gate"]["checks_status"] for item in payload} == {"unknown"} + assert not any(item["pr_gate"]["can_deploy_staging"] for item in payload) + + +def test_release_task_gate_status_returns_live_pr_gate( + monkeypatch, synced_client, db_session +): + def fake_gate(row, repo): + assert repo == "SynapseNetworkAI/Synapse-Network" + return ReleaseTaskPrGateOut( + branch_exists=True, + pr_exists=True, + pr_url="https://github.com/SynapseNetworkAI/Synapse-Network/pull/27", + pr_number=27, + pr_state="merged", + checks_status="success", + checks_summary="1 checks passed", + ) + + monkeypatch.setattr( + release_gate_status_service, "_release_task_pr_gate_for", fake_gate + ) + task = ReleaseTaskRow( + source_type="manual", + project_key="synapse-network", + service_key="gateway", + branch_name="main", + environment="staging", + status="requested", + actor="operator", + ) + db_session.add(task) + db_session.commit() + + response = synced_client.get(f"/api/releases/tasks/{int(task.id)}/gate-status") + + assert response.status_code == 200 + payload = response.json() + assert payload["pr_number"] == 27 + assert payload["checks_status"] == "success" + + +def test_release_task_gate_status_handles_not_found(synced_client): + response = synced_client.get("/api/releases/tasks/999/gate-status") + + assert response.status_code == 404 + assert "not found" in response.json()["detail"].lower() + + +def test_release_task_gate_status_handles_unsupported_environment( + synced_client, db_session +): + task = ReleaseTaskRow( + source_type="manual", + project_key="synapse-network", + service_key="gateway", + branch_name="main", + environment="qa", + status="requested", + actor="operator", + ) + db_session.add(task) + db_session.commit() + + response = synced_client.get(f"/api/releases/tasks/{int(task.id)}/gate-status") + + assert response.status_code == 200 + assert "only available" in response.json()["blocked_reason"] + + +def test_release_task_gate_status_projects_production_gate( + monkeypatch, synced_client, db_session +): + monkeypatch.setattr( + release_gate_status_service, + "release_task_production_gate", + lambda db, row, repo: ReleaseTaskPrGateOut( + can_deploy_production=True, + environment_gate_summary="prod gate ready", + ), + ) + task = ReleaseTaskRow( + source_type="manual", + project_key="synapse-network", + service_key="gateway", + branch_name="main", + environment="production", + status="requested", + actor="operator", + ) + db_session.add(task) + db_session.commit() + + response = synced_client.get(f"/api/releases/tasks/{int(task.id)}/gate-status") + + assert response.status_code == 200 + assert response.json()["can_deploy_production"] is True + + +def test_release_task_gate_status_returns_policy_error( + monkeypatch, synced_client, db_session +): + monkeypatch.setattr( + release_gate_status_service, + "_policy_for_project", + lambda db, project_key: (_ for _ in ()).throw(ValueError("policy missing")), + ) + task = ReleaseTaskRow( + source_type="manual", + project_key="synapse-network", + service_key="gateway", + branch_name="main", + environment="staging", + status="requested", + actor="operator", + ) + db_session.add(task) + db_session.commit() + + response = synced_client.get(f"/api/releases/tasks/{int(task.id)}/gate-status") + + assert response.status_code == 200 + assert response.json()["blocked_reason"] == "policy missing" + + +def test_release_task_query_does_not_compute_live_gate( + monkeypatch, synced_client, db_session +): + monkeypatch.setattr( + release_tasks_service, + "_release_task_pr_gate_for", + lambda row, repo: (_ for _ in ()).throw( + AssertionError("query must not refresh GitHub PR gate") + ), + ) + db_session.add( + ReleaseTaskRow( + source_type="manual", + project_key="synapse-network", + service_key="gateway", + branch_name="main", + environment="staging", + status="requested", + actor="operator", + ) + ) + db_session.commit() + + response = synced_client.get("/api/releases/tasks/query") + + assert response.status_code == 200 + payload = response.json() + assert payload["total"] == 1 + assert payload["items"][0]["pr_gate"]["checks_status"] == "unknown" + assert payload["items"][0]["pr_gate"]["can_deploy_staging"] is False + + +def test_create_release_task_does_not_compute_live_gate(monkeypatch, synced_client): + monkeypatch.setattr( + release_tasks_service, + "_release_task_pr_gate_for", + lambda row, repo: (_ for _ in ()).throw( + AssertionError("create must not refresh GitHub PR gate") + ), + ) + + response = synced_client.post( + "/api/releases/tasks", + json={ + "project_key": "synapse-network", + "service_key": "gateway", + "branch_name": "main", + "environment": "staging", + "actor": "operator", + }, + ) + + assert response.status_code == 200 + payload = response.json() + assert payload["status"] == "requested" + assert payload["pr_gate"]["checks_status"] == "unknown" + assert payload["pr_gate"]["can_deploy_staging"] is False diff --git a/tests/test_release_task_prebuilt_images_api.py b/tests/test_release_task_prebuilt_images_api.py new file mode 100644 index 00000000..1655d3e7 --- /dev/null +++ b/tests/test_release_task_prebuilt_images_api.py @@ -0,0 +1,381 @@ +import json + +from server.database import DeploymentRecordRow, ReleaseTaskRow +from server.schemas import ReleaseTaskPrGateOut +from server.services.delivery.deployment_governance import _json_dump +from server.services.releases import prebuilt_images as prebuilt_image_service +from server.services.releases import tasks as release_tasks_service + + +def _successful_pr_gate() -> ReleaseTaskPrGateOut: + return ReleaseTaskPrGateOut( + branch_exists=True, + pr_exists=True, + pr_url="https://github.com/SynapseNetworkAI/Synapse-Network/pull/99", + pr_number=99, + pr_state="open", + checks_status="success", + checks_summary="3 checks passed", + can_deploy_staging=True, + ) + + +def _create_user_front_task(client): + return client.post( + "/api/releases/tasks", + json={ + "project_key": "synapse-network", + "project_display_name": "Synapse-Network", + "service_key": "user-front", + "branch_name": "main", + "environment": "staging", + }, + ).json() + + +def test_frontend_release_task_can_attach_prebuilt_image_and_deploy_digest( + monkeypatch, synced_client, db_session +): + calls = [] + digest = ( + "us-central1-docker.pkg.dev/fabled-archive-494108-k5/" + "synapse-staging/user-front@sha256:" + ("a" * 64) + ) + commit_sha = "b" * 40 + + def fake_dispatch(**kwargs): + calls.append(kwargs) + return "https://github.com/SynapseNetworkAI/Synapse-Network/actions/workflows/deploy-staging-frontends.yml" + + monkeypatch.setattr( + release_tasks_service, "_dispatch_github_workflow", fake_dispatch + ) + monkeypatch.setattr( + release_tasks_service, + "_callback_url", + lambda record_id: f"https://ops.example/api/deployments/{record_id}/report", + ) + monkeypatch.setattr( + release_tasks_service, + "_release_task_pr_gate_for", + lambda row, repo: _successful_pr_gate(), + ) + monkeypatch.setattr( + release_tasks_service, + "_missing_required_staging_deploy_secrets", + lambda repo, **kwargs: ([], None), + ) + + task = _create_user_front_task(synced_client) + attach = synced_client.post( + f"/api/releases/tasks/{task['id']}/attach-prebuilt-image", + json={ + "service_key": "user-front", + "image_digest": digest, + "source_commit_sha": commit_sha, + "build_evidence": {"tag": "staging-local-user-front"}, + }, + ) + + assert attach.status_code == 200 + attached = attach.json() + assert attached["target_commit_sha"] == commit_sha + assert attached["task_metadata"]["prebuiltImageDigest"] == digest + + response = synced_client.post( + f"/api/releases/tasks/{task['id']}/deploy-staging", json={"actor": "ops-lead"} + ) + + assert response.status_code == 200 + assert calls[0]["workflow_file"] == "deploy-staging-frontends.yml" + assert calls[0]["inputs"]["deploy_scope"] == "user-front" + assert calls[0]["inputs"]["prebuilt_image_digest"] == digest + assert calls[0]["inputs"]["source_ref_type"] == "commit" + assert calls[0]["inputs"]["source_ref"] == commit_sha + assert calls[0]["inputs"]["commit_sha"] == commit_sha + + deployment = db_session.get( + DeploymentRecordRow, response.json()["deployment_record_id"] + ) + metadata = json.loads(deployment.metadata_json) + assert metadata["prebuiltImageDigest"] == digest + assert metadata["imageSource"] == "prebuilt_digest" + assert metadata["sourceCommitSha"] == commit_sha + + +def test_prebuilt_image_rejects_wrong_service_digest(synced_client): + task = _create_user_front_task(synced_client) + response = synced_client.post( + f"/api/releases/tasks/{task['id']}/attach-prebuilt-image", + json={ + "service_key": "user-front", + "image_digest": ( + "us-central1-docker.pkg.dev/fabled-archive-494108-k5/" + "synapse-staging/docs-front@sha256:" + ("a" * 64) + ), + "source_commit_sha": "b" * 40, + }, + ) + + assert response.status_code == 400 + assert "service path" in response.json()["detail"] + + +def test_prebuilt_image_endpoint_rejects_missing_or_non_attachable_tasks( + synced_client, db_session +): + digest = ( + "us-central1-docker.pkg.dev/fabled-archive-494108-k5/" + "synapse-staging/user-front@sha256:" + ("a" * 64) + ) + body = { + "service_key": "user-front", + "image_digest": digest, + "source_commit_sha": "b" * 40, + } + missing = synced_client.post( + "/api/releases/tasks/999/attach-prebuilt-image", json=body + ) + assert missing.status_code == 404 + + completed = _create_user_front_task(synced_client) + synced_client.patch( + f"/api/releases/tasks/{completed['id']}", + json={"status": "completed", "operator": "ops-lead"}, + ) + non_requested = synced_client.post( + f"/api/releases/tasks/{completed['id']}/attach-prebuilt-image", json=body + ) + assert non_requested.status_code == 400 + assert "Only requested" in non_requested.json()["detail"] + + deployment = DeploymentRecordRow( + project_key="synapse-network", + environment="staging", + action="deploy", + status="requested", + trigger_source="release_task", + ) + db_session.add(deployment) + db_session.flush() + task = ReleaseTaskRow( + source_type="manual", + project_key="synapse-network", + service_key="user-front", + branch_name="main", + environment="staging", + status="requested", + deployment_record_id=int(deployment.id), + ) + db_session.add(task) + db_session.commit() + deployed = synced_client.post( + f"/api/releases/tasks/{int(task.id)}/attach-prebuilt-image", json=body + ) + assert deployed.status_code == 400 + assert "already has a deployment" in deployed.json()["detail"] + + +def test_prebuilt_deploy_plan_handles_missing_and_corrupt_metadata(db_session): + row = ReleaseTaskRow( + source_type="manual", + project_key="synapse-network", + service_key="user-front", + branch_name="main", + environment="staging", + status="requested", + ) + db_session.add(row) + db_session.commit() + + assert not prebuilt_image_service.prebuilt_deploy_plan( + row, service_key="user-front", workflow_file="deploy-staging-frontends.yml" + ).enabled + + row.metadata_json = "{not-json" + assert prebuilt_image_service.prebuilt_image_metadata(row) == {} + + row.metadata_json = json.dumps(["not", "a", "dict"]) + assert prebuilt_image_service.prebuilt_image_metadata(row) == {} + + +def test_prebuilt_deploy_plan_rejects_wrong_workflow(db_session): + row = ReleaseTaskRow( + source_type="manual", + project_key="synapse-network", + service_key="user-front", + branch_name="main", + environment="staging", + status="requested", + metadata_json=_json_dump( + { + "prebuiltImageDigest": ( + "us-central1-docker.pkg.dev/fabled-archive-494108-k5/" + "synapse-staging/user-front@sha256:" + ("a" * 64) + ), + "sourceCommitSha": "b" * 40, + "imageSource": "ephemeral_worktree_local_build", + } + ), + ) + db_session.add(row) + db_session.commit() + + try: + prebuilt_image_service.prebuilt_deploy_plan( + row, service_key="user-front", workflow_file="deploy-staging-admin.yml" + ) + except ValueError as exc: + assert "staging frontend workflow" in str(exc) + else: + raise AssertionError("wrong workflow should fail closed") + + +def test_prebuilt_image_policy_rejects_invalid_scope_and_identity(db_session): + base = ReleaseTaskRow( + source_type="manual", + project_key="synapse-network", + service_key="user-front", + branch_name="main", + environment="staging", + status="requested", + target_commit_sha="c" * 40, + ) + db_session.add(base) + db_session.commit() + digest = ( + "us-central1-docker.pkg.dev/fabled-archive-494108-k5/" + "synapse-staging/user-front@sha256:" + ("a" * 64) + ) + + cases = [ + ( + { + "project_key": "synapse-network", + "service_key": "user-front", + "environment": "production", + }, + "only allowed for staging", + ), + ( + { + "project_key": "other", + "service_key": "user-front", + "environment": "staging", + }, + "Synapse-Network frontend", + ), + ( + { + "project_key": "synapse-network", + "service_key": "gateway", + "environment": "staging", + }, + "user-front/docs-front", + ), + ] + for values, expected in cases: + row = ReleaseTaskRow( + source_type="manual", + project_key=values["project_key"], + service_key=values["service_key"], + branch_name="main", + environment=values["environment"], + status="requested", + ) + try: + prebuilt_image_service.validate_prebuilt_image_for_task( + row, + service_key=values["service_key"], + image_digest=digest, + source_commit_sha="b" * 40, + image_source="ephemeral_worktree_local_build", + ) + except ValueError as exc: + assert expected in str(exc) + else: + raise AssertionError(f"{expected} should fail closed") + + invalid_cases = [ + { + "service_key": "docs-front", + "image_digest": digest, + "source_commit_sha": "b" * 40, + "image_source": "ephemeral_worktree_local_build", + "expected": "must match", + }, + { + "service_key": "user-front", + "image_digest": digest, + "source_commit_sha": "b" * 40, + "image_source": "other", + "expected": "image_source", + }, + { + "service_key": "user-front", + "image_digest": "tag-only", + "source_commit_sha": "b" * 40, + "image_source": "ephemeral_worktree_local_build", + "expected": "image@sha256", + }, + { + "service_key": "user-front", + "image_digest": digest, + "source_commit_sha": "short", + "image_source": "ephemeral_worktree_local_build", + "expected": "40-character", + }, + { + "service_key": "user-front", + "image_digest": digest, + "source_commit_sha": "b" * 40, + "image_source": "ephemeral_worktree_local_build", + "expected": "does not match", + }, + ] + for case in invalid_cases: + try: + prebuilt_image_service.validate_prebuilt_image_for_task( + base, + service_key=case["service_key"], + image_digest=case["image_digest"], + source_commit_sha=case["source_commit_sha"], + image_source=case["image_source"], + ) + except ValueError as exc: + assert case["expected"] in str(exc) + else: + raise AssertionError(f"{case['expected']} should fail closed") + + +def test_prebuilt_image_attach_ignores_non_dict_evidence(db_session): + row = ReleaseTaskRow( + source_type="manual", + project_key="synapse-network", + service_key="user-front", + branch_name="main", + environment="staging", + status="requested", + ) + db_session.add(row) + db_session.commit() + body = type( + "Body", + (), + { + "service_key": "user-front", + "image_digest": ( + "us-central1-docker.pkg.dev/fabled-archive-494108-k5/" + "synapse-staging/user-front@sha256:" + ("a" * 64) + ), + "source_commit_sha": "b" * 40, + "image_source": "ephemeral_worktree_local_build", + "build_evidence": "not-a-dict", + }, + )() + + updated = prebuilt_image_service.attach_prebuilt_image_to_task( + db_session, row, body + ) + + assert json.loads(updated.metadata_json)["buildEvidence"] == {} diff --git a/tests/test_release_task_sync_ordering.py b/tests/test_release_task_sync_ordering.py new file mode 100644 index 00000000..7b1416a3 --- /dev/null +++ b/tests/test_release_task_sync_ordering.py @@ -0,0 +1,71 @@ +import json +from datetime import datetime, timedelta, timezone + +from server.database import DeploymentRecordRow, ReleaseTaskRow +from server.services.releases import tasks as release_tasks_service + + +def test_release_task_deployment_status_sync_prioritizes_active_records( + monkeypatch, db_session +): + old_terminal = DeploymentRecordRow( + project_key="synapse-network", + environment="staging", + action="deploy", + status="succeeded", + external_run_id="10", + trigger_source="release_task", + updated_at=datetime.now(timezone.utc) - timedelta(days=1), + metadata_json=json.dumps({"deploy_repo_full_name": "example/repo"}), + ) + active = DeploymentRecordRow( + project_key="synapse-network", + environment="staging", + action="deploy", + status="running", + external_run_id="99", + trigger_source="release_task", + updated_at=datetime.now(timezone.utc), + metadata_json=json.dumps({"deploy_repo_full_name": "example/repo"}), + ) + db_session.add_all([old_terminal, active]) + db_session.flush() + task = ReleaseTaskRow( + source_type="manual", + project_key="synapse-network", + service_key="admin-front", + branch_name="main", + environment="staging", + status="deploying", + actor="operator", + deployment_record_id=int(active.id), + ) + db_session.add(task) + db_session.commit() + + monkeypatch.setattr( + release_tasks_service, + "_github_actions_run_view", + lambda *args, **kwargs: ( + { + "databaseId": 99, + "status": "completed", + "conclusion": "success", + "url": "https://github.com/example/repo/actions/runs/99", + "headSha": "abc123", + }, + None, + ), + ) + + result = release_tasks_service.sync_release_task_deployment_statuses( + db_session, max_records=1 + ) + + assert result["processed_count"] == 1 + assert int(active.id) in result["succeeded_ids"] + assert int(old_terminal.id) not in result["skipped_terminal_ids"] + db_session.refresh(active) + db_session.refresh(task) + assert active.status == "succeeded" + assert task.status == "completed" diff --git a/tests/test_release_tasks_api.py b/tests/test_release_tasks_api.py index 9ae1f667..635c6977 100644 --- a/tests/test_release_tasks_api.py +++ b/tests/test_release_tasks_api.py @@ -5,6 +5,7 @@ from server.database import DeploymentRecordRow, ReleaseTaskRow, RequirementRow from server.schemas import ProjectPolicyCreate, ReleaseTaskPrGateOut from server.services.projects.policy import create_project_policy +from server.services.releases import gate_status as release_gate_status_service from server.services.releases import tasks as release_tasks_service @@ -114,48 +115,6 @@ def test_manual_release_task_terminal_status_updates_linked_deployment(monkeypat assert payload["deployment_failure_summary"] == "manual deploy failed" -def test_release_task_list_caches_pr_gate_by_branch(monkeypatch, synced_client, db_session): - calls: list[int] = [] - - def fake_gate(row, repo): - assert repo == "SynapseNetworkAI/Synapse-Network" - calls.append(int(row.id)) - return ReleaseTaskPrGateOut( - branch_exists=True, - pr_exists=True, - pr_url="https://github.com/SynapseNetworkAI/Synapse-Network/pull/27", - pr_number=27, - pr_state="merged", - checks_status="success", - checks_summary="1 checks passed", - ) - - monkeypatch.setattr(release_tasks_service, "_release_task_pr_gate_for", fake_gate) - for note in ("first", "second"): - db_session.add( - ReleaseTaskRow( - source_type="manual", - project_key="synapse-network", - service_key="gateway", - branch_name="codex/shared-release-branch", - environment="staging", - status="requested", - actor="operator", - note=note, - ) - ) - db_session.commit() - - response = synced_client.get("/api/releases/tasks") - - assert response.status_code == 200 - payload = response.json() - assert len(payload) == 2 - assert len(calls) == 1 - assert {item["pr_gate"]["pr_number"] for item in payload} == {27} - assert all(item["pr_gate"]["can_deploy_staging"] for item in payload) - - def test_requirement_flow_release_task_keeps_requirement_and_null_deployment_anchor(synced_client, db_session): requirement = RequirementRow( title="Release candidate", @@ -996,6 +955,28 @@ def list_with_noise(args, *, timeout=30): monkeypatch.setattr(release_tasks_service, "_run_gh_text", lambda *args, **kwargs: ("ok", "SOURCE codex/match gateway", "")) assert release_tasks_service._find_recent_actions_run_id("example/repo", record, {"service_key": "gateway"}) == "2" + def list_with_record_title(args, *, timeout=30): + return ( + "ok", + [ + { + "createdAt": "2026-04-25T01:03:00Z", + "databaseId": 4, + "displayTitle": "Deploy Staging Admin - admin-front - main - record 999", + }, + { + "createdAt": "2026-04-25T01:02:00Z", + "databaseId": 3, + "displayTitle": f"Deploy Staging Admin - gateway-admin - main - record {record.id}", + }, + ], + "", + ) + + monkeypatch.setattr(release_tasks_service, "_run_gh_json", list_with_record_title) + monkeypatch.setattr(release_tasks_service, "_run_gh_text", lambda *args, **kwargs: ("ok", "gateway-admin", "")) + assert release_tasks_service._find_recent_actions_run_id("example/repo", record, {"service_key": "gateway-admin"}) == "3" + monkeypatch.setattr(release_tasks_service, "_run_gh_json", lambda *args, **kwargs: ("auth_error", None, "no auth")) assert release_tasks_service._github_actions_run_view("example/repo", "2") == (None, "no auth") @@ -1330,7 +1311,7 @@ def fake_gate(row, repo): can_deploy_staging=True, ) - monkeypatch.setattr(release_tasks_service, "_release_task_pr_gate_for", fake_gate) + monkeypatch.setattr(release_gate_status_service, "_release_task_pr_gate_for", fake_gate) synced_client.post( "/api/releases/tasks", json={ @@ -1341,12 +1322,15 @@ def fake_gate(row, repo): }, ) - payload = synced_client.get("/api/releases/tasks").json()[0] + list_payload = synced_client.get("/api/releases/tasks").json()[0] + assert list_payload["pr_gate"]["checks_status"] == "unknown" - assert payload["pr_gate"]["branch_exists"] is True - assert payload["pr_gate"]["pr_exists"] is True - assert payload["pr_gate"]["checks_status"] == "success" - assert payload["pr_gate"]["can_deploy_staging"] is True + payload = synced_client.get(f"/api/releases/tasks/{list_payload['id']}/gate-status").json() + + assert payload["branch_exists"] is True + assert payload["pr_exists"] is True + assert payload["checks_status"] == "success" + assert payload["can_deploy_staging"] is True def test_release_task_create_pr_requires_branch_and_returns_pending_gate(monkeypatch, synced_client, db_session):