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.

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

Threescale 7967 http proxy patch #1323

Merged
merged 5 commits into from
Apr 20, 2022
Merged

Conversation

kevprice83
Copy link
Member

I will leave this as marked WIP until we are able to safely merge to master again in the future. This PR is an example for the new, temporary patch process discussed with the 3scale program.

Fixes THREESCALE-7967

@kevprice83 kevprice83 requested a review from a team as a code owner February 4, 2022 12:06
@@ -1,10 +1,10 @@
# Change Log

Copy link
Contributor

@samugi samugi Feb 4, 2022

Choose a reason for hiding this comment

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

were all these newlines and formatting changes in the CHANGELOG meant to be committed?

Copy link
Member Author

Choose a reason for hiding this comment

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

no I didn't make those changes, not sure where they came from to be honest. I only added a CHANGELOG entry, I assume you are referring to the CHANGELOG and not README though right?

Copy link
Contributor

@samugi samugi Feb 9, 2022

Choose a reason for hiding this comment

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

yes I was :) - fixed my comment

return httpc
elseif uri.scheme == 'https' and skip_https_connect then
request.path = format('%s://%s:%s%s', uri.scheme, host, port, request.path or '/')
return _connect_tls_direct(httpc, request, host, port)
request.path = format('%s://%s:%s%s', uri.scheme, uri.host, uri.port, request.path or '/')
Copy link
Contributor

Choose a reason for hiding this comment

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

I think that this will work, but please test this with routing policy, I remember that we had issues with that. Also, with Camel policy

Copy link
Member Author

Choose a reason for hiding this comment

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

I will check with the routing policy yep! However, the camel policy I might need to get some help with because I don't understand how that works and the tests for that specific policy are not passing even without my changes. It seems like something is broken there or maybe it's expected and we need to test in another way?

@kevprice83
Copy link
Member Author

@samugi I've pushed the first iteration of a fix for the upstream http problem but there is a definite issue to take care of with args and so tests 13, 15 & 16 are partially failing as a result. Let's try to fix that last item on Tuesday.

@kevprice83 kevprice83 requested a review from a team April 18, 2022 22:17
@kevprice83 kevprice83 force-pushed the THREESCALE-7967-http-proxy-patch branch from 9b6d442 to 97c0c46 Compare April 19, 2022 17:14
@kevprice83 kevprice83 changed the title [WIP] - Threescale 7967 http proxy patch Threescale 7967 http proxy patch Apr 20, 2022
@samugi samugi force-pushed the THREESCALE-7967-http-proxy-patch branch from 9cf3bad to 83c551d Compare April 20, 2022 13:08
kevprice83 and others added 5 commits April 20, 2022 15:12
…ct request

adds comments linking to RFC and defines host and port values to remaining conditions

adds CHANGELOG entry

patches http proxy upstream requests

adds comments for future refactor
fixed integration tests from 10 to 20

Signed-off-by: Samuele Illuminati <samuele8@gmail.com>

fixes integration tests & adds upstream http proxy patch

fixes integration & unit tests
…commit 97c0c46 & adds back repeat_each(3) in integration test
@eguzki eguzki force-pushed the THREESCALE-7967-http-proxy-patch branch from 83c551d to 4b47c81 Compare April 20, 2022 13:15
@eguzki eguzki merged commit cb8e202 into master Apr 20, 2022
@eguzki eguzki deleted the THREESCALE-7967-http-proxy-patch branch April 20, 2022 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants