Skip to content

Commit

Permalink
Fixes #23037: New round of dependencies to update !
Browse files Browse the repository at this point in the history
  • Loading branch information
@VinceMacBuche
VinceMacBuche committed Jul 7, 2023
1 parent 1423909 commit 79c7051
Show file tree
Hide file tree
Showing 24 changed files with 137 additions and 124 deletions.
30 changes: 15 additions & 15 deletions webapp/sources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ limitations under the License.
<rudder-major-version>7.4</rudder-major-version>
<rudder-version>8.0.0~alpha1-SNAPSHOT</rudder-version>

<scala-version>2.13.10</scala-version>
<scala-version>2.13.11</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)
Expand All @@ -411,22 +411,22 @@ limitations under the License.
<scala-xml-version>1.3.0</scala-xml-version>
<lift-version>3.5.0</lift-version>
<slf4j-version>2.0.7</slf4j-version>
<logback-version>1.4.7</logback-version>
<logback-version>1.4.8</logback-version>
<jodatime-version>2.12.5</jodatime-version>
<jodaconvert-version>2.2.3</jodaconvert-version>
<commons-io-version>2.12.0</commons-io-version>
<commons-io-version>2.13.0</commons-io-version>
<commons-lang-version>3.12.0</commons-lang-version>
<commons-codec-version>1.15</commons-codec-version>
<commons-codec-version>1.16.0</commons-codec-version>
<commons-fileupload>1.5</commons-fileupload>
<commons-csv-version>1.10.0</commons-csv-version>
<spring-version>5.3.27</spring-version>
<spring-security-version>5.7.8</spring-security-version>
<jgit-version>6.5.0.202303070854-r</jgit-version>
<spring-version>5.3.28</spring-version>
<spring-security-version>5.7.9</spring-security-version>
<jgit-version>6.6.0.202305301015-r</jgit-version>
<cglib-version>3.3.0</cglib-version>
<asm-version>9.5</asm-version>
<!-- Level of Java compatibility, here 1.8+ -->
<bouncycastle-compat>jdk18on</bouncycastle-compat>
<bouncycastle-version>1.73</bouncycastle-version>
<bouncycastle-version>1.75</bouncycastle-version>
<better-files-version>3.9.2</better-files-version>
<sourcecode-version>0.3.0</sourcecode-version>
<quicklens-version>1.9.4</quicklens-version>
Expand All @@ -442,11 +442,11 @@ limitations under the License.
<caffeine-version>3.1.6</caffeine-version>
<jgrapht-version>1.5.2</jgrapht-version>
<reflections-version>0.10.2</reflections-version>
<graalvm-version>22.3.2</graalvm-version>
<graalvm-version>23.0.0</graalvm-version>
<chimney-version>0.7.5</chimney-version>
<cron4s-version>0.6.1</cron4s-version>
<ipaddress-version>5.4.0</ipaddress-version>
<snakeyaml-version>1.33</snakeyaml-version>
<snakeyaml-version>2.0</snakeyaml-version>

<zio-http-version>2.0.0-RC11</zio-http-version> <!-- used in datasources -->

Expand All @@ -458,13 +458,13 @@ limitations under the License.
<specs2-version>4.20.0</specs2-version>
<junit-version>4.13.2</junit-version>
<cats-version>2.9.0</cats-version>
<doobie-version>1.0.0-RC2</doobie-version>
<doobie-version>1.0.0-RC4</doobie-version>
<fs2-version>3.3.0</fs2-version>
<shapeless-version>2.3.10</shapeless-version>
<cats-effect-version>3.5.0</cats-effect-version>
<dev-zio-version>2.0.13</dev-zio-version>
<zio-cats-version>23.0.0.5</zio-cats-version> <!-- gives fs2 3.1.6, but doobie 1.0.0-RC1 is in 3.0.3 -->
<zio-json-version>0.5.0</zio-json-version>
<cats-effect-version>3.5.1</cats-effect-version>
<dev-zio-version>2.0.15</dev-zio-version>
<zio-cats-version>23.0.0.8</zio-cats-version> <!-- gives fs2 3.1.6, but doobie 1.0.0-RC1 is in 3.0.3 -->
<zio-json-version>0.6.0</zio-json-version>

<!--
Hack to make scalac jvm parameters like RAM configurable.
Expand Down
2 changes: 1 addition & 1 deletion ...p/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/DataStructures.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ object AclPath {
* so that!
* - Segment < Wildcard < DoubleWildcard
*/
implicit val orderingaAclPath = new Ordering[AclPath] {
implicit val orderingaAclPath: Ordering[AclPath] = new Ordering[AclPath] {
// compare: negative if x < y
override def compare(x: AclPath, y: AclPath): Int = {
import AclPathSegment._
Expand Down
67 changes: 37 additions & 30 deletions webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/db/Doobie.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ package com.normation.rudder.db

import cats.Show
import cats.data._
import com.normation.NamedZioLogger
import com.normation.box._
import com.normation.errors._
import com.normation.inventory.domain.NodeId
Expand All @@ -51,18 +52,17 @@ import doobie._
import doobie.implicits.javasql._
import doobie.postgres.implicits._
import doobie.util.log.ExecFailure
import doobie.util.log.LogEvent
import doobie.util.log.ProcessingFailure
import java.sql.SQLXML
import javax.sql.DataSource
import net.liftweb.common._
import org.joda.time.DateTime
import org.postgresql.util.PGobject
import org.slf4j.LoggerFactory
import scala.xml.Elem
import scala.xml.XML
import zio._
import zio.interop.catz._
import zio.interop.catz.implicits.rts
import zio.json.JsonDecoder
import zio.json.JsonEncoder
import zio.json.ast.Json
Expand Down Expand Up @@ -102,40 +102,47 @@ class Doobie(datasource: DataSource) {

object Doobie {

implicit val slf4jDoobieLogger: LogHandler = {
object DoobieLogger extends Logger {
override protected def _logger = LoggerFactory.getLogger("sql")
implicit val slf4jDoobieLogger: LogHandler[IOResult] = {
object DoobieLogger extends NamedZioLogger {
val loggerName = "sql"
}

LogHandler {
// we could log only if exec duration is more than X ms, etc.
case doobie.util.log.Success(s, a, e1, e2) =>
val total = (e1 + e2).toMillis
val msg = s"""Successful Statement Execution [${total} ms total (${e1.toMillis} ms exec + ${e2.toMillis} ms processing)]
| ${s.linesIterator.dropWhile(_.trim.isEmpty).mkString("\n ")}
| arguments = [${a.mkString(", ")}]
new LogHandler[IOResult] {
def run(logEvent: LogEvent): IOResult[Unit] = {
logEvent match {

// we could log only if exec duration is more than X ms, etc.
case doobie.util.log.Success(s, a, l, e1, e2) =>
val total = (e1 + e2).toMillis
val msg = {
s"""Successful Statement Execution [${total} ms total (${e1.toMillis} ms exec + ${e2.toMillis} ms processing)]
| ${s.linesIterator.dropWhile(_.trim.isEmpty).mkString("\n ")}
| arguments = [${a.mkString(", ")}]
""".stripMargin
if (total > 100) { // more than that => debug level, not trace
DoobieLogger.debug(msg)
} else {
DoobieLogger.trace(msg)
}

case ProcessingFailure(s, a, e1, e2, t) =>
DoobieLogger.debug(
s"""Failed Resultset Processing [${(e1 + e2).toMillis} ms total (${e1.toMillis} ms exec + ${e2.toMillis} ms processing)]
| ${s.linesIterator.dropWhile(_.trim.isEmpty).mkString("\n ")}
| arguments = [${a.mkString(", ")}]
| failure = ${t.getMessage}
}
if (total > 100) { // more than that => debug level, not trace
DoobieLogger.debug(msg)
} else {
DoobieLogger.trace(msg)
}

case ProcessingFailure(s, a, l, e1, e2, t) =>
DoobieLogger.debug(
s"""Failed Resultset Processing [${(e1 + e2).toMillis} ms total (${e1.toMillis} ms exec + ${e2.toMillis} ms processing)]
| ${s.linesIterator.dropWhile(_.trim.isEmpty).mkString("\n ")}
| arguments = [${a.mkString(", ")}]
| failure = ${t.getMessage}
""".stripMargin
)
)

case ExecFailure(s, a, e1, t) =>
DoobieLogger.debug(s"""Failed Statement Execution [${e1.toMillis} ms exec (failed)]
| ${s.linesIterator.dropWhile(_.trim.isEmpty).mkString("\n ")}
| arguments = [${a.mkString(", ")}]
| failure = ${t.getMessage}
case ExecFailure(s, a, l, e1, t) =>
DoobieLogger.debug(s"""Failed Statement Execution [${e1.toMillis} ms exec (failed)]
| ${s.linesIterator.dropWhile(_.trim.isEmpty).mkString("\n ")}
| arguments = [${a.mkString(", ")}]
| failure = ${t.getMessage}
""".stripMargin)
}
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/NodeDit.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import com.unboundid.ldap.sdk._

class NodeDit(val BASE_DN: DN) extends AbstractDit {
dit =>
implicit val DIT = dit
implicit val DIT: NodeDit = dit

dit.register(NODES.model)

Expand Down
2 changes: 1 addition & 1 deletion webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderDit.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ object RudderDit {
*/
class RudderDit(val BASE_DN: DN) extends AbstractDit {
dit =>
implicit val DIT = dit
implicit val DIT: RudderDit = dit

/**
* Create a new category for the active technique library
Expand Down
8 changes: 4 additions & 4 deletions ...rudder/rudder-core/src/main/scala/com/normation/rudder/domain/properties/Properties.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ object GenericProperty {
}

implicit class JsonProperties(val props: Seq[GenericProperty[_]]) extends AnyVal {
implicit def formats = DefaultFormats
implicit def formats: DefaultFormats.type = DefaultFormats

def toApiJson: JArray = {
JArray(props.map(_.toJson).toList)
Expand Down Expand Up @@ -874,7 +874,7 @@ object JsonPropertySerialisation {
}

implicit class JsonNodePropertyHierarchy(val prop: NodePropertyHierarchy) extends AnyVal {
implicit def formats = DefaultFormats
implicit def formats: DefaultFormats.type = DefaultFormats

private def buildHierarchy(displayParents: List[ParentProperty] => JValue): JObject = {
val (parents, origval) = prop.hierarchy match {
Expand Down Expand Up @@ -908,7 +908,7 @@ object JsonPropertySerialisation {
}

implicit class JsonNodePropertiesHierarchy(val props: List[NodePropertyHierarchy]) extends AnyVal {
implicit def formats = DefaultFormats
implicit def formats: DefaultFormats.type = DefaultFormats

def toApiJson: JArray = {
JArray(props.sortBy(_.prop.name).map(p => p.toApiJson))
Expand All @@ -928,7 +928,7 @@ object JsonPropertySerialisation {
}

implicit class JsonParameters(val parameters: Set[ParameterEntry]) extends AnyVal {
implicit def formats = DefaultFormats
implicit def formats: DefaultFormats.type = DefaultFormats

def dataJson(x: ParameterEntry): JField = {
JField(x.parameterName, x.escapedValue)
Expand Down
12 changes: 7 additions & 5 deletions ...dder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ExpectedReports.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -754,11 +754,13 @@ object ExpectedReportsSerialisation {

JsonDecoder[List[String]].map(toLeft).orElse(decodeJsonExpectedValueId7_1.map(toRight))
}
implicit lazy val encodeJsonEitherValue = new JsonEncoder[Either[List[String], JsonExpectedValueId7_1]] {
override def unsafeEncode(a: Either[List[String], JsonExpectedValueId7_1], indent: Option[Int], out: Write): Unit = {
a match {
case Left(x) => JsonEncoder[List[String]].unsafeEncode(x, indent, out)
case Right(x) => encodeJsonExpectedValueId7_1.unsafeEncode(x, indent, out)
implicit lazy val encodeJsonEitherValue: JsonEncoder[Either[List[String], JsonExpectedValueId7_1]] = {
new JsonEncoder[Either[List[String], JsonExpectedValueId7_1]] {
override def unsafeEncode(a: Either[List[String], JsonExpectedValueId7_1], indent: Option[Int], out: Write): Unit = {
a match {
case Left(x) => JsonEncoder[List[String]].unsafeEncode(x, indent, out)
case Right(x) => encodeJsonExpectedValueId7_1.unsafeEncode(x, indent, out)
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...er/rudder-core/src/main/scala/com/normation/rudder/services/policies/DataStructures.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ final case class InterpolationContext(
) extends GenericInterpolationContext[ConfigValue]

object InterpolationContext {
implicit val caseInsensitiveString = new Ordering[String] {
implicit val caseInsensitiveString: Ordering[String] = new Ordering[String] {
def compare(x: String, y: String): Int = x.compareToIgnoreCase(y)
}

Expand Down
3 changes: 2 additions & 1 deletion .../rudder-core/src/main/scala/com/normation/rudder/services/policies/JavascriptEngine.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ import javax.script.ScriptException
import org.apache.commons.codec.digest.Md5Crypt
import org.apache.commons.codec.digest.Sha2Crypt
import org.graalvm.polyglot.HostAccess
import org.graalvm.polyglot.io.IOAccess
import org.graalvm.polyglot.proxy.ProxyObject
import scala.annotation.nowarn
import scala.concurrent.duration.FiniteDuration
Expand Down Expand Up @@ -498,7 +499,7 @@ object JsEngine {
.newBuilder("js")
.engine(engine)
.allowHostAccess(HostAccess.EXPLICIT)
.allowIO(false)
.allowIO(IOAccess.NONE)
.allowCreateProcess(false)
.allowCreateThread(false)
.allowNativeAccess(false)
Expand Down
5 changes: 3 additions & 2 deletions ...r/rudder-core/src/test/scala/com/normation/cfclerk/services/TechniqueRepositoryTest.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import com.normation.rudder.repository.WoDirectiveRepository
import com.normation.rudder.services.policies.TechniqueAcceptationUpdater
import com.normation.rudder.services.policies.TestNodeConfiguration
import com.normation.utils.StringUuidGeneratorImpl
import java.nio.charset.Charset
import java.nio.charset.StandardCharsets
import net.liftweb.common._
import net.liftweb.common.Loggable
Expand All @@ -77,8 +78,8 @@ class TechniqueRepositoryTest extends Specification with Loggable with AfterAll
// Set sequential execution
sequential

implicit val charset = StandardCharsets.UTF_8
val setupRepos = new TestNodeConfiguration()
implicit val charset: Charset = StandardCharsets.UTF_8
val setupRepos = new TestNodeConfiguration()

val fsRepos = setupRepos.techniqueRepository
val git = setupRepos.repo.git
Expand Down
2 changes: 1 addition & 1 deletion ...der/rudder-core/src/test/scala/com/normation/rudder/domain/nodes/NodePropertiesTest.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class NodePropertiesTest extends Specification with Loggable with BoxSpecMatcher
val P2 = Some(PropertyProvider("p2"))

// just to have sequence in same order
implicit val ord = new Ordering[NodeProperty] {
implicit val ord: Ordering[NodeProperty] = new Ordering[NodeProperty] {
override def compare(x: NodeProperty, y: NodeProperty): Int = x.name.compareTo(y.name)
}

Expand Down
4 changes: 2 additions & 2 deletions ...e/src/test/scala/com/normation/rudder/repository/jdbc/GitModificationRepositoryTest.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ class GitModificationRepositoryTest extends DBCommon with BoxSpecMatcher {

lazy val repos = new GitModificationRepositoryImpl(doobie)

implicit def toCommitId(s: String) = GitCommitId(s)
implicit def toModId(s: String) = ModificationId(s)
implicit def toCommitId(s: String): GitCommitId = GitCommitId(s)
implicit def toModId(s: String): ModificationId = ModificationId(s)

sequential

Expand Down
2 changes: 1 addition & 1 deletion .../rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportsTest.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class ReportsTest extends DBCommon {

sequential

implicit def toReport(t: (DateTime, String, String, String, String, String, String, DateTime, String, String)) = {
implicit def toReport(t: (DateTime, String, String, String, String, String, String, DateTime, String, String)): Reports = {
implicit def toRuleId(s: String) = RuleId(RuleUid(s))
implicit def toDirectiveId(s: String) = DirectiveId(DirectiveUid(s))
implicit def toNodeId(s: String) = NodeId(s)
Expand Down
29 changes: 15 additions & 14 deletions ...er/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import com.normation.cfclerk.domain.SectionSpec
import com.normation.cfclerk.domain.Technique
import com.normation.cfclerk.domain.TechniqueId
import com.normation.cfclerk.domain.TechniqueName
import com.normation.cfclerk.domain.TechniqueVersion
import com.normation.cfclerk.domain.TechniqueVersionHelper
import com.normation.cfclerk.domain.TrackerVariableSpec
import com.normation.cfclerk.domain.Variable
Expand Down Expand Up @@ -562,18 +563,18 @@ ootapja6lKOaIpqp0kmmYN7gFIhp
* Some directives
* ************************************************************************
*/
implicit def toATID(s: String) = ActiveTechniqueId(s)
implicit def toTV(s: String) = TechniqueVersionHelper(s)
implicit def toTN(s: String) = TechniqueName(s)
implicit def toTID(id: (String, String)) = TechniqueId(id._1, id._2)
implicit def toDID(id: String) = DirectiveId(DirectiveUid(id), GitVersion.DEFAULT_REV)
implicit def toRID(id: String) = RuleId(RuleUid(id))
implicit def toRCID(id: String) = RuleCategoryId(id)
val t1 = Technique(("t1", "1.0"), "t1", "t1", Nil, TrackerVariableSpec(None, None), SectionSpec("root"), None)
val d1 = Directive("d1", "1.0", Map("foo1" -> Seq("bar1")), "d1", "d1", None)
val d2 = Directive("d2", "1.0", Map("foo2" -> Seq("bar2")), "d2", "d2", Some(PolicyMode.Enforce))
val d3 = Directive("d3", "1.0", Map("foo3" -> Seq("bar3")), "d3", "d3", Some(PolicyMode.Audit))
val fat1 = FullActiveTechnique(
implicit def toATID(s: String): ActiveTechniqueId = ActiveTechniqueId(s)
implicit def toTV(s: String): TechniqueVersion = TechniqueVersionHelper(s)
implicit def toTN(s: String): TechniqueName = TechniqueName(s)
implicit def toTID(id: (String, String)): TechniqueId = TechniqueId(id._1, id._2)
implicit def toDID(id: String): DirectiveId = DirectiveId(DirectiveUid(id), GitVersion.DEFAULT_REV)
implicit def toRID(id: String): RuleId = RuleId(RuleUid(id))
implicit def toRCID(id: String): RuleCategoryId = RuleCategoryId(id)
val t1 = Technique(("t1", "1.0"), "t1", "t1", Nil, TrackerVariableSpec(None, None), SectionSpec("root"), None)
val d1 = Directive("d1", "1.0", Map("foo1" -> Seq("bar1")), "d1", "d1", None)
val d2 = Directive("d2", "1.0", Map("foo2" -> Seq("bar2")), "d2", "d2", Some(PolicyMode.Enforce))
val d3 = Directive("d3", "1.0", Map("foo3" -> Seq("bar3")), "d3", "d3", Some(PolicyMode.Audit))
val fat1 = FullActiveTechnique(
"d1",
"t1",
SortedMap(toTV("1.0") -> DateTime.parse("2016-01-01T12:00:00.000+00:00")),
Expand Down Expand Up @@ -614,7 +615,7 @@ class TestTechniqueRepo(
def /(child: String) = new File(root, child)
}

implicit def stringToRuleUid(s: String) = RuleUid(s)
implicit def stringToRuleUid(s: String): RuleUid = RuleUid(s)

val t0 = System.currentTimeMillis()

Expand Down Expand Up @@ -689,7 +690,7 @@ class TestNodeConfiguration(
implicit class PathString2(root: File) {
def /(child: String) = new File(root, child)
}
implicit def stringToRuleUid(s: String) = RuleUid(s)
implicit def stringToRuleUid(s: String): RuleUid = RuleUid(s)

// technique repository + expose services & vars

Expand Down
4 changes: 2 additions & 2 deletions ...re/src/test/scala/com/normation/rudder/services/policies/write/PolicyAgregationTest.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ import scala.annotation.nowarn
@nowarn("msg=a type was inferred to be `\\w+`; this may indicate a programming error.")
@RunWith(classOf[JUnitRunner])
class PolicyAgregationTest extends Specification {
implicit def str2pId(id: String) = TechniqueId(TechniqueName(id), TechniqueVersionHelper("1.0"))
implicit def str2PolicyId(id: String) =
implicit def str2pId(id: String): TechniqueId = TechniqueId(TechniqueName(id), TechniqueVersionHelper("1.0"))
implicit def str2PolicyId(id: String): PolicyId =
PolicyId(RuleId(RuleUid("r_" + id)), DirectiveId(DirectiveUid("d_" + id)), TechniqueVersionHelper("1.0"))

// we are testing error cases, so we don't want to output error log for them
Expand Down

0 comments on commit 79c7051

Please sign in to comment.