Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 27, 2025

Proposed commit message

replace elastic fork with upstream pkcs8 lib

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. Where relevant, I have used the stresstest.sh script to run them under stress conditions and race detector to verify their stability.
  • I have added an entry in ./changelog/fragments using the changelog tool.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Followup to elastic/elastic-agent-libs#344

Use cases

Screenshots

Logs


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

* feat: switch back to upstream pkcs8 lib

* Update tls_helper.go

* lint: make notice

(cherry picked from commit 908d48f)

# Conflicts:
#	go.mod
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 27, 2025
@mergify mergify bot requested review from a team as code owners November 27, 2025 01:30
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 27, 2025
@mergify mergify bot requested review from andrzej-stencel and khushijain21 and removed request for a team November 27, 2025 01:30
@mergify
Copy link
Contributor Author

mergify bot commented Nov 27, 2025

Cherry-pick of 908d48f has failed:

On branch mergify/bp/9.2/pr-47763
Your branch is up to date with 'origin/9.2'.

You are currently cherry-picking commit 908d48fcb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE.txt
	modified:   go.sum
	modified:   libbeat/otelbeat/oteltest/tls_helper.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 27, 2025
@botelastic
Copy link

botelastic bot commented Nov 27, 2025

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

@github-actions
Copy link
Contributor

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@kruskall kruskall removed the conflicts There is a conflict in the backported pull request label Nov 27, 2025
@kruskall kruskall merged commit 46e1e32 into 9.2 Nov 27, 2025
212 checks passed
@kruskall kruskall deleted the mergify/bp/9.2/pr-47763 branch November 27, 2025 06:35
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 skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants