Skip to content

Commit

Permalink
Upgrade org.wiremock dependency (#1599)
Browse files Browse the repository at this point in the history
  • Loading branch information
@wind57
wind57 authored Mar 14, 2024
1 parent fa07ce6 commit 19fa6ab
Show file tree
Hide file tree
Showing 16 changed files with 54 additions and 57 deletions.
4 changes: 2 additions & 2 deletions spring-cloud-kubernetes-client-config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
</dependency>

<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8-standalone</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions spring-cloud-kubernetes-client-discovery/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8-standalone</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions spring-cloud-kubernetes-client-loadbalancer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8-standalone</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8-standalone</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
7 changes: 4 additions & 3 deletions ...BootstrapConfigServerIntegrationTest.java → ...BootstrapConfigServerIntegrationTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2013-2021 the original author or authors.
* Copyright 2013-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,9 +14,10 @@
* limitations under the License.
*/

package org.springframework.cloud.kubernetes.configserver;
package org.springframework.cloud.kubernetes.configserver.it;

import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.kubernetes.configserver.KubernetesConfigServerApplication;

/**
* @author Ryan Baxter
Expand All @@ -26,6 +27,6 @@
"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.secrets.enableApi=true",
"spring.cloud.bootstrap.enabled=true" },
classes = { KubernetesConfigServerApplication.class })
public class BootstrapConfigServerIntegrationTest extends ConfigServerIntegrationTest {
class BootstrapConfigServerIntegrationTest extends ConfigServerIntegrationTest {

}
32 changes: 12 additions & 20 deletions ...onfigDataConfigServerIntegrationTest.java → ...onfigDataConfigServerIntegrationTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2013-2021 the original author or authors.
* Copyright 2013-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,20 +14,19 @@
* limitations under the License.
*/

package org.springframework.cloud.kubernetes.configserver;
package org.springframework.cloud.kubernetes.configserver.it;

import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.client.WireMock;
import io.kubernetes.client.util.ClientBuilder;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.mockito.MockedStatic;

import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.kubernetes.client.KubernetesClientUtils;
import org.springframework.cloud.kubernetes.configserver.KubernetesConfigServerApplication;
import org.springframework.cloud.kubernetes.configserver.TestBootstrapConfig;

import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
import static org.mockito.Mockito.mockStatic;

/**
Expand All @@ -36,27 +35,20 @@
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.client.namespace=default",
"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.secrets.enableApi=true" },
classes = { KubernetesConfigServerApplication.class })
public class ConfigDataConfigServerIntegrationTest extends ConfigServerIntegrationTest {
classes = { KubernetesConfigServerApplication.class, TestBootstrapConfig.class })
class ConfigDataConfigServerIntegrationTest extends ConfigServerIntegrationTest {

private static WireMockServer wireMockServer;

private static MockedStatic<KubernetesClientUtils> clientUtilsMock;

@BeforeAll
static void setup() {
wireMockServer = new WireMockServer(options().dynamicPort());
wireMockServer.start();
WireMock.configureFor(wireMockServer.port());
private MockedStatic<KubernetesClientUtils> clientUtilsMock;

@BeforeEach
void setup() {
clientUtilsMock = mockStatic(KubernetesClientUtils.class);
clientUtilsMock.when(KubernetesClientUtils::kubernetesApiClient)
.thenReturn(new ClientBuilder().setBasePath(wireMockServer.baseUrl()).build());
}

@AfterAll
static void teardown() {
wireMockServer.stop();
@AfterEach
void teardown() {
clientUtilsMock.close();
}

Expand Down
12 changes: 8 additions & 4 deletions ...igserver/ConfigServerIntegrationTest.java → ...erver/it/ConfigServerIntegrationTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2013-2021 the original author or authors.
* Copyright 2013-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,8 +14,9 @@
* limitations under the License.
*/

package org.springframework.cloud.kubernetes.configserver;
package org.springframework.cloud.kubernetes.configserver.it;

import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.client.WireMock;
import io.kubernetes.client.openapi.JSON;
import io.kubernetes.client.openapi.models.V1ConfigMapBuilder;
Expand Down Expand Up @@ -45,8 +46,11 @@ abstract class ConfigServerIntegrationTest {
@Autowired
private TestRestTemplate testRestTemplate;

@Autowired
WireMockServer wireMockServer;

@BeforeEach
public void beforeEach() {
void beforeEach() {
V1ConfigMapList TEST_CONFIGMAP = new V1ConfigMapList().addItemsItem(new V1ConfigMapBuilder().withMetadata(
new V1ObjectMetaBuilder().withName("test-cm").withNamespace("default").withResourceVersion("1").build())
.addToData("app.name", "test").build());
Expand All @@ -67,7 +71,7 @@ public void beforeEach() {
}

@Test
public void enabled() {
void enabled() {
Environment env = testRestTemplate.getForObject("/test-cm/default", Environment.class);
assertThat(env.getPropertySources().size()).isEqualTo(2);
assertThat(env.getPropertySources().get(0).getName().equals("configmap.test-cm.default")).isTrue();
Expand Down
4 changes: 2 additions & 2 deletions spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8-standalone</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8-standalone</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions spring-cloud-kubernetes-dependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<hoverfly.version>0.13.0</hoverfly.version>
<kubernetes-fabric8-client.version>6.9.2</kubernetes-fabric8-client.version>
<kubernetes-native-client.version>19.0.0</kubernetes-native-client.version>
<wiremock.version>2.26.3</wiremock.version>
<wiremock.version>3.4.2</wiremock.version>
<commons.collections4.version>4.4</commons.collections4.version>
</properties>
<dependencyManagement>
Expand Down Expand Up @@ -213,8 +213,8 @@
</dependency>

<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8-standalone</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<version>${wiremock.version}</version>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions spring-cloud-kubernetes-discovery/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8-standalone</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions spring-cloud-kubernetes-fabric8-discovery/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8-standalone</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ...rnetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<packaging>jar</packaging>

<properties>
<wiremock.version>2.26.3</wiremock.version>
<wiremock.version>3.4.2</wiremock.version>
</properties>

<dependencies>
Expand All @@ -38,8 +38,8 @@
<artifactId>spring-boot-starter-test</artifactId>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8-standalone</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<version>${wiremock.version}</version>
<scope>test</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions ...st/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package org.springframework.cloud.kubernetes.configuration.watcher;

import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.time.Duration;

import com.github.tomakehurst.wiremock.client.WireMock;
Expand Down Expand Up @@ -100,8 +100,8 @@ void after() {
@Test
void testActuatorRefresh() {

WireMock.configureFor(WIREMOCK_HOST, WIREMOCK_PORT, WIREMOCK_PATH);
await().timeout(Duration.ofSeconds(60)).ignoreException(SocketException.class)
WireMock.configureFor(WIREMOCK_HOST, WIREMOCK_PORT);
await().timeout(Duration.ofSeconds(60)).ignoreException(SocketTimeoutException.class)
.until(() -> WireMock
.stubFor(WireMock.post(WireMock.urlEqualTo("/actuator/refresh"))
.willReturn(WireMock.aResponse().withBody("{}").withStatus(200)))
Expand All @@ -128,7 +128,7 @@ void testActuatorRefreshReloadDisabled() {

TestUtil.patchForDisabledReload(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, NAMESPACE, DOCKER_IMAGE);

WireMock.configureFor(WIREMOCK_HOST, WIREMOCK_PORT, WIREMOCK_PATH);
WireMock.configureFor(WIREMOCK_HOST, WIREMOCK_PORT);
await().timeout(Duration.ofSeconds(60))
.until(() -> WireMock
.stubFor(WireMock.post(WireMock.urlEqualTo("/actuator/refresh"))
Expand Down
6 changes: 3 additions & 3 deletions ...framework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package org.springframework.cloud.kubernetes.configuration.watcher;

import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.Base64;
Expand Down Expand Up @@ -99,7 +99,7 @@ static void afterAll() throws Exception {
*/
@Test
void testConfigMapActuatorRefreshMultipleNamespaces() {
WireMock.configureFor(WIREMOCK_HOST, WIREMOCK_PORT, WIREMOCK_PATH);
WireMock.configureFor(WIREMOCK_HOST, WIREMOCK_PORT);
await().timeout(Duration.ofSeconds(60))
.until(() -> WireMock
.stubFor(WireMock.post(WireMock.urlEqualTo("/actuator/refresh"))
Expand Down Expand Up @@ -145,7 +145,7 @@ void testConfigMapActuatorRefreshMultipleNamespaces() {
* </pre>
*/
void testSecretActuatorRefreshMultipleNamespaces() {
await().timeout(Duration.ofSeconds(60)).ignoreException(SocketException.class)
await().timeout(Duration.ofSeconds(60)).ignoreException(SocketTimeoutException.class)
.until(() -> WireMock
.stubFor(WireMock.post(WireMock.urlEqualTo("/actuator/refresh"))
.willReturn(WireMock.aResponse().withBody("{}").withStatus(200)))
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-kubernetes-test-support/src/main/resources/wiremock/wiremock-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: service-wiremock
image: wiremock/wiremock:2.35.0
image: wiremock/wiremock:3.4.2
args: ["--verbose"]
imagePullPolicy: IfNotPresent
readinessProbe:
Expand Down

1 comment on commit 19fa6ab

@wind57
Copy link
Contributor Author

@wind57 wind57 commented on 19fa6ab Mar 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

github recently has issues. I've seen quite a few builds in the last days that make zero sense. I would re-trigger, but tomorrow may be.

Please sign in to comment.