Merge pull request #65 from celonis/fix/DP-0000-proxy_bug

kowallen · web-flow · commit 63cd7d5b11f5 · 2024-07-05T10:46:06.000+02:00
Fixing a bug with proxy not being used while configured
diff --git a/connector/src/main/scala/com/celonis/kafka/connect/ems/config/HttpClientConfig.scala b/connector/src/main/scala/com/celonis/kafka/connect/ems/config/HttpClientConfig.scala
@@ -121,12 +121,14 @@ case class ProxiedHttpClientConfig(
     new Proxy(proxyType.javaProxyType, proxyAddr)
   }
 
-  override def customiseHttpClient(builder: OkHttpClient.Builder): OkHttpClient.Builder =
+  override def customiseHttpClient(builder: OkHttpClient.Builder): OkHttpClient.Builder = {
+    builder.proxy(createProxyServer())
     authentication match {
       case Some(auth) if javaProxyType == JavaProxyType.HTTP  => configureHttpProxyAuth(builder, auth)
       case Some(auth) if javaProxyType == JavaProxyType.SOCKS => configureSocksProxyAuth(auth); builder
       case _                                                  => builder
     }
+  }
 
   private def configureSocksProxyAuth(auth: BasicAuthentication): Unit =
     JavaAuthenticator.setDefault(

Original file line number	Diff line number	Diff line change
`@@ -121,12 +121,14 @@ case class ProxiedHttpClientConfig(`
`121`	`121`	`new Proxy(proxyType.javaProxyType, proxyAddr)`
`122`	`122`	`}`
`123`	`123`
`124`		`- override def customiseHttpClient(builder: OkHttpClient.Builder): OkHttpClient.Builder =`
	`124`	`+ override def customiseHttpClient(builder: OkHttpClient.Builder): OkHttpClient.Builder = {`
	`125`	`+ builder.proxy(createProxyServer())`
`125`	`126`	`authentication match {`
`126`	`127`	`case Some(auth) if javaProxyType == JavaProxyType.HTTP => configureHttpProxyAuth(builder, auth)`
`127`	`128`	`case Some(auth) if javaProxyType == JavaProxyType.SOCKS => configureSocksProxyAuth(auth); builder`
`128`	`129`	`case _ => builder`
`129`	`130`	`}`
	`131`	`+ }`
`130`	`132`
`131`	`133`	`private def configureSocksProxyAuth(auth: BasicAuthentication): Unit =`
`132`	`134`	`JavaAuthenticator.setDefault(`