quarkus wip

Author: csviri

samples/quarkus/pom.xml

@@ -59,6 +59,11 @@
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jackson2-provider</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.javaoperatorsdk.admissioncontroller.sample</groupId>
+      <artifactId>sample-commons</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/AdmissionControllerConfig.java renamed to samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/admission/AdmissionControllerConfig.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.webhook.admission.sample.quarkus;
+package io.javaoperatorsdk.webhook.admission.sample.quarkus.admission;
 
 import java.util.HashMap;
 import java.util.concurrent.CompletableFuture;

samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/AdmissionEndpoint.java renamed to samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/admission/AdmissionEndpoint.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.webhook.admission.sample.quarkus;
+package io.javaoperatorsdk.webhook.admission.sample.quarkus.admission;
 
 import javax.inject.Inject;
 import javax.inject.Named;

samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/ConversionControllerConfig.java

@@ -0,0 +1,33 @@
+package io.javaoperatorsdk.webhook.admission.sample.quarkus.conversion;
+
+import javax.enterprise.context.Dependent;
+import javax.inject.Singleton;
+
+import io.javaoperatorsdk.webhook.conversion.AsyncConversionController;
+import io.javaoperatorsdk.webhook.conversion.ConversionController;
+import io.javaoperatorsdk.webhook.sample.commons.mapper.AsyncV1Mapper;
+import io.javaoperatorsdk.webhook.sample.commons.mapper.AsyncV2Mapper;
+import io.javaoperatorsdk.webhook.sample.commons.mapper.V1Mapper;
+import io.javaoperatorsdk.webhook.sample.commons.mapper.V2Mapper;
+
+@Dependent
+public class ConversionControllerConfig {
+
+
+  @Singleton
+  public ConversionController conversionController() {
+    var controller = new ConversionController();
+    controller.registerMapper(new V1Mapper());
+    controller.registerMapper(new V2Mapper());
+    return controller;
+  }
+
+  @Singleton
+  public AsyncConversionController asyncConversionController() {
+    var controller = new AsyncConversionController();
+    controller.registerMapper(new AsyncV1Mapper());
+    controller.registerMapper(new AsyncV2Mapper());
+    return controller;
+  }
+
+}

samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/ConversionEndpoint.java

@@ -0,0 +1,47 @@
+package io.javaoperatorsdk.webhook.admission.sample.quarkus.conversion;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.fabric8.kubernetes.api.model.apiextensions.v1.ConversionReview;
+import io.javaoperatorsdk.webhook.conversion.AsyncConversionController;
+import io.javaoperatorsdk.webhook.conversion.ConversionController;
+import io.smallrye.mutiny.Uni;
+
+@Path("/")
+public class ConversionEndpoint {
+
+  public static final String CONVERSION_PATH = "convert";
+  public static final String ASYNC_CONVERSION_PATH = "async-convert";
+
+  private final ConversionController conversionController;
+  private final AsyncConversionController asyncConversionController;
+
+  public ConversionEndpoint(ConversionController conversionController,
+      AsyncConversionController asyncConversionController) {
+    this.conversionController = conversionController;
+    this.asyncConversionController = asyncConversionController;
+  }
+
+
+  @POST
+  @Path(CONVERSION_PATH)
+  @Consumes(MediaType.APPLICATION_JSON)
+  @Produces(MediaType.APPLICATION_JSON)
+  public ConversionReview convert(ConversionReview conversionReview) {
+    return conversionController.handle(conversionReview);
+  }
+
+  @POST
+  @Path(ASYNC_CONVERSION_PATH)
+  @Consumes(MediaType.APPLICATION_JSON)
+  @Produces(MediaType.APPLICATION_JSON)
+  public Uni<ConversionReview> convertAsync(ConversionReview conversionReview) {
+    return Uni.createFrom()
+        .completionStage(() -> asyncConversionController.handle(conversionReview));
+  }
+
+}

samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/AdmissionEndpointTest.java renamed to samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/admission/AdmissionEndpointTest.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.webhook.admission.sample.quarkus;
+package io.javaoperatorsdk.webhook.admission.sample.quarkus.admission;
 
 import java.io.IOException;
 import java.io.InputStream;

samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/NativeAdmissionEndpointIT.java renamed to samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/admission/NativeAdmissionEndpointIT.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.webhook.admission.sample.quarkus;
+package io.javaoperatorsdk.webhook.admission.sample.quarkus.admission;
 
 import io.quarkus.test.junit.NativeImageTest;
 

samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/ConversionEndpointTest.java

@@ -0,0 +1,46 @@
+package io.javaoperatorsdk.webhook.admission.sample.quarkus.conversion;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.http.ContentType;
+
+import static io.javaoperatorsdk.webhook.admission.sample.quarkus.conversion.ConversionEndpoint.ASYNC_CONVERSION_PATH;
+import static io.javaoperatorsdk.webhook.admission.sample.quarkus.conversion.ConversionEndpoint.CONVERSION_PATH;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class ConversionEndpointTest {
+
+  @Test
+  void conversion() {
+    testConversion(CONVERSION_PATH);
+  }
+
+  @Test
+  void asyncConversion() {
+    testConversion(ASYNC_CONVERSION_PATH);
+  }
+
+  public void testConversion(String path) {
+    given().contentType(ContentType.JSON)
+        .body(jsonRequest())
+        .when().post("/" + path)
+        .then()
+        .statusCode(200)
+        .body(is("s"));
+  }
+
+  private String jsonRequest() {
+    try (InputStream is = this.getClass().getResourceAsStream("/conversion-request.json")) {
+      return new String(is.readAllBytes(), StandardCharsets.UTF_8);
+    } catch (IOException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+}

samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/NativeConversionEndpointTest.java

@@ -0,0 +1,7 @@
+package io.javaoperatorsdk.webhook.admission.sample.quarkus.conversion;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeConversionEndpointTest extends ConversionEndpointTest {
+}

samples/quarkus/src/test/resources/conversion-request.json

@@ -0,0 +1,47 @@
+{
+  "apiVersion": "apiextensions.k8s.io/v1",
+  "kind": "ConversionReview",
+  "request": {
+
+  "uid": "705ab4f5-6393-11e8-b7cc-42010a800002",
+
+  "desiredAPIVersion": "sample.javaoperatorsdk/v2",
+
+  "objects": [
+    {
+      "kind": "MultiVersionCustomResource",
+      "apiVersion": "sample.javaoperatorsdk/v1",
+      "metadata": {
+        "creationTimestamp": "2021-09-04T14:03:02Z",
+        "name": "resource1",
+        "namespace": "default",
+        "resourceVersion": "143",
+        "uid": "3415a7fc-162b-4300-b5da-fd6083580d66"
+      },
+      "spec": {
+        "value": 1
+      },
+      "status":{
+        "ready": true
+      }
+    },
+    {
+      "kind": "MultiVersionCustomResource",
+      "apiVersion": "sample.javaoperatorsdk/v1",
+      "metadata": {
+        "creationTimestamp": "2021-09-04T14:03:02Z",
+        "name": "resource2",
+        "namespace": "default",
+        "resourceVersion": "14344",
+        "uid": "1115a7fc-162b-4300-b5da-fd6083580d55"
+      },
+      "spec": {
+        "value": 2
+      },
+      "status":{
+        "ready": false
+      }
+    }
+  ]
+}
+}

samples/spring-boot/pom.xml

@@ -78,6 +78,7 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 

samples/spring-boot/src/test/java/io/javaoperatorsdk/webhook/sample/springboot/conversion/ConversionEndpointTest.java

@@ -49,10 +49,11 @@ public void testConversion(String path) {
         .exchange()
         .expectStatus().isOk().expectBody(ConversionReview.class).consumeWith(res -> {
           var review = res.getResponseBody();
+          var resource1 =
+              ((TestCustomResourceV2) review.getResponse().getConvertedObjects().get(0));
           assertThat(review.getResponse().getConvertedObjects()).hasSize(2);
-          assertThat(((TestCustomResourceV2) review.getResponse().getConvertedObjects().get(0))
-              .getSpec().getAdditionalValue())
-                  .isEqualTo(DEFAULT_ADDITIONAL_VALUE);
+          assertThat(resource1).isEqualTo(DEFAULT_ADDITIONAL_VALUE);
+          assertThat(resource1.getMetadata().getName()).isEqualTo("resource1");
         });
   }