Merge pull request #491 from ripienaar/446

(#446) Compensate for inconsistent result shape from Puppet Server

lib/mcollective/util/tasks_support.rb

@@ -561,7 +561,13 @@ def task_metadata(task, environment)
 
         raise("Failed to request task metadata: %s: %s" % [resp.code, resp.body]) unless resp.code == "200"
 
-        JSON.parse(resp.body)
+        result = JSON.parse(resp.body)
+
+        result["metadata"] ||= {}
+        result["metadata"]["parameters"] ||= {}
+        result["files"] ||= []
+
+        result
       end
 
       # Validates that the inputs would be acceptable to the task

spec/unit/mcollective/util/tasks_support_spec.rb

@@ -633,6 +633,13 @@ module Util
             ts.task_metadata("choria::ls", "production")
           end.to raise_error("Failed to request task metadata: 404: Could not find module 'choria'")
         end
+
+        it "should normalize results" do
+          stub_request(:get, "https://stubpuppet:8140/puppet/v3/tasks/choria/ls?environment=production")
+            .to_return(:status => 200, :body => {}.to_json)
+
+          expect(ts.task_metadata("choria::ls", "production")).to eq("files" => [], "metadata" => {"parameters" => {}})
+        end
       end
 
       describe "#http_get" do