From 423fd93c0b15fa80c43cb65c4e5c77a67799aa17 Mon Sep 17 00:00:00 2001
From: Matthieu Baechler <matthieu@baechler-craftsmanship.fr>
Date: Mon, 29 Apr 2024 17:55:59 +0200
Subject: [PATCH] Fixes #24986: Enable scala 3 cross compilation

---
 webapp/sources/pom.xml                        |  31 +---
 .../rudder/facts/nodes/NodeFact.scala         |  32 ++--
 .../marshalling/XmlUnserialisationImpl.scala  |  47 +++---
 .../jdbc/ReportingServiceTest.scala           |   2 -
 .../rudder/rest/RudderJsonResponse.scala      |  10 +-
 .../rudder/rest/lift/GroupsApi.scala          |   4 -
 .../web/services/Section2FieldService.scala   |   1 -
 .../rudder/rest/RestDataExtractorTest.scala   | 137 +++++++++---------
 .../rudder/web/services/DisplayNode.scala     |   8 +-
 .../normation/rudder/web/snippet/Login.scala  |  28 ++--
 .../administration/DatabaseManagement.scala   |   2 +-
 .../rudder/web/snippet/HomePageTest.scala     |  72 ++++-----
 12 files changed, 168 insertions(+), 206 deletions(-)

diff --git a/webapp/sources/pom.xml b/webapp/sources/pom.xml
index 319bd3ae25f..2bd4106a778 100644
--- a/webapp/sources/pom.xml
+++ b/webapp/sources/pom.xml
@@ -107,23 +107,6 @@ limitations under the License.
       </extension>
     </extensions>
     <plugins>
-      <plugin>
-        <groupId>io.github.evis</groupId>
-        <artifactId>scalafix-maven-plugin_2.13</artifactId>
-        <version>0.1.8_0.11.0</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-rewrites_2.13</artifactId>
-            <version>0.1.5</version>
-          </dependency>
-          <dependency>
-            <groupId>ch.epfl.scala</groupId>
-            <artifactId>scala3-migrate-rules_2.13</artifactId>
-            <version>0.6.2</version>
-          </dependency>
-        </dependencies>
-      </plugin>
       <plugin>
         <!-- Specify maven resources plugin version because to avoid this bug from plugin 3.2+ https://issues.apache.org/jira/browse/MRESOURCES-269
 	especially with maven 3.9 that uses version 3.3.0 of this plugin by default, see https://issues.rudder.io/issues/22403
@@ -167,13 +150,6 @@ limitations under the License.
         <configuration>
           <scalaCompatVersion>${scala-binary-version}</scalaCompatVersion>
           <recompileMode>all</recompileMode>
-          <compilerPlugins>
-            <compilerPlugin>
-              <groupId>org.scalameta</groupId>
-              <artifactId>semanticdb-scalac_${scala-version}</artifactId>
-              <version>4.8.14</version>
-            </compilerPlugin>
-          </compilerPlugins>
           <args>
             <arg>-release:17</arg>
             <arg>-dependencyfile</arg>
@@ -184,7 +160,7 @@ limitations under the License.
               -Xlint:_,-nullary-unit,-missing-interpolator -Yno-adapted-args -Ywarn-dead-code -Ywarn-extra-implicit -Ywarn-inaccessible
               -Ywarn-infer-any -Ywarn-nullary-override -Ywarn-numeric-widen -Ywarn-unused:imports -Ywarn-unused:locals -Ywarn-unused:privates
             -->
-            <arg>-Xsource:3</arg>
+            <arg>-Xsource:3-cross</arg>
             <arg>-deprecation</arg>                  <!-- Emit warning and location for usages of deprecated APIs. -->
             <arg>-explaintypes</arg>                 <!-- Explain type errors in more detail. -->
             <arg>-feature</arg>                      <!-- Emit warning and location for usages of features that should be imported explicitly. -->
@@ -213,9 +189,6 @@ limitations under the License.
 
             <!-- fastparse 3.0.1 emits false unused warning. We must silence them on related files. See: https://github.com/com-lihaoyi/fastparse/issues/285-->
             <arg>-Wconf:cat=unused-nowarn&amp;src=com/normation/utils/Version.scala:s,cat=unused-nowarn&amp;src=com/normation/rudder/services/policies/InterpolatedValueCompiler.scala:s</arg>
-
-            <!-- this warning is no an actual issue, our smart constructor usage is fine with a scala 3 compiler-->
-            <arg>-Wconf:msg=constructor modifiers are assumed by synthetic:s</arg>
           </args>
           <jvmArgs>
             <jvmArg>-Xmx${jvmArg-Xmx}</jvmArg>
@@ -422,7 +395,7 @@ limitations under the License.
     <rudder-major-version>8.2</rudder-major-version>
     <rudder-version>8.2.0~alpha1-SNAPSHOT</rudder-version>
 
-    <scala-version>2.13.12</scala-version>
+    <scala-version>2.13.14</scala-version>
     <scala-binary-version>2.13</scala-binary-version>
     <!-- lift force us to remain with 1.3.0 because of
          java.lang.NoSuchMethodError: 'scala.collection.mutable.Stack scala.xml.parsing.NoBindingFactoryAdapter.scopeStack()'net.liftweb.util.Html5Parser.$anonfun$parse$1(HtmlParser.scala:373)
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFact.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFact.scala
index ef76cabe819..9f6b4c6c8de 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFact.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFact.scala
@@ -1600,7 +1600,7 @@ object JMachineInfo {
           case JMachineType.PhysicalMachineType => Result.Value(PhysicalMachineType)
           case JMachineType.VirtualMachineType  =>
             Result.fromEitherString(
-              jm.provider.traverse(VmType.parse).map(_.getOrElse(VmType.UnknownVmType)).map(VirtualMachineType)
+              jm.provider.traverse(VmType.parse).map(_.getOrElse(VmType.UnknownVmType)).map(VirtualMachineType.apply)
             )
         }
       }
@@ -2019,16 +2019,6 @@ object NodeFactSerialisation {
           .orElse(decoder)
       )
     }
-//=======
-//    implicit val codecMachineUuid:    JsonCodec[MachineUuid]    = JsonCodec.string.transform[MachineUuid](MachineUuid(_), _.value)
-
-//    implicit val codecManufacturer:   JsonCodec[Manufacturer]   = JsonCodec.string.transform[Manufacturer](Manufacturer(_), _.name)
-//    implicit val codecMachine:        JsonCodec[MachineInfo]    = DeriveJsonCodec.gen
-//    implicit val codecMemorySize:     JsonCodec[MemorySize]     = JsonCodec.long.transform[MemorySize](MemorySize(_), _.size)
-//    implicit val codecSVersion:       JsonCodec[SVersion]       = JsonCodec.string.transform[SVersion](new SVersion(_), _.value)
-//    implicit val codecSoftwareEditor: JsonCodec[SoftwareEditor] =
-//      JsonCodec.string.transform[SoftwareEditor](SoftwareEditor(_), _.name)
-//>>>>>>> branches/rudder/8.1
   }
 
   import SimpleCodec.*
@@ -2056,21 +2046,21 @@ object NodeFactSerialisation {
     }
   }
 
-  implicit val decoderJValue:       JsonDecoder[JValue]       = JsonDecoder[Option[Json]].map {
+  implicit lazy val decoderJValue:       JsonDecoder[JValue]       = JsonDecoder[Option[Json]].map {
     case None    => JNothing
     case Some(v) => recJsonToJValue(v)
   }
-  implicit val encoderJValue:       JsonEncoder[JValue]       = JsonEncoder[Option[Json]].contramap(recJValueToJson(_))
-  implicit val codecCustomProperty: JsonCodec[CustomProperty] = DeriveJsonCodec.gen
+  implicit lazy val encoderJValue:       JsonEncoder[JValue]       = JsonEncoder[Option[Json]].contramap(recJValueToJson(_))
+  implicit lazy val codecCustomProperty: JsonCodec[CustomProperty] = DeriveJsonCodec.gen
 
-  implicit val codecInputDevice:    JsonCodec[InputDevice]    = DeriveJsonCodec.gen
-  implicit val codecLocalGroup:     JsonCodec[LocalGroup]     = DeriveJsonCodec.gen
-  implicit val codecLocalUser:      JsonCodec[LocalUser]      = DeriveJsonCodec.gen
-  implicit val codecLogicalVolume:  JsonCodec[LogicalVolume]  = DeriveJsonCodec.gen
-  implicit val codecPhysicalVolume: JsonCodec[PhysicalVolume] = DeriveJsonCodec.gen
+  implicit lazy val codecInputDevice:    JsonCodec[InputDevice]    = DeriveJsonCodec.gen
+  implicit lazy val codecLocalGroup:     JsonCodec[LocalGroup]     = DeriveJsonCodec.gen
+  implicit lazy val codecLocalUser:      JsonCodec[LocalUser]      = DeriveJsonCodec.gen
+  implicit lazy val codecLogicalVolume:  JsonCodec[LogicalVolume]  = DeriveJsonCodec.gen
+  implicit lazy val codecPhysicalVolume: JsonCodec[PhysicalVolume] = DeriveJsonCodec.gen
 
-  implicit val codecSoftwareFact: JsonCodec[SoftwareFact] = DeriveJsonCodec.gen
+  implicit lazy val codecSoftwareFact: JsonCodec[SoftwareFact] = DeriveJsonCodec.gen
 
-  implicit val codecNodeFact: JsonCodec[NodeFact] = DeriveJsonCodec.gen
+  implicit lazy val codecNodeFact: JsonCodec[NodeFact] = DeriveJsonCodec.gen
 
 }
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala
index 0e7d0c4cf03..2c1fb625245 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala
@@ -270,28 +270,26 @@ class NodeGroupUnserialisationImpl(
       isSystem     <- (group \ "isSystem").headOption.flatMap(s =>
                         tryo(s.text.toBoolean)
                       ) ?~! ("Missing attribute 'isSystem' in entry type nodeGroup : " + entry)
-      properties   <- traverse((group \ "properties" \ "property").toList) {
-                        // format: off
-                        case <property>{p @ _*}</property> =>
-                        // format: on
-                          val name = (p \\ "name").text.trim
-                          if (name.trim.isEmpty) {
-                            Failure(s"Found unexpected xml under <properties> tag (name is blank): ${p}")
-                          } else {
-                            GroupProperty
-                              .parse(
-                                (p \\ "name").text.trim,
-                                ParseRev((p \\ "revision").text.trim),
-                                StringEscapeUtils.unescapeXml((p \\ "value").text.trim): @nowarn(
-                                  "msg=class StringEscapeUtils in package lang3 is deprecated"
-                                ),
-                                (p \\ "inheritMode").headOption.flatMap(p => InheritMode.parseString(p.text.trim).toOption),
-                                (p \\ "provider").headOption.map(p => PropertyProvider(p.text.trim))
-                              )
-                              .toBox
-                          }
-                        case xml                           => Failure(s"Found unexpected xml under <properties> tag: ${xml}")
-                      }
+      properties: Seq[GroupProperty] <- traverse(group \ "properties" \ "property") { p =>
+                                          val name = (p \ "name").text.trim
+                                          if (name.isEmpty) {
+                                            Failure(s"Found unexpected xml under <properties> tag (name is blank): ${p}")
+                                          } else {
+                                            GroupProperty
+                                              .parse(
+                                                name,
+                                                ParseRev((p \ "revision").text.trim),
+                                                StringEscapeUtils.unescapeXml((p \ "value").text.trim): @nowarn(
+                                                  "msg=class StringEscapeUtils in package lang3 is deprecated"
+                                                ),
+                                                (p \ "inheritMode").headOption.flatMap(p =>
+                                                  InheritMode.parseString(p.text.trim).toOption
+                                                ),
+                                                (p \ "provider").headOption.map(p => PropertyProvider(p.text.trim))
+                                              )
+                                              .toBox
+                                          }
+                                        }
     } yield {
       NodeGroup(
         id = id,
@@ -855,10 +853,7 @@ class ApiAccountUnserialisationImpl extends ApiAccountUnserialisation {
                             Full(ApiAuthorization.RO)
                           case Some(Text(text)) if text == ApiAuthorizationKind.RW.name =>
                             Full(ApiAuthorization.RW)
-                          // format: off
-                          case Some(<acl>{xml @ _*}</acl>) if (xml.nonEmpty) =>
-                          // format: on
-                            unserAcl(xml.head)
+                          case Some(xml @ <acl>{_*}</acl>) if xml.child.nonEmpty        => unserAcl(xml.child.head)
                           // all other case: serialization pb => None
                           case _                                                        => Full(ApiAuthorization.None)
                         }
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportingServiceTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportingServiceTest.scala
index e7692ae7ba5..338f40627c9 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportingServiceTest.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportingServiceTest.scala
@@ -88,7 +88,6 @@ import org.joda.time.DateTime
 import org.joda.time.Duration
 import org.junit.runner.RunWith
 import org.specs2.runner.JUnitRunner
-import scala.annotation.nowarn
 import scala.collection.SortedMap
 import scala.concurrent.duration.FiniteDuration
 import zio.*
@@ -178,7 +177,6 @@ class ReportingServiceTest extends DBCommon with BoxSpecMatcher {
     def getGlobalUserCompliance()(implicit qc: QueryContext): Box[Option[(ComplianceLevel, Long)]] = null
     def findUncomputedNodeStatusReports(): Box[Map[NodeId, NodeStatusReport]] = null
 
-    @nowarn("msg=parameter.*is never used")
     def getUserNodeStatusReports()(implicit qc: QueryContext):                  Box[Map[NodeId, NodeStatusReport]] = Full(Map())
     def getSystemAndUserCompliance(
         optNodeIds: Option[Set[NodeId]]
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonResponse.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonResponse.scala
index ed57b95fb9e..5097f4ce42f 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonResponse.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonResponse.scala
@@ -43,7 +43,6 @@ import com.normation.rudder.rest.lift.LiftApiProcessingLogger
 import com.normation.zio.*
 import net.liftweb.http.InMemoryResponse
 import net.liftweb.http.LiftResponse
-import scala.annotation.nowarn
 import scala.collection.immutable
 import zio.json.*
 import zio.json.DeriveJsonEncoder
@@ -140,10 +139,9 @@ object RudderJsonResponse {
 
   // rudder response. The "A" parameter is the business object (or list of it) in the response.
   // Success
-  @nowarn("msg=parameter encoder .* is never used") // used by magnolia macro
   def successOne[A](schema: ResponseSchema, obj: A, id: Option[String])(implicit
       prettify: Boolean,
-      encoder: JsonEncoder[A]
+      encoder:  JsonEncoder[A]
   ): LiftJsonResponse[? <: JsonRudderApiResponse[?]] = {
     schema.dataContainer match {
       case Some(key) =>
@@ -154,10 +152,9 @@ object RudderJsonResponse {
         generic.success(JsonRudderApiResponse.success(schema, id, obj))
     }
   }
-  @nowarn("msg=parameter encoder .* is never used") // used by magnolia macro
   def successList[A](schema: ResponseSchema, objs: List[A])(implicit
       prettify: Boolean,
-      encoder: JsonEncoder[A]
+      encoder:  JsonEncoder[A]
   ): LiftJsonResponse[
     ? <: JsonRudderApiResponse[? <: immutable.Iterable[Any] with PartialFunction[Int with String, Any] with Equals]
   ] = {
@@ -189,10 +186,9 @@ object RudderJsonResponse {
     generic.internalError(JsonRudderApiResponse.error(id, schema, errorMsg))
   }
   // Internal error with a specific schema
-  @nowarn("msg=parameter encoder .* is never used") // used by magnolia macro
   def internalError[A](id: Option[String], schema: ResponseSchema, obj: A, errorMsg: Option[String])(implicit
       prettify: Boolean,
-      encoder: JsonEncoder[A]
+      encoder:  JsonEncoder[A]
   ): LiftJsonResponse[? <: JsonRudderApiResponse[?]] = {
     schema.dataContainer match {
       case Some(key) =>
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala
index 95427828339..fc8e3e5168a 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala
@@ -867,10 +867,6 @@ class GroupApiService2(
             change.copy(newGroup = change.newGroup.copy(_isEnabled = enableCheck))
           }
 
-        case _ =>
-          Failure(
-            s"Could not create group '${name}' (id:${groupId.serialize}) based on an already existing group, cause is: too many values for source parameter."
-          )
       }
     }
 
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/Section2FieldService.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/Section2FieldService.scala
index b9cee76489a..6e1d6fce08b 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/Section2FieldService.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/Section2FieldService.scala
@@ -340,7 +340,6 @@ class Section2FieldService(val fieldFactory: DirectiveFieldFactory, val translat
     priority match {
       case LowDisplayPriority  => false
       case HighDisplayPriority => true
-      case _                   => true
     }
   }
 }
diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestDataExtractorTest.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestDataExtractorTest.scala
index 2fef1487f5d..b69f802c117 100644
--- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestDataExtractorTest.scala
+++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestDataExtractorTest.scala
@@ -52,12 +52,13 @@ import com.normation.rudder.domain.policies.*
 import com.normation.utils.StringUuidGeneratorImpl
 import net.liftweb.json.JValue
 import org.junit.runner.RunWith
-import org.specs2.mutable.*
-import org.specs2.runner.JUnitRunner
-import org.specs2.specification.core.Fragments
+import zio.{Tag as _, *}
+import zio.syntax.*
+import zio.test.*
+import zio.test.junit.ZTestJUnitRunner
 
-@RunWith(classOf[JUnitRunner])
-class RestDataExtractorTest extends Specification {
+@RunWith(classOf[ZTestJUnitRunner])
+class RestDataExtractorTest extends ZIOSpecDefault {
 
   val mockGitRepo = new MockGitConfigRepo("")
   val mockTechniques: MockTechniques = MockTechniques(mockGitRepo)
@@ -76,39 +77,43 @@ class RestDataExtractorTest extends Specification {
   )
   val jparse: String => JValue = net.liftweb.json.parse _
 
-  "extract RuleTarget" >> {
-    val tests = List(
-      (
-        """group:3d5d1d6c-4ba5-4ffc-b5a4-12ce02336f52""",
-        JRRuleTarget(GroupTarget(NodeGroupId(NodeGroupUid("3d5d1d6c-4ba5-4ffc-b5a4-12ce02336f52"))))
-      ),
-      ("""group:hasPolicyServer-root""", JRRuleTarget(GroupTarget(NodeGroupId(NodeGroupUid("hasPolicyServer-root"))))),
-      ("""policyServer:root""", JRRuleTarget(PolicyServerTarget(NodeId("root")))),
-      ("""special:all""", JRRuleTarget(AllTarget)),
-      (
-        """{"include":{"or":["special:all"]},"exclude":{"or":["group:all-nodes-with-dsc-agent"]}}""",
-        JRRuleTarget(
-          TargetExclusion(
-            TargetUnion(Set(AllTarget)),
-            TargetUnion(Set(GroupTarget(NodeGroupId(NodeGroupUid("all-nodes-with-dsc-agent")))))
-          )
+  override def spec: Spec[TestEnvironment with Scope, Any] = {
+    suite(s"Extracting data from rules")(
+      suite("extract RuleTarget") {
+        val tests = List(
+          (
+            """group:3d5d1d6c-4ba5-4ffc-b5a4-12ce02336f52""",
+            JRRuleTarget(GroupTarget(NodeGroupId(NodeGroupUid("3d5d1d6c-4ba5-4ffc-b5a4-12ce02336f52"))))
+          ),
+          ("""group:hasPolicyServer-root""", JRRuleTarget(GroupTarget(NodeGroupId(NodeGroupUid("hasPolicyServer-root"))))),
+          ("""policyServer:root""", JRRuleTarget(PolicyServerTarget(NodeId("root")))),
+          ("""special:all""", JRRuleTarget(AllTarget)),
+          (
+            """{"include":{"or":["special:all"]},"exclude":{"or":["group:all-nodes-with-dsc-agent"]}}""",
+            JRRuleTarget(
+              TargetExclusion(
+                TargetUnion(Set(AllTarget)),
+                TargetUnion(Set(GroupTarget(NodeGroupId(NodeGroupUid("all-nodes-with-dsc-agent")))))
+              )
+            )
+          ),
+          (
+            """{"include":{"or":[]},"exclude":{"or":[]}}""",
+            JRRuleTarget(TargetExclusion(TargetUnion(Set()), TargetUnion(Set())))
+          ),
+          ("""{"or":["special:all"]}""", JRRuleTarget(TargetUnion(Set(AllTarget))))
         )
-      ),
-      ("""{"include":{"or":[]},"exclude":{"or":[]}}""", JRRuleTarget(TargetExclusion(TargetUnion(Set()), TargetUnion(Set())))),
-      ("""{"or":["special:all"]}""", JRRuleTarget(TargetUnion(Set(AllTarget))))
-    )
 
-    Fragments.foreach(tests) {
-      case (json, expected) =>
-        (extractRuleTargetJson(json) must beEqualTo(Right(expected)))
-    }
-  }
+        ZIO.foreach(tests) {
+          case (json, expected) =>
+            test(json)(assertTrue(extractRuleTargetJson(json) == Right(expected))).succeed
+        }
+      },
+      suite("extract JsonRule") {
 
-  "extract JsonRule" >> {
-
-    val tests = List(
-      (
-        """{
+        val tests = List(
+          (
+            """{
             "source": "b9f6d98a-28bc-4d80-90f7-d2f14269e215",
             "id": "0c1713ae-cb9d-4f7b-abda-ca38c5d643ea",
             "displayName": "Security policy",
@@ -128,42 +133,44 @@ class RestDataExtractorTest extends Specification {
               }
             ]
          }""",
-        JQRule(
-          RuleId.parse("0c1713ae-cb9d-4f7b-abda-ca38c5d643ea").toOption,
-          Some("Security policy"),
-          Some("38e0c6ea-917f-47b8-82e0-e6a1d3dd62ca"),
-          Some("Baseline applying CIS guidelines"),
-          Some("This rules should be applied to all Linux nodes required basic hardening"),
-          Some(Set(DirectiveId(DirectiveUid("16617aa8-1f02-4e4a-87b6-d0bcdfb4019f")))),
-          Some(Set(JRRuleTargetString(AllTarget))),
-          Some(true),
-          Some(Tags(Set(Tag(TagName("customer"), TagValue("MyCompany"))))),
-          RuleId.parse("b9f6d98a-28bc-4d80-90f7-d2f14269e215").toOption
-        )
-      ),
-      (
-        """{
+            JQRule(
+              RuleId.parse("0c1713ae-cb9d-4f7b-abda-ca38c5d643ea").toOption,
+              Some("Security policy"),
+              Some("38e0c6ea-917f-47b8-82e0-e6a1d3dd62ca"),
+              Some("Baseline applying CIS guidelines"),
+              Some("This rules should be applied to all Linux nodes required basic hardening"),
+              Some(Set(DirectiveId(DirectiveUid("16617aa8-1f02-4e4a-87b6-d0bcdfb4019f")))),
+              Some(Set(JRRuleTargetString(AllTarget))),
+              Some(true),
+              Some(Tags(Set(Tag(TagName("customer"), TagValue("MyCompany"))))),
+              RuleId.parse("b9f6d98a-28bc-4d80-90f7-d2f14269e215").toOption
+            )
+          ),
+          (
+            """{
             "source": "b9f6d98a-28bc-4d80-90f7-d2f14269e215"
          }""",
-        JQRule(source = RuleId.parse("b9f6d98a-28bc-4d80-90f7-d2f14269e215").toOption)
-      ),
-      (
-        """{
+            JQRule(source = RuleId.parse("b9f6d98a-28bc-4d80-90f7-d2f14269e215").toOption)
+          ),
+          (
+            """{
             "category": "38e0c6ea-917f-47b8-82e0-e6a1d3dd62ca"
          }""",
-        JQRule(category = Some("38e0c6ea-917f-47b8-82e0-e6a1d3dd62ca"))
-      ),
-      (
-        """{
+            JQRule(category = Some("38e0c6ea-917f-47b8-82e0-e6a1d3dd62ca"))
+          ),
+          (
+            """{
             "tags": []
          }""",
-        JQRule(tags = Some(Tags(Set())))
-      )
-    )
+            JQRule(tags = Some(Tags(Set())))
+          )
+        )
 
-    Fragments.foreach(tests) {
-      case (json, expected) =>
-        (ruleDecoder.decodeJson(json)) must beEqualTo(Right(expected))
-    }
+        ZIO.foreach(tests) {
+          case (json, expected) =>
+            test(json)(assert(ruleDecoder.decodeJson(json))(Assertion.equalTo(Right(expected)))).succeed
+        }
+      }
+    )
   }
 }
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala
index 01ca5e3b38c..8a851c8f0a6 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala
@@ -488,9 +488,11 @@ object DisplayNode extends Loggable {
          |</div>""".stripMargin.replaceAll("\n", " ")
     }
 
-    val nodeStateIcon = (
-      <span class={"node-state " ++ escape(getNodeState(node.rudderSettings.state).toLowerCase).replaceAll(" ", "-")}></span>
-    )
+    val nodeStateClasses: String =
+      "node-state " ++ escape(getNodeState(node.rudderSettings.state).toLowerCase).replaceAll(" ", "-")
+    val nodeStateIcon = {
+      <span class={nodeStateClasses}></span>
+    }
 
     <div class="header-title">
     <div class={"os-logo " ++ sm.node.main.osDetails.os.name.toLowerCase()} data-bs-toggle="tooltip" title={osTooltip}></div>
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/Login.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/Login.scala
index b784a3d53f7..ba7aebf8914 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/Login.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/Login.scala
@@ -2,13 +2,26 @@ package com.normation.rudder.web.snippet
 
 import bootstrap.liftweb.RudderConfig
 import com.normation.plugins.DefaultExtendableSnippet
+import com.normation.rudder.users.FileUserDetailListProvider
 import net.liftweb.http.DispatchSnippet
 import scala.xml.NodeSeq
 
 class Login extends DispatchSnippet with DefaultExtendableSnippet[Login] {
 
-  val userListProvider = RudderConfig.rudderUserListProvider
-  def mainDispatch: Map[String, NodeSeq => NodeSeq] = Map(
+  val userListProvider: FileUserDetailListProvider      = RudderConfig.rudderUserListProvider
+  val script:           String                          = {
+    """window.setTimeout('location.reload()', 10000);
+      |new ClipboardJS('.btn-clipboard');
+      |var checked;
+      |$('.btn-cmd-user').on('click', function(){
+      |  clearInterval(checked);
+      |  $('.btn-cmd-user .fa-clipboard').attr('class', 'fas fa-check') ;
+      |    checked = setInterval(function(){
+      |    $('.btn-cmd-user .fa-check').attr('class', 'far fa-clipboard') ;
+      |  },700);
+      |});""".stripMargin
+  }
+  def mainDispatch:     Map[String, NodeSeq => NodeSeq] = Map(
     "display" -> { (authForm: NodeSeq) =>
       if (userListProvider.authConfig.users.isEmpty) {
         <div>
@@ -36,16 +49,7 @@ class Login extends DispatchSnippet with DefaultExtendableSnippet[Login] {
               </div>
               <script type="text/javascript">
                 // <![CDATA[
-                window.setTimeout('location.reload()', 10000);
-                new ClipboardJS('.btn-clipboard');
-                var checked;
-                $('.btn-cmd-user').on('click', function(){
-                  clearInterval(checked);
-                  $('.btn-cmd-user .fa-clipboard').attr('class', 'fas fa-check') ;
-                    checked = setInterval(function(){
-                    $('.btn-cmd-user .fa-check').attr('class', 'far fa-clipboard') ;
-                  },700);
-                });
+                {script}
                 // ]]>
               </script>
             </div>
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/DatabaseManagement.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/DatabaseManagement.scala
index cc3775434dd..33ff4ec5d30 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/DatabaseManagement.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/DatabaseManagement.scala
@@ -119,7 +119,7 @@ class DatabaseManagement extends DispatchSnippet with Loggable {
     def displayInProgress(lastValue: Box[Option[DateTime]]): NodeSeq = {
       val date = displayDate(lastValue)
       if (inProgress) {
-        <span>Archiving is in progress, please wait (last known value: '{date}')</span>
+        <span>Archiving is in progress, please wait (last known value: "{date}")</span>
       } else {
         date
       }
diff --git a/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/web/snippet/HomePageTest.scala b/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/web/snippet/HomePageTest.scala
index 4113daf6c4c..fae6c50dcc8 100644
--- a/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/web/snippet/HomePageTest.scala
+++ b/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/web/snippet/HomePageTest.scala
@@ -38,46 +38,48 @@
 package com.normation.rudder.web.snippet
 
 import org.junit.runner.RunWith
-import org.specs2.mutable.*
-import org.specs2.runner.JUnitRunner
+import zio.Scope
+import zio.test.*
+import zio.test.junit.ZTestJUnitRunner
 
-@RunWith(classOf[JUnitRunner])
-class HomePageTest extends Specification {
+@RunWith(classOf[ZTestJUnitRunner])
+class HomePageTest extends ZIOSpecDefault {
 
-  "Agent version mapping must matches" >> {
+  val mapping = Map(
+    "6.0.8-xenial0"                  -> "6.0.8",
+    "6.0.4.release-1.EL.7"           -> "6.0.4",
+    "6.1.10"                         -> "6.1.10",
+    "cfe-3.7.4"                      -> "3.7.4",
+    "6.1.6-0"                        -> "6.1.6",
+    "7.0.6-bionic0"                  -> "7.0.6",
+    "7.1.14-jessie0"                 -> "7.1.14",
+    "6.2-0.3"                        -> "6.2-0.3",
+    "6.2.3-stretch0"                 -> "6.2.3",
+    "cfe-3.6.0.65534"                -> "3.6.0.65534",
+    "4.1.8.release-1.SLES.12"        -> "4.1.8",
+    "3.1.15.release-1.EL.5"          -> "3.1.15",
+    "7.2.0~rc1-ubuntu22.04"          -> "7.2.0.rc1",
+    "6.1.17.release-1.EL.7"          -> "6.1.17",
+    "6.1.0-precise0"                 -> "6.1.0",
+    "1543543:6.0.1.beta4.git-1.EL.6" -> "6.0.1.beta4.git", // epoch is removed
 
-    val mapping = Map(
-      "6.0.8-xenial0"                  -> "6.0.8",
-      "6.0.4.release-1.EL.7"           -> "6.0.4",
-      "6.1.10"                         -> "6.1.10",
-      "cfe-3.7.4"                      -> "3.7.4",
-      "6.1.6-0"                        -> "6.1.6",
-      "7.0.6-bionic0"                  -> "7.0.6",
-      "7.1.14-jessie0"                 -> "7.1.14",
-      "6.2-0.3"                        -> "6.2-0.3",
-      "6.2.3-stretch0"                 -> "6.2.3",
-      "cfe-3.6.0.65534"                -> "3.6.0.65534",
-      "4.1.8.release-1.SLES.12"        -> "4.1.8",
-      "3.1.15.release-1.EL.5"          -> "3.1.15",
-      "7.2.0~rc1-ubuntu22.04"          -> "7.2.0.rc1",
-      "6.1.17.release-1.EL.7"          -> "6.1.17",
-      "6.1.0-precise0"                 -> "6.1.0",
-      "1543543:6.0.1.beta4.git-1.EL.6" -> "6.0.1.beta4.git", // epoch is removed
+    "6.1.0~alpha1~git201609090917-jessie0" -> "6.1.0.alpha1.git201609090917",
+    "6.2.0.beta1~git-1"                    -> "6.2.0.beta1.git",
+    "2.3.0~beta3~git201109200504-lenny0"   -> "2.3.0.beta3.git201109200504",
+    "5.0.9.rc1_git201903300127"            -> "5.0.9.rc1_git201903300127",
+    "7.1.19.rc1.git201901220440-1.EL.7"    -> "7.1.19.rc1.git201901220440",
+    "3.1.15.release-1.AIX.5.3"             -> "3.1.15",
+    "6.0.1~rc1~git201502100126-lenny0"     -> "6.0.1.rc1.git201502100126",
+    "not-init"                             -> "not" // well, not very interesting, but we had that at some point in rudder
+  )
 
-      "6.1.0~alpha1~git201609090917-jessie0" -> "6.1.0.alpha1.git201609090917",
-      "6.2.0.beta1~git-1"                    -> "6.2.0.beta1.git",
-      "2.3.0~beta3~git201109200504-lenny0"   -> "2.3.0.beta3.git201109200504",
-      "5.0.9.rc1_git201903300127"            -> "5.0.9.rc1_git201903300127",
-      "7.1.19.rc1.git201901220440-1.EL.7"    -> "7.1.19.rc1.git201901220440",
-      "3.1.15.release-1.AIX.5.3"             -> "3.1.15",
-      "6.0.1~rc1~git201502100126-lenny0"     -> "6.0.1.rc1.git201502100126",
-      "not-init"                             -> "not" // well, not very interesting, but we had that at some point in rudder
-    )
-
-    def matcherVersion(pair: (String, String)) = HomePageUtils.formatAgentVersion(pair._1) must beEqualTo(pair._2)
-
-    mapping must contain(matcherVersion(_)).foreach
+  val allTests: Seq[Spec[Any, Nothing]] = mapping.toList.map {
+    case (source, res) =>
+      test(res)(assertTrue(HomePageUtils.formatAgentVersion(source) == res))
+  }
 
+  override def spec: Spec[TestEnvironment with Scope, Any] = {
+    suite("Agent version mapping must matches")(allTests)
   }
 
 }