Fix signing diag file consolidation: always run#2074
Merged
Conversation
gdams
approved these changes
Jan 21, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes the signing diagnostic file consolidation process to ensure it always runs, even when the main signing process fails. Previously, diagnostic artifacts were only created on success, which prevented diagnosing actual errors. The fix uses a deferred function to guarantee execution, and implements error accumulation to consolidate as many files as possible instead of stopping at the first error.
Changes:
- Moved diagnostic file consolidation to a deferred function in
run()to ensure it executes regardless of success or failure - Refactored error handling in
consolidateDiagnosticFiles()to accumulate errors usingerrors.Joinrather than returning immediately on first error
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| eng/_util/cmd/sign/sign.go | Adds defer block to ensure diagnostic consolidation always runs and joins consolidation errors with main errors using named return value |
| eng/_util/cmd/sign/archive.go | Refactors consolidateDiagnosticFiles() to accumulate all errors with errors.Join instead of early returns |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
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.
The signing diagnosis artifact was only being created upon success of the main signing process. This works for diagnosing false successes, but not actual errors. Use defer to always create it.
Also, consolidate as many files as possible rather than stopping upon error.