refactor: reduce complexity of execute_impl in create_pull_request.rs - #1886
Draft
github-actions[bot] wants to merge 1 commit into
Draft
Conversation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
Author
There was a problem hiding this comment.
Threat detection produced a warning for this pull request output.
These changes need to be scrutinized before merge and only merged after a careful manual review.
- Detection reason:
parse_error - Review workflow run logs: https://github.com/githubnext/ado-aw/actions/runs/31581038019
|
Azure Pipelines: Successfully started running 1 pipeline(s). 1 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Warning
Threat Detection Engine Failure — The analysis engine could not complete. This is a tooling failure, not a security finding.
What happened
The threat detection results could not be parsed.
Review the workflow run logs for details.
What was complex
CreatePrResult::execute_implinsrc/safe_outputs/create_pull_request.rshad ballooned to 583 lines (clippytoo_many_lines, limit 100), mixing repository resolution, patch validation/security checks, git worktree setup, ADO base-commit resolution, and branch-collision retry logic all inline in one function.What changed
Extracted five cohesive, independently-testable blocks into helper functions (no public API or behavior changes):
resolve_target_repository— validatesself.repositoryagainst the allowed repository list and resolves it to an ADO repository ID.load_and_validate_patch— reads the patch file, enforces the size limit, verifies SHA-256 integrity, and runs the excluded/protected-files and max-files security checks.create_target_worktree— verifies the git repository and creates a worktree at the target branch (withorigin/<branch>fallback), returning aWorktreeGuardfor cleanup.resolve_base_commit— resolves the push base commit, preferring the Stage-1-recorded SHA and falling back to the ADO refs API.resolve_unique_source_branch— checks for source-branch name collisions on ADO and retries with a new random suffix (up to 3 times).Before / after
too_many_lines)Verification
cargo build— cleancargo clippy --all-targets --all-features— clean, no warningscargo test— full suite passes (2891+ tests, including all 58create_pull_requestunit/integration tests)Warning
Firewall blocked 1 domain
The following domain was blocked by the firewall during workflow execution:
spsprodeus21.vssps.visualstudio.comTo allow these domains, add them to the
network.allowedlist in your workflow frontmatter:See Network Configuration for more information.