Fixed problem processing sub children

rundeck-plugins · Nov 5, 2024 · 96e399d · 96e399d
1 parent a30cec5
commit 96e399d
Showing 1 changed file with 91 additions and 32 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
@@ -48,6 +48,7 @@
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -714,44 +715,102 @@ 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)) {
+      return;
+    }
 
-              nodes.putNode(node);
-            }
-          }
-        }
+    for (Map.Entry<String, Object> pair : children.entrySet()) {
+
+      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);
+        break;
       }
+
+      processHosts(nodes, hostNames, tags);
+      tags.clear();
+    }
+  }
+
+  /**
+   * Processes the hosts within the given host names map and adds them to the nodes set.
+   *
+   * @param nodes     the set of nodes to populate
+   * @param hostNames the map containing host names and their attributes
+   * @param tags      the set of tags to apply to the nodes
+   * @throws ResourceModelSourceException if an error occurs while processing the nodes
+   */
+  public void processHosts(NodeSetImpl nodes, Map<String, Object> hostNames, HashSet<String> tags) throws ResourceModelSourceException {
+    Map<String, Object> hosts = InventoryList.getValue(hostNames, HOSTS);
+
+    if (!isTagMapValid(hosts, HOSTS)) {
+      return;
+    }
+
+    for (Map.Entry<String, Object> hostNode : hosts.entrySet()) {
+      NodeEntryImpl node = createNodeEntry(hostNode, tags);
+      nodes.putNode(node);
     }
   }
 
+  /**
+   * Creates a NodeEntryImpl object from the given host node entry and tags.
+   *
+   * @param hostNode the entry containing the host name and its attributes
+   * @param tags     the set of tags to apply to the node
+   * @return the created NodeEntryImpl object
+   */
+  public NodeEntryImpl createNodeEntry(Map.Entry<String, Object> hostNode, HashSet<String> tags) throws ResourceModelSourceException {
+    NodeEntryImpl node = new NodeEntryImpl();
+    node.setTags(Set.copyOf(tags));
+    String hostName = hostNode.getKey();
+    node.setHostname(hostName);
+    node.setNodename(hostName);
+    Map<String, Object> nodeValues = InventoryList.getType(hostNode.getValue());
+
+    applyNodeTags(node, nodeValues);
+    nodeValues.forEach((key, value) -> {
+      if (value != null) {
+        node.setAttribute(key, value.toString());
+      }
+    });
+
+    return node;
+  }
+
+  /**
+   * Applies predefined tags to the given node based on the provided node values.
+   *
+   * @param node       the node to which the tags will be applied
+   * @param nodeValues the map containing the node's attributes
+   */
+  public void applyNodeTags(NodeEntryImpl node, Map<String, Object> nodeValues) throws ResourceModelSourceException {
+    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);
+  }
+
   /**
    * Gets Ansible nodes from inventory
    * @return Ansible nodes