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.

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

[8.13](backport #38405) x-pack/filebeat/input/{cel,httpjson}: fix PEM key validation #38406

Merged
merged 2 commits into from
Mar 19, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 19, 2024

Proposed commit message

Previously the validation was attempting to parse the PEM text as a key and was also attempting to parse the data as the wrong kind of key.

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 — also tested manually against the Okta integration as at okta: allow users to provide private key as a PEM block integrations#9291
  • 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

Use cases

Screenshots

Logs


This is an automatic backport of pull request #38405 done by [Mergify](https://mergify.com).

@mergify mergify bot requested a review from a team as a code owner March 19, 2024 06:43
@mergify mergify bot added the backport label Mar 19, 2024
@mergify mergify bot assigned efd6 Mar 19, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 19, 2024
@botelastic
Copy link

botelastic bot commented Mar 19, 2024

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

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@efd6 efd6 enabled auto-merge (squash) March 19, 2024 06:44
@efd6 efd6 force-pushed the mergify/bp/8.13/pr-38405 branch from 35ee0d0 to 4c0acc0 Compare March 19, 2024 06:48
Copy link
Contributor Author

mergify bot commented Mar 19, 2024

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.13/pr-38405 upstream/mergify/bp/8.13/pr-38405
git merge upstream/8.13
git push upstream mergify/bp/8.13/pr-38405

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@elasticmachine
Copy link
Collaborator

elasticmachine commented Mar 19, 2024

💚 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: 2024-03-19T06:53:41.912+0000

  • Duration: 134 min 27 sec

Test stats 🧪

Test Results
Failed 0
Passed 3330
Skipped 180
Total 3510

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the 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!)

Previously the validation was attempting to parse the PEM text as a key
and was also attempting to parse the data as the wrong kind of key.

(cherry picked from commit c29075e)
@efd6 efd6 force-pushed the mergify/bp/8.13/pr-38405 branch from 66cca94 to 9e32b28 Compare March 19, 2024 06:51
@efd6 efd6 force-pushed the mergify/bp/8.13/pr-38405 branch from 9e32b28 to 79de0b6 Compare March 19, 2024 06:53
@efd6 efd6 disabled auto-merge March 19, 2024 06:53
@efd6 efd6 enabled auto-merge (squash) March 19, 2024 06:54
@efd6 efd6 merged commit 4a86c64 into 8.13 Mar 19, 2024
21 checks passed
@efd6 efd6 deleted the mergify/bp/8.13/pr-38405 branch March 19, 2024 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants