aws-s3 input default content-type #25772
Merged
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
botelastic
bot
added
the
needs_team
leehinman
added
backport-v7.14.0
|
Pinging @elastic/security-external-integrations (Team:Security-External Integrations) |
botelastic
bot
removed
the
needs_team
- new option `content_type` - can be set at input or file selector level - overrides Content-Type that was given to the S3 object when it was uploaded. Closes elastic#25697
leehinman
force-pushed
the
25697_awss3_fallback_content_type
branch
from
a286ff5
to
87f4f26
Compare
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪💚 Flaky test reportTests succeeded. Expand to view the summary
Test stats 🧪
|
Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co>
andrewkroh
approved these changes
May 19, 2021
| @@ -82,6 +83,9 @@ func (f *readerConfig) Validate() error { | |||
| if f.MaxBytes <= 0 { | |||
| return fmt.Errorf("max_bytes <%v> must be greater than 0", f.MaxBytes) | |||
| } | |||
| if f.ExpandEventListFromField != "" && f.ContentType != "" && f.ContentType != "application/json" { | |||
| return fmt.Errorf("content_type must be `application/json` to be used with expand_event_list_from_field") | |||
There was a problem hiding this comment.
Suggested change
| return fmt.Errorf("content_type must be `application/json` to be used with expand_event_list_from_field") | |
| return fmt.Errorf("content_type must be `application/json` when expand_event_list_from_field is used") |
Just a suggestion
leehinman
added a commit
that referenced
this pull request
May 19, 2021
* aws-s3 input default content-type - new option `content_type` - can be set at input or file selector level - overrides Content-Type that was given to the S3 object when it was uploaded. Closes #25697 Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co> (cherry picked from commit d62b1be) Co-authored-by: Lee Hinman <57081003+leehinman@users.noreply.github.com>
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.
What does this PR do?
Adds a new option
content_typeto the aws-s3 input. This allows youto override the Content-Type that was given to the S3 object when it
was uploaded.
Why is it important?
Content-Type is used to determine if the S3 object should be treated
as JSON or not. If the object was uploaded with the incorrect
Content-Type that can prevent us from parsing the file correctly.
Checklist
- [ ] I have commented my code, particularly in hard-to-understand areas- [ ] I have made corresponding change to the default configuration filesCHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.Author's Checklist
How to test this PR locally
Setup SQS and S3 bucket and download files.
Related issues