Skip to content

Commit

Permalink
Merging to release-5.7.0: Revert "[TT-13422] Do not allow empty strin…
Browse files Browse the repository at this point in the history
…g in upstream auth configuration strings" (#6702) (#6704)

### **User description**
Revert "[TT-13422] Do not allow empty string in upstream auth
configuration strings" (#6702)

Reverts #6699
temporary revert with common change for AuthSource

[TT-13422]:
https://tyktech.atlassian.net/browse/TT-13422?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ


___

### **PR Type**
enhancement, bug fix


___

### **Description**
- Reverted changes that enforced non-empty strings in the OpenAPI
Specification (OAS) schema, specifically for the `name` property in
`X-Tyk-AuthSource`.
- Adjusted references for `header` properties in various authentication
objects to use `X-Tyk-UpstreamAuthSource`.
- Reintroduced the `X-Tyk-UpstreamAuthSource` definition to align with
previous configurations.



___



### **Changes walkthrough** 📝
<table><thead><tr><th></th><th align="left">Relevant
files</th></tr></thead><tbody><tr><td><strong>Bug
fix</strong></td><td><table>
<tr>
  <td>
    <details>
<summary><strong>x-tyk-api-gateway.json</strong><dd><code>Revert
non-empty string enforcement and adjust AuthSource
references</code></dd></summary>
<hr>

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

<li>Reverted the <code>name</code> property in
<code>X-Tyk-AuthSource</code> to use <code>type: string</code>
<br>instead of <code>X-Tyk-NonEmptyString</code>.<br> <li> Changed
<code>$ref</code> for <code>header</code> in
<code>X-Tyk-UpstreamBasicAuthentication</code> and other <br>sections to
<code>X-Tyk-UpstreamAuthSource</code>.<br> <li> Reintroduced
<code>X-Tyk-UpstreamAuthSource</code> definition with <code>name</code>
as a string <br>type.<br>


</details>


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

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

___

> 💡 **PR-Agent usage**: Comment `/help "your question"` on any pull
request to receive relevant information

Co-authored-by: Jeffy Mathew <[email protected]>
  • Loading branch information
buger and jeffy-mathew authored Nov 14, 2024
1 parent adb1f25 commit 70fc07b
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions apidef/oas/schema/x-tyk-api-gateway.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"type": "boolean"
},
"name": {
"$ref": "#/definitions/X-Tyk-NonEmptyString"
"type": "string"
}
},
"required": [
Expand Down Expand Up @@ -2023,7 +2023,7 @@
"type": "boolean"
},
"header": {
"$ref": "#/definitions/X-Tyk-AuthSource"
"$ref": "#/definitions/X-Tyk-UpstreamAuthSource"
},
"username": {
"$ref": "#/definitions/X-Tyk-NonEmptyString"
Expand Down Expand Up @@ -2077,7 +2077,7 @@
]
},
"header": {
"$ref": "#/definitions/X-Tyk-AuthSource"
"$ref": "#/definitions/X-Tyk-UpstreamAuthSource"
},
"extraMetadata": {
"type": [
Expand Down Expand Up @@ -2117,7 +2117,7 @@
"$ref": "#/definitions/X-Tyk-NonEmptyString"
},
"header": {
"$ref": "#/definitions/X-Tyk-AuthSource"
"$ref": "#/definitions/X-Tyk-UpstreamAuthSource"
},
"extraMetadata": {
"type": [
Expand All @@ -2143,6 +2143,17 @@
"X-Tyk-NonEmptyString": {
"type": "string",
"pattern": "\\S+"
},
"X-Tyk-UpstreamAuthSource": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean"
},
"name": {
"type": "string"
}
}
}
}
}

0 comments on commit 70fc07b

Please sign in to comment.