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.x](backport #42202) Update elastic-agent-libs to v0.18.0 #42211

Merged
merged 6 commits into from
Jan 9, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 3, 2025

Proposed commit message

Update elastic-agent-libs to v.0.18.0

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.

Disruptive User Impact

elastic-agent-libs v0.18.0 updates the min accepted TLS version to 1.1, and sets the default min to 1.2.

Related Issues

Co-authored-by: Julien Lind <[email protected]>
(cherry picked from commit ef29005)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 3, 2025
@mergify mergify bot requested a review from a team as a code owner January 3, 2025 16:49
Copy link
Contributor Author

mergify bot commented Jan 3, 2025

Cherry-pick of ef29005 has failed:

On branch mergify/bp/8.x/pr-42202
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit ef2900565.
  (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

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

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 Jan 3, 2025
@botelastic
Copy link

botelastic bot commented Jan 3, 2025

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

@michel-laterman michel-laterman force-pushed the mergify/bp/8.x/pr-42202 branch from d60c3f2 to 1b1d1d0 Compare January 3, 2025 17:12
Copy link
Contributor Author

mergify bot commented Jan 6, 2025

This pull request has not been merged yet. Could you please review and merge it @michel-laterman? 🙏

@jlind23 jlind23 enabled auto-merge (squash) January 6, 2025 07:46
Copy link
Contributor Author

mergify bot commented Jan 6, 2025

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.x/pr-42202 upstream/mergify/bp/8.x/pr-42202
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-42202

@michel-laterman
Copy link
Contributor

The TLS tests I added are failing. I think the issue here is that we added the SetInsecureDefaults call in GenRootCmdWithSettings; which is not actually called by NewBeat. @kruskall, do you think that we should add a call to SetInsecureDefaults within the tests themselves, or should test it some other way?

@kruskall
Copy link
Member

kruskall commented Jan 8, 2025

mmh, I think ideally we should have test coverage for GenRootCmdWithSettings but calling SetInsecureDefaults could be a good workaround to ensure the logic works as intended

@michel-laterman michel-laterman requested a review from a team as a code owner January 8, 2025 22:45
@michel-laterman michel-laterman requested review from belimawr and kruskall and removed request for a team January 8, 2025 22:45
@jlind23 jlind23 merged commit c2a6a48 into 8.x Jan 9, 2025
141 checks passed
@jlind23 jlind23 deleted the mergify/bp/8.x/pr-42202 branch January 9, 2025 00:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants