Print deploy results before post-deploy script & migration - #6368
Merged
Merged
Conversation
The migration's output preceded the deploy's own summary, so warnings from post-deploy work read as belonging to the deploy: Uploading bundle files to ... Warn: post-deploy dry-run migration to direct: ... Created secret_scopes.my_scope Files: 5 uploaded, 0 deleted The summary is deliberately printed last, so the migration moves rather than the summary: out of deployCore, which no longer needs requestedEngine, to the end of Deploy. It stays gated on the deploy alone, which the early return above already guarantees, and not on the postdeploy script: the resources were applied before that script ran, so the state is worth migrating even if it failed — the same reasoning that prints the summary regardless. Co-authored-by: Isaac
.gitattributes sets `merge: ours` for acceptance output.txt, so cherry-picking the reorder kept main's version of the two files that needed a 3-way merge. Regenerated with -update; all seven migrate goldens now move. Co-authored-by: Isaac
"Dry-run the migration ... and record the outcome in telemetry" reads as if nothing is ever migrated. It is: when the user opted in and the dry-run is clean, MigrateToDirect renames resources.json, backs up terraform.tfstate and pushes the new state. Lead with that and keep the dry-run as the condition. Co-authored-by: Isaac
The summary is the deploy reporting on itself, so it goes ahead of post-deploy work rather than in between it: the script's output and the migration's both follow it now, and neither reads as belonging to the deploy. Previously the script ran first, so on a script failure a clean-looking summary printed after the error. Co-authored-by: Isaac
An interrupted "go test -update" run wrote acceptance/fips/output.txt before it was killed, recording the local non-FIPS failure as the expected output. The test only passes with the FIPS build flags CI sets, so the golden has to stay at main's version. Co-authored-by: Isaac
denik
enabled auto-merge
August 24, 2026 16:05
denik
changed the title
ilyakuz-db
approved these changes
Aug 24, 2026
Collaborator
Integration test reportCommit: de62f44
7 interesting tests: 4 SKIP, 2 flaky, 1 RECOVERED
Top 14 slowest tests (at least 2 minutes):
|
denik
added a commit
that referenced
this pull request
Aug 25, 2026
#6368 regenerated the same auto-migrate goldens for its output reordering. Since main carries no template field, the rebase auto-merge took its line set and dropped direct_migrate_commit_error_template from both. Co-authored-by: Isaac
janniklasrose
pushed a commit
that referenced
this pull request
Sep 15, 2026
## Why The migration's output preceded the deploy's own summary, so its warnings read as belonging to the deploy: ``` Uploading bundle files to /Workspace/Users/.../files... Warn: post-deploy dry-run migration to direct: unknown permission level "BOGUS" for secret scope Created secret_scopes.my_scope Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged ```
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
3 participants
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.
Why
The migration's output preceded the deploy's own summary, so its warnings read as belonging to the deploy: