Merge branch 'branches/rudder/8.2'

Normation · Oct 4, 2024 · 6a5c330 · 6a5c330
2 parents 7f72f4c + a2cf72a
commit 6a5c330
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/.../sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala b/.../sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala
@@ -59,6 +59,7 @@ import com.normation.rudder.facts.nodes.ChangeContext
 import com.normation.rudder.facts.nodes.NodeFactRepository
 import com.normation.rudder.facts.nodes.QueryContext
 import com.normation.rudder.properties.MergeNodeProperties
+import com.normation.rudder.properties.NodePropertiesService
 import com.normation.rudder.properties.PropertiesRepository
 import com.normation.rudder.repository.CategoryAndNodeGroup
 import com.normation.rudder.repository.RoNodeGroupRepository
@@ -86,6 +87,7 @@ import zio.syntax.*
 
 class GroupsApi(
     readGroup:            RoNodeGroupRepository,
+    propertiesService:    NodePropertiesService,
     restExtractorService: RestExtractorService,
     zioJsonExtractor:     ZioJsonExtractor,
     uuidGen:              StringUuidGenerator,
@@ -532,6 +534,8 @@ class GroupsApi(
         restGroup <- zioJsonExtractor.extractGroup(req).chainError(s"Could not extract a group from request.").toIO
         id        <- NodeGroupId.parse(sid).toIO
         res       <- serviceV14.updateGroup(restGroup.copy(id = Some(id)), params, authzToken.qc.actor)
+        // await all properties update to guarantee that properties are resolved after group modification
+        _         <- propertiesService.updateAll()
       } yield {
         res
       }).toLiftResponseOne(params, schema, s => Some(s.id))

diff --git a/...pp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala b/...pp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala
@@ -78,6 +78,7 @@ import com.normation.rudder.facts.nodes.QueryContext
 import com.normation.rudder.facts.nodes.SelectFacts
 import com.normation.rudder.facts.nodes.SelectNodeStatus
 import com.normation.rudder.properties.MergeNodeProperties
+import com.normation.rudder.properties.NodePropertiesService
 import com.normation.rudder.properties.PropertiesRepository
 import com.normation.rudder.reports.ReportingConfiguration
 import com.normation.rudder.reports.execution.AgentRunWithNodeConfig
@@ -151,13 +152,14 @@ import zio.syntax.*
  * but make the implementation directly here.
  */
 class NodeApi(
-    zioJsonExtractor:    ZioJsonExtractor,
-    serializer:          RestDataSerializer,
-    nodeApiService:      NodeApiService,
-    userPropertyService: UserPropertyService,
-    inheritedProperties: NodeApiInheritedProperties,
-    uuidGen:             StringUuidGenerator,
-    deleteDefaultMode:   DeleteMode
+    zioJsonExtractor:      ZioJsonExtractor,
+    nodePropertiesService: NodePropertiesService,
+    serializer:            RestDataSerializer,
+    nodeApiService:        NodeApiService,
+    userPropertyService:   UserPropertyService,
+    inheritedProperties:   NodeApiInheritedProperties,
+    uuidGen:               StringUuidGenerator,
+    deleteDefaultMode:     DeleteMode
 ) extends LiftApiModuleProvider[API] {
 
   def schemas: ApiModuleProvider[API] = API
@@ -387,6 +389,8 @@ class NodeApi(
         restNode <- restExtractor.extractUpdateNode(req).toIO
         reason   <- extractReason(req)
         result   <- nodeApiService.updateRestNode(NodeId(id), restNode)
+        // await all properties update to guarantee that properties are resolved after node modification
+        _        <- nodePropertiesService.updateAll()
       } yield {
         result.transformInto[JRUpdateNode]
       }).chainError(s"An error occurred while updating Node '${id}'")

diff --git a/...p/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala b/...p/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala
@@ -953,6 +953,7 @@ class RestTestSetUp {
     new GroupsInternalApi(groupInternalApiService),
     new NodeApi(
       zioJsonExtractor,
+      mockNodeGroups.propService,
       restDataSerializer,
       nodeApiService,
       userPropertyService,
@@ -962,6 +963,7 @@ class RestTestSetUp {
     ),
     new GroupsApi(
       mockNodeGroups.groupsRepo,
+      mockNodeGroups.propService,
       restExtractorService,
       zioJsonExtractor,
       uuidGen,

diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala
@@ -2067,6 +2067,7 @@ object RudderConfigInit {
         new ComplianceApi(restExtractorService, complianceAPIService, roDirectiveRepository),
         new GroupsApi(
           roLdapNodeGroupRepository,
+          propertiesService,
           restExtractorService,
           zioJsonExtractor,
           stringUuidGenerator,
@@ -2085,6 +2086,7 @@ object RudderConfigInit {
         ),
         new NodeApi(
           zioJsonExtractor,
+          propertiesService,
           restDataSerializer,
           nodeApiService,
           userPropertyService,