Skip to content

[8.19](backport #7073) build(deps): bump github.com/oapi-codegen/runtime from 1.4.0 to 1.4.1#7080

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

[8.19](backport #7073) build(deps): bump github.com/oapi-codegen/runtime from 1.4.0 to 1.4.1#7080
mergify[bot] wants to merge 2 commits into
8.19from
mergify/bp/8.19/pr-7073

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 20, 2026

Bumps github.com/oapi-codegen/runtime from 1.4.0 to 1.4.1.

Release notes

Sourced from github.com/oapi-codegen/runtime's releases.

Bug fixes

This is a bug fix release.

Changes in v1.4.0, coupled with changes in v2.7.0 of oapi-codegen exposed some new problems. deepObject style marshaling behavior now supports encoding unicode. UTF-8 can't be directly included in parameters, so we need to % escape it.

Form binding now detects maps, which makes binding to a Nullable possible. We can't use generics around Nullable[T], so we handle maps generically, assuming they're a Nullable with its behavior assumptions.

🐛 Bug fixes

📦 Dependency updates

Sponsors

We would like to thank our sponsors for their support during this release.

Commits
  • 2755f15 Fix form binding of Nullables (#133)
  • 17de1dd Percent-encode deepObject parameter wire output (#132)
  • d2b7c4c chore(deps): update oapi-codegen/actions action to v0.7.0
  • 6fd6c25 chore(deps): update github/codeql-action action to v4
  • 19040cc fix(deps): update module github.com/kataras/iris/v12 to v12.2.11
  • e05282e chore(deps): update release-drafter/release-drafter action to v7.2.0 (#122)
  • See full diff in compare view


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

…#7073)

* build(deps): bump github.com/oapi-codegen/runtime from 1.4.0 to 1.4.1

Bumps [github.com/oapi-codegen/runtime](https://github.com/oapi-codegen/runtime) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/oapi-codegen/runtime/releases)
- [Commits](oapi-codegen/runtime@v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: github.com/oapi-codegen/runtime
  dependency-version: 1.4.1
  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 0696664)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify Bot requested a review from a team as a code owner May 20, 2026 13:43
@mergify mergify Bot requested review from lorienhu and samuelvl May 20, 2026 13:43
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels May 20, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented May 20, 2026

Cherry-pick of 0696664 has failed:

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

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

@github-actions
Copy link
Copy Markdown
Contributor

TL;DR

All failing Buildkite jobs are caused by unresolved merge conflict markers in go.mod (and corresponding conflict block in go.sum) on this backport PR. Resolve the cherry-pick conflict and commit clean module files; CI should proceed past all current failures.

Remediation

  • Resolve conflict markers from the backport in go.mod/go.sum by keeping a valid merged dependency set (including github.com/oapi-codegen/runtime v1.4.1 and the existing github.com/open-telemetry/opamp-go v0.23.0 entry), then commit.
  • Re-run CI (or mage check:all and mage test:unit locally) to confirm parsers/build steps advance beyond module parsing.
Investigation details

Root Cause

go.mod in the PR contains unresolved Git conflict markers (<<<<<<<, =======, >>>>>>>) near the github.com/oapi-codegen/runtime dependency block. Go tooling fails immediately when parsing that file, so every pipeline step that initializes Go exits before running its actual task.

Evidence

  • Build: https://buildkite.com/elastic/fleet-server/builds/14809
  • Jobs affected: Run check-ci, Detect FIPS crypto imports, Package x86_64, Package x86_64 FIPS, Package aarch64
  • Key log excerpt (repeated across failed jobs):
    go: errors parsing go.mod:
    go.mod:24: malformed module path "<<<<<<<": invalid char '<'
    go.mod:26: usage: require module/path v1.2.3
    go.mod:29: usage: require module/path v1.2.3
    
  • PR changed-files diff for go.mod/go.sum shows conflict markers from cherry-pick:
    • go.mod hunk contains <<<<<<< HEAD ... ======= ... >>>>>>> 0696664
    • go.sum hunk contains matching conflict-marker block

Verification

  • Not run in this workflow (read-only detective analysis based on Buildkite logs + PR diff).

Follow-up

After conflict resolution commit, this should clear all currently reported failures because each failing job stops at the same early go.mod parse error.


What is this? | From workflow: PR Buildkite Detective

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

@ebeahan
Copy link
Copy Markdown
Member

ebeahan commented May 20, 2026

@copilot fix the merge conflicts on this PR.

Copy link
Copy Markdown
Contributor

Copilot AI commented May 20, 2026

@copilot fix the merge conflicts on this PR.

Fixed in commit 6abe6840: I resolved the merge-conflict artifacts in go.mod and go.sum (removed conflict markers and kept the intended dependency bump to github.com/oapi-codegen/runtime v1.4.1).

Copilot AI requested a review from ebeahan May 20, 2026 16:19
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