feat: KubernetesMockServer creates default expectation for /version

Author: manusa

kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServer.java

@@ -20,11 +20,13 @@
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.VersionInfo;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import io.fabric8.mockwebserver.Context;
 import io.fabric8.mockwebserver.DefaultMockServer;
 import io.fabric8.mockwebserver.ServerRequest;
 import io.fabric8.mockwebserver.ServerResponse;
+import io.fabric8.mockwebserver.internal.MockDispatcher;
 import okhttp3.mockwebserver.Dispatcher;
 import okhttp3.mockwebserver.MockWebServer;
 
@@ -40,6 +42,8 @@ public class KubernetesMockServer extends DefaultMockServer {
 
     private static final Context context = new Context(Serialization.jsonMapper());
 
+    private final VersionInfo versionInfo;
+
     public KubernetesMockServer() {
         this(true);
     }
@@ -53,16 +57,23 @@ public KubernetesMockServer(MockWebServer server, Map<ServerRequest, Queue<Serve
     }
 
     public KubernetesMockServer(Context context, MockWebServer server, Map<ServerRequest, Queue<ServerResponse>> responses, boolean useHttps) {
-        super(context, server, responses, useHttps);
+        this(context, server, responses, new MockDispatcher(responses), useHttps);
     }
 
     public KubernetesMockServer(Context context, MockWebServer server, Map<ServerRequest, Queue<ServerResponse>> responses, Dispatcher dispatcher, boolean useHttps) {
+        this(context, server, responses, dispatcher, useHttps,
+          new VersionInfo.Builder().withMajor("0").withMinor("0").build());
+    }
+
+    public KubernetesMockServer(Context context, MockWebServer server, Map<ServerRequest, Queue<ServerResponse>> responses, Dispatcher dispatcher, boolean useHttps, VersionInfo versionInfo) {
         super(context, server, responses, dispatcher, useHttps);
+        this.versionInfo = versionInfo;
     }
 
     @Override
     public void onStart() {
         expect().get().withPath("/").andReturn(200, new RootPathsBuilder().addToPaths(getRootPaths()).build()).always();
+        expect().get().withPath("/version").andReturn(200, versionInfo).always();
     }
 
     public void init() {

kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerExtensionStaticTests.java

@@ -21,15 +21,15 @@
 import org.junit.jupiter.api.Test;
 
 @EnableKubernetesMockClient(crud = true)
-public class KubernetesMockServerExtensionStaticTests {
+class KubernetesMockServerExtensionStaticTests {
 
-	static KubernetesClient client;
+  static KubernetesClient client;
 
-	@Test
-	void testExample() {
-		Assertions.assertNotNull(client);
+  @Test
+  void testExample() {
+    Assertions.assertNotNull(client);
     Assertions.assertNull(client.getConfiguration().getOauthToken());
     Assertions.assertNull(client.getConfiguration().getCurrentContext());
     Assertions.assertTrue(client.getConfiguration().getContexts().isEmpty());
-	}
+  }
 }

kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerExtensionTests.java

@@ -17,19 +17,34 @@
 package io.fabric8.kubernetes.client.server.mock;
 
 import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.VersionInfo;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 @EnableKubernetesMockClient(crud = true)
-public class KubernetesMockServerExtensionTests {
+class KubernetesMockServerExtensionTests {
 
-	KubernetesClient client;
+  KubernetesClient client;
 
-	@Test
-	void testExample() {
-		Assertions.assertNotNull(client);
+  @Test
+  void testExample() {
+    Assertions.assertNotNull(client);
     Assertions.assertNull(client.getConfiguration().getOauthToken());
     Assertions.assertNull(client.getConfiguration().getCurrentContext());
     Assertions.assertTrue(client.getConfiguration().getContexts().isEmpty());
-	}
+  }
+
+  @Test
+  @DisplayName("KubernetesMockServerExtension uses KubernetesMixedDispatcher and provides expectation for GET /version")
+  void testGetKubernetesVersion() {
+    // When
+    final VersionInfo result = client.getKubernetesVersion();
+    // Then
+    assertThat(result)
+      .hasFieldOrPropertyWithValue("major", "0")
+      .hasFieldOrPropertyWithValue("minor", "0");
+  }
 }

kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerTest.java

@@ -0,0 +1,41 @@
+package io.fabric8.kubernetes.client.server.mock;
+
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.VersionInfo;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+class KubernetesMockServerTest {
+
+  private KubernetesMockServer server;
+  private KubernetesClient client;
+
+  @BeforeEach
+  void setUp() {
+    server = new KubernetesMockServer();
+    server.start();
+    client = server.createClient();
+  }
+
+  @AfterEach
+  void tearDown() {
+    client.close();
+    server.shutdown();
+  }
+
+  @Test
+  @DisplayName("onStart, generates version endpoint")
+  void onStartVersionInfo() {
+    // When
+    final VersionInfo result = client.getKubernetesVersion();
+    // Then
+    assertThat(result)
+      .hasFieldOrPropertyWithValue("major", "0")
+      .hasFieldOrPropertyWithValue("minor", "0");
+  }
+}

kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/MasterProtocolTest.java

@@ -22,20 +22,19 @@
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.io.IOException;
 import java.util.Locale;
 
 import static okhttp3.TlsVersion.TLS_1_2;
 
-public class MasterProtocolTest {
+class MasterProtocolTest {
 
     @Test
-    public void testWithSSL() throws IOException {
+    void testWithSSL() {
         KubernetesMockServer sslServer = new KubernetesMockServer();
         sslServer.init();
 
         String host = sslServer.getHostName();
-        Integer port = sslServer.getPort();
+        int port = sslServer.getPort();
         Config config = new ConfigBuilder()
                 .withMasterUrl(host + ":" +port)
                 .withTlsVersions(TLS_1_2)
@@ -47,11 +46,11 @@ public void testWithSSL() throws IOException {
     }
 
     @Test
-    public void testWithoutSSL() throws IOException {
+    void testWithoutSSL() {
         KubernetesMockServer plainServer = new KubernetesMockServer(false);
         plainServer.init();
         String host = plainServer.getHostName();
-        Integer port = plainServer.getPort();
+        int port = plainServer.getPort();
         Config config = new ConfigBuilder()
                 .withMasterUrl(host + ":" +port)
                 .build();