choria-mcorpc-support 2.24.4 → 2.25.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 707a3ec934abb7197a7eaaf95377c01149aa481f8320ffcfd7d07891094e6373
-  data.tar.gz: 6bdc5f52c104d5a10a3f06e5de1194c0633f20a4458d2bbf5b10064b0f153808
+  metadata.gz: 6ea0c40e0fddf65e2507b695f3bfe70a21252ebc43747f03e549d2741c4eda04
+  data.tar.gz: 0305377ba6a38d5a213cc46ac7e5b09dc82829d6e32cab8e77f7f7da75225bb4
 SHA512:
-  metadata.gz: 9bc9ea26a564281863c042abc4e1e652279c62833240d7281a17cdc04a9485efd54b932d578c29415bc829432a7848acece6ef6f82e8b935e65e26e5e75fc2b0
-  data.tar.gz: 8b0b97bc19f45c868b3052c20256cff43960f4b5804ec1fda4cff2f7e65fa427dd34495727ed5adaa01c6b8bc393ef823cec3d5edd14b450938f8c73ec142f32
+  metadata.gz: 974f141cd420b640f96fa3aeac2c6fc4148ddb31dfd226f2f9c02c9f0ba3aa97f2094cac9dd1e87bf40eb169c9d3d4114e570f3485eac0a58f2faa54eb84b060
+  data.tar.gz: 073e8a67eaa6b53d8650128c550327b6b34b7003f74b7958d959515ab7ce6511f8870d5463d72b1474ffc80ece4ccb449d23b0f34da7ada182ac01ba5cb4d2fc

data/lib/mcollective/agent/aaa_signer.ddl

@@ -0,0 +1,41 @@
+metadata :name        => "aaa_signer",
+         :description => "Request Signer for Choria AAA Service",
+         :author      => "R.I.Pienaar <rip@devco.net>",
+         :license     => "Apache-2.0",
+         :version     => "0.24.0",
+         :url         => "https://github.com/choria-io/aaasvc",
+         :provider    => "golang",
+         :service     => true,
+         :timeout     => 10
+
+
+action "sign", :description => "Signs a RPC Request on behalf of a user" do
+  display :always
+
+  input :request,
+        :prompt      => "RPC Request",
+        :description => "The request to sign",
+        :type        => :string,
+        :validation  => :shellsafe,
+        :maxlength   => 100240,
+        :optional    => false
+
+
+  input :token,
+        :prompt      => "JWT Token",
+        :description => "The JWT token authenticating the user",
+        :type        => :string,
+        :validation  => '.',
+        :maxlength   => 10024,
+        :optional    => false
+
+
+
+
+  output :secure_request,
+         :description => "The signed Secure Request",
+         :type        => "string",
+         :display_as  => "Secure Request"
+
+end
+

data/lib/mcollective/agent/aaa_signer.json

@@ -0,0 +1,46 @@
+{
+  "$schema": "https://choria.io/schemas/mcorpc/ddl/v1/agent.json",
+  "metadata": {
+    "license": "Apache-2.0",
+    "author": "R.I.Pienaar \u003crip@devco.net\u003e",
+    "timeout": 10,
+    "name": "aaa_signer",
+    "version": "0.24.0",
+    "url": "https://github.com/choria-io/aaasvc",
+    "description": "Request Signer for Choria AAA Service",
+    "provider": "golang",
+    "service": true
+  },
+  "actions": [
+    {
+      "action": "sign",
+      "input": {
+        "request": {
+          "prompt": "RPC Request",
+          "description": "The request to sign",
+          "type": "string",
+          "optional": false,
+          "validation": "shellsafe",
+          "maxlength": 100240
+        },
+        "token": {
+          "prompt": "JWT Token",
+          "description": "The JWT token authenticating the user",
+          "type": "string",
+          "optional": false,
+          "validation": ".",
+          "maxlength": 10024
+        }
+      },
+      "output": {
+        "secure_request": {
+          "description": "The signed Secure Request",
+          "display_as": "Secure Request",
+          "type": "string"
+        }
+      },
+      "display": "always",
+      "description": "Signs a RPC Request on behalf of a user"
+    }
+  ]
+}

data/lib/mcollective/agent/choria_provision.ddl

@@ -1,214 +1,297 @@
-metadata :name => "choria_provision",
+metadata :name        => "choria_provision",
          :description => "Choria Provisioner",
-         :author => "R.I.Pienaar <rip@devco.net>",
-         :license => "Apache-2.0",
-         :version => "0.22.0",
-         :url => "https://choria.io",
-         :timeout => 20
+         :author      => "R.I.Pienaar <rip@devco.net>",
+         :license     => "Apache-2.0",
+         :version     => "0.24.0",
+         :url         => "https://choria.io",
+         :timeout     => 20
+
+
+action "configure", :description => "Configure the Choria Server" do
+  display :failed
+
+  input :action_policies,
+        :prompt      => "Action Policy Documents",
+        :description => "Map of Action Policy documents indexed by file name",
+        :type        => :hash,
+        :optional    => true
+
+
+  input :ca,
+        :prompt      => "CA Bundle",
+        :description => "PEM text block for the CA",
+        :type        => :string,
+        :validation  => '^-----BEGIN CERTIFICATE-----',
+        :maxlength   => 20480,
+        :optional    => true
+
+
+  input :certificate,
+        :prompt      => "Certificate",
+        :description => "PEM text block for the certificate",
+        :type        => :string,
+        :validation  => '^-----BEGIN CERTIFICATE-----',
+        :maxlength   => 10240,
+        :optional    => true
+
+
+  input :config,
+        :prompt      => "Configuration",
+        :description => "The configuration to apply to this node",
+        :type        => :string,
+        :validation  => '^{.+}$',
+        :maxlength   => 2048,
+        :optional    => false
+
+
+  input :ecdh_public,
+        :prompt      => "ECDH Public Key",
+        :description => "Required when sending a private key",
+        :type        => :string,
+        :validation  => '.',
+        :maxlength   => 64,
+        :optional    => true
+
+
+  input :key,
+        :prompt      => "PEM text block for the private key",
+        :description => "",
+        :type        => :string,
+        :validation  => '-----BEGIN RSA PRIVATE KEY-----',
+        :maxlength   => 10240,
+        :optional    => true
+
+
+  input :opa_policies,
+        :prompt      => "Open Policy Agent Policy Documents",
+        :description => "Map of Open Policy Agent Policy documents indexed by file name",
+        :type        => :hash,
+        :optional    => true
+
+
+  input :ssldir,
+        :prompt      => "SSL Dir",
+        :description => "Directory for storing the certificate in",
+        :type        => :string,
+        :validation  => '.',
+        :maxlength   => 500,
+        :optional    => true
+
+
+  input :token,
+        :prompt      => "Token",
+        :description => "Authentication token to pass to the server",
+        :type        => :string,
+        :validation  => '.',
+        :maxlength   => 128,
+        :optional    => true
+
+
+
+
+  output :message,
+         :description => "Status message from the Provisioner",
+         :type        => "string",
+         :display_as  => "Message"
+
+end
 
 action "gencsr", :description => "Request a CSR from the Choria Server" do
-    display :always
-
-    input :token,
-          :prompt  => "Token",
-          :description => "Authentication token to pass to the server",
-          :type => :string,
-          :validation => ".",
-          :optional => true,
-          :default => "",
-          :maxlength => 128
-
-    input :cn,
-          :prompt => "Common Name",
-          :description => "The certificate Common Name to place in the CSR",
-          :type => :string,
-          :validation => "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$",
-          :optional => true,
-          :maxlength => 80
-
-    input :C,
-          :prompt => "Country",
-          :description => "Country Code",
-          :type => :string,
-          :validation => "^[A-Z]{2}$",
-          :optional => true,
-          :maxlength => 2
-
-    input :L,
-          :prompt => "Locality",
-          :description => "Locality or municipality (such as city or town name)",
-          :type => :string,
-          :validation => "^[\\w\\s-]+$",
-          :optional => true,
-          :maxlength => 50
-
-    input :O,
-          :prompt => "Organization",
-          :description => "Organization",
-          :type => :string,
-          :validation => "^[\\w\\s-]+$",
-          :optional => true,
-          :maxlength => 50
-
-    input :OU,
-          :prompt => "Organizational Unit",
-          :description => "Organizational Unit",
-          :type => :string,
-          :validation => "^[\\w\\s-]+$",
-          :optional => true,
-          :maxlength => 50
-
-    input :ST,
-          :prompt => "State",
-          :description => "State",
-          :type => :string,
-          :validation => "^[\\w\\s-]+$",
-          :optional => true,
-          :maxlength => 50
-
-    output :csr,
-           :description => "PEM text block for the CSR",
-           :display_as => "CSR"
-
-    output :ssldir,
-           :description => "SSL directory as determined by the server",
-           :display_as => "SSL Dir"
+  display :always
+
+  input :C,
+        :prompt      => "Country",
+        :description => "Country Code",
+        :type        => :string,
+        :validation  => '^[A-Z]{2}$',
+        :maxlength   => 2,
+        :optional    => true
+
+
+  input :L,
+        :prompt      => "Locality",
+        :description => "Locality or municipality (such as city or town name)",
+        :type        => :string,
+        :validation  => '^[\w\s-]+$',
+        :maxlength   => 50,
+        :optional    => true
+
+
+  input :O,
+        :prompt      => "Organization",
+        :description => "Organization",
+        :type        => :string,
+        :validation  => '^[\w\s-]+$',
+        :maxlength   => 50,
+        :optional    => true
+
+
+  input :OU,
+        :prompt      => "Organizational Unit",
+        :description => "Organizational Unit",
+        :type        => :string,
+        :validation  => '^[\w\s-]+$',
+        :maxlength   => 50,
+        :optional    => true
+
+
+  input :ST,
+        :prompt      => "State",
+        :description => "State",
+        :type        => :string,
+        :validation  => '^[\w\s-]+$',
+        :maxlength   => 50,
+        :optional    => true
+
+
+  input :cn,
+        :prompt      => "Common Name",
+        :description => "The certificate Common Name to place in the CSR",
+        :type        => :string,
+        :validation  => '^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]).)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$',
+        :maxlength   => 80,
+        :optional    => true
+
+
+  input :token,
+        :prompt      => "Token",
+        :description => "Authentication token to pass to the server",
+        :type        => :string,
+        :validation  => '.',
+        :maxlength   => 128,
+        :optional    => true
+
+
+
+
+  output :csr,
+         :description => "PEM text block for the CSR",
+         :type        => "string",
+         :display_as  => "CSR"
+
+  output :public_key,
+         :description => "PEM text block of the public key that made the CSR",
+         :type        => "string",
+         :display_as  => "Public Key"
+
+  output :ssldir,
+         :description => "SSL directory as determined by the server",
+         :type        => "string",
+         :display_as  => "SSL Dir"
+
 end
 
-action "configure", :description => "Configure the Choria Server" do
-    input :token,
-          :prompt  => "Token",
-          :description => "Authentication token to pass to the server",
-          :type => :string,
-          :validation => ".",
-          :optional => true,
-          :default => "",
-          :maxlength => 128
-
-    input :config,
-          :prompt  => "Configuration",
-          :description => "The configuration to apply to this node",
-          :type => :string,
-          :validation => "^{.+}$",
-          :optional => false,
-          :maxlength => 2048
-
-    input :certificate,
-          :prompt  => "Certificate",
-          :description => "PEM text block for the certificate",
-          :type => :string,
-          :validation => "^-----BEGIN CERTIFICATE-----",
-          :optional => true,
-          :maxlength => 10240
-
-    input :ca,
-          :prompt  => "CA Bundle",
-          :description => "PEM text block for the CA",
-          :type => :string,
-          :validation => "^-----BEGIN CERTIFICATE-----",
-          :optional => true,
-          :maxlength => 10240
-
-    input :ssldir,
-          :prompt  => "SSL Dir",
-          :description => "Directory for storing the certificate in",
-          :type => :string,
-          :validation => ".",
-          :optional => true,
-          :maxlength => 500
-
-    output :message,
-           :description => "Status message from the Provisioner",
-           :display_as => "Message"
+action "release_update", :description => "Performs an in-place binary update and restarts Choria" do
+  display :always
+
+  input :repository,
+        :prompt      => "Repository URL",
+        :description => "HTTP(S) server hosting the update repository",
+        :type        => :string,
+        :validation  => '^http(s*)://',
+        :maxlength   => 512,
+        :optional    => false
+
+
+  input :token,
+        :prompt      => "Token",
+        :description => "Authentication token to pass to the server",
+        :type        => :string,
+        :validation  => '.',
+        :maxlength   => 128,
+        :optional    => true
+
+
+  input :version,
+        :prompt      => "Version to update to",
+        :description => "Package version to update to",
+        :type        => :string,
+        :validation  => '.+',
+        :maxlength   => 32,
+        :optional    => false
+
+
+
+
+  output :message,
+         :description => "Status message from the Provisioner",
+         :type        => "string",
+         :display_as  => "Message"
+
 end
 
-action "restart", :description => "Restart the Choria Server" do
-    input :token,
-          :prompt  => "Token",
-          :description => "Authentication token to pass to the server",
-          :type => :string,
-          :validation => ".",
-          :optional => true,
-          :default => "",
-          :maxlength => 128
-
-    input :splay,
-          :prompt  => "Splay time",
-          :description => "The configuration to apply to this node",
-          :type => :number,
-          :optional => true
-
-    output :message,
-           :description => "Status message from the Provisioner",
-           :display_as => "Message"
+action "jwt", :description => "Re-enable provision mode in a running Choria Server" do
+  display :always
+
+  input :token,
+        :prompt      => "Token",
+        :description => "Authentication token to pass to the server",
+        :type        => :string,
+        :validation  => '.',
+        :maxlength   => 128,
+        :optional    => true
+
+
+
+
+  output :ecdh_public,
+         :description => "The ECDH public key for calculating shared secrets",
+         :type        => "string",
+         :display_as  => "ECDH Public Key"
+
+  output :jwt,
+         :description => "The contents of the JWT token",
+         :type        => "string",
+         :display_as  => "JWT Token"
+
 end
 
 action "reprovision", :description => "Reenable provision mode in a running Choria Server" do
-    display :always
-
-    input :token,
-          :prompt  => "Token",
-          :description => "Authentication token to pass to the server",
-          :type => :string,
-          :validation => ".",
-          :optional => true,
-          :default => "",
-          :maxlength => 128
-
-    output :message,
-           :description => "Status message from the Provisioner",
-           :display_as => "Message"
+  display :always
+
+  input :token,
+        :prompt      => "Token",
+        :description => "Authentication token to pass to the server",
+        :type        => :string,
+        :validation  => '.',
+        :maxlength   => 128,
+        :optional    => true
+
+
+
+
+  output :message,
+         :description => "Status message from the Provisioner",
+         :type        => "string",
+         :display_as  => "Message"
+
 end
 
-action "jwt", :description => "Retrieves the Provisioning JWT token if set" do
-      display :always
-
-      input :token,
-            :prompt  => "Token",
-            :description => "Authentication token to pass to the server",
-            :type => :string,
-            :validation => ".",
-            :optional => true,
-            :default => "",
-            :maxlength => 128
-
-      output :jwt,
-             :description => "The contents of the JWT token",
-             :display_as => "JWT Token",
-             :default => ""
+action "restart", :description => "Restart the Choria Server" do
+  display :failed
+
+  input :splay,
+        :prompt      => "Splay time",
+        :description => "The configuration to apply to this node",
+        :type        => :number,
+        :optional    => true
+
+
+  input :token,
+        :prompt      => "Token",
+        :description => "Authentication token to pass to the server",
+        :type        => :string,
+        :validation  => '.',
+        :maxlength   => 128,
+        :optional    => true
+
+
+
+
+  output :message,
+         :description => "Status message from the Provisioner",
+         :type        => "string",
+         :display_as  => "Message"
+
 end
 
-action "release_update", :description => "Performs an in-place binary update and restarts Choria" do
-      display :always
-
-      input :token,
-            :prompt  => "Token",
-            :description => "Authentication token to pass to the server",
-            :type => :string,
-            :validation => ".",
-            :optional => true,
-            :default => "",
-            :maxlength => 128
-
-      input :repository,
-            :prompt => "Repository URL",
-            :description => "HTTP(S) server hosting the update repository",
-            :type => :string,
-            :validation => "^http(s*):\/\/",
-            :optional => false,
-            :default => "",
-            :maxlength => "512"
-
-      input :version,
-            :prompt => "Version to update to",
-            :description => "Package version to update to",
-            :type => :string,
-            :validation => ".+",
-            :optional => false,
-            :default => "",
-            :maxlength => "32"
-
-      output :message,
-             :description => "Status message from the Provisioner",
-             :display_as => "Message"
-  end

data/lib/mcollective/agent/choria_provision.json

@@ -5,7 +5,7 @@
     "description": "Choria Provisioner",
     "author": "R.I.Pienaar <rip@devco.net>",
     "license": "Apache-2.0",
-    "version": "0.22.0",
+    "version": "0.24.0",
     "url": "https://choria.io",
     "timeout": 20
   },
@@ -47,7 +47,7 @@
           "default": null,
           "optional": true,
           "validation": "^-----BEGIN CERTIFICATE-----",
-          "maxlength": 10240
+          "maxlength": 20480
         },
         "ssldir": {
           "prompt": "SSL Dir",
@@ -57,12 +57,45 @@
           "optional": true,
           "validation": ".",
           "maxlength": 500
+        },
+        "key": {
+          "prompt": "PEM text block for the private key",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": "-----BEGIN RSA PRIVATE KEY-----",
+          "maxlength": 10240
+        },
+        "ecdh_public": {
+          "prompt":  "ECDH Public Key",
+          "description": "Required when sending a private key",
+          "type": "string",
+          "default": "",
+          "optional": true,
+          "maxlength": 64,
+          "validation": "."
+        },
+        "action_policies": {
+          "prompt": "Action Policy Documents",
+          "description": "Map of Action Policy documents indexed by file name",
+          "type": "hash",
+          "default": {},
+          "optional": true
+        },
+        "opa_policies": {
+          "prompt": "Open Policy Agent Policy Documents",
+          "description": "Map of Open Policy Agent Policy documents indexed by file name",
+          "type": "hash",
+          "default": {},
+          "optional": true
         }
+
       },
       "output": {
         "message": {
           "description": "Status message from the Provisioner",
           "display_as": "Message",
+          "type": "string",
           "default": null
         }
       },
@@ -140,11 +173,19 @@
         "csr": {
           "description": "PEM text block for the CSR",
           "display_as": "CSR",
+          "type": "string",
+          "default": null
+        },
+        "public_key": {
+          "description": "PEM text block of the public key that made the CSR",
+          "display_as": "Public Key",
+          "type": "string",
           "default": null
         },
         "ssldir": {
           "description": "SSL directory as determined by the server",
           "display_as": "SSL Dir",
+          "type": "string",
           "default": null
         }
       },
@@ -186,6 +227,7 @@
         "message": {
           "description": "Status message from the Provisioner",
           "display_as": "Message",
+          "type": "string",
           "default": null
         }
       },
@@ -209,11 +251,18 @@
         "jwt": {
           "description": "The contents of the JWT token",
           "display_as": "JWT Token",
+          "type": "string",
+          "default": ""
+        },
+        "ecdh_public": {
+          "description": "The ECDH public key for calculating shared secrets",
+          "display_as": "ECDH Public Key",
+          "type": "string",
           "default": ""
         }
       },
       "display": "always",
-      "description": "Reenable provision mode in a running Choria Server"
+      "description": "Re-enable provision mode in a running Choria Server"
     },
     {
       "action": "reprovision",
@@ -232,6 +281,7 @@
         "message": {
           "description": "Status message from the Provisioner",
           "display_as": "Message",
+          "type": "string",
           "default": null
         }
       },
@@ -262,6 +312,7 @@
         "message": {
           "description": "Status message from the Provisioner",
           "display_as": "Message",
+          "type": "string",
           "default": null
         }
       },

data/lib/mcollective/agent/choria_registry.ddl

@@ -0,0 +1,65 @@
+metadata :name        => "choria_registry",
+         :description => "Choria Registry Service",
+         :author      => "rip@devco.net <rip@devco.net>",
+         :license     => "Apache-2.0",
+         :version     => "0.24.0",
+         :url         => "https://choria.io",
+         :provider    => "golang",
+         :service     => true,
+         :timeout     => 2
+
+
+action "ddl", :description => "Retrieve the DDL for a specific plugin" do
+  display :always
+
+  input :format,
+        :prompt      => "Plugin Format",
+        :description => "The result format the plugin should be retrieved in",
+        :type        => :list,
+        :default     => "json",
+        :list        => ["ddl", "json"],
+        :optional    => true
+
+
+  input :name,
+        :prompt      => "Plugin Name",
+        :description => "The name of the plugin",
+        :type        => :string,
+        :validation  => :shellsafe,
+        :maxlength   => 64,
+        :optional    => false
+
+
+  input :plugin_type,
+        :prompt      => "Plugin Type",
+        :description => "The type of plugin",
+        :type        => :list,
+        :default     => "agent",
+        :list        => ["agent"],
+        :optional    => false
+
+
+
+
+  output :ddl,
+         :description => "The plugin DDL in the requested format",
+         :type        => "string",
+         :display_as  => "DDL"
+
+  output :name,
+         :description => "The name of the plugin",
+         :type        => "string",
+         :display_as  => "Name"
+
+  output :plugin_type,
+         :description => "The type of plugin",
+         :type        => "string",
+         :display_as  => "Type"
+
+  output :version,
+         :description => "The version of the plugin",
+         :type        => "string",
+         :display_as  => "Version"
+
+end
+

data/lib/mcollective/agent/choria_registry.json

@@ -0,0 +1,74 @@
+{
+  "$schema": "https://choria.io/schemas/mcorpc/ddl/v1/agent.json",
+  "metadata": {
+    "license": "Apache-2.0",
+    "author": "rip@devco.net \u003crip@devco.net\u003e",
+    "timeout": 2,
+    "name": "choria_registry",
+    "version": "0.24.0",
+    "url": "https://choria.io",
+    "description": "Choria Registry Service",
+    "provider": "golang",
+    "service": true
+  },
+  "actions": [
+    {
+      "action": "ddl",
+      "input": {
+        "format": {
+          "prompt": "Plugin Format",
+          "description": "The result format the plugin should be retrieved in",
+          "type": "list",
+          "default": "json",
+          "optional": true,
+          "list": [
+            "ddl",
+            "json"
+          ]
+        },
+        "name": {
+          "prompt": "Plugin Name",
+          "description": "The name of the plugin",
+          "type": "string",
+          "optional": false,
+          "validation": "shellsafe",
+          "maxlength": 64
+        },
+        "plugin_type": {
+          "prompt": "Plugin Type",
+          "description": "The type of plugin",
+          "type": "list",
+          "default": "agent",
+          "optional": false,
+          "list": [
+            "agent"
+          ]
+        }
+      },
+      "output": {
+        "ddl": {
+          "description": "The plugin DDL in the requested format",
+          "display_as": "DDL",
+          "type": "string"
+        },
+        "name": {
+          "description": "The name of the plugin",
+          "display_as": "Name",
+          "type": "string"
+        },
+        "plugin_type": {
+          "description": "The type of plugin",
+          "display_as": "Type",
+          "type": "string"
+        },
+        "version": {
+          "description": "The version of the plugin",
+          "display_as": "Version",
+          "type": "string"
+        }
+      },
+      "display": "always",
+      "description": "Retrieve the DDL for a specific plugin"
+    }
+  ]
+}

data/lib/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.22.0",
+         :version     => "0.24.0",
          :url         => "https://choria.io",
          :timeout     => 2
 

data/lib/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.22.0",
+    "version": "0.24.0",
     "url": "https://choria.io",
     "timeout": 2
   },

data/lib/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.22.0",
+         :version     => "0.24.0",
          :url         => "https://choria.io/",
          :timeout     => 2
 

data/lib/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.22.0",
+    "version": "0.24.0",
     "url": "https://choria.io/",
     "timeout": 2
   },

data/lib/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.22.0",
+         :version     => "0.24.0",
          :url         => "https://choria.io",
          :provider    => "golang",
          :timeout     => 5
@@ -132,9 +132,9 @@ action "goss_validate", :description => "Performs a Goss validation using a spec
          :display_as  => "Tests"
 
   summarize do
-    aggregate summary(:tests, :format => "%s Test Cases on %d node(s)")
-    aggregate summary(:failures, :format => "%s Failed Cases on %d node(s)")
-    aggregate summary(:success, :format => "%s Passed Cases on %d node(s)")
+    aggregate summary(:tests, :format => "%s Tests on %d node(s)")
+    aggregate summary(:failures, :format => "%s Failed test on %d node(s)")
+    aggregate summary(:success, :format => "%s Passed tests on %d node(s)")
   end
 end
 

data/lib/mcollective/agent/scout.json

@@ -5,7 +5,7 @@
     "author": "R.I.Pienaar <rip@devco.net>",
     "timeout": 5,
     "name": "scout",
-    "version": "0.22.0",
+    "version": "0.24.0",
     "url": "https://choria.io",
     "description": "Choria Scout Agent Management API",
     "provider": "golang"

data/lib/mcollective/discovery/delegate.rb

@@ -10,6 +10,9 @@ module MCollective
 
         cmd = [binary_name, "discover", "-j", "--silent"]
 
+        config = client.options.fetch(:config)
+        cmd << "--config" << config if config
+
         cmd << "-T" << filter["collective"] if filter["collective"]
 
         filter.fetch("identity", []).each do |i|
@@ -53,10 +56,12 @@ module MCollective
 
           begin
             Timeout.timeout(timeout + 0.5) do
-              nodes.concat(JSON.parse(stdout.read))
+              out = stdout.read
               status = wait_thr.value
 
               raise("Choria discovery failed: %s" % stderr.read) unless status.exitstatus == 0
+
+              nodes.concat(JSON.parse(out))
             end
           rescue Timeout::Error
             Log.warn("Timeout waiting for Choria to perform discovery")

data/lib/mcollective/rpc/client.rb

@@ -847,6 +847,7 @@ module MCollective
             message.requestid = @stats.requestid
 
             message.discovered_hosts = hosts.clone.compact
+            message.type = :direct_request
 
             @client.req(message) do |resp|
               respcount += 1

data/lib/mcollective/util/tasks_support.rb

@@ -65,7 +65,7 @@ module MCollective
       # AIO path to binaries like wrappers etc
       def aio_bin_path
         if Util.windows?
-          'C:\Program Files\Puppet Labs\Puppet\bin'
+          'C:\Program Files\Puppet Labs\Puppet\puppet\bin'
         else
           "/opt/puppetlabs/puppet/bin"
         end
@@ -88,6 +88,13 @@ module MCollective
         end
       end
 
+      # Is this an AIO install?
+      #
+      # @return [Boolean]
+      def aio?
+        File.directory?(aio_bin_path)
+      end
+
       # Path to the task wrapper executable
       #
       # @return [String]
@@ -179,6 +186,8 @@ module MCollective
           "_choria_task_caller" => task_caller
         }
 
+        environment["PATH"] = "#{aio_bin_path}#{File::PATH_SEPARATOR}#{ENV['PATH']}" if aio?
+
         return environment unless task["input"]
         return environment unless ["both", "environment"].include?(task_input_method(task))
 
@@ -250,7 +259,7 @@ module MCollective
       # act on these tasks either by asking for their status or perhaps killing
       # them?
       #
-      # @param command [Array<String>] command to run
+      # @param command [String] command to run
       # @param environment [Hash] environment to run with
       # @param stdin [String] stdin to send to the command
       # @param spooldir [String] path to the spool for this specific request
@@ -291,7 +300,7 @@ module MCollective
             Process.exec(environment, command, options)
           end
         else
-          pid = Process.spawn(environment, command, options)
+          pid = Process.spawn(environment, [command, command], options)
         end
 
         sleep 0.1 until File.exist?(wrapper_stdout)

data/lib/mcollective/validator/typecheck_validator.rb

@@ -12,7 +12,7 @@ module MCollective
         when :integer
           validator.is_a?(Integer)
         when :float
-          validator.is_a?(Float)
+          validator.is_a?(Float) || validator.is_a?(Integer)
         when :number
           validator.is_a?(Numeric)
         when :string

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: choria-mcorpc-support
 version: !ruby/object:Gem::Version
-  version: 2.24.4
+  version: 2.25.3
 platform: ruby
 authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-19 00:00:00.000000000 Z
+date: 2021-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -37,6 +37,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,6 +47,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 description: Libraries enabling Ruby support for the Choria Orchestration Server
 email: rip@devco.net
 executables:
@@ -54,11 +60,15 @@ files:
 - bin/mco
 - lib/mcollective.rb
 - lib/mcollective/agent.rb
+- lib/mcollective/agent/aaa_signer.ddl
+- lib/mcollective/agent/aaa_signer.json
 - lib/mcollective/agent/bolt_tasks.ddl
 - lib/mcollective/agent/bolt_tasks.json
 - lib/mcollective/agent/bolt_tasks.rb
 - lib/mcollective/agent/choria_provision.ddl
 - lib/mcollective/agent/choria_provision.json
+- lib/mcollective/agent/choria_registry.ddl
+- lib/mcollective/agent/choria_registry.json
 - lib/mcollective/agent/choria_util.ddl
 - lib/mcollective/agent/choria_util.json
 - lib/mcollective/agent/rpcutil.ddl