Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[TT-11960]fix panic in Oas when using mode public #6241

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[TT-11960]fix panic in Oas when using mode public #6241

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1acfa8
fix race condition in oas
Keithwachira Apr 23, 2024
3fcba9d
remove formating in pull request
Keithwachira Apr 23, 2024
6858229
change from dereference to using clone to make a deep copy of oas
Keithwachira Apr 23, 2024
d3b2073
change from deepcopy to dereference
Keithwachira Apr 23, 2024
082001a
Merge branch 'master' into TT-11960-fix-race-condition-in-oas-delete
Keithwachira Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions gateway/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,9 @@ func (gw *Gateway) handleGetAPIOAS(apiID string, modePublic bool) (interface{},

obj, code := gw.handleGetAPI(apiID, true)
if apiOAS, ok := obj.(*oas.OAS); ok && modePublic {
apiOAS.RemoveTykExtension()
oasCopy := *apiOAS
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use OAS.Clone for a deep copy.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use OAS.Clone for a deep copy.

@titpetric I have tried to use OAS.Clone but when I use OAS.Clone it still panics. I am not sure why

oasCopy.RemoveTykExtension()
return oasCopy, code
}
return obj, code

Expand Down Expand Up @@ -3476,4 +3478,4 @@ func updateOASServers(spec *APISpec, conf config.Config, apiDef *apidef.APIDefin

newAPIURL := getAPIURL(*apiDef, conf)
oasObj.UpdateServers(newAPIURL, oldAPIURL)
}
}
Loading