refactor(files_external/s3): tighten headObject error handling and normalization#58644
Open
joshtrichards wants to merge 2 commits intomasterfrom
Open
refactor(files_external/s3): tighten headObject error handling and normalization#58644joshtrichards wants to merge 2 commits intomasterfrom
joshtrichards wants to merge 2 commits intomasterfrom
Conversation
- Refactor headObject() to use early-return on cache hit for readability - Reduce code nesting - Normalize S3 object metadata to include 'Key' when caching (once) versus when reading (always) - Add explicit structured return type in docblock No observable change in behavior; improves code clarity and consistently ensures normalized cache entries. Signed-off-by: Josh <[email protected]>
- Classify explicit “missing object” conditions only (404, maybe NoSuchKey, NotFound) as negative cache. - No longer swallow non-notfound 4xx (i.e. <500) by caching as false. Instead throw upstream (to expose authentication problems, etc.) Signed-off-by: Josh <[email protected]>
CarlSchwan
approved these changes
Mar 1, 2026
| return false; | ||
| } | ||
|
|
||
| /** @var CappedMemoryCache<array|false> */ |
Member
There was a problem hiding this comment.
Suggested change
| /** @var CappedMemoryCache<array{Key:string, LastModified?:string, ContentLength?:int, ETag?:string, Size?:int}|false> */ |
| } | ||
|
|
||
| try { | ||
| $result = $this->getConnection()->headObject([ |
Member
There was a problem hiding this comment.
Suggested change
| $result = $this->getConnection()->headObject([ | |
| /** @var array{Key?:string, LastModified?:string, ContentLength?:int, ETag?:string, Size?:int} */ | |
| $result = $this->getConnection()->headObject([ |
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
2 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.
Summary
Keyonly when writing to cache (once), not on subsequent reads.404,NoSuchKey,NotFound) asfalse.This reduces the risk of masking permission/configuration issues, avoids repeated normalization work, and improves code clarity.
TODO
Checklist
3. to review, feature component)stable32)AI (if applicable)