Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[8.0](backport #29087) [Filebeat][httpjson] httpjson oauth2 authentication mechanism for salesforce events #29246

Merged
merged 3 commits into from
Dec 9, 2021
Merged

[8.0](backport #29087) [Filebeat][httpjson] httpjson oauth2 authentication mechanism for salesforce events #29246

merged 3 commits into from
Dec 9, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 2, 2021 •
edited by zube bot
Loading

This is an automatic backport of pull request #29087 done by Mergify.

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@kush-elastic
[Filebeat][httpjson] httpjson oauth2 authentication mechanism for sal…
b56ad09 
…esforce events (#29087)

* Add grant-type: passoword in httpjson oauth2

* refactor code and add new properties tests in config_test.go

* Add grant_type: password in oAuth2ProviderDefault

* Update CHANGELOG.next.asciidoc

* update input-httpjson.asciidoc with new extended httpjson authentication method

* add comment for authstyleparam variable

* update user dummy value in the doc

* Update input-httpjson.asciidoc - provider should be default only for user-passowrd method

* refactor code and add new properties tests in config_test.go

* Add grant_type: password in oAuth2ProviderDefault

Co-authored-by: Sunny Chaudhari <sunny.chaudhari@elastic.co>
(cherry picked from commit 008182a)
@mergify mergify bot added the backport label Dec 2, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 2, 2021
@botelastic
Copy link

botelastic bot commented Dec 2, 2021

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 2, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-12-09T07:11:37.637+0000

  • Duration: 95 min 48 sec

  • Commit: 5d8c51d

Test stats 🧪

Test Results
Failed 0
Passed 2411
Skipped 152
Total 2563

💚 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!)

@mergify
Copy link
Contributor Author

mergify bot commented Dec 6, 2021

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 mergify/bp/8.0/pr-29087 upstream/mergify/bp/8.0/pr-29087
git merge upstream/8.0
git push upstream mergify/bp/8.0/pr-29087

@ruflin ruflin mentioned this pull request Dec 8, 2021
Merged
@ruflin ruflin self-assigned this Dec 8, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Dec 9, 2021

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 mergify/bp/8.0/pr-29087 upstream/mergify/bp/8.0/pr-29087
git merge upstream/8.0
git push upstream mergify/bp/8.0/pr-29087

@mtojek mtojek merged commit 1707e1c into 8.0 Dec 9, 2021
@mergify mergify bot deleted the mergify/bp/8.0/pr-29087 branch December 9, 2021 08:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ruflin ruflin

Labels
backport needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@elasticmachine @ruflin @mtojek @kush-elastic