Skip to content

Commit

Permalink
refactor: Kubernetes Client is compatible with Vert.x-based mockwebse…
Browse files Browse the repository at this point in the history 
…rver

Signed-off-by: Marc Nuri <marc@marcnuri.com>
  • Loading branch information
@manusa
manusa committed Jan 24, 2024
1 parent 4e3b9eb commit a3b901a
Show file tree
Hide file tree
Showing 51 changed files with 122 additions and 141 deletions.
2 changes: 1 addition & 1 deletion ...ions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/AuthorizationPolicyTest.java
View file
Expand Up @@ -29,7 +29,7 @@
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import okhttp3.mockwebserver.RecordedRequest;
import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

Expand Down
2 changes: 1 addition & 1 deletion extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/DestinationRuleTest.java
View file
Expand Up @@ -27,7 +27,7 @@
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import okhttp3.mockwebserver.RecordedRequest;
import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

Expand Down
2 changes: 1 addition & 1 deletion extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/GatewayTest.java
View file
Expand Up @@ -25,7 +25,7 @@
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.kubernetes.client.utils.Serialization;
import okhttp3.mockwebserver.RecordedRequest;
import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.snakeyaml.engine.v2.api.Load;
Expand Down
2 changes: 1 addition & 1 deletion ...sions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/PeerAuthenticationTest.java
View file
Expand Up @@ -24,7 +24,7 @@
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import okhttp3.mockwebserver.RecordedRequest;
import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

Expand Down
2 changes: 1 addition & 1 deletion extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/ServiceEntryTest.java
View file
Expand Up @@ -23,7 +23,7 @@
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import okhttp3.mockwebserver.RecordedRequest;
import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

Expand Down
2 changes: 1 addition & 1 deletion extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/SidecarTest.java
View file
Expand Up @@ -22,7 +22,7 @@
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import okhttp3.mockwebserver.RecordedRequest;
import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

Expand Down
2 changes: 1 addition & 1 deletion extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/VirtualServiceTest.java
View file
Expand Up @@ -34,7 +34,7 @@
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.kubernetes.client.utils.Serialization;
import okhttp3.mockwebserver.RecordedRequest;
import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.snakeyaml.engine.v2.api.Load;
Expand Down
2 changes: 1 addition & 1 deletion extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/WorkloadEntryTest.java
View file
Expand Up @@ -21,7 +21,7 @@
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import okhttp3.mockwebserver.RecordedRequest;
import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

Expand Down
2 changes: 1 addition & 1 deletion extensions/knative/tests/src/test/java/io/fabric8/knative/test/ServiceTest.java
View file
Expand Up @@ -21,7 +21,7 @@
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import okhttp3.mockwebserver.RecordedRequest;
import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

Expand Down
2 changes: 1 addition & 1 deletion extensions/tekton/tests/src/test/java/io/fabric8/tekton/pipeline/v1beta1/PipelineTest.java
View file
Expand Up @@ -18,8 +18,8 @@
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.mockwebserver.http.RecordedRequest;
import io.fabric8.tekton.client.TektonClient;
import okhttp3.mockwebserver.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

Expand Down
8 changes: 4 additions & 4 deletions ...t-okhttp/src/test/java/io/fabric8/kubernetes/client/okhttp/ConnectionPoolLeakageTest.java
View file
Expand Up @@ -18,10 +18,10 @@
import io.fabric8.kubernetes.client.http.AsyncBody;
import io.fabric8.kubernetes.client.http.HttpClient;
import io.fabric8.kubernetes.client.http.HttpResponse;
import io.fabric8.mockwebserver.MockWebServer;
import io.fabric8.mockwebserver.http.MockResponse;
import okhttp3.ConnectionPool;
import okhttp3.Protocol;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
Expand Down Expand Up @@ -53,7 +53,7 @@ void setUp() {
}

@AfterEach
void tearDown() throws Exception {
void tearDown() {
server.shutdown();
connectionPool.evictAll();
}
Expand All @@ -63,7 +63,7 @@ void tearDown() throws Exception {
@ValueSource(strings = { "h2_prior_knowledge", "http/1.1" })
void consumeBytes(String protocol) throws Exception {
final Protocol p = Protocol.get(protocol);
server.setProtocols(Collections.singletonList(p));
server.setProtocols(Collections.singletonList(io.fabric8.mockwebserver.vertx.Protocol.get(p.toString())));
server.start();
clientBuilder.getBuilder().protocols(Collections.singletonList(p));
try (HttpClient httpClient = clientBuilder.build()) {
Expand Down
15 changes: 10 additions & 5 deletions junit/kubernetes-server-mock/pom.xml
View file
Expand Up @@ -41,6 +41,16 @@
<groupId>io.fabric8</groupId>
<artifactId>mockwebserver</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
Expand All @@ -54,11 +64,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
View file
Expand Up @@ -24,7 +24,7 @@
import io.fabric8.mockwebserver.crud.Attribute;
import io.fabric8.mockwebserver.crud.AttributeExtractor;
import io.fabric8.mockwebserver.crud.AttributeSet;
import okhttp3.HttpUrl;
import io.fabric8.mockwebserver.http.HttpUrl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
6 changes: 2 additions & 4 deletions ...mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesCrudDispatcher.java
View file
Expand Up @@ -30,9 +30,8 @@
import io.fabric8.mockwebserver.crud.Attribute;
import io.fabric8.mockwebserver.crud.AttributeSet;
import io.fabric8.mockwebserver.crud.CrudDispatcher;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.RecordedRequest;
import okhttp3.mockwebserver.SocketPolicy;
import io.fabric8.mockwebserver.http.MockResponse;
import io.fabric8.mockwebserver.http.RecordedRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -292,7 +291,6 @@ public MockResponse handleWatch(String path) {
.filter(entry -> watch.attributeMatches(entry.getKey()))
.forEach(entry -> watch.sendWebSocketResponse(entry.getValue(), Action.ADDED))));
watchEventListeners.add(watchEventListener);
mockResponse.setSocketPolicy(SocketPolicy.KEEP_OPEN);
return mockResponse.withWebSocketUpgrade(watchEventListener);
}

Expand Down
8 changes: 4 additions & 4 deletions ...ock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMixedDispatcher.java
View file
Expand Up @@ -19,11 +19,11 @@
import io.fabric8.mockwebserver.ServerRequest;
import io.fabric8.mockwebserver.ServerResponse;
import io.fabric8.mockwebserver.dsl.HttpMethod;
import io.fabric8.mockwebserver.http.Dispatcher;
import io.fabric8.mockwebserver.http.MockResponse;
import io.fabric8.mockwebserver.http.RecordedRequest;
import io.fabric8.mockwebserver.internal.MockDispatcher;
import io.fabric8.mockwebserver.internal.SimpleRequest;
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.RecordedRequest;

import java.util.Collections;
import java.util.List;
Expand Down Expand Up @@ -58,7 +58,7 @@ public KubernetesMixedDispatcher(
}

@Override
public MockResponse dispatch(RecordedRequest request) throws InterruptedException {
public MockResponse dispatch(RecordedRequest request) {
final Queue<ServerResponse> responseQueue = responses.get(
new SimpleRequest(HttpMethod.valueOf(request.getMethod()), request.getPath()));
if (responseQueue != null && !responseQueue.isEmpty()) {
Expand Down
4 changes: 2 additions & 2 deletions ...ver-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServer.java
View file
Expand Up @@ -35,13 +35,13 @@
import io.fabric8.kubernetes.client.utils.Serialization;
import io.fabric8.mockwebserver.Context;
import io.fabric8.mockwebserver.DefaultMockServer;
import io.fabric8.mockwebserver.MockWebServer;
import io.fabric8.mockwebserver.ServerRequest;
import io.fabric8.mockwebserver.ServerResponse;
import io.fabric8.mockwebserver.http.Dispatcher;
import io.fabric8.mockwebserver.internal.MockDispatcher;
import io.fabric8.servicecatalog.client.DefaultServiceCatalogClient;
import io.fabric8.servicecatalog.client.NamespacedServiceCatalogClient;
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockWebServer;

import java.net.HttpURLConnection;
import java.net.InetAddress;
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerExtension.java
View file
Expand Up @@ -21,11 +21,11 @@
import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
import io.fabric8.kubernetes.client.utils.Serialization;
import io.fabric8.mockwebserver.Context;
import io.fabric8.mockwebserver.MockWebServer;
import io.fabric8.mockwebserver.ServerRequest;
import io.fabric8.mockwebserver.ServerResponse;
import io.fabric8.mockwebserver.http.Dispatcher;
import io.fabric8.mockwebserver.internal.MockDispatcher;
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockWebServer;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
Expand Down
4 changes: 2 additions & 2 deletions ...-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesServer.java
View file
Expand Up @@ -18,11 +18,11 @@
import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
import io.fabric8.mockwebserver.Context;
import io.fabric8.mockwebserver.MockWebServer;
import io.fabric8.mockwebserver.ServerRequest;
import io.fabric8.mockwebserver.ServerResponse;
import io.fabric8.mockwebserver.dsl.MockServerExpectation;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.rules.ExternalResource;

import java.net.InetAddress;
Expand Down
6 changes: 3 additions & 3 deletions ...rver-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/WatchEventsListener.java
View file
Expand Up @@ -22,10 +22,10 @@
import io.fabric8.kubernetes.client.utils.Serialization;
import io.fabric8.mockwebserver.Context;
import io.fabric8.mockwebserver.crud.AttributeSet;
import io.fabric8.mockwebserver.http.Response;
import io.fabric8.mockwebserver.http.WebSocket;
import io.fabric8.mockwebserver.http.WebSocketListener;
import io.fabric8.mockwebserver.internal.WebSocketMessage;
import okhttp3.Response;
import okhttp3.WebSocket;
import okhttp3.WebSocketListener;
import org.slf4j.Logger;

import java.util.Set;
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/io/fabric8/kubernetes/client/server/mock/crud/KubernetesCrudDispatcherHandler.java
View file
Expand Up @@ -21,8 +21,8 @@
import io.fabric8.kubernetes.client.utils.Serialization;
import io.fabric8.kubernetes.client.utils.Utils;
import io.fabric8.mockwebserver.crud.AttributeSet;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.RecordedRequest;
import io.fabric8.mockwebserver.http.MockResponse;
import io.fabric8.mockwebserver.http.RecordedRequest;

import java.net.HttpURLConnection;

Expand Down
4 changes: 2 additions & 2 deletions ...server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/PatchHandler.java
View file
Expand Up @@ -22,9 +22,9 @@
import io.fabric8.kubernetes.client.utils.Serialization;
import io.fabric8.kubernetes.client.utils.Utils;
import io.fabric8.mockwebserver.crud.AttributeSet;
import io.fabric8.mockwebserver.http.MediaType;
import io.fabric8.mockwebserver.http.MockResponse;
import io.fabric8.zjsonpatch.JsonPatch;
import okhttp3.MediaType;
import okhttp3.mockwebserver.MockResponse;

import java.net.HttpURLConnection;
import java.util.Iterator;
Expand Down
2 changes: 1 addition & 1 deletion ...-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/PostHandler.java
View file
Expand Up @@ -23,7 +23,7 @@
import io.fabric8.kubernetes.client.utils.Utils;
import io.fabric8.mockwebserver.crud.Attribute;
import io.fabric8.mockwebserver.crud.AttributeSet;
import okhttp3.mockwebserver.MockResponse;
import io.fabric8.mockwebserver.http.MockResponse;

import java.net.HttpURLConnection;
import java.time.ZoneOffset;
Expand Down
2 changes: 1 addition & 1 deletion ...s-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/PutHandler.java
View file
Expand Up @@ -19,7 +19,7 @@
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
import io.fabric8.kubernetes.client.utils.Serialization;
import io.fabric8.mockwebserver.crud.AttributeSet;
import okhttp3.mockwebserver.MockResponse;
import io.fabric8.mockwebserver.http.MockResponse;

import java.net.HttpURLConnection;
import java.util.Map;
Expand Down
12 changes: 6 additions & 6 deletions ...src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesMixedDispatcherTest.java
View file
Expand Up @@ -20,12 +20,12 @@
import io.fabric8.mockwebserver.ServerRequest;
import io.fabric8.mockwebserver.ServerResponse;
import io.fabric8.mockwebserver.dsl.HttpMethod;
import io.fabric8.mockwebserver.http.Buffer;
import io.fabric8.mockwebserver.http.Headers;
import io.fabric8.mockwebserver.http.MockResponse;
import io.fabric8.mockwebserver.http.RecordedRequest;
import io.fabric8.mockwebserver.internal.SimpleRequest;
import io.fabric8.mockwebserver.internal.SimpleResponse;
import okhttp3.Headers;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.RecordedRequest;
import okio.Buffer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -59,7 +59,7 @@ void setUp() {

@Test
@DisplayName("dispatch, with matching expectation, returns expectation")
void dispatchWithMatchingExpectation() throws Exception {
void dispatchWithMatchingExpectation() {
// Given
responses.compute(new SimpleRequest(HttpMethod.GET, "/api/v1/resources/my-resource"), (k, v) -> new ArrayDeque<>())
.add(new SimpleResponse(true, 200, "resourceBody", null));
Expand All @@ -76,7 +76,7 @@ void dispatchWithMatchingExpectation() throws Exception {

@Test
@DisplayName("dispatch, with existing CRUD resource, returns CRUD resource")
void dispatchWithCrudExistentResource() throws Exception {
void dispatchWithCrudExistentResource() {
// Given
final Buffer requestBody = new Buffer();
requestBody.writeString("{\"kind\": \"Resource\", \"apiVersion\": \"v1\",\"metadata\": {\"name\": \"my-resource\"}}",
Expand Down
2 changes: 1 addition & 1 deletion .../java/io/fabric8/kubernetes/client/server/mock/crud/KubernetesCrudDispatcherTestBase.java
View file
Expand Up @@ -19,7 +19,7 @@
import io.fabric8.kubernetes.client.server.mock.KubernetesCrudDispatcher;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.mockwebserver.Context;
import okhttp3.mockwebserver.MockWebServer;
import io.fabric8.mockwebserver.MockWebServer;
import org.assertj.core.api.Condition;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
Expand Down
5 changes: 5 additions & 0 deletions junit/openshift-server-mock/pom.xml
View file
Expand Up @@ -39,6 +39,11 @@
<artifactId>openshift-client</artifactId>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions ...erver-mock/src/main/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServer.java
View file
Expand Up @@ -18,12 +18,12 @@

import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.mockwebserver.Context;
import io.fabric8.mockwebserver.MockWebServer;
import io.fabric8.mockwebserver.ServerRequest;
import io.fabric8.mockwebserver.ServerResponse;
import io.fabric8.mockwebserver.http.Dispatcher;
import io.fabric8.openshift.client.NamespacedOpenShiftClient;
import io.fabric8.openshift.client.OpenShiftConfig;
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockWebServer;

import java.util.Map;
import java.util.Queue;
Expand Down
2 changes: 1 addition & 1 deletion ...k/src/main/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtension.java
View file
Expand Up @@ -18,11 +18,11 @@
import io.fabric8.kubernetes.client.server.mock.KubernetesMixedDispatcher;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServerExtension;
import io.fabric8.mockwebserver.Context;
import io.fabric8.mockwebserver.MockWebServer;
import io.fabric8.mockwebserver.ServerRequest;
import io.fabric8.mockwebserver.ServerResponse;
import io.fabric8.openshift.client.NamespacedOpenShiftClient;
import io.fabric8.openshift.client.OpenShiftClient;
import okhttp3.mockwebserver.MockWebServer;
import org.junit.jupiter.api.extension.ExtensionContext;

import java.lang.reflect.Field;
Expand Down

0 comments on commit a3b901a

Please sign in to comment.