Merge pull request #589 from ripienaar/0150

(misc) Release 0.15.0
choria-legacy · May 27, 2019 · 550578b · 550578b
2 parents 12790fc + 0305e09
commit 550578b
Show file tree

Hide file tree

Showing 12 changed files with 106 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 |Date      |Issue |Description                                                                                              |
 |----------|------|---------------------------------------------------------------------------------------------------------|
+|2019/05/27|      |Release 0.15.0                                                                                           |
+|2019/05/27|      |Release 0.15.0                                                                                           |
+|2019/05/02|585   |Add support for Choria Autonomous Agents                                                                 |
+|2019/03/19|583   |Fix path expansion for token locations with `~` in them                                                  |
 |2019/03/04|      |Release 0.14.1                                                                                           |
 |2019/03/04|      |Require the latest choria-mcorpc-support gem                                                             |
 |2019/03/04|      |Release 0.14.0                                                                                           |

diff --git a/lib/mcollective/agent/bolt_tasks.ddl b/lib/mcollective/agent/bolt_tasks.ddl
@@ -2,7 +2,7 @@ metadata :name => "bolt_tasks",
          :description => "Downloads and runs Puppet Tasks",
          :author => "R.I.Pienaar <[email protected]>",
          :license => "Apache-2.0",
-         :version => "0.14.1",
+         :version => "0.15.0",
          :url => "https://choria.io",
          :timeout => 60
 

diff --git a/lib/mcollective/agent/choria_util.ddl b/lib/mcollective/agent/choria_util.ddl
@@ -2,7 +2,7 @@ metadata    :name        => "choria_util",
             :description => "Choria Utilities",
             :author      => "R.I.Pienaar <[email protected]>",
             :license     => "Apache-2.0",
-            :version     => "0.14.1",
+            :version     => "0.15.0",
             :url         => "https://choria.io",
             :timeout     => 20
 

diff --git a/lib/mcollective/agent/choria_util.json b/lib/mcollective/agent/choria_util.json
@@ -148,6 +148,97 @@
           ]
         }
       ]
+    },
+    {
+      "action": "machine_states",
+      "input": {
+      },
+      "output": {
+        "machine_names": {
+          "description": "List of running machine names",
+          "display_as": "Machine Names",
+          "default": null
+        },
+        "machine_ids": {
+          "description": "List of running machine IDs",
+          "display_as": "Machine IDs",
+          "default": null
+        },
+        "states": {
+          "description": "Hash map of machine statusses indexed by machine ID",
+          "display_as": "Machine States",
+          "default": null
+        }
+      },
+      "display": "always",
+      "description": "States of the hosted Choria Autonomous Agents",
+      "aggregate": [
+        {
+          "function": "summary",
+          "args": [
+            "machine_names"
+          ]
+        }
+      ]
+    },
+    {
+      "action": "machine_transition",
+      "input": {
+        "instance": {
+          "prompt": "Instance ID",
+          "description": "Machine Instance ID",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": "^.+-.+-.+-.+-.+$",
+          "maxlength": 36
+        },
+        "version": {
+          "prompt": "Version",
+          "description": "Machine Version",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": "^\\d+\\.\\d+\\.\\d+$",
+          "maxlength": 20
+        },
+        "name": {
+          "prompt": "Name",
+          "description": "Machine Name",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": "^[a-zA-Z][a-zA-Z0-9_-]+",
+          "maxlength": 128
+        },
+        "path": {
+          "prompt": "Path",
+          "description": "Machine Path",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": ".+",
+          "maxlength": 512
+        },
+        "transition": {
+          "prompt": "Transition Name",
+          "description": "The transition event to send to the machine",
+          "type": "string",
+          "default": null,
+          "optional": false,
+          "validation": "^[a-zA-Z][a-zA-Z0-9_-]+$",
+          "maxlength": 128
+        }
+      },
+      "output": {
+        "success": {
+          "description": "Indicates if the transition was succesfully accepted",
+          "display_as": "Accepted",
+          "default": null
+        }
+      },
+      "display": "failed",
+      "description": "Attempts to force a transition in a hosted Choria Autonomous Agent"
     }
   ]
 }
diff --git a/lib/mcollective/agent/rpcutil.ddl b/lib/mcollective/agent/rpcutil.ddl
@@ -2,7 +2,7 @@ metadata    :name        => "rpcutil",
             :description => "General helpful actions that expose stats and internals to SimpleRPC clients",
             :author      => "R.I.Pienaar <[email protected]>",
             :license     => "Apache License, Version 2.0",
-            :version     => "0.14.1",
+            :version     => "0.15.0",
             :url         => "https://docs.puppetlabs.com/mcollective/",
             :timeout     => 10
 

diff --git a/lib/mcollective/connector/nats.ddl b/lib/mcollective/connector/nats.ddl
@@ -2,7 +2,7 @@ metadata    :name        => "nats",
             :description => "Connector plugin for NATS.io middleware",
             :author      => "R.I.Pienaar <[email protected]>",
             :license     => "Apache-2.0",
-            :version     => "0.14.1",
+            :version     => "0.15.0",
             :url         => "https://github.com/choria-io",
             :timeout     => 60
 

diff --git a/lib/mcollective/data/bolt_task_data.ddl b/lib/mcollective/data/bolt_task_data.ddl
@@ -2,7 +2,7 @@ metadata    :name => "bolt_task",
             :description => "Information about past Bolt Task",
             :author => "R.I.Pienaar <[email protected]>",
             :license => "Apache-2.0",
-            :version => "0.14.1",
+            :version => "0.15.0",
             :url => "https://choria.io",
             :timeout => 1
 

diff --git a/lib/mcollective/discovery/choria.ddl b/lib/mcollective/discovery/choria.ddl
@@ -2,7 +2,7 @@ metadata    :name        => "choria",
             :description => "PuppetDB based discovery for the Choria plugin suite",
             :author      => "R.I.Pienaar <[email protected]>",
             :license     => "Apache-2.0",
-            :version     => "0.14.1",
+            :version     => "0.15.0",
             :url         => "https://github.com/choria-io",
             :timeout     => 0
 

diff --git a/lib/mcollective/util/choria.rb b/lib/mcollective/util/choria.rb
@@ -8,7 +8,7 @@ class UserError < StandardError; end
       class Abort < StandardError; end
 
       unless defined?(Choria::VERSION) # rubocop:disable Style/IfUnlessModifier
-        VERSION = "0.14.1".freeze
+        VERSION = "0.15.0".freeze
       end
 
       attr_writer :ca

diff --git a/lib/mcollective/validator/bolt_task_name_validator.ddl b/lib/mcollective/validator/bolt_task_name_validator.ddl
@@ -2,6 +2,6 @@ metadata    :name => "bolt_task_name",
             :description => "Validates that a string matches Bolt Task Name",
             :author => "R.I.Pienaar <[email protected]>",
             :license => "Apache-2.0",
-            :version => "0.14.1",
+            :version => "0.15.0",
             :url => "https://choria.io",
             :timeout => 1
diff --git a/module/choria/metadata.json b/module/choria/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "choria-mcollective_choria",
-  "version": "0.14.1",
+  "version": "0.15.0",
   "author": "R.I.Pienaar <[email protected]>",
   "summary": "A suite of MCollective Plugins for AIO Puppet",
   "license": "Apache-2.0",

diff --git a/module/tasks/metadata.json b/module/tasks/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "choria-mcollective_agent_bolt_tasks",
-  "version": "0.14.1",
+  "version": "0.15.0",
   "author": "R.I.Pienaar <[email protected]>",
   "summary": "Puppet Tasks integration for Choria",
   "license": "Apache-2.0",
@@ -9,7 +9,7 @@
   "issues_url": "https://github.com/choria-io/mcollective-choria/issues",
   "dependencies": [
     { "name": "choria/mcollective","version_requirement":">= 0.9.0 < 2.0.0"},
-    { "name": "choria/mcollective_choria","version_requirement":"0.14.1"}
+    { "name": "choria/mcollective_choria","version_requirement":"0.15.0"}
   ],
   "requirements": [
     {