Merge branch 'bug_24665/number_of_nodes_in_rule_badge_is_not_correct_…

…with_tenants_pr' into branches/rudder/7.3
Normation · Apr 17, 2024 · b608506 · b608506
2 parents f739b3e + 7d0d06a
commit b608506
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...s/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/RuleTarget.scala b/...s/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/RuleTarget.scala
@@ -329,7 +329,15 @@ object RuleTarget extends Loggable {
           // here, if we don't find the group, we consider it's an error in the
           // target recording, but don't fail, just log it.
           case GroupTarget(groupId)         =>
-            nodes ++ groups.getOrElse(groupId, Chunk.empty)
+            val groupNodes = groups.getOrElse(groupId, Chunk.empty)
+            val filtered   = {
+              if (allNodesAreThere) groupNodes
+              else {
+                val keys = Chunk.fromIterable(allNodes.keys)
+                groupNodes.filter(keys.contains(_))
+              }
+            }
+            nodes ++ filtered
 
           case TargetIntersection(targets) =>
             val nodeSets     = targets.map(t => getNodeIdsChunkRec(Chunk(t), allNodes, groups, allNodesAreThere))

diff --git a/...dder/rudder-core/src/main/scala/com/normation/rudder/repository/NodeGroupRepository.scala b/...dder/rudder-core/src/main/scala/com/normation/rudder/repository/NodeGroupRepository.scala
@@ -353,7 +353,7 @@ object RoNodeGroupRepository {
       allNodeInfos: Map[NodeId, NodeInfo]
   ): Chunk[NodeId] = {
     val allNodes = allNodeInfos.view.mapValues(x => (x.isPolicyServer))
-    RuleTarget.getNodeIdsChunk(targets, allNodes.toMap, allGroups)
+    RuleTarget.getNodeIdsChunk(targets, allNodes.toMap, allGroups, false)
   }
 }