Small corrections for gcp cloudrun example (#405)

* small corrections for gcp cloudrun example * fix stupid scala-cli & bloop behaviour
VirtusLab · Aug 22, 2024 · e296d7f · e296d7f
1 parent fbd6ca5
commit e296d7f
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/Justfile b/Justfile
@@ -444,6 +444,7 @@ clean-test-templates:
 test-example example-name:
 	@echo "----------------------------------------"
 	@echo "Testing example {{example-name}}"
+	scala-cli bloop exit # allow different examples use different jvms
 	scala-cli compile -v -v -v {{no-bloop-ci}} examples/{{example-name}} {{ci-opts}} --suppress-experimental-feature-warning --suppress-directives-in-multiple-files-warning
 
 # Cleans after an example test

diff --git a/examples/gcp-cloudrun/README.md b/examples/gcp-cloudrun/README.md
@@ -25,9 +25,10 @@ These values are indicated with `***`.
    pulumi -C infra config set gcp:region us-west1 # any valid GCP region here
    ```
 
-3. Authenticate to GCR with Docker:
+3. Authenticate to GCR with application-default credentials and Docker:
 
    ```bash
+   gcloud auth application-default login # this is required for pulumi to reach GCP
    gcloud auth configure-docker # this is required to push the container
    ```
 

diff --git a/examples/gcp-cloudrun/app/.scalafmt.conf b/examples/gcp-cloudrun/app/.scalafmt.conf
@@ -0,0 +1,2 @@
+version = "3.7.15"
+runner.dialect = scala3
diff --git a/examples/gcp-cloudrun/app/Dockerfile b/examples/gcp-cloudrun/app/Dockerfile
@@ -24,16 +24,17 @@ WORKDIR /src
 # Copy local code to the container image
 COPY . .
 # Build a native binary with Scala CLI
-ARG GRAALVM_VERSION=22
+ARG GRAALVM_VERSION=21.0.2
 RUN \
     --mount=type=cache,target=/root/.cache/coursier \
     /usr/local/bin/scala-cli --power package . \
       --suppress-experimental-feature-warning \
       --server=false \
-      --jvm=graalvm-java17 \
+      --jvm=graalvm-java21:21.0.2 \
       --native-image \
-      --graalvm-jvm-id=graalvm-java17:${GRAALVM_VERSION} \
+      --graalvm-jvm-id=graalvm-java21:${GRAALVM_VERSION} \
       --graalvm-args="--static" \
+      --graalvm-args="--install-exit-handlers" \
       --main-class org.virtuslab.besom.example.main -o app -f
 
 FROM --platform=linux/amd64 gcr.io/distroless/static

diff --git a/examples/gcp-cloudrun/app/Main.scala b/examples/gcp-cloudrun/app/Main.scala
@@ -2,6 +2,7 @@ package org.virtuslab.besom.example
 
 import sttp.tapir.*
 import sttp.tapir.server.jdkhttp.*
+import java.util.concurrent.Executors
 
 @main def main(): Unit =
   // required by Cloud Run Container runtime contract https://cloud.google.com/run/docs/reference/container-contract
@@ -13,8 +14,8 @@ import sttp.tapir.server.jdkhttp.*
 
   println(s"Starting server on $host:$port")
   val _ = JdkHttpServer()
+    .executor(Executors.newVirtualThreadPerTaskExecutor())
     .host(host)
     .port(port)
     .addEndpoint(handler)
     .start()
-end main
diff --git a/examples/gcp-cloudrun/app/project.scala b/examples/gcp-cloudrun/app/project.scala
@@ -1,7 +1,8 @@
 //> using scala 3.3.1
-//> using options -java-output-version:17 -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement
+//> using options -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement
+//> using jvm "graalvm-java21:21.0.2"
 
-//> using dep com.softwaremill.sttp.tapir::tapir-jdkhttp-server:1.9.9
+//> using dep com.softwaremill.sttp.tapir::tapir-jdkhttp-server:1.9.10
 
 //> using publish.organization org.virtuslab.besom.example
-//> using publish.name app
+//> using publish.name app
diff --git a/examples/gcp-cloudrun/infra/project.scala b/examples/gcp-cloudrun/infra/project.scala
@@ -1,9 +1,10 @@
 //> using scala "3.3.1"
 //> using options -Werror -Wunused:all -Wvalue-discard -Wnonunit-statement
+///> using plugin "org.virtuslab::besom-compiler-plugin:0.3.2"
+
 //> using dep "org.virtuslab::besom-core:0.4.0-SNAPSHOT"
 //> using dep "org.virtuslab::besom-gcp:7.26.0-core.0.3"
 //> using dep "org.virtuslab::besom-docker:4.5.4-core.0.3"
 
-
 //> using exclude "app/*"
 //> using repository sonatype:snapshots