Merge pull request spotify#970 from deki/890-proxy-usage

spotify#890 fix for proxy usage ("Expected authority at index 7" error)
vladbusov · Jan 30, 2018 · 3791a2e · 3791a2e
2 parents b0d9a69 + c2f1b1d
commit 3791a2e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/main/java/com/spotify/docker/client/DefaultDockerClient.java b/src/main/java/com/spotify/docker/client/DefaultDockerClient.java
@@ -444,7 +444,7 @@ private ClientConfig updateProxy(ClientConfig config, Builder builder) {
       final String proxyHost = System.getProperty("http.proxyHost");
       if (proxyHost != null) {
         String proxyPort = checkNotNull(System.getProperty("http.proxyPort"), "http.proxyPort");
-        config.property(ClientProperties.PROXY_URI, !proxyHost.startsWith("http") ? "http://" : ""
+        config.property(ClientProperties.PROXY_URI, (!proxyHost.startsWith("http") ? "http://" : "")
                 + proxyHost + ":" + proxyPort);
         final String proxyUser = System.getProperty("http.proxyUser");
         if (proxyUser != null) {

diff --git a/src/test/java/com/spotify/docker/client/DefaultDockerClientUnitTest.java b/src/test/java/com/spotify/docker/client/DefaultDockerClientUnitTest.java
@@ -166,6 +166,22 @@ public void testHostForIpHttps() {
     assertThat(client.getHost(), equalTo("192.168.53.103"));
   }
 
+  @Test
+  public void testHostWithProxy() {
+    try {
+      System.setProperty("http.proxyHost", "gmodules.com");
+      System.setProperty("http.proxyPort", "80");
+      final DefaultDockerClient client = DefaultDockerClient.builder()
+              .uri("https://192.168.53.103:2375").build();
+      assertThat((String) client.getClient().getConfiguration()
+                      .getProperty("jersey.config.client.proxy.uri"),
+              equalTo("http://gmodules.com:80"));
+    } finally {
+      System.clearProperty("http.proxyHost");
+      System.clearProperty("http.proxyPort");
+    }
+  }
+
   private RecordedRequest takeRequestImmediately() throws InterruptedException {
     return server.takeRequest(1, TimeUnit.MILLISECONDS);
   }