Allow connecting to websockets via api/websocket/ #14866
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Before, we just allowed websockets on <host>/websocket/. With this change, they can now come from <host>/api/websocket/
chrismeyersfsu
requested review from
relrod,
AlanCoding,
rooftopcellist,
john-westcott-iv and
TheRealHaoLiu
relrod
reviewed
Feb 12, 2024
| @@ -10,7 +10,7 @@ location {{ (ingress_path + '/favicon.ico').replace('//', '/') }} { | |||
| alias /awx_devel/awx/public/static/favicon.ico; | |||
| } | |||
|
|
|||
| location {{ (ingress_path + '/websocket').replace('//', '/') }} { | |||
| location ~ ({{ (ingress_path + '/websocket').replace('//', '/') }}|{{ (ingress_path + '/api/websocket').replace('//', '/') }}) { | |||
There was a problem hiding this comment.
Can this simplify to
Suggested change
| location ~ ({{ (ingress_path + '/websocket').replace('//', '/') }}|{{ (ingress_path + '/api/websocket').replace('//', '/') }}) { | |
| location ~ {{ (ingress_path + '/(api/)?websocket').replace('//', '/') }} { |
?
relrod
approved these changes
Feb 12, 2024
rooftopcellist
approved these changes
Feb 13, 2024
The endpoint here is additive. Didn’t want to break folks. I should make a card to deprecate /websockets |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SUMMARY
Before, we just allowed websockets on /websocket/. With this change, they can now come from /api/websocket/
ISSUE TYPE
COMPONENT NAME
AWX VERSION
ADDITIONAL INFORMATION