Merge branch 'bug_17448/fix_non_compiling_plugins_after_changes_on_ru…

…dder_pr' into branches/rudder/6.1
Normation · May 19, 2020 · afcbe48 · afcbe48
2 parents 2611f7f + 153429a
commit afcbe48
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 24 deletions.
diff --git a/.../main/scala/com/normation/plugins/changevalidation/snippet/ChangeRequestChangesForm.scala b/.../main/scala/com/normation/plugins/changevalidation/snippet/ChangeRequestChangesForm.scala
@@ -205,12 +205,12 @@ class ChangeRequestChangesForm(
     override val attrs = List(("data-jstree" -> """{ "type" : "changeType" }"""),("id" -> { "groups"}))
   }
 
-  def globalParameterChild(paramName:ParameterName) = new JsTreeNode{
+  def globalParameterChild(paramName:String) = new JsTreeNode{
     val changes = changeRequest.globalParams(paramName).changes
-    val parameterName = changes.initialState.map(_.name.value).getOrElse(changes.firstChange.diff match{
-           case a :AddGlobalParameterDiff => a.parameter.name.value
-           case d :DeleteGlobalParameterDiff => d.parameter.name.value
-           case modTo : ModifyToGlobalParameterDiff => modTo.parameter.name.value
+    val parameterName = changes.initialState.map(_.name).getOrElse(changes.firstChange.diff match{
+           case a :AddGlobalParameterDiff => a.parameter.name
+           case d :DeleteGlobalParameterDiff => d.parameter.name
+           case modTo : ModifyToGlobalParameterDiff => modTo.parameter.name
     } )
     val body = SHtml.a(
         () => SetHtml("history",displayHistory(rootRuleCategory, Nil, Nil, Nil, List(changes)))
@@ -628,7 +628,7 @@ class ChangeRequestChangesForm(
                 case Some(initialParameter) =>
                   val diff = diffService.diffGlobalParameter(initialParameter, param)
                  displayGlobalParameterDiff(diff,param)
-                case None =>  val msg = s"Could not display diff for ${param.name.value}"
+                case None =>  val msg = s"Could not display diff for ${param.name}"
                 logger.error(msg)
                 <div>msg</div>
                }
@@ -652,7 +652,7 @@ class ChangeRequestChangesForm(
 
   private[this] def displayGlobalParameter(param: GlobalParameter) = (
       "#paramName" #> createGlobalParameterLink(param.name) &
-      "#name" #> param.name.value &
+      "#name" #> param.name &
       "#value" #> net.liftweb.json.prettyRender(param.value) &
       "#description" #> param.description
   )(globalParameterXML)
@@ -662,7 +662,7 @@ class ChangeRequestChangesForm(
       , param         : GlobalParameter
   ) = {
     ( "#paramName" #> createGlobalParameterLink(param.name) &
-      "#name" #> param.name.value &
+      "#name" #> param.name &
       "#value" #> displaySimpleDiff(diff.modValue,"value",Text(net.liftweb.json.prettyRender(param.value))) &
       "#description" #> displaySimpleDiff(diff.modDescription,"description",Text(param.description))
     ) (globalParameterXML)
@@ -746,9 +746,9 @@ class ChangeRequestChangesForm(
 
   def displayGlobalParameterChange(globalParameterChange: GlobalParameterChange) = {
     val action = globalParameterChange.firstChange.diff match {
-           case a : AddGlobalParameterDiff => Text(s"Create Global Parameter ${a.parameter.name.value}")
-           case d : DeleteGlobalParameterDiff => <span>Delete Global Parameter <a href={baseGlobalParameterLink(d.parameter.name)} onclick="noBubble(event);">{d.parameter.name.value}</a></span>
-           case m : ModifyToGlobalParameterDiff => <span>Modify Global Parameter <a href={baseGlobalParameterLink(m.parameter.name)} onclick="noBubble(event);">{m.parameter.name.value}</a></span>
+           case a : AddGlobalParameterDiff => Text(s"Create Global Parameter ${a.parameter.name}")
+           case d : DeleteGlobalParameterDiff => <span>Delete Global Parameter <a href={baseGlobalParameterLink(d.parameter.name)} onclick="noBubble(event);">{d.parameter.name}</a></span>
+           case m : ModifyToGlobalParameterDiff => <span>Modify Global Parameter <a href={baseGlobalParameterLink(m.parameter.name)} onclick="noBubble(event);">{m.parameter.name}</a></span>
          }
    displayEvent(action,globalParameterChange.firstChange.actor,globalParameterChange.firstChange.creationDate, globalParameterChange.firstChange.reason.getOrElse(""))
   }

diff --git a/datasources/pom-template.xml b/datasources/pom-template.xml
@@ -43,13 +43,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- it seems to not be resolved, don't know why -->
-    <dependency>
-      <groupId>org.scala-lang.modules</groupId>
-      <artifactId>scala-parser-combinators_${scala-binary-version}</artifactId>
-      <version>${scala-parser-combinators-version}</version>
-    </dependency>
-
     <!-- Test: rudder -->
     <dependency>
       <groupId>com.normation.rudder</groupId>

diff --git a/datasources/src/main/scala/com/normation/plugins/datasources/DataTypes.scala b/datasources/src/main/scala/com/normation/plugins/datasources/DataTypes.scala
@@ -40,12 +40,11 @@ package com.normation.plugins.datasources
 import com.normation.NamedZioLogger
 import com.normation.inventory.domain.NodeId
 import com.normation.rudder.domain.nodes.NodeProperty
-import com.normation.rudder.domain.nodes.NodePropertyProvider
+import com.normation.rudder.domain.nodes.PropertyProvider
 import net.liftweb.common.Logger
 import net.liftweb.json.JsonAST.JValue
 import org.joda.time.DateTime
 import org.slf4j.LoggerFactory
-
 import zio.duration._
 
 /**
@@ -69,7 +68,7 @@ object DataSourceLoggerPure extends NamedZioLogger {
 final object DataSource {
   val defaultDuration = 5.minutes
 
-  val providerName = NodePropertyProvider("datasources")
+  val providerName = PropertyProvider("datasources")
 
   /*
    * Name used in both datasource id and "reload" place in

diff --git a/datasources/src/main/scala/com/normation/plugins/datasources/UpdateHttpDataset.scala b/datasources/src/main/scala/com/normation/plugins/datasources/UpdateHttpDataset.scala
@@ -208,7 +208,7 @@ object QueryHttp {
 class InterpolateNode(compiler: InterpolatedValueCompiler) {
 
   def compileParameters(parameter: GlobalParameter): PureResult[(String, ParamInterpolationContext => PureResult[String])] = {
-    compiler.compileParam(GenericPropertyUtils.serializeValue(parameter.value)).map(v => (parameter.name.value, v))
+    compiler.compileParam(GenericPropertyUtils.serializeValue(parameter.value)).map(v => (parameter.name, v))
   }
 
   def compileInput(node: NodeInfo, policyServer: NodeInfo, globalPolicyMode: GlobalPolicyMode,  parameters: Map[String, ParamInterpolationContext => PureResult[String]])(input: String): PureResult[String] = {

diff --git a/datasources/src/test/scala/com/normation/plugins/datasources/UpdateHttpDatasetTest.scala b/datasources/src/test/scala/com/normation/plugins/datasources/UpdateHttpDatasetTest.scala
@@ -51,7 +51,6 @@ import com.normation.rudder.domain.nodes.CompareProperties
 import com.normation.rudder.domain.nodes.Node
 import com.normation.rudder.domain.nodes.NodeInfo
 import com.normation.rudder.domain.nodes.NodeProperty
-import com.normation.rudder.domain.parameters.ParameterName
 import com.normation.rudder.repository.RoParameterRepository
 import com.normation.rudder.repository.WoNodeRepository
 import com.normation.rudder.services.nodes.NodeInfoService
@@ -311,7 +310,7 @@ class UpdateHttpDatasetTest extends Specification with BoxSpecMatcher with Logga
   val parameterRepo = new RoParameterRepository() {
     def getAllGlobalParameters() = Seq().succeed
     def getAllOverridable() = Seq().succeed
-    def getGlobalParameter(parameterName: ParameterName) = None.succeed
+    def getGlobalParameter(parameterName: String) = None.succeed
   }
 
   class TestNodeRepoInfo(initNodeInfo: Map[NodeId, NodeInfo]) extends WoNodeRepository with NodeInfoService {