Fixed problem processing sub children

rundeck-plugins · Nov 4, 2024 · 6676ba8 · 6676ba8
1 parent a30cec5
commit 6676ba8
Showing 1 changed file with 49 additions and 30 deletions.
diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleResourceModelSource.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleResourceModelSource.java
@@ -714,38 +714,57 @@ public void ansibleInventoryList(NodeSetImpl nodes, AnsibleRunner.AnsibleRunnerB
 
     if (isTagMapValid(all, ALL)) {
       Map<String, Object> children = InventoryList.getValue(all, CHILDREN);
+      processChildren(nodes, children, new HashSet<>());
+    }
+  }
 
-      if (isTagMapValid(children, CHILDREN)) {
-        for (Map.Entry<String, Object> pair : children.entrySet()) {
-          String hostGroup = pair.getKey();
-          Map<String, Object> hostNames = InventoryList.getType(pair.getValue());
-          Map<String, Object> hosts = InventoryList.getValue(hostNames, HOSTS);
-
-          if (isTagMapValid(hosts, HOSTS)) {
-            for (Map.Entry<String, Object> hostNode : hosts.entrySet()) {
-              NodeEntryImpl node = new NodeEntryImpl();
-              node.setTags(Set.of(hostGroup));
-              String hostName = hostNode.getKey();
-              node.setHostname(hostName);
-              node.setNodename(hostName);
-              Map<String, Object> nodeValues = InventoryList.getType(hostNode.getValue());
-
-              InventoryList.tagHandle(NodeTag.HOSTNAME, node, nodeValues);
-              InventoryList.tagHandle(NodeTag.USERNAME, node, nodeValues);
-              InventoryList.tagHandle(NodeTag.OS_FAMILY, node, nodeValues);
-              InventoryList.tagHandle(NodeTag.OS_NAME, node, nodeValues);
-              InventoryList.tagHandle(NodeTag.OS_ARCHITECTURE, node, nodeValues);
-              InventoryList.tagHandle(NodeTag.OS_VERSION, node, nodeValues);
-              InventoryList.tagHandle(NodeTag.DESCRIPTION, node, nodeValues);
-
-              nodeValues.forEach((key, value) -> {
-                if (value != null) {
-                  node.setAttribute(key, value.toString());
-                }
-              });
+  /**
+   * Processes the given set of nodes and populates the children map with the results.
+   *
+   * @param nodes   the set of nodes to process
+   * @param children a map to be populated with the processed children nodes
+   * @param tags    a set of tags to filter the nodes
+   * @throws ResourceModelSourceException if an error occurs while processing the nodes
+   */
+  public void processChildren(NodeSetImpl nodes, Map<String, Object> children, HashSet<String> tags) throws ResourceModelSourceException {
+    if (isTagMapValid(children, CHILDREN)) {
+      for (Map.Entry<String, Object> pair : children.entrySet()) {
 
-              nodes.putNode(node);
-            }
+        String hostGroup = pair.getKey();
+        tags.add(hostGroup);
+        Map<String, Object> hostNames = InventoryList.getType(pair.getValue());
+
+        if (hostNames.containsKey(CHILDREN)) {
+          Map<String, Object> subChildren = InventoryList.getValue(hostNames, CHILDREN);
+          processChildren(nodes, subChildren, tags);
+        }
+
+        Map<String, Object> hosts = InventoryList.getValue(hostNames, HOSTS);
+
+        if (isTagMapValid(hosts, HOSTS)) {
+          for (Map.Entry<String, Object> hostNode : hosts.entrySet()) {
+            NodeEntryImpl node = new NodeEntryImpl();
+            node.setTags(tags);
+            String hostName = hostNode.getKey();
+            node.setHostname(hostName);
+            node.setNodename(hostName);
+            Map<String, Object> nodeValues = InventoryList.getType(hostNode.getValue());
+
+            InventoryList.tagHandle(NodeTag.HOSTNAME, node, nodeValues);
+            InventoryList.tagHandle(NodeTag.USERNAME, node, nodeValues);
+            InventoryList.tagHandle(NodeTag.OS_FAMILY, node, nodeValues);
+            InventoryList.tagHandle(NodeTag.OS_NAME, node, nodeValues);
+            InventoryList.tagHandle(NodeTag.OS_ARCHITECTURE, node, nodeValues);
+            InventoryList.tagHandle(NodeTag.OS_VERSION, node, nodeValues);
+            InventoryList.tagHandle(NodeTag.DESCRIPTION, node, nodeValues);
+
+            nodeValues.forEach((key, value) -> {
+              if (value != null) {
+                node.setAttribute(key, value.toString());
+              }
+            });
+
+            nodes.putNode(node);
           }
         }
       }