Skip to content

Merging to release-5.12.1: [TT-16890] Validate middleware speicifc fix (#7974)#8060

Closed
probelabs[bot] wants to merge 1 commit intorelease-5.12.1from
merge/release-5.12.1/d89cf0b762974bafc767df1fbf9bfcbb44c412cc/TT-16890
Closed

Merging to release-5.12.1: [TT-16890] Validate middleware speicifc fix (#7974)#8060
probelabs[bot] wants to merge 1 commit intorelease-5.12.1from
merge/release-5.12.1/d89cf0b762974bafc767df1fbf9bfcbb44c412cc/TT-16890

Conversation

@probelabs
Copy link
Copy Markdown
Contributor

@probelabs probelabs Bot commented Apr 16, 2026

Cherry-pick of d89cf0b762974bafc767df1fbf9bfcbb44c412cc from master to release-5.12.1 requires manual resolution.

Conflicts detected: 6

  • gateway/mw_mock_response.go
  • gateway/mw_oas_validate_request.go

Tips:

  • Check out this branch locally and run: git cherry-pick -x d89cf0b762974bafc767df1fbf9bfcbb44c412cc
  • Resolve conflicts (including submodules if any), then push back to this branch.

Original commit: d89cf0b

    Cherry-pick failed with conflicts and requires manual resolution.
    This empty commit exists to allow opening a draft PR.
@probelabs probelabs Bot added the needs-manual-cherry-pick Cherry-pick has conflicts label Apr 16, 2026
@buger
Copy link
Copy Markdown
Member

buger commented Apr 17, 2026

Closing: this PR has 0 changed files due to a broken cherry-pick (the automated backport created an empty branch). Replacing with clean manually-created backport PRs.

@buger buger closed this Apr 17, 2026
buger added a commit that referenced this pull request Apr 17, 2026
## Summary
Clean backport of #7974 to release-5.12.1. Replaces #8060 which had
cherry-pick issues (empty diff, 0 changed files).

- Adds collapsed parameterized path disambiguation for validate-request
and mock-response OAS middleware
- Cherry-picked from merge commit d89cf0b with conflict resolution for
the 2-value `mockResponse` return signature on this branch

## Test plan
- [ ] Unit Tests & Linting passes
- [ ] CI Tests pass

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-manual-cherry-pick Cherry-pick has conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant