(#87) update DDL files

Signed-off-by: R.I.Pienaar <[email protected]>

Rakefile

@@ -31,3 +31,35 @@ task :test do
   sh "bundle exec rubocop --config .rubocop.yml lib"
   sh "bundle exec rspec"
 end
+
+desc "Update JSON DDL files"
+task :update_ddl do
+  require "mcollective"
+
+  Dir.glob("lib/mcollective/agent/*.ddl") do |ddlfile|
+    next if ddlfile =~ /^choria_uril/
+
+    agent_dir = File.dirname(ddlfile)
+    agent_name = File.basename(ddlfile, ".ddl")
+    json_file = File.join(agent_dir, "%s.json" % agent_name)
+
+    ddl = MCollective::DDL.new(agent_name, :agent, false)
+    ddl.instance_eval(File.read(ddlfile))
+
+    data = {
+      "$schema" => "https://choria.io/schemas/mcorpc/ddl/v1/agent.json",
+      "metadata" => ddl.meta,
+      "actions" => []
+    }
+
+    ddl.actions.sort.each do |action|
+      data["actions"] << ddl.action_interface(action)
+    end
+
+    puts "Writing JSON DDL in %s" % json_file
+
+    File.open(json_file, "w") do |jddl|
+      jddl.print(JSON.pretty_generate(data))
+    end
+  end
+end

lib/mcollective/agent/choria_util.ddl

@@ -4,7 +4,7 @@ metadata    :name        => "choria_util",
             :license     => "Apache-2.0",
             :version     => "0.19.0",
             :url         => "https://choria.io",
-            :timeout     => 20
+            :timeout     => 2
 
 requires :mcollective => "2.9.0"
 
@@ -50,7 +50,7 @@ action "machine_transition", :description => "Attempts to force a transition in
         :optional => false
 
   output :success,
-         :description => "Indicates if the transition was succesfully accepted",
+         :description => "Indicates if the transition was successfully accepted",
          :display_as => "Accepted"
 end
 

lib/mcollective/agent/choria_util.json

@@ -7,7 +7,7 @@
     "license": "Apache-2.0",
     "version": "0.19.0",
     "url": "https://choria.io",
-    "timeout": 20
+    "timeout": 2
   },
   "actions": [
     {
@@ -232,7 +232,7 @@
       },
       "output": {
         "success": {
-          "description": "Indicates if the transition was succesfully accepted",
+          "description": "Indicates if the transition was successfully accepted",
           "display_as": "Accepted",
           "default": null
         }

lib/mcollective/agent/rpcutil.ddl

@@ -3,8 +3,8 @@ metadata    :name        => "rpcutil",
             :author      => "R.I.Pienaar <[email protected]>",
             :license     => "Apache License, Version 2.0",
             :version     => "0.19.0",
-            :url         => "https://docs.puppetlabs.com/mcollective/",
-            :timeout     => 10
+            :url         => "https://choria.io/",
+            :timeout     => 2
 
 action "collective_info", :description => "Info about the main and sub collectives" do
     display :always

lib/mcollective/agent/rpcutil.json

@@ -6,8 +6,8 @@
     "author": "R.I.Pienaar <[email protected]>",
     "license": "Apache License, Version 2.0",
     "version": "0.19.0",
-    "url": "https://docs.puppetlabs.com/mcollective/",
-    "timeout": 10
+    "url": "https://choria.io/",
+    "timeout": 2
   },
   "actions": [
     {

lib/mcollective/agent/scout.ddl

@@ -1,8 +1,8 @@
 metadata :name        => "scout",
-         :description => "Choria Scout Management API",
+         :description => "Choria Scout Agent Management API",
          :author      => "R.I.Pienaar <[email protected]>",
          :license     => "Apache-2.0",
-         :version     => "0.19.0",
+         :version     => "0.0.1",
          :url         => "https://choria.io",
          :provider    => "golang",
          :timeout     => 5

lib/mcollective/agent/scout.json

@@ -2,10 +2,10 @@
   "$schema": "https://choria.io/schemas/mcorpc/ddl/v1/agent.json",
   "metadata": {
     "name": "scout",
-    "description": "Choria Scout Management API",
+    "description": "Choria Scout Agent Management API",
     "author": "R.I.Pienaar <[email protected]>",
     "license": "Apache-2.0",
-    "version": "0.19.0",
+    "version": "0.0.1",
     "url": "https://choria.io",
     "provider": "golang",
     "timeout": 5