Merge branch 'main' into oom

zio · Nov 4, 2024 · d14a04d · d14a04d
2 parents 2caf4cf + df186d4
commit d14a04d
Show file tree

Hide file tree

Showing 9 changed files with 156 additions and 85 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml
@@ -1,4 +1,4 @@
-# This file was autogenerated using `zio-sbt-website` via `sbt generateGithubWorkflow` 
+# This file was autogenerated using `zio-sbt-website` via `sbt generateGithubWorkflow`
 # task and should be included in the git repository. Please do not edit it manually.
 
 name: Website
@@ -23,6 +23,7 @@ jobs:
       uses: actions/checkout@v3.3.0
       with:
         fetch-depth: '0'
+    - uses: coursier/setup-action@v1
     - name: Setup Scala
       uses: actions/setup-java@v3.9.0
       with:
@@ -48,6 +49,7 @@ jobs:
         distribution: temurin
         java-version: 17
         check-latest: true
+    - uses: coursier/setup-action@v1
     - name: Setup NodeJs
       uses: actions/setup-node@v3
       with:
@@ -67,6 +69,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: '0'
+    - uses: coursier/setup-action@v1
     - name: Install libuv
       run: sudo apt-get update && sudo apt-get install -y libuv1-dev
     - name: Setup Scala

diff --git a/build.sbt b/build.sbt
@@ -38,7 +38,10 @@ ThisBuild / githubWorkflowAddedJobs    :=
     WorkflowJob(
       id = "mima_check",
       name = "Mima Check",
-      steps = WorkflowStep.CheckoutFull +: WorkflowStep.SetupJava(List(JavaSpec.temurin("21"))) :+  WorkflowStep.Sbt(List("mimaChecks")),
+      steps = List(
+        WorkflowStep.Use(UseRef.Public("actions", "checkout", "v4"), Map("fetch-depth" -> "0")),
+        WorkflowStep.Use(UseRef.Public("coursier", "setup-action", "v1")),
+      ) ++ WorkflowStep.SetupJava(List(JavaSpec.temurin("21"))) :+ WorkflowStep.Sbt(List("mimaChecks")),
       cond = Option("${{ github.event_name == 'pull_request' }}"),
       javas = List(JavaSpec.temurin("21")),
     ),
@@ -75,6 +78,7 @@ ThisBuild / githubWorkflowPublish       :=
 //scala fix isn't available for scala 3 so ensure we only run the fmt check
 //using the latest scala 2.13
 ThisBuild / githubWorkflowBuildPreamble := Seq(
+  WorkflowStep.Use(UseRef.Public("coursier", "setup-action", "v1")),
   WorkflowStep.Run(
     name = Some("Check formatting"),
     commands = List(s"sbt ++${Scala213} fmtCheck"),
@@ -87,6 +91,7 @@ ThisBuild / githubWorkflowBuildPostamble :=
     "checkDocGeneration",
     "Check doc generation",
     List(
+      WorkflowStep.Use(UseRef.Public("coursier", "setup-action", "v1")),
       WorkflowStep.Run(
         commands = List(s"sbt ++${Scala213} doc"),
         name = Some("Check doc generation"),

diff --git a/docs/guides/testing-http-apps.md b/docs/guides/testing-http-apps.md
@@ -117,12 +117,10 @@ object TestServerExampleSpec extends ZIOSpecDefault {
         fallbackResponse <- client.batched(Request.get(testRequest.url / "any"))
         fallbackBody     <- fallbackResponse.body.asString
       } yield assertTrue(helloBody == "Hey there!", fallbackBody == "fallback")
-    }.provideSome[Client with Driver](TestServer.layer)
+    }
   }.provide(
-    ZLayer.succeed(Server.Config.default.onAnyOpenPort),
+    TestServer.default,
     Client.default,
-    NettyDriver.customized,
-    ZLayer.succeed(NettyConfig.defaultWithFastShutdown),
   )
 }
 ```
diff --git a/project/BenchmarkWorkFlow.scala b/project/BenchmarkWorkFlow.scala
@@ -35,13 +35,13 @@ object BenchmarkWorkFlow {
           commands = List("sudo rm -rf *"),
         ),
         WorkflowStep.Use(
-          UseRef.Public("actions", "checkout", s"v2"),
+          UseRef.Public("actions", "checkout", s"v4"),
           Map(
             "path" -> "zio-http",
           ),
         ),
         WorkflowStep.Use(
-          UseRef.Public("actions", "checkout", s"v2"),
+          UseRef.Public("actions", "checkout", s"v4"),
           Map(
             "repository" -> "khajavi/FrameworkBenchmarks",
             "path"       -> "FrameworkBenchMarks",
@@ -103,7 +103,7 @@ object BenchmarkWorkFlow {
 
               |if (( REQUESTS_PER_SECOND > PERFORMANCE_FLOOR )); then
               |  echo "Woohoo! Performance is good! $REQUESTS_PER_SECOND requests/sec exceeds the performance floor of $PERFORMANCE_FLOOR requests/sec."
-              |else 
+              |else
               |  echo "Performance benchmark failed with $REQUESTS_PER_SECOND req/sec! Performance must exceed $PERFORMANCE_FLOOR req/sec."
               |   exit 1
               |fi""".stripMargin,

diff --git a/project/JmhBenchmarkWorkflow.scala b/project/JmhBenchmarkWorkflow.scala
@@ -11,7 +11,7 @@ object JmhBenchmarkWorkflow {
     Glob("zio-http-benchmarks/src/main/scala-2.13/**"),
     Glob("zio-http-benchmarks/src/main/scala/**")),scalaSources
     )
- 
+
   /**
    * Get zioHttpBenchmark file names
    */
@@ -45,7 +45,7 @@ object JmhBenchmarkWorkflow {
  def downloadArtifacts(branch: String, batchSize: Int) = groupedBenchmarks(batchSize).flatMap(l => {
     Seq(
       WorkflowStep.Use(
-        ref = UseRef.Public("actions", "download-artifact", "v3"),
+        ref = UseRef.Public("actions", "download-artifact", "v4"),
         Map(
           "name" -> s"Jmh_${branch}_${l.head}",
         ),
@@ -84,7 +84,7 @@ object JmhBenchmarkWorkflow {
       steps =  downloadArtifacts("Main", batchSize) ++
         Seq(
         WorkflowStep.Use(
-          UseRef.Public("actions", "checkout", "v2"),
+          UseRef.Public("actions", "checkout", "v4"),
           Map(
             "path" -> "zio-http"
           )
@@ -113,14 +113,15 @@ object JmhBenchmarkWorkflow {
       ),
       scalas = List(Scala213),
       steps = List(
+        WorkflowStep.Use(UseRef.Public("coursier", "setup-action","v1"), Map("apps" -> "sbt")),
         WorkflowStep.Use(
-          UseRef.Public("actions", "checkout", "v2"),
+          UseRef.Public("actions", "checkout", "v4"),
           Map(
             "path" -> "zio-http",
           ),
         ),
         WorkflowStep.Use(
-          UseRef.Public("actions", "setup-java", "v2"),
+          UseRef.Public("actions", "setup-java", "v4"),
           Map(
             "distribution" -> "temurin",
             "java-version" -> "11",
@@ -137,7 +138,7 @@ object JmhBenchmarkWorkflow {
           name = Some("Benchmark_Main"),
         ),
         WorkflowStep.Use(
-          UseRef.Public("actions", "upload-artifact", "v3"),
+          UseRef.Public("actions", "upload-artifact", "v4"),
           Map(
             "name" -> s"Jmh_Main_${l.head}",
             "path" -> s"Main_${l.head}.txt",

diff --git a/project/ScoverageWorkFlow.scala b/project/ScoverageWorkFlow.scala
@@ -1,5 +1,5 @@
 import BuildHelper.{Scala213, ScoverageVersion}
-import sbtghactions.GenerativePlugin.autoImport.{WorkflowJob, WorkflowStep}
+import sbtghactions.GenerativePlugin.autoImport.{UseRef, WorkflowJob, WorkflowStep}
 
 object ScoverageWorkFlow {
   // TODO move plugins to plugins.sbt after scoverage's support for Scala 3
@@ -15,7 +15,8 @@ object ScoverageWorkFlow {
         name = "Unsafe Scoverage",
         scalas = List(Scala213),
         steps = List(
-          WorkflowStep.CheckoutFull,
+          WorkflowStep.Use(UseRef.Public("actions", "checkout", "v4"), Map("fetch-depth" -> "0")),
+          WorkflowStep.Use(UseRef.Public("coursier", "setup-action","v1"), Map("apps" -> "sbt")),
           WorkflowStep.Run(
             commands = List(s"sed -i -e '$$a${scoveragePlugin}' project/plugins.sbt"),
             id = Some("add_plugin"),

diff --git a/zio-http-testkit/src/main/scala/zio/http/TestServer.scala b/zio-http-testkit/src/main/scala/zio/http/TestServer.scala
@@ -2,6 +2,9 @@ package zio.http
 
 import zio._
 
+import zio.http.netty.NettyConfig
+import zio.http.netty.server.NettyDriver
+
 /**
  * Enables tests that make calls against "localhost" with user-specified
  * Behavior/Responses.
@@ -136,4 +139,11 @@ object TestServer {
       } yield TestServer(driver, result.port)
     }
 
+  val default: ZLayer[Any, Nothing, Server with TestServer] = ZLayer.make[Server with TestServer][Nothing](
+    TestServer.layer.orDie,
+    ZLayer.succeed(Server.Config.default.onAnyOpenPort),
+    NettyDriver.customized.orDie,
+    ZLayer.succeed(NettyConfig.defaultWithFastShutdown),
+  )
+
 }
diff --git a/zio-http-testkit/src/test/scala/zio/http/TestServerSpec.scala b/zio-http-testkit/src/test/scala/zio/http/TestServerSpec.scala
@@ -37,8 +37,8 @@ object TestServerSpec extends ZIOHttpSpec {
           )
       } yield assertTrue(status(response1) == Status.Ok) &&
         assertTrue(status(response2) == Status.InternalServerError)
-    }.provideSome[Client with Driver](
-      TestServer.layer,
+    }.provideSome[Client](
+      TestServer.default,
       Scope.default,
     ),
     suite("Exact Request=>Response version")(
@@ -83,8 +83,8 @@ object TestServerSpec extends ZIOHttpSpec {
         } yield assertTrue(status(finalResponse) == Status.NotFound)
       },
     )
-      .provideSome[Client with Driver](
-        TestServer.layer,
+      .provideSome[Client](
+        TestServer.default,
         Scope.default,
       ),
     test("add routes to the server") {
@@ -102,15 +102,12 @@ object TestServerSpec extends ZIOHttpSpec {
         fallbackResponse <- client(Request.get(testRequest.url / "any"))
         fallbackBody     <- fallbackResponse.body.asString
       } yield assertTrue(helloBody == "Hey there!", fallbackBody == "fallback")
-    }.provideSome[Client with Driver](
-      TestServer.layer,
+    }.provideSome[Client](
+      TestServer.default,
       Scope.default,
     ),
   ).provide(
-    ZLayer.succeed(Server.Config.default.onAnyOpenPort),
     Client.default,
-    NettyDriver.customized,
-    ZLayer.succeed(NettyConfig.defaultWithFastShutdown),
   )
 
   private def requestToCorrectPort =