Merge pull request #411 from rundeck-plugins/RUN-3409-Ansible-Model-Sources-return-host-vars-data-in-key-value-format-when-Gather-Facts-is-set-to-no

Run 3409 ansible model sources return host vars data in key value format when gather facts is set to no

Author: edbaltra

.gitignore

@@ -73,6 +73,8 @@ hs_err_pid*
 /.project
 /.settings/
 
+/functional-test/bin/
+
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle/wrapper/gradle-wrapper.jar
 

src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleResourceModelSource.java

@@ -32,6 +32,8 @@
 import org.rundeck.app.spi.Services;
 import org.rundeck.storage.api.PathUtil;
 import org.rundeck.storage.api.StorageException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
@@ -68,8 +70,10 @@
 @Slf4j
 public class AnsibleResourceModelSource implements ResourceModelSource, ProxyRunnerPlugin {
 
+  private static final Logger logger = LoggerFactory.getLogger(AnsibleResourceModelSource.class);
   public static final String HOST_TPL_J2 = "host-tpl.j2";
   public static final String GATHER_HOSTS_YML = "gather-hosts.yml";
+  private final Gson gson = new Gson();
 
   @Setter
   private Framework framework;
@@ -801,9 +805,14 @@ public NodeEntryImpl createNodeEntry(Map.Entry<String, Object> hostNode) throws
     Map<String, Object> nodeValues = InventoryList.getType(hostNode.getValue());
 
     applyNodeTags(node, nodeValues);
+
     nodeValues.forEach((key, value) -> {
       if (value != null) {
-        node.setAttribute(key, value.toString());
+        if (value instanceof Map || value instanceof List) {
+          node.setAttribute(key, gson.toJson(value));
+        } else {
+          node.setAttribute(key, value.toString());
+        }
       }
     });
 

src/test/groovy/com/rundeck/plugins/ansible/plugin/AnsibleResourceModelSourceSpec.groovy

@@ -163,6 +163,67 @@ class AnsibleResourceModelSourceSpec extends Specification {
         then: "throws an exception because data is too big to be precessed"
         thrown(ResourceModelSourceException)
     }
+    void "structured data like ports is serialized as JSON when gather facts is false"() {
+        given:
+        def nodeName = 'NODE_JSON'
+        def structuredPorts = [
+                [port: 22, protocol: 'tcp', service: 'ssh', state: 'open'],
+                [port: 80, protocol: 'tcp', service: 'http', state: 'open']
+        ]
+
+        Framework framework = Mock(Framework) {
+            getPropertyLookup() >> Mock(IPropertyLookup){
+                getProperty("framework.tmp.dir") >> '/tmp'
+            }
+            getBaseDir() >> Mock(File) {
+                getAbsolutePath() >> '/tmp'
+            }
+        }
+        ResourceModelSource plugin = new AnsibleResourceModelSource(framework)
+        Properties config = new Properties()
+        config.put('project', 'project_1')
+        config.put(AnsibleDescribable.ANSIBLE_GATHER_FACTS, 'false')
+        plugin.configure(config)
+
+        Services services = Mock(Services) {
+            getService(KeyStorageTree.class) >> Mock(KeyStorageTree)
+        }
+        plugin.setServices(services)
+
+        def host = [(nodeName): [
+                'ports': structuredPorts
+        ]]
+        def hosts = ['hosts': host]
+        def groups = ['ungrouped': hosts]
+        def children = ['children': groups]
+        def all = ['all': children]
+
+        Yaml yaml = new Yaml()
+        String result = yaml.dump(all)
+
+        AnsibleInventoryListBuilder inventoryListBuilder = Mock(AnsibleInventoryListBuilder) {
+            build() >> Mock(AnsibleInventoryList) {
+                getNodeList() >> result
+            }
+        }
+
+        plugin.ansibleInventoryListBuilder = inventoryListBuilder
+
+        when:
+        INodeSet nodes = plugin.getNodes()
+        INodeEntry node = nodes.getNode(nodeName)
+
+        then:
+        node != null
+        node.getAttributes().containsKey("ports")
+
+        and:
+        def portsJson = node.getAttributes().get("ports")
+        portsJson.startsWith("[")
+        portsJson.contains("\"port\":22")
+        portsJson.contains("\"service\":\"ssh\"")
+    }
+
 
     void "tag hosts is empty"() {
         given: