Skip to content

Merging to release-5.8: Tt 16178 update gateway to kinopenapi fork (#7594)#7605

Merged
lghiur merged 2 commits intorelease-5.8from
merge/release-5.8/7169c3a3983913d7f0c4d7127a6f1ee983c60730
Dec 8, 2025
Merged

Merging to release-5.8: Tt 16178 update gateway to kinopenapi fork (#7594)#7605
lghiur merged 2 commits intorelease-5.8from
merge/release-5.8/7169c3a3983913d7f0c4d7127a6f1ee983c60730

Conversation

@probelabs
Copy link
Copy Markdown
Contributor

@probelabs probelabs bot commented Dec 8, 2025

User description

Cherry-pick of 7169c3a3983913d7f0c4d7127a6f1ee983c60730 from master to release-5.8 requires manual resolution.

Conflicts detected: 6

  • go.mod
  • go.sum

Tips:

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

Original commit: 7169c3a


PR Type

Enhancement, Other


Description

  • Replace kin-openapi with Tyk fork

  • Pin fork to version v0.92.0

  • Maintain otelhttp replace constraint


Diagram Walkthrough

flowchart LR
  A["go.mod dependency map"] -- "replace getkin/kin-openapi" --> B["TykTechnologies/kin-openapi v0.92.0"]
  A -- "keep" --> C["otelhttp replace v0.49.0"]
Loading

File Walkthrough

Relevant files
Enhancement
go.mod
Point kin-openapi to Tyk fork                                                       

go.mod

  • Replace github.com/getkin/kin-openapi with
    github.com/TykTechnologies/kin-openapi.
  • Pin forked dependency to v0.92.0.
  • Preserve existing otelhttp replace directive.
+1/-1     

    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 Dec 8, 2025
@lghiur lghiur marked this pull request as ready for review December 8, 2025 08:26
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Dec 8, 2025

PR Reviewer Guide 🔍

(Review updated until commit ddfac34)

Here are some key observations to aid the review process:

⏱️ Estimated effort to review: 1 🔵⚪⚪⚪⚪
🧪 No relevant tests
🔒 No security concerns identified
⚡ Recommended focus areas for review

Dependency Pin

Validate that replacing github.com/getkin/kin-openapi with github.com/TykTechnologies/kin-openapi v0.92.0 is compatible with all existing imports and transitive dependencies, and that module proxies/CI can fetch the forked module reliably.

replace github.com/getkin/kin-openapi => github.com/TykTechnologies/kin-openapi v0.92.0
Version Consistency

Confirm that the pinned fork version v0.92.0 matches the APIs expected by the codebase and any generators/tools relying on kin-openapi, especially across release branches.

replace github.com/getkin/kin-openapi => github.com/TykTechnologies/kin-openapi v0.92.0

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Dec 8, 2025

PR Code Suggestions ✨

Latest suggestions up to ddfac34
Explore these optional code suggestions:

CategorySuggestion                                                                                                                                    Impact
General
Narrow the replace scope

Constrain the replace directive to the specific module path(s) used (e.g.,
submodules like openapi3) to avoid unintentionally overriding all transitive usages.
This reduces the risk of incompatible API substitutions across dependencies.

go.mod [333]

-replace github.com/getkin/kin-openapi => github.com/TykTechnologies/kin-openapi v0.92.0
+replace github.com/getkin/kin-openapi/openapi3 => github.com/TykTechnologies/kin-openapi/openapi3 v0.92.0
Suggestion importance[1-10]: 4

__

Why: The existing code matches a new hunk line and the suggestion to narrow the replace can reduce unintended overrides, but it may break builds if other subpackages are used and lacks confirmation that only openapi3 is needed. The impact is modest and context-dependent.

Low

Previous suggestions

Suggestions up to commit ddfac34
CategorySuggestion                                                                                                                                    Impact
Possible issue
Ensure correct module versioning

Pin the replace to the exact upstream module path version to avoid accidental
transitive mismatches. Also include the original module's major version suffix if
applicable to ensure Go's MVS resolves correctly.

go.mod [333]

-replace github.com/getkin/kin-openapi => github.com/TykTechnologies/kin-openapi v0.92.0
+replace github.com/getkin/kin-openapi => github.com/TykTechnologies/kin-openapi v0.92.0+incompatible
Suggestion importance[1-10]: 3

__

Why: The suggestion to append '+incompatible' is speculative without evidence that the target module lacks a go.mod or uses a different module path; Go tooling adds this automatically when needed. Low impact and uncertain correctness relative to the diff.

Low

@lghiur lghiur closed this Dec 8, 2025
@lghiur lghiur reopened this Dec 8, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Dec 8, 2025

🚨 Jira Linter Failed

Commit: ddfac34
Failed at: 2025-12-08 08:54:02 UTC

The Jira linter failed to validate your PR. Please check the error details below:

🔍 Click to view error details
failed to validate branch and PR title rules: branch name 'merge/release-5.8/7169c3a3983913d7f0c4d7127a6f1ee983c60730' must contain a valid Jira ticket ID (e.g., ABC-123)

Next Steps

  • Ensure your branch name contains a valid Jira ticket ID (e.g., ABC-123)
  • Verify your PR title matches the branch's Jira ticket ID
  • Check that the Jira ticket exists and is accessible

This comment will be automatically deleted once the linter passes.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Dec 8, 2025

Persistent review updated to latest commit ddfac34

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Dec 8, 2025

API Changes

no api changes detected

@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Dec 8, 2025

@lghiur lghiur merged commit eccbcfe into release-5.8 Dec 8, 2025
115 of 124 checks passed
@lghiur lghiur deleted the merge/release-5.8/7169c3a3983913d7f0c4d7127a6f1ee983c60730 branch December 8, 2025 11:01
lghiur added a commit that referenced this pull request Jan 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant