dev-preprod-prod logic

2026-03-01 14:39:25 +03:00
parent 80b28ac371
commit da24fb9253
13 changed files with 754 additions and 70 deletions
--- a/backend/src/api/routes/environments.py
+++ b/backend/src/api/routes/environments.py
@@ -31,6 +31,7 @@ class EnvironmentResponse(BaseModel):
    id: str
    name: str
    url: str
+    stage: str = "DEV"
    is_production: bool = False
    backup_schedule: Optional[ScheduleSchema] = None
 # [/DEF:EnvironmentResponse:DataClass]
@@ -59,18 +60,26 @@ async def get_environments(
    # Ensure envs is a list
    if not isinstance(envs, list):
        envs = []
-    return [
-        EnvironmentResponse(
-            id=e.id,
-            name=e.name,
-            url=e.url,
-            is_production=getattr(e, "is_production", False),
-            backup_schedule=ScheduleSchema(
-                enabled=e.backup_schedule.enabled,
-                cron_expression=e.backup_schedule.cron_expression
-            ) if getattr(e, 'backup_schedule', None) else None
-        ) for e in envs
-    ]
+    response_items = []
+    for e in envs:
+        resolved_stage = str(
+            getattr(e, "stage", "")
+            or ("PROD" if bool(getattr(e, "is_production", False)) else "DEV")
+        ).upper()
+        response_items.append(
+            EnvironmentResponse(
+                id=e.id,
+                name=e.name,
+                url=e.url,
+                stage=resolved_stage,
+                is_production=(resolved_stage == "PROD"),
+                backup_schedule=ScheduleSchema(
+                    enabled=e.backup_schedule.enabled,
+                    cron_expression=e.backup_schedule.cron_expression
+                ) if getattr(e, 'backup_schedule', None) else None
+            )
+        )
+    return response_items
 # [/DEF:get_environments:Function]

 # [DEF:update_environment_schedule:Function]
--- a/backend/src/api/routes/git.py
+++ b/backend/src/api/routes/git.py
@@ -26,6 +26,7 @@ from src.api.routes.git_schemas import (
    RepoStatusBatchRequest, RepoStatusBatchResponse,
    GiteaRepoCreateRequest, GiteaRepoSchema,
    RemoteRepoCreateRequest, RemoteRepoSchema,
+    PromoteRequest, PromoteResponse,
 )
 from src.services.git_service import GitService
 from src.core.superset_client import SupersetClient
@@ -627,6 +628,107 @@ async def sync_dashboard(
            _handle_unexpected_git_route_error("sync_dashboard", e)
 # [/DEF:sync_dashboard:Function]

+
+# [DEF:promote_dashboard:Function]
+# @PURPOSE: Promote changes between branches via MR or direct merge.
+# @PRE: dashboard repository is initialized and Git config is valid.
+# @POST: Returns promotion result metadata.
+@router.post("/repositories/{dashboard_ref}/promote", response_model=PromoteResponse)
+async def promote_dashboard(
+    dashboard_ref: str,
+    payload: PromoteRequest,
+    env_id: Optional[str] = None,
+    config_manager=Depends(get_config_manager),
+    db: Session = Depends(get_db),
+    _ = Depends(has_permission("plugin:git", "EXECUTE"))
+):
+    with belief_scope("promote_dashboard"):
+        dashboard_id = _resolve_dashboard_id_from_ref(dashboard_ref, config_manager, env_id)
+        db_repo = db.query(GitRepository).filter(GitRepository.dashboard_id == dashboard_id).first()
+        if not db_repo:
+            raise HTTPException(status_code=404, detail=f"Repository for dashboard {dashboard_ref} is not initialized")
+        config = _get_git_config_or_404(db, db_repo.config_id)
+
+        from_branch = payload.from_branch.strip()
+        to_branch = payload.to_branch.strip()
+        if not from_branch or not to_branch:
+            raise HTTPException(status_code=400, detail="from_branch and to_branch are required")
+        if from_branch == to_branch:
+            raise HTTPException(status_code=400, detail="from_branch and to_branch must be different")
+
+        mode = (payload.mode or "mr").strip().lower()
+        if mode == "direct":
+            reason = (payload.reason or "").strip()
+            if not reason:
+                raise HTTPException(status_code=400, detail="Direct promote requires non-empty reason")
+            logger.warning(
+                "[promote_dashboard][PolicyViolation] Direct promote without MR by actor=unknown dashboard_ref=%s from=%s to=%s reason=%s",
+                dashboard_ref,
+                from_branch,
+                to_branch,
+                reason,
+            )
+            result = git_service.promote_direct_merge(
+                dashboard_id=dashboard_id,
+                from_branch=from_branch,
+                to_branch=to_branch,
+            )
+            return PromoteResponse(
+                mode="direct",
+                from_branch=from_branch,
+                to_branch=to_branch,
+                status=result.get("status", "merged"),
+                policy_violation=True,
+            )
+
+        title = (payload.title or "").strip() or f"Promote {from_branch} -> {to_branch}"
+        description = payload.description
+        if config.provider == GitProvider.GITEA:
+            pr = await git_service.create_gitea_pull_request(
+                server_url=config.url,
+                pat=config.pat,
+                remote_url=db_repo.remote_url,
+                from_branch=from_branch,
+                to_branch=to_branch,
+                title=title,
+                description=description,
+            )
+        elif config.provider == GitProvider.GITHUB:
+            pr = await git_service.create_github_pull_request(
+                server_url=config.url,
+                pat=config.pat,
+                remote_url=db_repo.remote_url,
+                from_branch=from_branch,
+                to_branch=to_branch,
+                title=title,
+                description=description,
+                draft=payload.draft,
+            )
+        elif config.provider == GitProvider.GITLAB:
+            pr = await git_service.create_gitlab_merge_request(
+                server_url=config.url,
+                pat=config.pat,
+                remote_url=db_repo.remote_url,
+                from_branch=from_branch,
+                to_branch=to_branch,
+                title=title,
+                description=description,
+                remove_source_branch=payload.remove_source_branch,
+            )
+        else:
+            raise HTTPException(status_code=501, detail=f"Provider {config.provider} does not support promotion API")
+
+        return PromoteResponse(
+            mode="mr",
+            from_branch=from_branch,
+            to_branch=to_branch,
+            status=pr.get("status", "opened"),
+            url=pr.get("url"),
+            reference_id=str(pr.get("id")) if pr.get("id") is not None else None,
+            policy_violation=False,
+        )
+# [/DEF:promote_dashboard:Function]
+
 # [DEF:get_environments:Function]
 # @PURPOSE: List all deployment environments.
 # @PRE: Config manager is accessible.
--- a/backend/src/api/routes/git_schemas.py
+++ b/backend/src/api/routes/git_schemas.py
@@ -203,4 +203,31 @@ class RemoteRepoCreateRequest(BaseModel):
    default_branch: Optional[str] = "main"
 # [/DEF:RemoteRepoCreateRequest:Class]

+
+# [DEF:PromoteRequest:Class]
+# @PURPOSE: Request schema for branch promotion workflow.
+class PromoteRequest(BaseModel):
+    from_branch: str = Field(..., min_length=1, max_length=255)
+    to_branch: str = Field(..., min_length=1, max_length=255)
+    mode: str = Field(default="mr", pattern="^(mr|direct)$")
+    title: Optional[str] = None
+    description: Optional[str] = None
+    reason: Optional[str] = None
+    draft: bool = False
+    remove_source_branch: bool = False
+# [/DEF:PromoteRequest:Class]
+
+
+# [DEF:PromoteResponse:Class]
+# @PURPOSE: Response schema for promotion operation result.
+class PromoteResponse(BaseModel):
+    mode: str
+    from_branch: str
+    to_branch: str
+    status: str
+    url: Optional[str] = None
+    reference_id: Optional[str] = None
+    policy_violation: bool = False
+# [/DEF:PromoteResponse:Class]
+
 # [/DEF:backend.src.api.routes.git_schemas:Module]