allow for json/ndjson content type with charset #32767

aspacca · 2022-08-23T02:00:31Z

Enhancement

What does this PR do?

Why is it important?

see: https://github.com/elastic/enhancements/issues/16194

Checklist

My code follows the style guidelines of this project
~~- [ ] I have commented my code, particularly in hard-to-understand areas~~
~~- [ ] I have made corresponding changes to the documentation~~
~~- [ ] I have made corresponding change to the default configuration files~~
I have added tests that prove my fix is effective or that my feature works
I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

[ ]

How to test this PR locally

Related issues

Closes https://github.com/elastic/enhancements/issues/16194

Use cases

Screenshots

Logs

mergify · 2022-08-23T02:00:59Z

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @aspacca? 🙏.
For such, you'll need to label your PR with:

The upcoming major version of the Elastic Stack
The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

elasticmachine · 2022-08-23T02:29:16Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2022-08-25T01:51:44.795+0000
Duration: 133 min 19 sec

Test stats 🧪

Test	Results
Failed	0
Passed	4403
Skipped	338
Total	4741

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

/test : Re-trigger the build.
/package : Generate the packages and run the E2E tests.
/beats-tester : Run the installation tests with beats-tester.
run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

tommyers-elastic · 2022-08-23T08:42:02Z

x-pack/filebeat/input/awss3/input_integration_test.go

@@ -328,11 +325,19 @@ func uploadS3TestFiles(t *testing.T, region, bucket string, filenames ...string)
 			t.Fatalf("Failed to open file %q, %v", filename, err)
 		}

+		contentType := ""
+		if strings.HasSuffix(filename, "ndjson") || strings.HasSuffix(filename, "ndjson.gz") {
+			contentType = "let-CI-fail-" + contentTypeNDJSON + "; charset=UTF-8"


what is the reason for this let-CI-fail?

I wanted to asses that the integration tests were run in CI, forcing a failure

they don't: CI is green anyway

(having let-CI-fail- as suffix https://github.com/elastic/beats/pull/32767/files#diff-f345fd6a1f5ea9523117d4ead2e5f1d13fb82eb1c65a089fd34fcdd514916a96R156 will be false)

mergify · 2022-08-23T14:25:20Z

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b enhancements-16194 upstream/enhancements-16194
git merge upstream/main
git push upstream enhancements-16194

kaiyan-sheng

LGTM

kaiyan-sheng · 2022-08-24T14:50:15Z

Do we also need to backport it to 7.17?

aspacca · 2022-08-25T01:44:49Z

Do we also need to backport it to 7.17?

I didn't backport to 7.17 since it's a different code base now (aws sdk v2 upgrade)

I will create a new PR for that, thanks for reminding me

aspacca · 2022-08-25T01:48:52Z

I didn't backport to 7.17 since it's a different code base now (aws sdk v2 upgrade)

it seems the lines affected didn't change, so I will add the backport label here

* allow for json/ndjson content type with charset * add '; charset=UTF-8' in integration tests * changelog * assessing CI * revert correct behaviour (cherry picked from commit b40349c) # Conflicts: # x-pack/filebeat/input/awss3/input_integration_test.go

* allow for json/ndjson content type with charset * add '; charset=UTF-8' in integration tests * changelog * assessing CI * revert correct behaviour (cherry picked from commit b40349c)

…et (#32834) * allow for json/ndjson content type with charset (#32767) * allow for json/ndjson content type with charset * add '; charset=UTF-8' in integration tests * changelog * assessing CI * revert correct behaviour (cherry picked from commit b40349c) # Conflicts: # x-pack/filebeat/input/awss3/input_integration_test.go * fix backport conflicts Co-authored-by: Andrea Spacca <andrea.spacca@elastic.co>

#32835) * allow for json/ndjson content type with charset (#32767) * allow for json/ndjson content type with charset * add '; charset=UTF-8' in integration tests * changelog * assessing CI * revert correct behaviour (cherry picked from commit b40349c) * fix backport conflicts Co-authored-by: Andrea Spacca <andrea.spacca@elastic.co>

…ackaging * upstream/main: (109 commits) Add cap_net_raw requirements to heartbeat docs (elastic#32816) apply a quick hotfix for having main working properly (elastic#32934) action: checks for x-pack/libbeat and libbeat (elastic#32754) Update to Go 1.18 in go.mod. (elastic#32940) [heartbeat] disable browser code on windows via build tags (elastic#32939) action: checks for heartbeat and x-pack/heartbeat (elastic#32749) Make event acknowledgment asynchronous in shipper output (elastic#32785) [Automation] Update elastic stack version to 8.5.0-fedc3e60 for testing (elastic#32930) Preallocate memory to reduce GC load (elastic#32905) [Automation] Update elastic stack version to 8.5.0-440e0896 for testing (elastic#32919) Skip broken ceph tests. (elastic#32912) Use non-deprecated docker image for testing jolokia (elastic#32885) update ironbank image product name (elastic#32867) ci: pre-commit stage within Jenkins (elastic#32839) Fix a couple of bugs in the logic for how AWS metric periods are calculated (elastic#32724) [Filebeat] [httpjson] Add support for single string containing multiple relation-types in getRFC5988Link (elastic#32811) [Heartbeat] Update HB k8s template to use <Mi> metric (elastic#32801) action: checks for metricbeat and x-pack/metricbeat (elastic#32748) action: checks for filebeat and x-pack/filebeat (elastic#32746) allow for json/ndjson content type with charset (elastic#32767) ...

* allow for json/ndjson content type with charset * add '; charset=UTF-8' in integration tests * changelog * assessing CI * revert correct behaviour

allow for json/ndjson content type with charset

6e38af8

aspacca requested a review from a team August 23, 2022 02:00

aspacca requested a review from a team as a code owner August 23, 2022 02:00

aspacca self-assigned this Aug 23, 2022

aspacca requested review from fearful-symmetry and leehinman and removed request for a team August 23, 2022 02:00

botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 23, 2022

aspacca added the Team:Cloud-Monitoring Label for the Cloud Monitoring team label Aug 23, 2022

botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 23, 2022

aspacca added the backport-v8.4.0 Automated backport with mergify label Aug 23, 2022

Andrea Spacca added 2 commits August 23, 2022 11:22

add '; charset=UTF-8' in integration tests

75825d3

changelog

4db06b1

assessing CI

e644016

tommyers-elastic reviewed Aug 23, 2022

View reviewed changes

revert correct behaviour

f947357

kaiyan-sheng approved these changes Aug 24, 2022

View reviewed changes

aspacca added the backport-7.17 Automated backport to the 7.17 branch with mergify label Aug 25, 2022

Merge branch 'main' into enhancements-16194

e38e065

aspacca merged commit b40349c into elastic:main Aug 25, 2022

mergify bot mentioned this pull request Aug 25, 2022

[7.17](backport #32767) allow for json/ndjson content type with charset #32834

Merged

mergify bot mentioned this pull request Aug 25, 2022

[8.4](backport #32767) allow for json/ndjson content type with charset #32835

Merged

chrisberkhout pushed a commit that referenced this pull request Jun 1, 2023

allow for json/ndjson content type with charset (#32767)

39f4e64

* allow for json/ndjson content type with charset * add '; charset=UTF-8' in integration tests * changelog * assessing CI * revert correct behaviour

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

allow for json/ndjson content type with charset #32767

allow for json/ndjson content type with charset #32767

aspacca commented Aug 23, 2022 •

edited

Loading

mergify bot commented Aug 23, 2022

elasticmachine commented Aug 23, 2022 •

edited by jenkins-beats-ci bot

Loading

Build stats

Test stats 🧪

tommyers-elastic Aug 23, 2022

aspacca Aug 23, 2022 •

edited

Loading

mergify bot commented Aug 23, 2022

kaiyan-sheng left a comment

kaiyan-sheng commented Aug 24, 2022

aspacca commented Aug 25, 2022 •

edited

Loading

aspacca commented Aug 25, 2022

allow for json/ndjson content type with charset #32767

allow for json/ndjson content type with charset #32767

Conversation

aspacca commented Aug 23, 2022 • edited Loading

What does this PR do?

Why is it important?

Checklist

Author's Checklist

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

mergify bot commented Aug 23, 2022

elasticmachine commented Aug 23, 2022 • edited by jenkins-beats-ci bot Loading

💚 Build Succeeded

Build stats

Test stats 🧪

💚 Flaky test report

🤖 GitHub comments

tommyers-elastic Aug 23, 2022

Choose a reason for hiding this comment

aspacca Aug 23, 2022 • edited Loading

Choose a reason for hiding this comment

mergify bot commented Aug 23, 2022

kaiyan-sheng left a comment

Choose a reason for hiding this comment

kaiyan-sheng commented Aug 24, 2022

aspacca commented Aug 25, 2022 • edited Loading

aspacca commented Aug 25, 2022

aspacca commented Aug 23, 2022 •

edited

Loading

elasticmachine commented Aug 23, 2022 •

edited by jenkins-beats-ci bot

Loading

aspacca Aug 23, 2022 •

edited

Loading

aspacca commented Aug 25, 2022 •

edited

Loading