fix(git): handle manually deployed stacks without version metadata
This commit is contained in:
@@ -60,6 +60,10 @@ class App:
|
||||
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__)
|
||||
|
||||
+30
-1
@@ -364,9 +364,27 @@ class GitUnmerge(AbstractStep[GitUnmergeResult]):
|
||||
super().__init__(**kwargs)
|
||||
self.wd = wd
|
||||
self.check = check
|
||||
self.warnings: List[str] = []
|
||||
|
||||
def _default_branch(self, repo: git.Repo) -> Tuple[str, Commit] | None:
|
||||
for remote in repo.remotes:
|
||||
for ref in remote.refs:
|
||||
if ref.name == f"{remote.name}/HEAD":
|
||||
branch = ref.name.removeprefix(f"{remote.name}/HEAD -> ")
|
||||
if branch == ref.name:
|
||||
branch = ref.reference.name.removeprefix(f"{remote.name}/")
|
||||
return branch, ref.commit
|
||||
for branch_name in ("master", "main"):
|
||||
for remote in repo.remotes:
|
||||
ref_name = f"{remote.name}/{branch_name}"
|
||||
if ref_name in repo.refs:
|
||||
return branch_name, repo.refs[ref_name].commit
|
||||
return None
|
||||
|
||||
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()])
|
||||
@@ -374,9 +392,20 @@ class GitUnmerge(AbstractStep[GitUnmergeResult]):
|
||||
raise BaseException(f"Expected exactly one version, got: {versions}")
|
||||
|
||||
version = list(versions)[0]
|
||||
if not version:
|
||||
message = "Deployed stack has no Brencher version metadata; using the repository default branch"
|
||||
self.warnings.append(message)
|
||||
logger.warning(message)
|
||||
default_branch = self._default_branch(repo)
|
||||
if default_branch is None:
|
||||
return GitUnmergeResult(branches=[], columns={"Deployed": {}})
|
||||
branch, commit = default_branch
|
||||
return GitUnmergeResult(
|
||||
branches=[(branch, commit.hexsha)],
|
||||
columns={"Deployed": {branch: commit.hexsha[:8]}},
|
||||
)
|
||||
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('-')
|
||||
|
||||
@@ -376,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');
|
||||
|
||||
@@ -387,6 +388,8 @@ function renderJobs() {
|
||||
? `<span class="step-spinner" title="Running"></span>`
|
||||
: isError
|
||||
? `<span style="color:#dc3545;font-weight:bold;margin-right:6px;" title="Error">!</span>`
|
||||
: isWarning
|
||||
? `<span style="color:#d99700;font-weight:bold;margin-right:6px;" title="Warning">⚠</span>`
|
||||
: `<span style="color:#28a745;font-weight:bold;margin-right:6px;" title="OK">✔</span>`}
|
||||
${envObj.id} - ${job.name}
|
||||
</div>
|
||||
|
||||
@@ -359,6 +359,17 @@ 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 == [("master", repo_helper.repo.commit("master").hexsha)]
|
||||
assert repo_helper.git_unmerge.warnings
|
||||
assert "no Brencher version metadata" in repo_helper.git_unmerge.warnings[0]
|
||||
|
||||
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",
|
||||
|
||||
Reference in New Issue
Block a user