TG-583: get version WIP

GEO-BON · Sep 6, 2023 · 8e1b159 · 8e1b159
1 parent d0abfc8
commit 8e1b159
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 0 deletions.
diff --git a/http-proxy/conf.d-prod/ngnix.conf b/http-proxy/conf.d-prod/ngnix.conf
@@ -17,6 +17,9 @@ server {
         proxy_pass http://biab-script-server:8080/pipeline/;
     }
 
+    location /api/ {
+        proxy_pass http://biab-script-server:8080/api/;
+    }
 
     location /tiler/ {
         proxy_pass http://biab-tiler:8000/;

diff --git a/http-proxy/conf.d/ngnix.conf b/http-proxy/conf.d/ngnix.conf
@@ -17,6 +17,10 @@ server {
         proxy_pass http://biab-script-server:8080/pipeline/;
     }
 
+    location /api/ {
+        proxy_pass http://biab-script-server:8080/api/;
+    }
+
     ## Server to use when making changes to the OpenAPI specification. (dev only)
     location /swagger/ {
         proxy_pass http://swagger_editor:8080/swagger/;

diff --git a/script-server/api/openapi.yaml b/script-server/api/openapi.yaml
@@ -185,6 +185,22 @@ paths:
           description: Bad request
         "404":
           description: id not found
+  /api/versions:
+    get:
+      summary: Returns the version of system components.
+      responses:
+        "200":
+          description: The version of system components.
+          content:
+            text/plain:
+              schema:
+                type: string
+                x-content-type: text/plain
+                example: |
+                  R runner: 2023-06-15T14:09:32.212670687-04:00
+                  Rscript (R) version 4.2.3 (2023-03-15)
+
+            
 components:
   parameters:
     stepType:

diff --git a/script-server/src/main/kotlin/org/geobon/server/plugins/Routing.kt b/script-server/src/main/kotlin/org/geobon/server/plugins/Routing.kt
@@ -7,10 +7,13 @@ import io.ktor.server.application.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.launch
 import org.geobon.pipeline.*
 import org.geobon.pipeline.Pipeline.Companion.createMiniPipelineFromScript
 import org.geobon.pipeline.Pipeline.Companion.createRootPipeline
 import org.geobon.pipeline.RunContext.Companion.scriptRoot
+import org.geobon.utils.runCommand
 import org.geobon.utils.toMD5
 import org.json.JSONObject
 import org.slf4j.Logger
@@ -209,5 +212,14 @@ fun Application.configureRouting() {
                 call.respond(HttpStatusCode.OK)
             } ?: call.respond(/*412*/HttpStatusCode.PreconditionFailed, "The pipeline wasn't running")
         }
+
+        get("/api/versions") {
+            println("getting the versions")
+            val rRunner =
+            call.respond("""
+                R runner: ${"docker inspect --type=image -f '{{ .Created }}' biab_20-runner-r".runCommand()?.trim()}
+                ${"docker exec -i biab-runner-r Rscript --version".runCommand()}
+                """.trimIndent())
+        }
     }
 }
diff --git a/script-server/src/main/kotlin/org/geobon/utils/runCommand.kt b/script-server/src/main/kotlin/org/geobon/utils/runCommand.kt
@@ -0,0 +1,19 @@
+package org.geobon.utils
+
+import java.io.File
+import java.util.concurrent.TimeUnit
+
+
+fun String.runCommand(
+    workingDir: File = File("."),
+    timeoutAmount: Long = 1,
+    timeoutUnit: TimeUnit = TimeUnit.SECONDS
+): String? = runCatching {
+    println("bash -c $this")
+    ProcessBuilder("bash", "-c", this)
+        .directory(workingDir)
+        .redirectOutput(ProcessBuilder.Redirect.PIPE)
+        .redirectErrorStream(true) // Merges stderr into stdout
+        .start().also { it.waitFor(timeoutAmount, timeoutUnit) }
+        .inputStream.bufferedReader().readText()
+}.onFailure { it.printStackTrace() }.getOrNull()
diff --git a/script-server/src/test/kotlin/org/geobon/server/ApplicationTest.kt b/script-server/src/test/kotlin/org/geobon/server/ApplicationTest.kt
@@ -236,4 +236,14 @@ class ApplicationTest {
             assertEquals(HttpStatusCode.OK, status)
         }
     }
+
+    @Test
+    fun testGetVersion() = testApplication {
+        application { configureRouting() }
+
+        client.get("/api/versions").apply {
+            assertEquals(HttpStatusCode.OK, status)
+            println(bodyAsText())
+        }
+    }
 }