From fb4d2b230fb3cf166a20a1779e890b84364e674c Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 3 Dec 2020 15:21:00 -0500 Subject: [PATCH] Removing unused variables and centralizing API client creation. --- .../config/it/ConfigMapAndSecretIT.java | 23 ++------------ .../watcher/ActuatorRefreshIT.java | 8 ++--- .../watcher/ActuatorRefreshKafkaIT.java | 8 ++--- .../watcher/ActuatorRefreshRabbitMQIT.java | 31 ++----------------- .../core/k8s/it/ActuatorEndpointIT.java | 23 ++------------ .../integration/tests/commons/K8SUtils.java | 16 ++++++++++ 6 files changed, 26 insertions(+), 83 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/java/org/springframework/cloud/kubernetes/client/config/it/ConfigMapAndSecretIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/java/org/springframework/cloud/kubernetes/client/config/it/ConfigMapAndSecretIT.java index 30515a55..c29344ec 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/java/org/springframework/cloud/kubernetes/client/config/it/ConfigMapAndSecretIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/java/org/springframework/cloud/kubernetes/client/config/it/ConfigMapAndSecretIT.java @@ -21,7 +21,6 @@ import java.time.Duration; import java.util.Map; import io.kubernetes.client.openapi.ApiClient; -import io.kubernetes.client.openapi.Configuration; import io.kubernetes.client.openapi.apis.AppsV1Api; import io.kubernetes.client.openapi.apis.CoreV1Api; import io.kubernetes.client.openapi.apis.NetworkingV1beta1Api; @@ -30,7 +29,6 @@ import io.kubernetes.client.openapi.models.V1ConfigMap; import io.kubernetes.client.openapi.models.V1Deployment; import io.kubernetes.client.openapi.models.V1Secret; import io.kubernetes.client.openapi.models.V1Service; -import io.kubernetes.client.util.Config; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.After; @@ -45,6 +43,7 @@ import org.springframework.web.client.RestTemplate; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; +import static org.springframework.cloud.kubernetes.integration.tests.commons.K8SUtils.createApiClient; /** * @author Ryan Baxter @@ -53,22 +52,6 @@ public class ConfigMapAndSecretIT { private static final Log LOG = LogFactory.getLog(ConfigMapAndSecretIT.class); - private static final String KIND_REPO_HOST_PORT = "localhost:5000"; - - private static final String KIND_REPO_URL = "http://" + KIND_REPO_HOST_PORT; - - private static final String IMAGE = "spring-cloud-kubernetes-client-config-it"; - - private static final String IMAGE_TAG = "2.0.0-SNAPSHOT"; - - private static final String LOCAL_REPO = "docker.io/springcloud"; - - private static final String LOCAL_IMAGE = LOCAL_REPO + "/" + IMAGE + ":" + IMAGE_TAG; - - private static final String KIND_IMAGE = KIND_REPO_HOST_PORT + "/" + IMAGE; - - private static final String KIND_IMAGE_WITH_TAG = KIND_IMAGE + ":" + IMAGE_TAG; - private static final String SPRING_CLOUD_CLIENT_CONFIG_IT_DEPLOYMENT_NAME = "spring-cloud-kubernetes-client-config-it-deployment"; private static final String K8S_CONFIG_CLIENT_IT_NAME = "spring-cloud-kubernetes-client-config-it-deployment"; @@ -95,9 +78,7 @@ public class ConfigMapAndSecretIT { @BeforeClass public static void setup() throws Exception { - client = Config.defaultClient(); - // client.setDebugging(true); - Configuration.setDefaultApiClient(client); + client = createApiClient(); api = new CoreV1Api(); appsApi = new AppsV1Api(); networkingApi = new NetworkingV1beta1Api(); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java index 1c0faa77..2db973b6 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java @@ -20,7 +20,6 @@ import java.time.Duration; import com.github.tomakehurst.wiremock.client.WireMock; import io.kubernetes.client.openapi.ApiClient; -import io.kubernetes.client.openapi.Configuration; import io.kubernetes.client.openapi.apis.AppsV1Api; import io.kubernetes.client.openapi.apis.CoreV1Api; import io.kubernetes.client.openapi.apis.NetworkingV1beta1Api; @@ -29,7 +28,6 @@ import io.kubernetes.client.openapi.models.V1ConfigMap; import io.kubernetes.client.openapi.models.V1ConfigMapBuilder; import io.kubernetes.client.openapi.models.V1Deployment; import io.kubernetes.client.openapi.models.V1Service; -import io.kubernetes.client.util.Config; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -46,6 +44,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static com.github.tomakehurst.wiremock.client.WireMock.verify; import static org.awaitility.Awaitility.await; +import static org.springframework.cloud.kubernetes.integration.tests.commons.K8SUtils.createApiClient; /** * @author Ryan Baxter @@ -97,10 +96,7 @@ public class ActuatorRefreshIT { @Before public void setup() throws Exception { - this.client = Config.defaultClient(); - this.client.setHttpClient(this.client.getHttpClient().newBuilder().readTimeout(Duration.ofSeconds(15)).build()); - // client.setDebugging(true); - Configuration.setDefaultApiClient(client); + this.client = createApiClient(); this.api = new CoreV1Api(); this.appsApi = new AppsV1Api(); this.networkingApi = new NetworkingV1beta1Api(); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshKafkaIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshKafkaIT.java index b717c3f7..27fe572d 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshKafkaIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshKafkaIT.java @@ -19,7 +19,6 @@ package org.springframework.cloud.kubernetes.configuration.watcher; import java.time.Duration; import io.kubernetes.client.openapi.ApiClient; -import io.kubernetes.client.openapi.Configuration; import io.kubernetes.client.openapi.apis.AppsV1Api; import io.kubernetes.client.openapi.apis.CoreV1Api; import io.kubernetes.client.openapi.apis.NetworkingV1beta1Api; @@ -28,7 +27,6 @@ import io.kubernetes.client.openapi.models.V1ConfigMap; import io.kubernetes.client.openapi.models.V1ConfigMapBuilder; import io.kubernetes.client.openapi.models.V1Deployment; import io.kubernetes.client.openapi.models.V1Service; -import io.kubernetes.client.util.Config; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.After; @@ -43,6 +41,7 @@ import org.springframework.web.client.RestTemplate; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; +import static org.springframework.cloud.kubernetes.integration.tests.commons.K8SUtils.createApiClient; /** * @author Kris Iyer @@ -105,10 +104,7 @@ public class ActuatorRefreshKafkaIT { @Before public void setup() throws Exception { - this.client = Config.defaultClient(); - // client.setDebugging(true); - this.client.setHttpClient(this.client.getHttpClient().newBuilder().readTimeout(Duration.ofSeconds(15)).build()); - Configuration.setDefaultApiClient(client); + this.client = createApiClient(); this.api = new CoreV1Api(); this.appsApi = new AppsV1Api(); this.networkingApi = new NetworkingV1beta1Api(); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshRabbitMQIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshRabbitMQIT.java index c46af336..57829ad7 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshRabbitMQIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshRabbitMQIT.java @@ -19,7 +19,6 @@ package org.springframework.cloud.kubernetes.configuration.watcher; import java.time.Duration; import io.kubernetes.client.openapi.ApiClient; -import io.kubernetes.client.openapi.Configuration; import io.kubernetes.client.openapi.apis.AppsV1Api; import io.kubernetes.client.openapi.apis.CoreV1Api; import io.kubernetes.client.openapi.apis.NetworkingV1beta1Api; @@ -29,7 +28,6 @@ import io.kubernetes.client.openapi.models.V1ConfigMapBuilder; import io.kubernetes.client.openapi.models.V1Deployment; import io.kubernetes.client.openapi.models.V1ReplicationController; import io.kubernetes.client.openapi.models.V1Service; -import io.kubernetes.client.util.Config; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.After; @@ -44,6 +42,7 @@ import org.springframework.web.client.RestTemplate; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; +import static org.springframework.cloud.kubernetes.integration.tests.commons.K8SUtils.createApiClient; /** * @author Ryan Baxter @@ -53,31 +52,8 @@ public class ActuatorRefreshRabbitMQIT { private Log log = LogFactory.getLog(getClass()); - private static final String KIND_REPO_HOST_PORT = "localhost:5000"; - - private static final String KIND_REPO_URL = "http://" + KIND_REPO_HOST_PORT; - - private static final String CONFIG_WATCHER_IMAGE = "spring-cloud-kubernetes-configuration-watcher"; - private static final String CONFIG_WATCHER_IT_IMAGE = "spring-cloud-kubernetes-configuration-watcher-it"; - private static final String IMAGE_TAG = "2.0.0-SNAPSHOT"; - - private static final String LOCAL_REPO = "docker.io/springcloud"; - - private static final String CONFIG_WATCHER_LOCAL_IMAGE = LOCAL_REPO + "/" + CONFIG_WATCHER_IMAGE + ":" + IMAGE_TAG; - - private static final String CONFIG_WATCHER_IT_LOCAL_IMAGE = LOCAL_REPO + "/" + CONFIG_WATCHER_IT_IMAGE + ":" - + IMAGE_TAG; - - private static final String CONFIG_WATCHER_KIND_IMAGE = KIND_REPO_HOST_PORT + "/" + CONFIG_WATCHER_IMAGE; - - private static final String CONFIG_WATCHER_IT_KIND_IMAGE = KIND_REPO_HOST_PORT + "/" + CONFIG_WATCHER_IT_IMAGE; - - private static final String CONFIG_WATCHER_KIND_IMAGE_WITH_TAG = CONFIG_WATCHER_KIND_IMAGE + ":" + IMAGE_TAG; - - private static final String CONFIG_WATCHER_IT_KIND_IMAGE_WITH_TAG = CONFIG_WATCHER_IT_KIND_IMAGE + ":" + IMAGE_TAG; - private static final String SPRING_CLOUD_K8S_CONFIG_WATCHER_DEPLOYMENT_NAME = "spring-cloud-kubernetes-configuration-watcher-deployment"; private static final String SPRING_CLOUD_K8S_CONFIG_WATCHER_IT_DEPLOYMENT_NAME = "spring-cloud-kubernetes-configuration-watcher-it-deployment"; @@ -100,10 +76,7 @@ public class ActuatorRefreshRabbitMQIT { @Before public void setup() throws Exception { - this.client = Config.defaultClient(); - this.client.setHttpClient(this.client.getHttpClient().newBuilder().readTimeout(Duration.ofSeconds(15)).build()); - // client.setDebugging(true); - Configuration.setDefaultApiClient(client); + this.client = createApiClient(); this.api = new CoreV1Api(); this.appsApi = new AppsV1Api(); this.networkingApi = new NetworkingV1beta1Api(); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/java/org/springframework/cloud/kubernetes/core/k8s/it/ActuatorEndpointIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/java/org/springframework/cloud/kubernetes/core/k8s/it/ActuatorEndpointIT.java index e573e66e..ccd4b9dc 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/java/org/springframework/cloud/kubernetes/core/k8s/it/ActuatorEndpointIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/java/org/springframework/cloud/kubernetes/core/k8s/it/ActuatorEndpointIT.java @@ -21,14 +21,12 @@ import java.time.Duration; import java.util.Map; import io.kubernetes.client.openapi.ApiClient; -import io.kubernetes.client.openapi.Configuration; import io.kubernetes.client.openapi.apis.AppsV1Api; import io.kubernetes.client.openapi.apis.CoreV1Api; import io.kubernetes.client.openapi.apis.NetworkingV1beta1Api; import io.kubernetes.client.openapi.models.NetworkingV1beta1Ingress; import io.kubernetes.client.openapi.models.V1Deployment; import io.kubernetes.client.openapi.models.V1Service; -import io.kubernetes.client.util.Config; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.AfterClass; @@ -45,6 +43,7 @@ import org.springframework.web.client.RestTemplate; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; import static org.awaitility.Awaitility.await; +import static org.springframework.cloud.kubernetes.integration.tests.commons.K8SUtils.createApiClient; /** * @author Ryan Baxter @@ -54,22 +53,6 @@ public class ActuatorEndpointIT { private static final Log LOG = LogFactory.getLog(ActuatorEndpointIT.class); - private static final String KIND_REPO_HOST_PORT = "localhost:5000"; - - private static final String KIND_REPO_URL = "http://" + KIND_REPO_HOST_PORT; - - private static final String IMAGE = "spring-cloud-kubernetes-core-k8s-client-it"; - - private static final String IMAGE_TAG = "2.0.0-SNAPSHOT"; - - private static final String LOCAL_REPO = "docker.io/springcloud"; - - private static final String LOCAL_IMAGE = LOCAL_REPO + "/" + IMAGE + ":" + IMAGE_TAG; - - private static final String KIND_IMAGE = KIND_REPO_HOST_PORT + "/" + IMAGE; - - private static final String KIND_IMAGE_WITH_TAG = KIND_IMAGE + ":" + IMAGE_TAG; - private static final String SPRING_CLOUD_K8S_CLIENT_IT_DEPLOYMENT_NAME = "spring-cloud-kubernetes-core-k8s-client-it-deployment"; private static final String K8S_CONFIG_CLIENT_IT_NAME = "spring-cloud-kubernetes-core-k8s-client-it-deployment"; @@ -90,9 +73,7 @@ public class ActuatorEndpointIT { @BeforeClass public static void setup() throws Exception { - client = Config.defaultClient(); - // client.setDebugging(true); - Configuration.setDefaultApiClient(client); + client = createApiClient(); api = new CoreV1Api(); appsApi = new AppsV1Api(); networkingApi = new NetworkingV1beta1Api(); diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/K8SUtils.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/K8SUtils.java index ac2b6d53..675b1da9 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/K8SUtils.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/K8SUtils.java @@ -18,6 +18,7 @@ package org.springframework.cloud.kubernetes.integration.tests.commons; import java.io.BufferedReader; import java.io.File; +import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; import java.time.Duration; @@ -25,7 +26,9 @@ import java.util.Collection; import java.util.Map; import java.util.concurrent.TimeUnit; +import io.kubernetes.client.openapi.ApiClient; import io.kubernetes.client.openapi.ApiException; +import io.kubernetes.client.openapi.Configuration; import io.kubernetes.client.openapi.apis.AppsV1Api; import io.kubernetes.client.openapi.apis.CoreV1Api; import io.kubernetes.client.openapi.models.V1Deployment; @@ -38,6 +41,7 @@ import io.kubernetes.client.openapi.models.V1ReplicationController; import io.kubernetes.client.openapi.models.V1ReplicationControllerList; import io.kubernetes.client.openapi.models.V1Service; import io.kubernetes.client.openapi.models.V1ServiceBuilder; +import io.kubernetes.client.util.Config; import io.kubernetes.client.util.Yaml; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -56,6 +60,18 @@ public class K8SUtils { private AppsV1Api appsApi; + public static ApiClient createApiClient() throws IOException { + return createApiClient(false, Duration.ofSeconds(15)); + } + + public static ApiClient createApiClient(boolean debug, Duration readTimeout) throws IOException { + ApiClient client = Config.defaultClient(); + client.setHttpClient(client.getHttpClient().newBuilder().readTimeout(readTimeout).build()); + client.setDebugging(debug); + Configuration.setDefaultApiClient(client); + return client; + } + public K8SUtils(CoreV1Api api, AppsV1Api appsApi) { this.api = api; this.appsApi = appsApi;