-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
change: refactor logic for enabling L4/L7 proxy #9607
change: refactor logic for enabling L4/L7 proxy #9607
Conversation
Signed-off-by: revolyssup <[email protected]>
@leslie-tsang @monkeyDluffy6017 Please review and make suggestions. |
Co-authored-by: leslie <[email protected]>
apisix/cli/ops.lua
Outdated
local stream = "stream" | ||
if yaml_conf.apisix.proxy_mode then | ||
-- check for "http" as prefix | ||
if string.sub(yaml_conf.apisix.proxy_mode,1,#http) ~= http then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Literally compare with "http", "stream" and "http&stream" here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
apisix/cli/schema.lua
Outdated
proxy_mode = { | ||
type = "string", | ||
enum = {"http", "stream", "http&stream"}, | ||
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fix the indent.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
Signed-off-by: revolyssup <[email protected]>
…o revolyssup/fix9600
Signed-off-by: revolyssup <[email protected]>
Signed-off-by: revolyssup <[email protected]>
Hi @Revolyssup, test cases are needed |
You need to remove the configuration |
Co-authored-by: Liu Wei <[email protected]>
Co-authored-by: Liu Wei <[email protected]>
Signed-off-by: revolyssup <[email protected]>
Signed-off-by: revolyssup <[email protected]>
Signed-off-by: revolyssup <[email protected]>
I have changed all test files to respect |
Co-authored-by: Liu Wei <[email protected]>
@monkeyDluffy6017 Please approve CI again. |
@Revolyssup I find that many places in our code rely on the |
@monkeyDluffy6017 I could find only those two places left to make that change. Can you approve CI now? Or point out if there is some other place I missed. I searched for |
Please search |
Please make the ci pass |
Signed-off-by: revolyssup <[email protected]>
done |
Signed-off-by: revolyssup <[email protected]>
@Revolyssup Please make the ci pass |
@monkeyDluffy6017 Yeah, I am trying to figure out this is failing Details |
It says |
Signed-off-by: revolyssup <[email protected]>
Signed-off-by: revolyssup <[email protected]>
@monkeyDluffy6017 approve CI please |
Most tests failed because of unrelated single reason. I think we need to re run the tests. |
Signed-off-by: revolyssup <[email protected]>
Signed-off-by: Ashish Tiwari <[email protected]>
Signed-off-by: Ashish Tiwari <[email protected]>
Signed-off-by: Ashish Tiwari <[email protected]>
@leslie-tsang pls take a review . |
Description
Fixes #9600
This PR refactors the logic as explained in the issue above.
Checklist