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.16](backport #4468) build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.17.0 to 8.17.1 #4486

Open
wants to merge 2 commits into
base: 8.16
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 14, 2025

Bumps github.com/elastic/go-elasticsearch/v8 from 8.17.0 to 8.17.1.

Release notes

Sourced from github.com/elastic/go-elasticsearch/v8's releases.

v8.17.1

  • Update elastictransport to 8.6.1 fixes #912

Thanks to @​AkisAya and @​jmfrees for their contributions!

Changelog

Sourced from github.com/elastic/go-elasticsearch/v8's changelog.

8.17.1

  • Update elastictransport to 8.6.1

Thanks to @​AkisAya and @​jmfrees for their contributions!

Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

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

…to 8.17.1 (#4468)

* build(deps): bump github.com/elastic/go-elasticsearch/v8

Bumps [github.com/elastic/go-elasticsearch/v8](https://github.com/elastic/go-elasticsearch) from 8.17.0 to 8.17.1.
- [Release notes](https://github.com/elastic/go-elasticsearch/releases)
- [Changelog](https://github.com/elastic/go-elasticsearch/blob/main/CHANGELOG.md)
- [Commits](elastic/go-elasticsearch@v8.17.0...v8.17.1)

---
updated-dependencies:
- dependency-name: github.com/elastic/go-elasticsearch/v8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Post dependabot file modifications

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 8aa73ff)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot added the backport label Feb 14, 2025
@mergify mergify bot requested a review from a team as a code owner February 14, 2025 17:34
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Feb 14, 2025
Copy link
Contributor Author

mergify bot commented Feb 14, 2025

Cherry-pick of 8aa73ff has failed:

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

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

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

no changes added to commit (use "git add" and/or "git commit -a")

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

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Feb 14, 2025
@@ -1,15 +1,15 @@
module github.com/elastic/fleet-server/v7

go 1.22
go 1.22.10
Copy link

@andrzej-stencel andrzej-stencel Feb 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope this is OK, I didn't find a way to prevent go mod tidy from updating this.

Copy link
Contributor Author

mergify bot commented Feb 26, 2025

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
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.16/pr-4468 upstream/mergify/bp/8.16/pr-4468
git merge upstream/8.16
git push upstream mergify/bp/8.16/pr-4468

@michel-laterman
Copy link
Contributor

@andrzej-stencel a unit test is failing because we forgot to backport a call to tlscommon.SetInsecureDefaults, #4446 includes the call and the associated tests; please merge 8.16 to get the fixes

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 Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants