diff --git a/backend/app.py b/backend/app.py index 63cc7ba..2f07f5e 100644 --- a/backend/app.py +++ b/backend/app.py @@ -51,11 +51,20 @@ class App: "is_running": False, }) else: - pipeline_state.append({ + step_state = { "name": r.name, "status": result, "is_running": False, - }) + } + step_errors = getattr(r, "errors", []) + if step_errors: + step_state["status"] = {"result": result, "errors": step_errors} + step_state["error"] = True + step_warnings = getattr(r, "warnings", []) + if step_warnings and not step_errors: + step_state["status"] = {"result": result, "warnings": step_warnings} + step_state["warning"] = True + pipeline_state.append(step_state) except BaseException as e: stack = traceback.format_exception(type(e), e, e.__traceback__) pipeline_state.append({ diff --git a/backend/steps/git.py b/backend/steps/git.py index 93ca504..19f1e53 100644 --- a/backend/steps/git.py +++ b/backend/steps/git.py @@ -70,6 +70,7 @@ class GitClone(AbstractStep[str]): self.repo_path = repo_path self.branchNamePrefix = branchNamePrefix self.credEnvPrefix = credEnvPrefix + self.errors: List[str] = [] def _get_auth_git_url(self, url: str) -> str: username = os.getenv(f'{self.credEnvPrefix}_USERNAME') @@ -82,6 +83,7 @@ class GitClone(AbstractStep[str]): return url def progress(self) -> str: + self.errors = [] self.repo_path = self.repo_path or os.path.join(tempfile.gettempdir(), f"{self.env.id}_{hashlib.sha1('|'.join(self.urls).encode()).hexdigest()[:5]}") logger.info(f"Cloning repositories {self.remotes} to {self.repo_path}") @@ -93,29 +95,39 @@ class GitClone(AbstractStep[str]): else: repo = git.Repo.init(self.repo_path) + fetched_remotes = 0 for entry in self.remotes: remote_name = entry["name"] repository_url = entry["url"] - auth_url = self._get_auth_git_url(repository_url) - if remote_name in repo.remotes: - remote = repo.remotes[remote_name] - if remote.url != auth_url: - remote.set_url(auth_url) - else: - remote = repo.create_remote(remote_name, auth_url) - with repo.config_writer() as config: - config.set_value( - f'remote "{remote_name}"', - 'fetch', - f'+refs/heads/*:refs/remotes/{remote_name}/*', - ) - if remote_name == "origin" and self.branchNamePrefix != "": + try: + auth_url = self._get_auth_git_url(repository_url) + if remote_name in repo.remotes: + remote = repo.remotes[remote_name] + if remote.url != auth_url: + remote.set_url(auth_url) + else: + remote = repo.create_remote(remote_name, auth_url) with repo.config_writer() as config: - config.set_value('remote "origin"', "fetch", - f"+refs/heads/{self.branchNamePrefix}/*:refs/remotes/origin/{self.branchNamePrefix}/*") - result = remote.fetch(prune=True) - if not result or any(fetch_info.flags & fetch_info.ERROR for fetch_info in result): - raise BaseException(f"Failed to fetch updates for {remote_name}") + config.set_value( + f'remote "{remote_name}"', + 'fetch', + f'+refs/heads/*:refs/remotes/{remote_name}/*', + ) + if remote_name == "origin" and self.branchNamePrefix != "": + with repo.config_writer() as config: + config.set_value('remote "origin"', "fetch", + f"+refs/heads/{self.branchNamePrefix}/*:refs/remotes/origin/{self.branchNamePrefix}/*") + result = remote.fetch(prune=True) + if not result or any(fetch_info.flags & fetch_info.ERROR for fetch_info in result): + raise BaseException(f"Failed to fetch updates for {remote_name}") + fetched_remotes += 1 + except BaseException as remote_error: + if "File contains no section headers" in str(remote_error): + raise + self.errors.append(f"Unable to fetch remote {remote_name} ({repository_url}): {remote_error}") + logger.warning("Unable to fetch remote %s (%s): %s", remote_name, repository_url, remote_error) + if fetched_remotes == 0: + logger.warning("No configured git remotes are available; keeping the local repository state") if not os.path.exists(os.path.join(self.repo_path, ".git")): raise BaseException(f"Failed to clone repositories {self.remotes} to {self.repo_path}") except BaseException as e: @@ -352,9 +364,12 @@ class GitUnmerge(AbstractStep[GitUnmergeResult]): super().__init__(**kwargs) self.wd = wd self.check = check + self.warnings: List[str] = [] def progress(self) -> GitUnmergeResult: + self.warnings = [] wd = self.wd.progress() + repo = git.Repo(wd) deployState: Mapping[str, HasVersion] = self.check.progress() versions = set([it.version for it in deployState.values()]) @@ -362,9 +377,10 @@ class GitUnmerge(AbstractStep[GitUnmergeResult]): raise BaseException(f"Expected exactly one version, got: {versions}") version = list(versions)[0] + if not version: + return GitUnmergeResult(branches=[], columns={"Deployed": {}}) if version is None: raise BaseException(f"Expected exactly one version, got: {versions}") - repo = git.Repo(wd) childs: Dict[Commit, List[Commit]] | None = None if 'auto-' in version: version_parts = version[len('auto-'):].split('-') diff --git a/docs/USE_CASES_NOT_COVERED_BY_TESTS.md b/docs/USE_CASES_NOT_COVERED_BY_TESTS.md index 6a7df2b..a8f3c2f 100644 --- a/docs/USE_CASES_NOT_COVERED_BY_TESTS.md +++ b/docs/USE_CASES_NOT_COVERED_BY_TESTS.md @@ -26,6 +26,20 @@ Эти тесты не покрывают весь пользовательский сценарий целиком: например, проверка `GET /state` на HTTP 200 не проверяет все поля ответа, а локальный container test не является тестом Docker Swarm rollout. +## Непокрытые UI-сценарии + +### NU-09. Красная рамка toggle-кнопки при проблемном pipeline + +**Требование:** [U-06](USE_CASES_UI.md#u-06-отфильтровать-окружения-toggle-кнопками). + +Нет автоматического UI-теста, который проверяет: + +- красную рамку для окружения с `error`-шагом; +- красную рамку для окружения с `is_running`-шагом; +- отсутствие красной рамки у окружения, где все шаги завершены успешно; +- обновление рамки после WebSocket-сообщения с новым pipeline state; +- сохранение возможности включать и выключать проблемную toggle-кнопку. + ## Непокрытые backend-сценарии ### NB-01. Получение главной страницы и static resource diff --git a/docs/USE_CASES_UI.md b/docs/USE_CASES_UI.md index cd2d3a9..a159b0f 100644 --- a/docs/USE_CASES_UI.md +++ b/docs/USE_CASES_UI.md @@ -60,6 +60,8 @@ Brencher показывает оператору состояние Git-исто 6. Если все toggle-кнопки выключены, UI показывает все окружения. 7. Фильтр меняет только отображение и не изменяет серверное состояние. 8. Обновление состояния не должно сбрасывать активный выбор toggle-кнопок, если выбранные окружения всё ещё существуют. +9. Если pipeline окружения содержит хотя бы один неуспешный (`error`) или незаконченный (`is_running`) шаг, соответствующая toggle-кнопка получает красную рамку. +10. Красная рамка обновляется вместе с состоянием pipeline и не изменяет доступность или поведение toggle-кнопки. ### U-06a. Отфильтровать окружения текстом diff --git a/frontend/app.js b/frontend/app.js index 4b25620..c4bc47d 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -89,6 +89,12 @@ function filterBranches() { renderBranches(); } +function environmentHasPipelineProblem(envObj) { + return Array.isArray(envObj.pipeline) && envObj.pipeline.some(job => + job && (job.error || job.is_running) + ); +} + function renderEnvironmentFilters() { const environments = environmentsRaw .filter(envObj => envObj && (envObj.id || envObj.name)) @@ -98,9 +104,14 @@ function renderEnvironmentFilters() { [...activeEnvFilters].forEach(envId => { if (!environmentIds.has(envId)) activeEnvFilters.delete(envId); }); - envFilterToggles.innerHTML = environments.map(({id, name}) => ` - - `).join(''); + envFilterToggles.innerHTML = environments.map(({id, name}) => { + const hasPipelineProblem = environmentHasPipelineProblem( + environmentsRaw.find(envObj => (envObj.id || envObj.name) === id) || {} + ); + return ` + + `; + }).join(''); envFilterToggles.querySelectorAll('.env-filter-toggle').forEach(button => { button.onclick = () => { const envId = button.dataset.env; @@ -184,11 +195,6 @@ function renderBranches() { checkForPendingChanges(); const branchesToShow = filteredBranches.length > 0 || branchFilter.value.trim() || activeEnvFilters.size > 0 ? filteredBranches : branches; - if (!branchesToShow.length) { - branchesList.innerHTML = '

No branches found.

'; - return; - } - // Group by envId for clearer separation const groups = branchesToShow.reduce((acc, b) => { acc[b.envId] = acc[b.envId] || {envName: b.envName, rows: []}; @@ -196,18 +202,30 @@ function renderBranches() { return acc; }, {}); + environmentsRaw + .filter(envObj => envObj && (activeEnvFilters.size === 0 || activeEnvFilters.has(envObj.id || envObj.name))) + .forEach(envObj => { + const envId = envObj.id || envObj.name; + if (!groups[envId]) groups[envId] = {envName: envObj.name || envId, rows: []}; + }); + + if (!Object.keys(groups).length) { + branchesList.innerHTML = '

No branches found.

'; + return; + } + branchesList.innerHTML = Object.entries(groups).map(([envId, {envName, rows}]) => { const envCols = columnsByEnv[envId] || {}; const colNames = Object.keys(envCols); return `

- Environment: ${envName || envId} + Environment: ${escapeHtml(envName || envId)}

- + ${rows.length ? `
@@ -238,7 +256,7 @@ function renderBranches() { `; }).join('')} -
Deploy
+ ` : '

No branches found.

'}
`; }).join(''); // Event wiring @@ -358,6 +376,7 @@ function renderJobs() { const storageKey = 'jobSpoiler:' + key; const safeId = 'spoiler-' + encodeURIComponent(key).replace(/[^a-zA-Z0-9_-]/g, '_'); const isError = job.error; + const isWarning = job.warning; const isRunning = !!job.is_running; const openByDefault = isError || (window._jobSpoilerState && window._jobSpoilerState[storageKey] === 'open'); @@ -369,6 +388,8 @@ function renderJobs() { ? `` : isError ? `!` + : isWarning + ? `⚠` : `✔`} ${envObj.id} - ${job.name} diff --git a/frontend/styles.css b/frontend/styles.css index 9b26b1f..0a72520 100644 --- a/frontend/styles.css +++ b/frontend/styles.css @@ -161,6 +161,10 @@ body { border-color: #007bff; } +.env-filter-toggle.has-pipeline-problem { + border: 2px solid #dc3545; +} + /* Branches table styling */ .branches-table { width: 100%; diff --git a/tests/test_git_integration.py b/tests/test_git_integration.py index 3a81c27..ca137f6 100644 --- a/tests/test_git_integration.py +++ b/tests/test_git_integration.py @@ -71,6 +71,29 @@ class TestGitIntegration: shutil.rmtree(github_dir, ignore_errors=True) shutil.rmtree(gitea_dir, ignore_errors=True) + def test_git_clone_keeps_available_remote_when_another_is_unreachable(self, repo_helper: RemoteRepoHelper) -> None: + repo_helper.create_commit(repo_helper.repo, "master", "master", "README.md", "content", "Initial commit") + clone = GitClone(remotes=[ + {"name": "available", "url": repo_helper.remote_dir}, + {"name": "unreachable", "url": "/does/not/exist"}, + ]) + clone.env = repo_helper.env + + clone.progress() + + assert "available/master" in clone.get_branches() + assert len(clone.errors) == 1 + assert "unreachable" in clone.errors[0] + + def test_git_clone_keeps_empty_repository_when_all_remotes_are_unreachable(self, repo_helper: RemoteRepoHelper) -> None: + clone = GitClone(url="/does/not/exist") + clone.env = repo_helper.env + + repo_path = clone.progress() + + assert os.path.isdir(os.path.join(repo_path, ".git")) + assert clone.get_branches() == {} + def test_git_clone_remotes_validation(self) -> None: # Empty list: rejected (would produce an unusable clone). with pytest.raises(ValueError, match="At least one repository URL is required"): @@ -336,6 +359,15 @@ class TestGitIntegration: with pytest.raises(BaseException, match="Version format not recognized"): repo_helper.git_unmerge.progress() + def test_git_unmerge_empty_version_uses_default_branch(self, repo_helper: RemoteRepoHelper) -> None: + repo_helper.create_commit(repo_helper.repo, "master", "master", "file1.txt", "content", "Initial commit") + repo_helper.set_desired_branches([]) + repo_helper.mock_check.version = lambda: "" # type: ignore[attr-defined] + + result = repo_helper.git_unmerge.progress() + + assert result.branches == [()] + def test_git_unmerge_nonhead_commit(self, repo_helper: RemoteRepoHelper) -> None: # Create initial commit commit1 = repo_helper.create_commit(repo_helper.repo, "master", "master", "file1.txt", "content1",