Repository navigation
Keep external credential declarations out of the bus inventory - #3884
Merged
Merged
Conversation
There was a problem hiding this comment.
Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.
An organization owner can choose the repository organization as the billing source for reviews requested by members with a paid Copilot license. Learn about Copilot code review billing.
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.
External credential locations: two bogus bus declarations → zero
4 files, +62/-11. Follow-up to #3861, found by running the real pending carry against captured live inputs before installation.
Failure and owner repair
The original private-copy run reached the actual installer worker and completed its dry run.
StoreBackup.stores_original()then crashed:RootFile.named_paths()included a nonexistentbus/grants.json, andExternalStore.retained_name()tried to resolve that bus path relative to the external HOME credential file.Before:
RootFile.declarations_in()treated every class declaringfilenameas bus-relative.ConnectorCredentialsFileandConnectorStoresupplied that filename.After:
RootFile.root_declaration()owns bus-relative inventory contribution.ExternalFile(DurableFile)supplies the external/explicit-location behavior: no bus-relative contribution.ExternalStoremembers inherit that behavior.ConnectorFile(ExternalFile)declaresgrants.jsononce; the external resource and selected document reader inherit it.ConnectorStore.at(...)fixture/live-verification callers retain their selected-file construction through that inherited filename.No catch, path filter, credential-name special case or runtime-format fallback was added.
Executed preservation and rollback
The failed epoch is retained under
.connector-carry-live-01. The repaired epoch reuses its captured bytes, rather than changing the input until it passes.The captured live root's complete unfinished chain was exactly
connector_access_carry. The run used the actualInstallCommands/TargetProgram/CarryProbeworker exchange,WriterOwnedOpeningProbe,StoreBackup.take/restore, and inherited credential locks.e7c2eb27f4eb2e76ff3c17218766cdaaa5a04cc0a418a2996a89f35f5b75061b.Artifacts:
/home/ts/.cache/agent-scratch/pi-shell-colleague/termux/connector-carry-live-01.log/home/ts/.cache/agent-scratch/pi-shell-colleague/termux/connector-carry-live-02.log/home/ts/wt/pi-shell-colleague--08d60541405342efa6d4f3330b320056--agent-comms/.connector-carry-live-02/capture.jsonresult.jsonrecords the selected backup names and every result above.A regression control was added to
tests/test_carry_connector_access.py, using the real HOME-selected resource, practice copy, backup, carry and byte-exact restore. That pytest control has not been executed locally; the execution above is the real installer-operation proof, not a pytest result. This is source execution with the installed interpreter/dependencies, not a full candidate-runtime installation or phone proof.Assumed: the credential file remains the canonical HOME resource declared by
ConnectorCredentialsFile; the actual install retains its existing maintenance/borrowed-lock lifetime through rollback.