Skip to content

Commit

Permalink
[TT-4862] Fix oas headers (#5910)
Browse files Browse the repository at this point in the history
<!-- Provide a general summary of your changes in the Title above -->

## Description

<!-- Describe your changes in detail -->

## 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: -->

- [ ] 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

<!-- 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
  • Loading branch information
furkansenharputlu authored Dec 22, 2023
1 parent 99f1da0 commit 9524f89
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 14 deletions.
16 changes: 2 additions & 14 deletions apidef/oas/oas_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func TestOAS_ExtractTo_DontTouchExistingClassicFields(t *testing.T) {
api.VersionData.Versions = map[string]apidef.VersionInfo{
Main: {
ExtendedPaths: apidef.ExtendedPathsSet{
TransformHeader: []apidef.HeaderInjectionMeta{
PersistGraphQL: []apidef.PersistGraphQLMeta{
{},
},
},
Expand All @@ -124,7 +124,7 @@ func TestOAS_ExtractTo_DontTouchExistingClassicFields(t *testing.T) {
var s OAS
s.ExtractTo(&api)

assert.Len(t, api.VersionData.Versions[Main].ExtendedPaths.TransformHeader, 1)
assert.Len(t, api.VersionData.Versions[Main].ExtendedPaths.PersistGraphQL, 1)
}

func TestOAS_ExtractTo_ResetAPIDefinition(t *testing.T) {
Expand Down Expand Up @@ -197,18 +197,6 @@ func TestOAS_ExtractTo_ResetAPIDefinition(t *testing.T) {
"APIDefinition.VersionData.Versions[0].ExtendedPaths.TransformJQResponse[0].Filter",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.TransformJQResponse[0].Path",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.TransformJQResponse[0].Method",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.TransformHeader[0].Disabled",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.TransformHeader[0].DeleteHeaders[0]",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.TransformHeader[0].AddHeaders[0]",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.TransformHeader[0].Path",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.TransformHeader[0].Method",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.TransformHeader[0].ActOnResponse",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.TransformResponseHeader[0].Disabled",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.TransformResponseHeader[0].DeleteHeaders[0]",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.TransformResponseHeader[0].AddHeaders[0]",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.TransformResponseHeader[0].Path",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.TransformResponseHeader[0].Method",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.TransformResponseHeader[0].ActOnResponse",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.CircuitBreaker[0].Path",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.CircuitBreaker[0].Method",
"APIDefinition.VersionData.Versions[0].ExtendedPaths.CircuitBreaker[0].ThresholdPercent",
Expand Down
2 changes: 2 additions & 0 deletions apidef/oas/operation.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ func (s *OAS) extractPathsAndOperations(ep *apidef.ExtendedPathsSet) {
ep.AdvanceCacheConfig = nil
ep.Transform = nil
ep.TransformResponse = nil
ep.TransformHeader = nil
ep.TransformResponseHeader = nil
ep.HardTimeouts = nil
ep.Virtual = nil
ep.MethodTransforms = nil
Expand Down

0 comments on commit 9524f89

Please sign in to comment.