Skip to content

[8.19](backport #7100) build(deps): bump github.com/go-chi/chi/v5 from 5.2.5 to 5.3.0#7106

Open
mergify[bot] wants to merge 2 commits into
8.19from
mergify/bp/8.19/pr-7100
Open

[8.19](backport #7100) build(deps): bump github.com/go-chi/chi/v5 from 5.2.5 to 5.3.0#7106
mergify[bot] wants to merge 2 commits into
8.19from
mergify/bp/8.19/pr-7100

Conversation

@mergify

@mergify mergify Bot commented May 25, 2026

Copy link
Copy Markdown
Contributor

Bumps github.com/go-chi/chi/v5 from 5.2.5 to 5.3.0.

Release notes

Sourced from github.com/go-chi/chi/v5's releases.

v5.3.0

What's Changed

New Contributors

SECURITY: middleware.ClientIP, a replacement for middleware.RealIP

@​VojtechVitek submitted PR #967, which introduces middleware.ClientIP — a replacement for middleware.RealIP that closes the three open spoofing advisories:

It also addresses issues outlined at:

middleware.RealIP is deprecated in this PR with pointers to the new API.

The deprecation only adds a // Deprecated: doc comment; the function keeps working for backward compatibility.

Why a new middleware (not "fix RealIP in place")

RealIP has two unfixable design choices: it mutates r.RemoteAddr, and it tries to be a one-size-fits-all default by walking a hard-coded list of headers any client can supply. Per adam-p's "The perils of the 'real' client IP" (which calls chi out by name on this), there is no safe default — the user must pick their trust source explicitly.

The new API

Four middlewares, two accessors. Pick exactly one middleware based on your infrastructure, read the result with one of the two accessors:

// One of the four. There is no safe default — pick exactly one.
func ClientIPFromHeader(trustedHeader string) func(http.Handler) http.Handler
func ClientIPFromXFF(trustedIPPrefixes ...string) func(http.Handler) http.Handler
func ClientIPFromXFFTrustedProxies(numTrustedProxies int) func(http.Handler) http.Handler
</tr></table> 

... (truncated)

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 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 #7100 done by [Mergify](https://mergify.com).

* build(deps): bump github.com/go-chi/chi/v5 from 5.2.5 to 5.3.0

Bumps [github.com/go-chi/chi/v5](https://github.com/go-chi/chi) from 5.2.5 to 5.3.0.
- [Release notes](https://github.com/go-chi/chi/releases)
- [Changelog](https://github.com/go-chi/chi/blob/master/CHANGELOG.md)
- [Commits](go-chi/chi@v5.2.5...v5.3.0)

---
updated-dependencies:
- dependency-name: github.com/go-chi/chi/v5
  dependency-version: 5.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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 cfc9257)

# Conflicts:
#	go.mod
@mergify mergify Bot requested a review from a team as a code owner May 25, 2026 12:25
@mergify mergify Bot requested review from blakerouse and michel-laterman May 25, 2026 12:25
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels May 25, 2026
@mergify

mergify Bot commented May 25, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of cfc9257 has failed:

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

You are currently cherry-picking commit cfc9257.
  (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-fips.txt
	modified:   NOTICE.txt
	modified:   go.sum

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

@github-actions

Copy link
Copy Markdown
Contributor

TL;DR

Both failing Buildkite steps are blocked by an unresolved merge conflict committed into go.mod, so Go tooling cannot parse modules. Resolve the conflict markers in go.mod and re-run CI.

Remediation

  • Resolve conflict markers in go.mod at the github.com/go-chi/chi/v5 / github.com/gofrs/uuid section (currently contains <<<<<<<, =======, >>>>>>>).
  • Keep a single valid dependency set that matches the target branch imports, then regenerate module consistency if needed (go mod tidy / dependency update flow used in this repo) and re-run Buildkite.
Investigation details

Root Cause

The PR diff itself includes unresolved conflict markers in go.mod (introduced in this backport/cherry-pick), which makes go.mod syntactically invalid.

  • go.mod in PR commit 07b28cdb2b8526f67a3e11fc035aabf6a16f8424 contains:
    • <<<<<<< HEAD
    • =======
    • >>>>>>> cfc9257 ...
  • This appears in the dependency block around go.mod lines 15–21 in the failing file content.

Evidence

go: errors parsing go.mod:
go.mod:15: malformed module path "<<<<<<<": invalid char '<'
go.mod:18: usage: require module/path v1.2.3
go.mod:21: usage: require module/path v1.2.3

Verification

  • Not run locally (workflow is read-only and investigation-only); conclusion is based on PR diff and failing job logs.

Follow-up

After resolving go.mod, rerun the same Buildkite build; these two steps should unblock immediately if no additional issues exist.

Note

🔒 Integrity filter blocked 2 items

The following items were blocked because they don't meet the GitHub integrity level.

To allow these resources, lower min-integrity in your GitHub frontmatter:

tools:
  github:
    min-integrity: approved  # merged | approved | unapproved | none

What is this? | From workflow: PR Buildkite Detective

Give us feedback! React with 🚀 if perfect, 👍 if helpful, 👎 if not.

@ebeahan

ebeahan commented May 26, 2026

Copy link
Copy Markdown
Member

@copilot fix the merge conflicts on this PR.

Copilot AI commented May 26, 2026

Copy link
Copy Markdown
Contributor

@copilot fix the merge conflicts on this PR.

Fixed in commit 2f4974dc. The go.mod had unresolved conflict markers from the cherry-pick. Resolved by accepting github.com/go-chi/chi/v5 v5.3.0 (the purpose of this PR) while keeping github.com/gofrs/uuid v4.4.0+incompatible since the 8.19 branch code still uses the v4 import paths across ~24 files.

Copilot AI requested a review from ebeahan May 26, 2026 15:50
@ebeahan ebeahan enabled auto-merge (squash) May 26, 2026 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automation backport conflicts There is a conflict in the backported pull request dependency 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.

2 participants