Skip to content

Merging to release-5.8.4: [TT-15505] Remove negate field as mandatory from the OAS API schema (#7284) #7288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

buger
Copy link
Member

@buger buger commented Aug 8, 2025

User description

TT-15505 Remove negate field as mandatory from the OAS API schema (#7284)

User description

TT-15505
Summary Fix URL Rewrite Middleware Schema breaking change introduced in 5.8.3 and 5.9.0
Type Bug Bug
Status In Dev
Points N/A
Labels jira_escalated

Description

Make negate field optional in URL rewrite schema

The negate field was previously made mandatory in the OAS API schema,
which broke existing API definitions that don't have the negate field
defined. This prevented customers from updating their APIs.

This change:

  • Removes negate from required fields in both OAS schema files
  • Adds omitempty tags to the URLRewriteRule struct to handle optional
    negate field
  • Restores backward compatibility with existing API definitions

Fixes breaking change introduced in previous release where customers
with API definitions lacking negate field could not update their APIs.

Related Issue

Motivation and Context

How This Has Been Tested

Screenshots (if appropriate)

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing
    functionality to change)
  • Refactoring or add test (improvements in base code or adds test
    coverage to functionality)

Checklist

  • I ensured that the documentation is up to date
  • I explained why this PR updates go.mod in detail with reasoning
    why it's required
  • I would like a code coverage CI quality gate exception and have
    explained why

PR Type

Bug fix, Enhancement


Description

  • Make negate field optional in URL rewrite schema

  • Remove negate from required fields in OAS schema files

  • Add omitempty to Negate in URLRewriteRule struct

  • Restore backward compatibility for existing API definitions


Diagram Walkthrough

flowchart LR
  schemaOld["OAS Schema: 'negate' required"] -- "remove from required" --> schemaNew["OAS Schema: 'negate' optional"]
  structOld["Go Struct: 'negate' mandatory"] -- "add omitempty" --> structNew["Go Struct: 'negate' optional"]
  schemaNew -- "restores compatibility" --> compatibility["Backward Compatibility"]
Loading

File Walkthrough

Relevant files
Enhancement
url_rewrite.go
Make `Negate` field optional in Go struct                               

apidef/oas/url_rewrite.go

  • Add omitempty to Negate field in URLRewriteRule struct
  • Make Negate optional in Go struct serialization
+1/-1     
Bug fix
x-tyk-api-gateway.json
Remove `negate` from required fields in OAS schema             

apidef/oas/schema/x-tyk-api-gateway.json

  • Remove negate from required fields in two schema definitions
  • Make negate field optional in OAS schema
+2/-4     
x-tyk-api-gateway.strict.json
Remove `negate` from required fields in strict OAS schema

apidef/oas/schema/x-tyk-api-gateway.strict.json

  • Remove negate from required fields in two strict schema definitions
  • Make negate field optional in strict OAS schema
+2/-4     


Co-authored-by: Claude [email protected]


PR Type

Bug fix, Enhancement


Description

  • Make URL rewrite negate optional

  • Remove negate from OAS required lists

  • Add omitempty to Go struct field

  • Update testdata to cover optional negate


Diagram Walkthrough

flowchart LR
  schemaOld["OAS schemas require negate"] -- "remove from required" --> schemaNew["OAS schemas: negate optional"]
  goOld["Go URLRewriteRule requires negate"] -- "add omitempty" --> goNew["Go struct: negate optional"]
  testsOld["Tests lacked optional cases"] -- "add samples" --> testsNew["Testdata includes rules w/o negate"]
  schemaNew -- "aligns with struct" --> goNew
Loading

File Walkthrough

Relevant files
Enhancement
url_rewrite.go
Make Negate optional in Go URLRewriteRule                               

apidef/oas/url_rewrite.go

  • Add json/bson omitempty to Negate
  • Make Negate serialization optional
+1/-1     
Bug fix
x-tyk-api-gateway.json
OAS schema: negate no longer required                                       

apidef/oas/schema/x-tyk-api-gateway.json

  • Remove negate from required in two defs
  • Keep negate property as boolean, optional
+2/-4     
x-tyk-api-gateway.strict.json
Strict OAS: make negate optional                                                 

apidef/oas/schema/x-tyk-api-gateway.strict.json

  • Remove negate from required in two strict defs
  • Preserve additionalProperties constraints
+2/-4     
Tests
urlRewrite-native.json
Testdata: native example without negate                                   

apidef/oas/testdata/urlRewrite-native.json

  • Add header match example without negate
  • Ensure both true/false reverse cases present
+4/-0     
urlRewrite-oas.json
Testdata: OAS rule without negate                                               

apidef/oas/testdata/urlRewrite-oas.json

  • Add rule lacking negate field
  • Cover header rule with only pattern/name
+5/-0     

…#7284)

### **User description**
<details open>
<summary><a href="https://tyktech.atlassian.net/browse/TT-15505"
title="TT-15505" target="_blank">TT-15505</a></summary>
  <br />
  <table>
    <tr>
      <th>Summary</th>
<td>Fix URL Rewrite Middleware Schema breaking change introduced in
5.8.3 and 5.9.0</td>
    </tr>
    <tr>
      <th>Type</th>
      <td>
<img alt="Bug"
src="https://tyktech.atlassian.net/rest/api/2/universal_avatar/view/type/issuetype/avatar/10303?size=medium"
/>
        Bug
      </td>
    </tr>
    <tr>
      <th>Status</th>
      <td>In Dev</td>
    </tr>
    <tr>
      <th>Points</th>
      <td>N/A</td>
    </tr>
    <tr>
      <th>Labels</th>
<td><a
href="https://tyktech.atlassian.net/issues?jql=project%20%3D%20TT%20AND%20labels%20%3D%20jira_escalated%20ORDER%20BY%20created%20DESC"
title="jira_escalated">jira_escalated</a></td>
    </tr>
  </table>
</details>
<!--
  do not remove this marker as it will break jira-lint's functionality.
  added_by_jira_lint
-->

---

<!-- Provide a general summary of your changes in the Title above -->

## Description

Make negate field optional in URL rewrite schema

The negate field was previously made mandatory in the OAS API schema,
which broke existing API definitions that don't have the negate field
defined. This prevented customers from updating their APIs.

This change:
  - Removes negate from required fields in both OAS schema files
  - Adds omitempty tags to the URLRewriteRule struct to handle optional
  negate field
  - Restores backward compatibility with existing API definitions

Fixes breaking change introduced in previous release where customers
with API definitions lacking negate field could not update their APIs.

## Related Issue

<!-- This project only accepts pull requests related to open issues. -->
<!-- If suggesting a new feature or change, please discuss it in an
issue first. -->
<!-- If fixing a bug, there should be an issue describing it with steps
to reproduce. -->
<!-- OSS: Please link to the issue here. Tyk: please create/link the
JIRA ticket. -->

## Motivation and Context

<!-- Why is this change required? What problem does it solve? -->

## How This Has Been Tested

<!-- Please describe in detail how you tested your changes -->
<!-- Include details of your testing environment, and the tests -->
<!-- you ran to see how your change affects other areas of the code,
etc. -->
<!-- This information is helpful for reviewers and QA. -->

## Screenshots (if appropriate)

## Types of changes

<!-- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [x] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Refactoring or add test (improvements in base code or adds test
coverage to functionality)

## Checklist

<!-- Go over all the following points, and put an `x` in all the boxes
that apply -->
<!-- If there are no documentation updates required, mark the item as
checked. -->
<!-- Raise up any additional concerns not covered by the checklist. -->

- [ ] I ensured that the documentation is up to date
- [ ] I explained why this PR updates go.mod in detail with reasoning
why it's required
- [ ] I would like a code coverage CI quality gate exception and have
explained why


___

### **PR Type**
Bug fix, Enhancement


___

### **Description**
- Make `negate` field optional in URL rewrite schema

- Remove `negate` from required fields in OAS schema files

- Add `omitempty` to `Negate` in `URLRewriteRule` struct

- Restore backward compatibility for existing API definitions


___

### Diagram Walkthrough


```mermaid
flowchart LR
  schemaOld["OAS Schema: 'negate' required"] -- "remove from required" --> schemaNew["OAS Schema: 'negate' optional"]
  structOld["Go Struct: 'negate' mandatory"] -- "add omitempty" --> structNew["Go Struct: 'negate' optional"]
  schemaNew -- "restores compatibility" --> compatibility["Backward Compatibility"]
```



<details> <summary><h3> File Walkthrough</h3></summary>

<table><thead><tr><th></th><th align="left">Relevant
files</th></tr></thead><tbody><tr><td><strong>Enhancement</strong></td><td><table>
<tr>
  <td>
    <details>
<summary><strong>url_rewrite.go</strong><dd><code>Make `Negate` field
optional in Go struct</code>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
</dd></summary>
<hr>

apidef/oas/url_rewrite.go

<ul><li>Add <code>omitempty</code> to <code>Negate</code> field in
<code>URLRewriteRule</code> struct<br> <li> Make <code>Negate</code>
optional in Go struct serialization</ul>


</details>


  </td>
<td><a
href="https://github.com/TykTechnologies/tyk/pull/7284/files#diff-7317c6061fb6488e079d733230045c7cbc1b4b2ffb98bb7da20d4025f4976e51">+1/-1</a>&nbsp;
&nbsp; &nbsp; </td>

</tr>
</table></td></tr><tr><td><strong>Bug fix</strong></td><td><table>
<tr>
  <td>
    <details>
<summary><strong>x-tyk-api-gateway.json</strong><dd><code>Remove
`negate` from required fields in OAS schema</code>&nbsp; &nbsp; &nbsp;
&nbsp; &nbsp; &nbsp; &nbsp; </dd></summary>
<hr>

apidef/oas/schema/x-tyk-api-gateway.json

<ul><li>Remove <code>negate</code> from required fields in two schema
definitions<br> <li> Make <code>negate</code> field optional in OAS
schema</ul>


</details>


  </td>
<td><a
href="https://github.com/TykTechnologies/tyk/pull/7284/files#diff-78828969c0c04cc1a776dfc93a8bad3c499a8c83e6169f83e96d090bed3e7dd0">+2/-4</a>&nbsp;
&nbsp; &nbsp; </td>

</tr>

<tr>
  <td>
    <details>
<summary><strong>x-tyk-api-gateway.strict.json</strong><dd><code>Remove
`negate` from required fields in strict OAS schema</code></dd></summary>
<hr>

apidef/oas/schema/x-tyk-api-gateway.strict.json

<ul><li>Remove <code>negate</code> from required fields in two strict
schema definitions<br> <li> Make <code>negate</code> field optional in
strict OAS schema</ul>


</details>


  </td>
<td><a
href="https://github.com/TykTechnologies/tyk/pull/7284/files#diff-39a62344d6b741814a58dfd2d219665ecdf962bbec8e755dbc61e1684bb4892a">+2/-4</a>&nbsp;
&nbsp; &nbsp; </td>

</tr>
</table></td></tr></tr></tbody></table>

</details>

___

---------

Co-authored-by: Claude <[email protected]>

(cherry picked from commit 35b0c98)
@buger buger enabled auto-merge (squash) August 8, 2025 08:02
Copy link
Contributor

github-actions bot commented Aug 8, 2025

API Changes

--- prev.txt	2025-08-08 08:02:52.661717753 +0000
+++ current.txt	2025-08-08 08:02:48.498688165 +0000
@@ -4726,7 +4726,7 @@
 
 	// Negate is a boolean negation operator. Setting it to true inverts the matching behaviour
 	// such that the rewrite will be triggered if the value does not match the `pattern` for this rule.
-	Negate bool `bson:"negate" json:"negate"`
+	Negate bool `bson:"negate,omitempty" json:"negate,omitempty"`
 }
     URLRewriteRule represents a rewrite
     matching rules. Tyk classic API definition:

Copy link
Contributor

github-actions bot commented Aug 8, 2025

PR Code Suggestions ✨

Explore these optional code suggestions:

CategorySuggestion                                                                                                                                    Impact
Possible issue
Preserve unset vs false state

Making negate omitempty on a non-pointer bool treats absent and false identically,
losing the distinction between "unspecified" and "explicitly false". If downstream
logic needs to detect omission for defaulting or migration, switch to a pointer.
Update any logic to handle nil as "unset".

apidef/oas/url_rewrite.go [119]

-Negate bool `bson:"negate,omitempty" json:"negate,omitempty"`
+Negate *bool `bson:"negate,omitempty" json:"negate,omitempty"`
Suggestion importance[1-10]: 6

__

Why: Correctly notes that omitempty on a non-pointer bool conflates absent and false and proposes a pointer to preserve tri-state, which can aid migrations/defaulting; impact depends on broader code expectations, so moderate score.

Low
General
Allow nullable optional boolean

Since negate is no longer required, explicitly mark it as nullable to align with
optionality and avoid validation ambiguity across tooling. This helps distinguish
omission from explicit false where validators support nullable semantics.

apidef/oas/schema/x-tyk-api-gateway.strict.json [956-958]

 "negate": {
-  "type": "boolean"
+  "type": ["boolean", "null"]
 }
Suggestion importance[1-10]: 4

__

Why: The schema makes negate optional by removing it from required, but introducing nullability is optional and may not align with existing tooling/semantics; minor improvement with potential compatibility risks.

Low
Keep schemas consistent on nullability

Mirror the optionality change by permitting null for negate to ensure consistent
schema behavior between non-strict and strict variants. This reduces client
validation mismatches when the field is omitted.

apidef/oas/schema/x-tyk-api-gateway.json [944-946]

 "negate": {
-  "type": "boolean"
+  "type": ["boolean", "null"]
 }
Suggestion importance[1-10]: 4

__

Why: Similar to the strict schema, allowing null is a stylistic consistency choice rather than required by the PR; minor benefit but could introduce validator differences.

Low

Copy link

sonarqubecloud bot commented Aug 8, 2025

Quality Gate Failed Quality Gate failed

Failed conditions
77.8% Coverage on New Code (required ≥ 80%)

See analysis details on SonarQube Cloud

@lghiur lghiur disabled auto-merge August 8, 2025 10:26
@lghiur lghiur merged commit 9b6d572 into release-5.8.4 Aug 8, 2025
87 of 101 checks passed
@lghiur lghiur deleted the merge/release-5.8.4/35b0c9834624714f20343aebbca348e8dd4e7e77 branch August 8, 2025 10:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants