Cherry-pick #15252 to 7.5: [Filebeat] Check content type when reading s3 files #15369
Conversation
This file contains 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
* Check resp.ContentType and filename * Remove case "text/plain" to use default instead (cherry picked from commit 034e719)
ChrsMark
approved these changes
Jan 8, 2020
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
…reading s3 files (elastic#15369) * [Filebeat] Check content type when reading s3 files (elastic#15252) * Check resp.ContentType and filename * Remove case "text/plain" to use default instead (cherry picked from commit 6692049) * Fix changelog
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.
Cherry-pick of PR #15252 to 7.5 branch. Original message:
When file name has
.gzsuffix but with text/plain content type,newS3BucketReaderfunction will fail when using s3 input in Filebeat. Instead of simply checking file name, check the actual content type from the response and then decide how to build the new reader.How to test it:
Upload file to an S3 bucket and change the file metadata property to test this PR:
Upload a test1.txt.gz file and change content type to
text/plain, s3 input should still be able to read the file.closes #15225