@devkong/cli-nx 0.0.45 → 0.0.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devkong/cli-nx",
-  "version": "0.0.45",
+  "version": "0.0.48",
   "type": "commonjs",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",

package/src/generators/preset/files/kotlin/Dockerfile

@@ -11,7 +11,7 @@ COPY --chown=quarkus:quarkus .editorconfig /code/
 USER quarkus
 WORKDIR /code
 COPY src /code/src
-RUN ./gradlew build -Dquarkus.package.main-class=io.kong.sdkkotlin.QuarkusApp -Dquarkus.native.enabled=true -Dquarkus.profile=prod -Dquarkus.package.jar.enabled=false
+RUN ./gradlew build -Dquarkus.package.main-class=io.kong.sdk.function.template.QuarkusApp -Dquarkus.native.enabled=true -Dquarkus.profile=prod -Dquarkus.package.jar.enabled=false
 
 ## Stage 2 : create the docker final image
 FROM quay.io/quarkus/quarkus-micro-image:2.0

package/src/generators/preset/files/kotlin/build.gradle.kts.template

@@ -1,4 +1,7 @@
 val javaVersion: String by project
+val kongSdkVersion: String by project
+val kongVersion: String by project
+val kotlinxCoroutinesTestVersion: String by project
 val quarkusVersion: String by project
 
 plugins {
@@ -12,16 +15,16 @@ repositories {
   mavenCentral()
   mavenLocal()
   maven {
-    url = uri("https://nexus.shared.app-dts.net/repository/maven-releases/")
+    url = uri("https://nexus.shared.sg.app-dts.net/repository/maven-releases/")
   }
   maven {
-    url = uri("https://nexus.shared.app-dts.net/repository/maven-snapshots/")
+    url = uri("https://nexus.shared.sg.app-dts.net/repository/maven-snapshots/")
   }
 }
 
 dependencies {
-  implementation("io.kong:kong-common:0.0.7-SNAPSHOT")
-  implementation("io.kong:kong-sdk-kotlin:0.0.31-SNAPSHOT")
+  implementation("io.kong:kong-common:$kongVersion")
+  implementation("io.kong:kong-sdk-function-template:$kongSdkVersion")
 
   implementation(enforcedPlatform("io.quarkus.platform:quarkus-bom:$quarkusVersion"))
   implementation("io.quarkus:quarkus-arc")
@@ -32,6 +35,7 @@ dependencies {
   implementation("io.quarkus:quarkus-smallrye-health")
 
   testImplementation("io.quarkus:quarkus-junit5")
+  testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesTestVersion")
 }
 
 group = "io.kong"

package/src/generators/preset/files/kotlin/gradle.properties

@@ -12,11 +12,17 @@ jsonSchemaValidatorVersion=1.5.8
 # https://mvnrepository.com/artifact/io.github.khalilou88.jnxplus/jnxplus-gradle-plugin
 jnxplusGradlePluginVersion=0.4.0
 
-#https://mvnrepository.com/artifact/com.networknt/json-schema-validator
-jsonSchemaValidatorVersion=1.5.8
+# Version of Kong SDK artifacts
+kongSdkVersion=0.0.8-SNAPSHOT
+
+# Version of Kong non-SDK artifacts
+kongVersion=0.0.1-SNAPSHOT
 
 # https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib
 kotlinVersion=2.1.10
 
+# https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-test
+kotlinxCoroutinesTestVersion=1.10.2
+
 # https://mvnrepository.com/artifact/io.quarkus/quarkus-core
 quarkusVersion=3.18.4

package/src/generators/preset/files/kotlin/project.json.template

@@ -3,6 +3,46 @@
   "$schema": "./node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "sourceRoot": "./src",
-  "targets": {},
+  "targets": {
+    "build": {
+      "executor": "@jnxplus/nx-gradle:run-task",
+      "outputs": [
+        "{projectRoot}/build"
+      ],
+      "options": {
+        "task": "quarkusBuild"
+      },
+      "configurations": {
+        "production": {
+          "task": "quarkusBuild -Dquarkus.package.jar.enabled=false -Dquarkus.native.enabled=true -Dquarkus.profile=prod"
+        }
+      }
+    },
+    "build-image": {
+      "dependsOn": [
+        "build"
+      ],
+      "executor": "@jnxplus/nx-gradle:quarkus-build-image"
+    },
+    "serve": {
+      "executor": "@jnxplus/nx-gradle:run-task",
+      "options": {
+        "task": "quarkusDev",
+        "keepItRunning": true
+      }
+    },
+    "lint": {
+      "executor": "@jnxplus/nx-gradle:run-task",
+      "options": {
+        "task": "ktlintCheck"
+      }
+    },
+    "test": {
+      "executor": "@jnxplus/nx-gradle:run-task",
+      "options": {
+        "task": "test"
+      }
+    }
+  },
   "tags": []
 }

package/src/generators/preset/files/kotlin/src/main/kotlin/io/kong/extension/Main.kt

@@ -1,10 +1,11 @@
-package io.kong.extensionapicall
+package io.kong.extension
 
-import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper
 import io.kong.common.AppLogger
-import io.kong.sdkkotlin.Field
-import io.kong.sdkkotlin.KongFunction
+import io.kong.sdk.KongFunction
+import io.kong.sdk.KongFunctionContext
+import io.kong.sdk.function.template.Field
+import io.quarkus.runtime.annotations.RegisterForReflection
 import jakarta.inject.Singleton
 
 // This is the main entry point for developing an extension for Kong.
@@ -13,12 +14,14 @@ import jakarta.inject.Singleton
 // Define the structure of the input data that your extension will accept.
 // Be sure to include example values for each field. These examples help generate
 // sample objects in the UI, making it easier to work with the models.
+@RegisterForReflection
 data class InputData(
   // REPLACE BELLOW WITH YOUR FIELDS
   @Field(description = "An integer number", examples = ["1"]) val a: Int,
   @Field(description = "An integer number", examples = ["2"]) val b: Int,
 )
 
+@RegisterForReflection
 data class OutputData(
   // Define the structure of the output data that your extension will return.
   // REPLACE BELLOW WITH YOUR FIELDS
@@ -37,6 +40,8 @@ val objectMapper = ObjectMapper()
 class Main : KongFunction<InputData>(InputData::class.java) {
   private val logger = AppLogger(Main::class.simpleName)
 
-  override suspend fun handle(data: InputData): JsonNode? =
-    objectMapper.valueToTree(OutputData(sum_of = data.a + data.b))
+  override suspend fun handle(
+    data: InputData,
+    context: KongFunctionContext,
+  ): ByteArray? = objectMapper.writeValueAsBytes(OutputData(sum_of = data.a + data.b))
 }

package/src/generators/preset/files/kotlin/src/main/resources/META-INF/resources/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <title>kong-extension-python-call - 0.0.1-SNAPSHOT</title>
+    <title>kong-extension-code-call - 0.0.1-SNAPSHOT</title>
     <style>
       body {
         margin: 0;
@@ -290,8 +290,8 @@
             <div class="app-details">
               <h5>Application</h5>
               <ul>
-                <li>GroupId: <code>io.kong.data</code></li>
-                <li>ArtifactId: <code>kong-extension-python-call</code></li>
+                <li>GroupId: <code>io.kong</code></li>
+                <li>ArtifactId: <code>kong-extension-code-call</code></li>
                 <li>Version: <code>0.0.1-SNAPSHOT</code></li>
                 <li>Quarkus Version: <code>2.16.11.Final</code></li>
               </ul>

package/src/generators/preset/files/kotlin/src/main/resources/application.properties.template

@@ -3,6 +3,7 @@ quarkus.log.level=INFO
 quarkus.log.console.format=%d{yyyy-MM-dd'T'HH:mm:ss,SSS} | %-5p | %s thread=%t module=%c{2.} %e%n
 quarkus.otel.enabled=true
 quarkus.otel.exporter.otlp.enabled=false
+quarkus.http.test-port=8083
 
 
 # non-prod profiles

package/src/generators/preset/files/kotlin/src/test/kotlin/io/kong/extension/Test.kt

@@ -0,0 +1,32 @@
+package io.kong.extensionapicall
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import io.kong.extension.InputData
+import io.kong.extension.Main
+import io.kong.extension.OutputData
+import io.quarkus.test.junit.QuarkusTest
+import jakarta.inject.Inject
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+@QuarkusTest
+class Test {
+  @Inject
+  lateinit var extension: Main
+
+  @Inject
+  lateinit var objectMapper: ObjectMapper
+
+  @Test
+  fun `when provided valid input then returns expected result`() =
+    runTest {
+      val input = InputData(a = 1, b = 2)
+
+      val bytes = extension.handle(input)
+      val output = objectMapper.readValue(bytes, OutputData::class.java)
+      val sumOf = output.sum_of
+
+      assertEquals(3, sumOf)
+    }
+}

package/src/generators/preset/files/kotlin/kong.json

@@ -1,6 +0,0 @@
-{
-  "id": "<%=id%>",
-  "name": "<%=name%>",
-  "sdk": "<%=platform%>",
-  "category": "unknown"
-}