Compliancetests fixes improvements

modules/compliance-tests/src/smithy4s/compliancetests/internals/ClientHttpComplianceTestCase.scala

@@ -24,7 +24,6 @@ import org.http4s.Request
 import org.http4s.Response
 import org.http4s.Status
 import org.http4s.Uri
-import org.typelevel.ci.CIString
 import smithy.test._
 import smithy4s.compliancetests.ComplianceTest.ComplianceResult
 import smithy4s.http.CodecAPI
@@ -35,7 +34,7 @@ import smithy4s.Service
 import scala.concurrent.duration._
 import smithy4s.http.HttpMediaType
 import org.http4s.MediaType
-import org.http4s.Header
+import org.http4s.Headers
 
 private[compliancetests] class ClientHttpComplianceTestCase[
     F[_],
@@ -186,21 +185,20 @@ private[compliancetests] class ClientHttpComplianceTestCase[
                     .through(utf8Encode)
                 }
                 .getOrElse(fs2.Stream.empty)
-            val headers: Seq[Header.ToRaw] =
-              testCase.headers.toList
-                .flatMap(_.toList)
-                .map { case (key, value) =>
-                  Header.Raw(CIString(key), value)
-                }
-                .map(Header.ToRaw.rawToRaw)
-                .toSeq
+
+            //  val headers = extractHeaders(testCase.headers).toList.flatten
+
+            val headers = List(
+              extractHeaders(testCase.headers),
+              Some(
+                Headers(`Content-Type`(MediaType.unsafeParse(mediaType.value)))
+              )
+            ).foldMap(_.combineAll)
+
             req.body.compile.drain.as(
               Response[F](status)
                 .withBodyStream(body)
-                .putHeaders(headers: _*)
-                .putHeaders(
-                  `Content-Type`(MediaType.unsafeParse(mediaType.value))
-                )
+                .withHeaders(headers)
             )
           }
 

modules/compliance-tests/src/smithy4s/compliancetests/internals/ServerHttpComplianceTestCase.scala

@@ -51,9 +51,7 @@ private[compliancetests] class ServerHttpComplianceTestCase[
   ): Request[F] = {
     val expectedHeaders =
       List(
-        testCase.headers.map(h =>
-          Headers(h.toList.map(a => a: Header.ToRaw): _*)
-        ),
+        extractHeaders(testCase.headers),
         testCase.bodyMediaType.map(mt =>
           Headers(`Content-Type`(MediaType.unsafeParse(mt)))
         )

modules/compliance-tests/src/smithy4s/compliancetests/internals/package.scala

@@ -17,11 +17,12 @@
 package smithy4s
 package compliancetests
 
-import org.http4s.Uri
+import org.http4s.{Header, Headers, Uri}
 import cats.implicits._
 
 import java.nio.charset.StandardCharsets
-import scala.collection.immutable.{ListMap}
+import scala.annotation.tailrec
+import scala.collection.immutable.ListMap
 
 package object internals {
 
@@ -62,4 +63,33 @@ package object internals {
           }
       }
   }
+
+  def extractHeaders(
+      maybeHeaders: Option[Map[String, String]]
+  ): Option[Headers] =
+    maybeHeaders.map(h =>
+      Headers(h.toList.flatMap(parseSingleHeader).map(a => a: Header.ToRaw): _*)
+    )
+
+  // regex for comma not between quotes
+  private val commaNotBetweenQuotes = ",(?=([^\"]*\"[^\"]*\")*[^\"]*$)"
+
+  private def parseSingleHeader(
+      kv: (String, String)
+  ): List[(String, String)] = {
+    val key = kv._1
+    val values = kv._2.split(commaNotBetweenQuotes).toList
+    @tailrec
+    def loop(
+        rest: List[String],
+        acc: List[(String, String)]
+    ): List[(String, String)] = {
+      rest match {
+        case ::(head, next) => loop(next, (key, head) :: acc)
+        case Nil            => acc
+      }
+    }
+    loop(values, List.empty)
+  }
+
 }