From c4f90226094a35fc470f95b77d0cf7f35dd7c123 Mon Sep 17 00:00:00 2001
From: "http4s-steward[bot]"
 <106843772+http4s-steward[bot]@users.noreply.github.com>
Date: Thu, 14 Nov 2024 08:14:04 +0000
Subject: [PATCH 1/2] Update armeria to 1.31.0 in series/1.x

---
 build.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index c396235..c1eb128 100644
--- a/build.sbt
+++ b/build.sbt
@@ -21,7 +21,7 @@ ThisBuild / resolvers += Resolver.mavenLocal
 ThisBuild / Test / javaOptions += "-Dcom.linecorp.armeria.verboseResponses=true -Dcom.linecorp.armeria.verboseExceptions=always"
 
 val versions = new {
-  val armeria = "1.30.1"
+  val armeria = "1.31.0"
   val fs2 = "3.11.0"
   val http4s = "1.0.0-M43"
   val log4cats = "2.7.0"

From 1ae51197a87a969e86555c486e68380ba799049b Mon Sep 17 00:00:00 2001
From: danicheg <esik.danny@gmail.com>
Date: Thu, 14 Nov 2024 20:47:55 +0300
Subject: [PATCH 2/2] Use TlsProvider in ArmeriaServerBuilder

---
 .../armeria/server/ArmeriaServerBuilder.scala | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/server/src/main/scala/org/http4s/armeria/server/ArmeriaServerBuilder.scala b/server/src/main/scala/org/http4s/armeria/server/ArmeriaServerBuilder.scala
index 4110c1e..b237dff 100644
--- a/server/src/main/scala/org/http4s/armeria/server/ArmeriaServerBuilder.scala
+++ b/server/src/main/scala/org/http4s/armeria/server/ArmeriaServerBuilder.scala
@@ -21,7 +21,13 @@ import cats.syntax.applicative._
 import cats.syntax.flatMap._
 import cats.syntax.functor._
 import com.linecorp.armeria.common.util.Version
-import com.linecorp.armeria.common.{HttpRequest, HttpResponse, SessionProtocol}
+import com.linecorp.armeria.common.{
+  HttpRequest,
+  HttpResponse,
+  SessionProtocol,
+  TlsKeyPair,
+  TlsProvider
+}
 import com.linecorp.armeria.server.{
   HttpService,
   HttpServiceWithRoutes,
@@ -258,7 +264,12 @@ sealed class ArmeriaServerBuilder[F[_]] private (
     *   [[withTlsCustomizer]]
     */
   def withTls(keyCertChainFile: File, keyFile: File, keyPassword: Option[String]): Self =
-    atBuild(_.tls(keyCertChainFile, keyFile, keyPassword.orNull))
+    atBuild(
+      _.tlsProvider(
+        TlsProvider
+          .builder()
+          .keyPair(TlsKeyPair.of(keyFile, keyPassword.orNull, keyCertChainFile))
+          .build()))
 
   /** Configures SSL or TLS of this [[com.linecorp.armeria.server.Server]] with the specified
     * `keyCertChainInputStream`, `keyInputStream` and `keyPassword`.
@@ -276,7 +287,11 @@ sealed class ArmeriaServerBuilder[F[_]] private (
           .both(keyInputStream)
           .use { case (keyCertChain, key) =>
             F.delay {
-              ab.tls(keyCertChain, key, keyPassword.orNull)
+              ab.tlsProvider(
+                TlsProvider
+                  .builder()
+                  .keyPair(TlsKeyPair.of(key, keyPassword.orNull, keyCertChain))
+                  .build())
             }
           }
       })
@@ -288,7 +303,12 @@ sealed class ArmeriaServerBuilder[F[_]] private (
     *   [[withTlsCustomizer]]
     */
   def withTls(key: PrivateKey, keyCertChain: X509Certificate*): Self =
-    atBuild(_.tls(key, keyCertChain: _*))
+    atBuild(
+      _.tlsProvider(
+        TlsProvider
+          .builder()
+          .keyPair(TlsKeyPair.of(key, keyCertChain: _*))
+          .build()))
 
   /** Configures SSL or TLS of this [[com.linecorp.armeria.server.Server]] with the specified
     * [[javax.net.ssl.KeyManagerFactory]].