ease configuration for docker and proxy configs

gesellix · gesellix · commit 294ef39adff6 · 2021-11-06T18:03:19.000+01:00
diff --git a/api-client/src/main/java/de/gesellix/docker/remote/api/EngineApiClientImpl.java b/api-client/src/main/java/de/gesellix/docker/remote/api/EngineApiClientImpl.java
@@ -1,5 +1,6 @@
 package de.gesellix.docker.remote.api;
 
+import de.gesellix.docker.engine.DockerClientConfig;
 import de.gesellix.docker.remote.api.client.ConfigApi;
 import de.gesellix.docker.remote.api.client.ContainerApi;
 import de.gesellix.docker.remote.api.client.DistributionApi;
@@ -15,6 +16,8 @@
 import de.gesellix.docker.remote.api.client.TaskApi;
 import de.gesellix.docker.remote.api.client.VolumeApi;
 
+import java.net.Proxy;
+
 public class EngineApiClientImpl implements EngineApiClient {
 
   private final ConfigApi configApi;
@@ -33,20 +36,29 @@ public class EngineApiClientImpl implements EngineApiClient {
   private final VolumeApi volumeApi;
 
   public EngineApiClientImpl() {
-    configApi = new ConfigApi();
-    containerApi = new ContainerApi();
-    distributionApi = new DistributionApi();
-    execApi = new ExecApi();
-    imageApi = new ImageApi();
-    networkApi = new NetworkApi();
-    nodeApi = new NodeApi();
-    pluginApi = new PluginApi();
-    secretApi = new SecretApi();
-    serviceApi = new ServiceApi();
-    swarmApi = new SwarmApi();
-    systemApi = new SystemApi();
-    taskApi = new TaskApi();
-    volumeApi = new VolumeApi();
+    this(new DockerClientConfig());
+  }
+
+  public EngineApiClientImpl(DockerClientConfig dockerClientConfig) {
+    this(dockerClientConfig, null);
+//    this(dockerClientConfig, Proxy.NO_PROXY);
+  }
+
+  public EngineApiClientImpl(DockerClientConfig dockerClientConfig, Proxy proxy) {
+    configApi = new ConfigApi(dockerClientConfig, proxy);
+    containerApi = new ContainerApi(dockerClientConfig, proxy);
+    distributionApi = new DistributionApi(dockerClientConfig, proxy);
+    execApi = new ExecApi(dockerClientConfig, proxy);
+    imageApi = new ImageApi(dockerClientConfig, proxy);
+    networkApi = new NetworkApi(dockerClientConfig, proxy);
+    nodeApi = new NodeApi(dockerClientConfig, proxy);
+    pluginApi = new PluginApi(dockerClientConfig, proxy);
+    secretApi = new SecretApi(dockerClientConfig, proxy);
+    serviceApi = new ServiceApi(dockerClientConfig, proxy);
+    swarmApi = new SwarmApi(dockerClientConfig, proxy);
+    systemApi = new SystemApi(dockerClientConfig, proxy);
+    taskApi = new TaskApi(dockerClientConfig, proxy);
+    volumeApi = new VolumeApi(dockerClientConfig, proxy);
   }
 
   @Override
diff --git a/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/ConfigApi.kt b/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/ConfigApi.kt
@@ -1,5 +1,6 @@
 package de.gesellix.docker.remote.api.client
 
+import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.RequestMethod
 import de.gesellix.docker.remote.api.Config
 import de.gesellix.docker.remote.api.ConfigSpec
@@ -13,13 +14,16 @@ import de.gesellix.docker.remote.api.core.ResponseType
 import de.gesellix.docker.remote.api.core.ServerError
 import de.gesellix.docker.remote.api.core.ServerException
 import de.gesellix.docker.remote.api.core.Success
+import java.net.Proxy
+
+class ConfigApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, proxy: Proxy?) : ApiClient(dockerClientConfig, proxy) {
+  constructor(dockerClientConfig: DockerClientConfig = defaultClientConfig) : this(dockerClientConfig, null)
 
-class ConfigApi(basePath: String = defaultBasePath) : ApiClient(basePath) {
   companion object {
 
     @JvmStatic
-    val defaultBasePath: String by lazy {
-      System.getProperties().getProperty("docker.client.baseUrl", "http://localhost/v1.41")
+    val defaultClientConfig: DockerClientConfig by lazy {
+      DockerClientConfig()
     }
   }
 
diff --git a/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/ContainerApi.kt b/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/ContainerApi.kt
@@ -11,6 +11,7 @@
  */
 package de.gesellix.docker.remote.api.client
 
+import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.RequestMethod.*
 import de.gesellix.docker.remote.api.ContainerChangeResponseItem
 import de.gesellix.docker.remote.api.ContainerCreateRequest
@@ -41,13 +42,16 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
 import java.net.HttpURLConnection.HTTP_NOT_FOUND
 import java.net.HttpURLConnection.HTTP_NOT_MODIFIED
+import java.net.Proxy
+
+class ContainerApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, proxy: Proxy?) : ApiClient(dockerClientConfig, proxy) {
+  constructor(dockerClientConfig: DockerClientConfig = defaultClientConfig) : this(dockerClientConfig, null)
 
-class ContainerApi(basePath: String = defaultBasePath) : ApiClient(basePath) {
   companion object {
 
     @JvmStatic
-    val defaultBasePath: String by lazy {
-      System.getProperties().getProperty("docker.client.baseUrl", "http://localhost/v1.41")
+    val defaultClientConfig: DockerClientConfig by lazy {
+      DockerClientConfig()
     }
   }
 
diff --git a/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/DistributionApi.kt b/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/DistributionApi.kt
@@ -11,6 +11,7 @@
  */
 package de.gesellix.docker.remote.api.client
 
+import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.RequestMethod.GET
 import de.gesellix.docker.remote.api.DistributionInspect
 import de.gesellix.docker.remote.api.core.ApiClient
@@ -22,13 +23,16 @@ import de.gesellix.docker.remote.api.core.ResponseType
 import de.gesellix.docker.remote.api.core.ServerError
 import de.gesellix.docker.remote.api.core.ServerException
 import de.gesellix.docker.remote.api.core.Success
+import java.net.Proxy
+
+class DistributionApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, proxy: Proxy?) : ApiClient(dockerClientConfig, proxy) {
+  constructor(dockerClientConfig: DockerClientConfig = defaultClientConfig) : this(dockerClientConfig, null)
 
-class DistributionApi(basePath: String = defaultBasePath) : ApiClient(basePath) {
   companion object {
 
     @JvmStatic
-    val defaultBasePath: String by lazy {
-      System.getProperties().getProperty("docker.client.baseUrl", "http://localhost/v1.41")
+    val defaultClientConfig: DockerClientConfig by lazy {
+      DockerClientConfig()
     }
   }
 
diff --git a/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/ExecApi.kt b/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/ExecApi.kt
@@ -11,6 +11,7 @@
  */
 package de.gesellix.docker.remote.api.client
 
+import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.RequestMethod.GET
 import de.gesellix.docker.engine.RequestMethod.POST
 import de.gesellix.docker.remote.api.ExecConfig
@@ -35,15 +36,18 @@ import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeoutOrNull
+import java.net.Proxy
 import java.time.Duration
 import java.time.temporal.ChronoUnit
 
-class ExecApi(basePath: String = defaultBasePath) : ApiClient(basePath) {
+class ExecApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, proxy: Proxy?) : ApiClient(dockerClientConfig, proxy) {
+  constructor(dockerClientConfig: DockerClientConfig = defaultClientConfig) : this(dockerClientConfig, null)
+
   companion object {
 
     @JvmStatic
-    val defaultBasePath: String by lazy {
-      System.getProperties().getProperty("docker.client.baseUrl", "http://localhost/v1.41")
+    val defaultClientConfig: DockerClientConfig by lazy {
+      DockerClientConfig()
     }
   }
 
diff --git a/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/ImageApi.kt b/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/ImageApi.kt
@@ -11,6 +11,7 @@
  */
 package de.gesellix.docker.remote.api.client
 
+import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.RequestMethod.DELETE
 import de.gesellix.docker.engine.RequestMethod.GET
 import de.gesellix.docker.engine.RequestMethod.POST
@@ -42,16 +43,19 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
 import okio.source
 import java.io.InputStream
+import java.net.Proxy
 import java.time.Duration
 import java.time.temporal.ChronoUnit
 import java.util.*
 
-class ImageApi(basePath: String = defaultBasePath) : ApiClient(basePath) {
+class ImageApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, proxy: Proxy?) : ApiClient(dockerClientConfig, proxy) {
+  constructor(dockerClientConfig: DockerClientConfig = defaultClientConfig) : this(dockerClientConfig, null)
+
   companion object {
 
     @JvmStatic
-    val defaultBasePath: String by lazy {
-      System.getProperties().getProperty("docker.client.baseUrl", "http://localhost/v1.41")
+    val defaultClientConfig: DockerClientConfig by lazy {
+      DockerClientConfig()
     }
   }
 
diff --git a/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/NetworkApi.kt b/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/NetworkApi.kt
@@ -11,6 +11,7 @@
  */
 package de.gesellix.docker.remote.api.client
 
+import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.RequestMethod.DELETE
 import de.gesellix.docker.engine.RequestMethod.GET
 import de.gesellix.docker.engine.RequestMethod.POST
@@ -30,13 +31,16 @@ import de.gesellix.docker.remote.api.core.ServerError
 import de.gesellix.docker.remote.api.core.ServerException
 import de.gesellix.docker.remote.api.core.Success
 import java.net.HttpURLConnection
+import java.net.Proxy
+
+class NetworkApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, proxy: Proxy?) : ApiClient(dockerClientConfig, proxy) {
+  constructor(dockerClientConfig: DockerClientConfig = defaultClientConfig) : this(dockerClientConfig, null)
 
-class NetworkApi(basePath: String = defaultBasePath) : ApiClient(basePath) {
   companion object {
 
     @JvmStatic
-    val defaultBasePath: String by lazy {
-      System.getProperties().getProperty("docker.client.baseUrl", "http://localhost/v1.41")
+    val defaultClientConfig: DockerClientConfig by lazy {
+      DockerClientConfig()
     }
   }
 
diff --git a/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/NodeApi.kt b/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/NodeApi.kt
@@ -11,6 +11,7 @@
  */
 package de.gesellix.docker.remote.api.client
 
+import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.RequestMethod.DELETE
 import de.gesellix.docker.engine.RequestMethod.GET
 import de.gesellix.docker.engine.RequestMethod.POST
@@ -25,13 +26,16 @@ import de.gesellix.docker.remote.api.core.ResponseType
 import de.gesellix.docker.remote.api.core.ServerError
 import de.gesellix.docker.remote.api.core.ServerException
 import de.gesellix.docker.remote.api.core.Success
+import java.net.Proxy
+
+class NodeApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, proxy: Proxy?) : ApiClient(dockerClientConfig, proxy) {
+  constructor(dockerClientConfig: DockerClientConfig = defaultClientConfig) : this(dockerClientConfig, null)
 
-class NodeApi(basePath: String = defaultBasePath) : ApiClient(basePath) {
   companion object {
 
     @JvmStatic
-    val defaultBasePath: String by lazy {
-      System.getProperties().getProperty("docker.client.baseUrl", "http://localhost/v1.41")
+    val defaultClientConfig: DockerClientConfig by lazy {
+      DockerClientConfig()
     }
   }
 
diff --git a/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/PluginApi.kt b/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/PluginApi.kt
@@ -11,6 +11,7 @@
  */
 package de.gesellix.docker.remote.api.client
 
+import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.RequestMethod.DELETE
 import de.gesellix.docker.engine.RequestMethod.GET
 import de.gesellix.docker.engine.RequestMethod.POST
@@ -25,13 +26,16 @@ import de.gesellix.docker.remote.api.core.ResponseType
 import de.gesellix.docker.remote.api.core.ServerError
 import de.gesellix.docker.remote.api.core.ServerException
 import de.gesellix.docker.remote.api.core.Success
+import java.net.Proxy
+
+class PluginApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, proxy: Proxy?) : ApiClient(dockerClientConfig, proxy) {
+  constructor(dockerClientConfig: DockerClientConfig = defaultClientConfig) : this(dockerClientConfig, null)
 
-class PluginApi(basePath: String = defaultBasePath) : ApiClient(basePath) {
   companion object {
 
     @JvmStatic
-    val defaultBasePath: String by lazy {
-      System.getProperties().getProperty("docker.client.baseUrl", "http://localhost/v1.41")
+    val defaultClientConfig: DockerClientConfig by lazy {
+      DockerClientConfig()
     }
   }
 
diff --git a/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/SecretApi.kt b/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/SecretApi.kt
@@ -11,6 +11,7 @@
  */
 package de.gesellix.docker.remote.api.client
 
+import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.RequestMethod.DELETE
 import de.gesellix.docker.engine.RequestMethod.GET
 import de.gesellix.docker.engine.RequestMethod.POST
@@ -26,13 +27,16 @@ import de.gesellix.docker.remote.api.core.ResponseType
 import de.gesellix.docker.remote.api.core.ServerError
 import de.gesellix.docker.remote.api.core.ServerException
 import de.gesellix.docker.remote.api.core.Success
+import java.net.Proxy
+
+class SecretApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, proxy: Proxy?) : ApiClient(dockerClientConfig, proxy) {
+  constructor(dockerClientConfig: DockerClientConfig = defaultClientConfig) : this(dockerClientConfig, null)
 
-class SecretApi(basePath: String = defaultBasePath) : ApiClient(basePath) {
   companion object {
 
     @JvmStatic
-    val defaultBasePath: String by lazy {
-      System.getProperties().getProperty("docker.client.baseUrl", "http://localhost/v1.41")
+    val defaultClientConfig: DockerClientConfig by lazy {
+      DockerClientConfig()
     }
   }
 
diff --git a/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/ServiceApi.kt b/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/ServiceApi.kt
@@ -11,6 +11,7 @@
  */
 package de.gesellix.docker.remote.api.client
 
+import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.RequestMethod.DELETE
 import de.gesellix.docker.engine.RequestMethod.GET
 import de.gesellix.docker.engine.RequestMethod.POST
@@ -37,13 +38,16 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
 import java.net.HttpURLConnection
+import java.net.Proxy
+
+class ServiceApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, proxy: Proxy?) : ApiClient(dockerClientConfig, proxy) {
+  constructor(dockerClientConfig: DockerClientConfig = defaultClientConfig) : this(dockerClientConfig, null)
 
-class ServiceApi(basePath: String = defaultBasePath) : ApiClient(basePath) {
   companion object {
 
     @JvmStatic
-    val defaultBasePath: String by lazy {
-      System.getProperties().getProperty("docker.client.baseUrl", "http://localhost/v1.41")
+    val defaultClientConfig: DockerClientConfig by lazy {
+      DockerClientConfig()
     }
   }
 
diff --git a/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/SessionApi.kt b/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/SessionApi.kt
@@ -11,6 +11,7 @@
  */
 package de.gesellix.docker.remote.api.client
 
+import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.RequestMethod.POST
 import de.gesellix.docker.remote.api.core.ApiClient
 import de.gesellix.docker.remote.api.core.ClientError
@@ -20,13 +21,16 @@ import de.gesellix.docker.remote.api.core.RequestConfig
 import de.gesellix.docker.remote.api.core.ResponseType
 import de.gesellix.docker.remote.api.core.ServerError
 import de.gesellix.docker.remote.api.core.ServerException
+import java.net.Proxy
+
+class SessionApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, proxy: Proxy?) : ApiClient(dockerClientConfig, proxy) {
+  constructor(dockerClientConfig: DockerClientConfig = defaultClientConfig) : this(dockerClientConfig, null)
 
-class SessionApi(basePath: String = defaultBasePath) : ApiClient(basePath) {
   companion object {
 
     @JvmStatic
-    val defaultBasePath: String by lazy {
-      System.getProperties().getProperty("docker.client.baseUrl", "http://localhost/v1.41")
+    val defaultClientConfig: DockerClientConfig by lazy {
+      DockerClientConfig()
     }
   }
 
diff --git a/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/SwarmApi.kt b/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/SwarmApi.kt
@@ -11,6 +11,7 @@
  */
 package de.gesellix.docker.remote.api.client
 
+import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.RequestMethod.GET
 import de.gesellix.docker.engine.RequestMethod.POST
 import de.gesellix.docker.remote.api.Swarm
@@ -28,13 +29,16 @@ import de.gesellix.docker.remote.api.core.ResponseType
 import de.gesellix.docker.remote.api.core.ServerError
 import de.gesellix.docker.remote.api.core.ServerException
 import de.gesellix.docker.remote.api.core.Success
+import java.net.Proxy
+
+class SwarmApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, proxy: Proxy?) : ApiClient(dockerClientConfig, proxy) {
+  constructor(dockerClientConfig: DockerClientConfig = defaultClientConfig) : this(dockerClientConfig, null)
 
-class SwarmApi(basePath: String = defaultBasePath) : ApiClient(basePath) {
   companion object {
 
     @JvmStatic
-    val defaultBasePath: String by lazy {
-      System.getProperties().getProperty("docker.client.baseUrl", "http://localhost/v1.41")
+    val defaultClientConfig: DockerClientConfig by lazy {
+      DockerClientConfig()
     }
   }
 
diff --git a/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/SystemApi.kt b/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/SystemApi.kt
diff --git a/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/TaskApi.kt b/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/TaskApi.kt
diff --git a/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/VolumeApi.kt b/api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/VolumeApi.kt
diff --git a/api-client/src/main/kotlin/de/gesellix/docker/remote/api/core/ApiClient.kt b/api-client/src/main/kotlin/de/gesellix/docker/remote/api/core/ApiClient.kt
