Skip to content

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

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

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

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 25, 2026

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
#	go.sum
@mergify mergify Bot requested a review from a team as a code owner May 25, 2026 12:25
@mergify mergify Bot requested review from swiatekm and ycombinator 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
Copy link
Copy Markdown
Contributor Author

mergify Bot commented May 25, 2026

Cherry-pick of cfc9257 has failed:

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

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

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

@swiatekm
Copy link
Copy Markdown
Member

@copilot fix the backport conflict.

@github-actions

This comment has been minimized.

Copy link
Copy Markdown
Contributor

Copilot AI commented May 25, 2026

@copilot fix the backport conflict.

Fixed in commit f1a87bf. I resolved the backport conflict markers in go.mod and go.sum, kept the intended github.com/go-chi/chi/v5 bump to v5.3.0, and preserved the 9.4 branch’s unrelated dependency versions.

@github-actions
Copy link
Copy Markdown
Contributor

TL;DR

All six failed Buildkite jobs are blocked by the same parse error: go.mod in this PR commit contains unresolved merge-conflict markers (<<<<<<<, =======, >>>>>>>). Remove the conflict block and commit a resolved go.mod/go.sum so CI can run.

Remediation

  • Resolve the conflict region in go.mod (around line 15) by removing merge markers and keeping the intended dependency versions for this backport.
  • Regenerate and commit go.sum after resolution (go mod tidy / repo-standard dependency update flow), then re-run CI.
Investigation details

Root Cause

This is a configuration/merge-conflict failure introduced in the PR commit itself, not an infrastructure or flaky-test issue.

go.mod at PR head commit 7c52b80e7d711f9c2651e8e819971ea3706856c4 contains unresolved conflict markers:

  • go.mod line 15: <<<<<<< HEAD
  • go.mod line 18: =======
  • go.mod line 21: >>>>>>> cfc9257 ...

(From repo://elastic/fleet-server/sha/7c52b80e7d711f9c2651e8e819971ea3706856c4/contents/go.mod.)

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

(Log files: /tmp/gh-aw/buildkite-logs/fleet-server-white_check_mark-run-check-ci.txt, /tmp/gh-aw/buildkite-logs/fleet-server-detect-fips-crypto-imports.txt, and all four package job logs.)

Verification

  • Local command execution was not needed to confirm root cause; failure is directly evidenced by Buildkite logs and the PR head go.mod content.

Follow-up

  • After conflict resolution, all six jobs should at least proceed past Go module parsing; any subsequent failures (if any) can then be evaluated on their own merits.

Note

🔒 Integrity filter blocked 1 item

The following item 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.

@swiatekm swiatekm enabled auto-merge (squash) May 25, 2026 13:05
@ebeahan
Copy link
Copy Markdown
Member

ebeahan commented May 26, 2026

/test

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.

3 participants