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

feat(proxy): Proxy exception list for outbound http connectors #3460

Merged

Conversation

johnBgood
Copy link
Collaborator

@johnBgood johnBgood commented Oct 4, 2024

Description

  • REST connector can now use Java System Properties to configure a proxy (and nonProxyHosts as well).

Related issues

closes #3252

Checklist

  • PR has a milestone or the no milestone label.

@johnBgood johnBgood linked an issue Oct 4, 2024 that may be closed by this pull request
@johnBgood johnBgood self-assigned this Oct 4, 2024
@johnBgood johnBgood added this to the 8.7.0-alpha1 milestone Oct 4, 2024
@johnBgood johnBgood changed the title 3252 proxy exception list for outbound http connectors feat(proxy): Proxy exception list for outbound http connectors Oct 4, 2024
@johnBgood johnBgood marked this pull request as ready for review October 4, 2024 15:34
@johnBgood johnBgood requested a review from a team as a code owner October 4, 2024 15:34
Copy link
Contributor

@mathias-vandaele mathias-vandaele left a comment

Choose a reason for hiding this comment

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

Good changes!

sbuettner
sbuettner previously approved these changes Oct 7, 2024
Copy link
Contributor

@sbuettner sbuettner left a comment

Choose a reason for hiding this comment

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

Awesome!

Comment on lines 58 to 62
new GenericContainer<>(DockerImageName.parse("sameersbn/squid:3.5.27-2"))
.withExposedPorts(3128)
.withClasspathResourceMapping("squid.conf", "/etc/squid/squid.conf", BindMode.READ_ONLY)
.waitingFor(org.testcontainers.containers.wait.strategy.Wait.forListeningPort());
proxyContainer.start();
Copy link
Contributor

Choose a reason for hiding this comment

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

Great idea to use squid.

proxy.verify(deleteRequestedFor(urlEqualTo("/path")));
}

private String getWireMockBaseUrlWithPath(WireMockRuntimeInfo wmRuntimeInfo, String path) {

Check notice

Code scanning / CodeQL

Useless parameter Note test

The parameter 'wmRuntimeInfo' is never used.
@johnBgood johnBgood added this pull request to the merge queue Oct 8, 2024
Merged via the queue into main with commit fb03259 Oct 8, 2024
15 checks passed
@johnBgood johnBgood deleted the 3252-proxy-exception-list-for-outbound-http-connectors branch October 8, 2024 14:41
@sbuettner
Copy link
Contributor

Backport failed for release/8.6, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release/8.6
git worktree add -d .worktree/backport-3460-to-release/8.6 origin/release/8.6
cd .worktree/backport-3460-to-release/8.6
git switch --create backport-3460-to-release/8.6
git cherry-pick -x fb03259d191c8231f2e2cf59765ace267dc25229

johnBgood added a commit that referenced this pull request Oct 8, 2024
* feat(rest): Use System Properties for proxy configuration

* feat(rest): Use System Properties for proxy configuration

* feat(rest): Lint

* feat(rest): Fix imports

* feat(rest): Disable proxy settings after Proxy tests

* feat(rest): Extract proxy tests

* feat(rest): Lint

* feat(rest): Use a random port for WireMock server

* feat(rest): Fix UTs

* feat(rest): Fix UTs

* feat(rest): Fix UTs

(cherry picked from commit fb03259)
johnBgood added a commit that referenced this pull request Oct 8, 2024
#3471)

* feat(rest): Use System Properties for proxy configuration
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Proxy Exception List for Outbound HTTP Connectors
3 participants