Allow npipe protocol in DefaultDockerClientConfig (docker-java#1325)

bsideup · web-flow · commit e0ea277ae657 · 2020-02-18T23:23:37.000+01:00
Fixes docker-java#1324
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -98,11 +98,13 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
     }
 
     private URI checkDockerHostScheme(URI dockerHost) {
-        if ("tcp".equals(dockerHost.getScheme()) || "unix".equals(dockerHost.getScheme())) {
-            return dockerHost;
-        } else {
-            throw new DockerClientException("Unsupported protocol scheme found: '" + dockerHost
-                    + "'. Only 'tcp://' or 'unix://' supported.");
+        switch (dockerHost.getScheme()) {
+            case "tcp":
+            case "unix":
+            case "npipe":
+                return dockerHost;
+            default:
+                throw new DockerClientException("Unsupported protocol scheme found: '" + dockerHost);
         }
     }
 
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -139,15 +139,20 @@ public void init(DockerClientConfig dockerClientConfig) {
             protocol = "http";
         }
 
-        if (!originalUri.getScheme().equals("unix")) {
-
-            try {
-                originalUri = new URI(originalUri.toString().replaceFirst("tcp", protocol));
-            } catch (URISyntaxException e) {
-                throw new RuntimeException(e);
-            }
+        switch (originalUri.getScheme()) {
+            case "unix":
+                break;
+            case "tcp":
+                try {
+                    originalUri = new URI(originalUri.toString().replaceFirst("tcp", protocol));
+                } catch (URISyntaxException e) {
+                    throw new RuntimeException(e);
+                }
 
-            configureProxy(clientConfig, originalUri, protocol);
+                configureProxy(clientConfig, originalUri, protocol);
+                break;
+            default:
+                throw new IllegalArgumentException("Unsupported protocol scheme: " + originalUri);
         }
 
         connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -101,13 +101,18 @@ public void init(DockerClientConfig dockerClientConfig) {
         String scheme = dockerClientConfig.getDockerHost().getScheme();
         String host = "";
 
-        if ("unix".equals(scheme)) {
-            nettyInitializer = new UnixDomainSocketInitializer();
-            host = "DUMMY";
-        } else if ("tcp".equals(scheme)) {
-            nettyInitializer = new InetSocketInitializer();
-            host = dockerClientConfig.getDockerHost().getHost() + ":"
-                + Integer.toString(dockerClientConfig.getDockerHost().getPort());
+        switch (scheme) {
+            case "unix":
+                nettyInitializer = new UnixDomainSocketInitializer();
+                host = "DUMMY";
+                break;
+            case "tcp":
+                nettyInitializer = new InetSocketInitializer();
+                host = dockerClientConfig.getDockerHost().getHost() + ":"
+                    + Integer.toString(dockerClientConfig.getDockerHost().getPort());
+                break;
+            default:
+                throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerClientConfig.getDockerHost());
         }
 
         eventLoopGroup = nettyInitializer.init(bootstrap, dockerClientConfig);
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -177,6 +177,12 @@ public void testUnixHostScheme() throws Exception {
                 null);
     }
 
+    @Test()
+    public void testNpipeHostScheme() throws Exception {
+        new DefaultDockerClientConfig(URI.create("npipe://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+                null);
+    }
+
     @Test
     public void withDockerTlsVerify() throws Exception {
         DefaultDockerClientConfig.Builder builder = new DefaultDockerClientConfig.Builder();

Original file line number	Diff line number	Diff line change
`@@ -98,11 +98,13 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`private URI checkDockerHostScheme(URI dockerHost) {`
`101`		`- if ("tcp".equals(dockerHost.getScheme()) \|\| "unix".equals(dockerHost.getScheme())) {`
`102`		`- return dockerHost;`
`103`		`- } else {`
`104`		`- throw new DockerClientException("Unsupported protocol scheme found: '" + dockerHost`
`105`		`- + "'. Only 'tcp://' or 'unix://' supported.");`
	`101`	`+ switch (dockerHost.getScheme()) {`
	`102`	`+ case "tcp":`
	`103`	`+ case "unix":`
	`104`	`+ case "npipe":`
	`105`	`+ return dockerHost;`
	`106`	`+ default:`
	`107`	`+ throw new DockerClientException("Unsupported protocol scheme found: '" + dockerHost);`
`106`	`108`	`}`
`107`	`109`	`}`
`108`	`110`