Merge pull request #23 from ripienaar/0_21_4

(misc) Release 0.21.4
choria-plugins · Nov 7, 2022 · 3fcdee7 · 3fcdee7
2 parents 649a430 + 981be1b
commit 3fcdee7
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 |Date      |Issue |Description                                                                                              |
 |----------|------|---------------------------------------------------------------------------------------------------------|
+|2022/11/07|      |Release 0.21.4                                                                                           |
+|2022/02/23|      |Update DDL files and dependencies                                                                        |
 |2022/02/23|      |Release 0.21.3                                                                                           |
 |2022/02/23|      |Update DDL files and dependencies                                                                        |
 |2021/08/24|      |Release 0.21.1                                                                                           |

diff --git a/data/puppet_aio/6.yaml b/data/puppet_aio/6.yaml
@@ -1,2 +1,2 @@
 mcollective_choria::gem_dependencies:
-  "choria-mcorpc-support": "2.26.0"
+  "choria-mcorpc-support": "2.26.1"
diff --git a/data/puppet_aio/7.yaml b/data/puppet_aio/7.yaml
@@ -1,2 +1,2 @@
 mcollective_choria::gem_dependencies:
-  "choria-mcorpc-support": "2.26.0"
+  "choria-mcorpc-support": "2.26.1"
diff --git a/files/mcollective/agent/choria_util.ddl b/files/mcollective/agent/choria_util.ddl
@@ -2,7 +2,7 @@ metadata :name        => "choria_util",
          :description => "Choria Utilities",
          :author      => "R.I.Pienaar <rip@devco.net>",
          :license     => "Apache-2.0",
-         :version     => "0.25.0",
+         :version     => "0.26.2",
          :url         => "https://choria.io",
          :timeout     => 2
 

diff --git a/files/mcollective/agent/choria_util.json b/files/mcollective/agent/choria_util.json
@@ -5,7 +5,7 @@
     "description": "Choria Utilities",
     "author": "R.I.Pienaar <rip@devco.net>",
     "license": "Apache-2.0",
-    "version": "0.25.0",
+    "version": "0.26.2",
     "url": "https://choria.io",
     "timeout": 2
   },

diff --git a/files/mcollective/agent/rpcutil.ddl b/files/mcollective/agent/rpcutil.ddl
@@ -2,7 +2,7 @@ metadata :name        => "rpcutil",
          :description => "Utility actions that expose information about the state of the running Server",
          :author      => "R.I.Pienaar <rip@devco.net>",
          :license     => "Apache-2.0",
-         :version     => "0.25.0",
+         :version     => "0.26.2",
          :url         => "https://choria.io/",
          :timeout     => 2
 
@@ -276,7 +276,7 @@ action "ping", :description => "Responds to requests for PING with PONG" do
 
   output :pong,
          :description => "The local Unix timestamp",
-         :type        => "string",
+         :type        => "number",
          :display_as  => "Timestamp"
 
 end

diff --git a/files/mcollective/agent/rpcutil.json b/files/mcollective/agent/rpcutil.json
@@ -5,7 +5,7 @@
     "description": "Utility actions that expose information about the state of the running Server",
     "author": "R.I.Pienaar <rip@devco.net>",
     "license": "Apache-2.0",
-    "version": "0.25.0",
+    "version": "0.26.2",
     "url": "https://choria.io/",
     "timeout": 2
   },
@@ -319,7 +319,7 @@
         "pong": {
           "description": "The local Unix timestamp",
           "display_as": "Timestamp",
-          "type": "string"
+          "type": "number"
         }
       },
       "display": "always",

diff --git a/files/mcollective/agent/scout.ddl b/files/mcollective/agent/scout.ddl
@@ -2,7 +2,7 @@ metadata :name        => "scout",
          :description => "Choria Scout Agent Management API",
          :author      => "R.I.Pienaar <rip@devco.net>",
          :license     => "Apache-2.0",
-         :version     => "0.25.0",
+         :version     => "0.26.2",
          :url         => "https://choria.io",
          :provider    => "golang",
          :timeout     => 5
@@ -87,7 +87,7 @@ action "goss_validate", :description => "Performs a Goss validation using a spec
         :type        => :string,
         :validation  => '.+',
         :maxlength   => 256,
-        :optional    => false
+        :optional    => true
 
 
   input :vars,
@@ -99,6 +99,24 @@ action "goss_validate", :description => "Performs a Goss validation using a spec
         :optional    => true
 
 
+  input :yaml_rules,
+        :prompt      => "Gossfile contents",
+        :description => "Contents of the Gossfile to validate",
+        :type        => :string,
+        :validation  => '.',
+        :maxlength   => 5120,
+        :optional    => true
+
+
+  input :yaml_vars,
+        :prompt      => "Variables YAML",
+        :description => "YAML data to use as variables",
+        :type        => :string,
+        :validation  => '.+',
+        :maxlength   => 5120,
+        :optional    => true
+
+
 
 
   output :failures,
@@ -116,9 +134,14 @@ action "goss_validate", :description => "Performs a Goss validation using a spec
          :type        => "integer",
          :display_as  => "Runtime"
 
+  output :skipped,
+         :description => "Indicates how many tests were skipped",
+         :type        => "integer",
+         :display_as  => "Skipped"
+
   output :success,
-         :description => "Indicates if the test passed",
-         :type        => "string",
+         :description => "Indicates how many tests passed",
+         :type        => "integer",
          :display_as  => "Success"
 
   output :summary,

diff --git a/files/mcollective/agent/scout.json b/files/mcollective/agent/scout.json
@@ -5,7 +5,7 @@
     "author": "R.I.Pienaar <rip@devco.net>",
     "timeout": 5,
     "name": "scout",
-    "version": "0.25.0",
+    "version": "0.26.2",
     "url": "https://choria.io",
     "description": "Choria Scout Agent Management API",
     "provider": "golang"
@@ -112,13 +112,21 @@
         }
       ],
       "input": {
+        "yaml_rules": {
+          "prompt": "Gossfile contents",
+          "description": "Contents of the Gossfile to validate",
+          "type": "string",
+          "maxlength": 5120,
+          "validation": ".",
+          "optional": true
+        },
         "file": {
           "prompt": "Goss File",
           "description": "Path to the Goss validation specification",
           "type": "string",
           "maxlength": 256,
           "validation": ".+",
-          "optional": false
+          "optional": true
         },
         "vars": {
           "prompt": "Vars File",
@@ -127,6 +135,14 @@
           "maxlength": 256,
           "validation": ".+",
           "optional": true
+        },
+        "yaml_vars": {
+          "prompt": "Variables YAML",
+          "description": "YAML data to use as variables",
+          "type": "string",
+          "maxlength": 5120,
+          "validation": ".+",
+          "optional": true
         }
       },
       "output": {
@@ -146,9 +162,14 @@
           "type": "integer"
         },
         "success": {
-          "description": "Indicates if the test passed",
+          "description": "Indicates how many tests passed",
           "display_as": "Success",
-          "type": "string"
+          "type": "integer"
+        },
+        "skipped": {
+          "description": "Indicates how many tests were skipped",
+          "display_as": "Skipped",
+          "type": "integer"
         },
         "summary": {
           "description": "A human friendly test result",

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "choria-mcollective_choria",
-  "version": "0.21.3",
+  "version": "0.21.4",
   "author": "R.I.Pienaar <rip@devco.net>",
   "summary": "Configuration of the Choria MCollective Compatibility Layer",
   "license": "Apache-2.0",