choria-mcorpc-support 2.25.0 → 2.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 872d9ec79ab2ad9236e7d7d353dc57914b5b1f35bf9089c6cea13aa9580feb77
-  data.tar.gz: c2f616aee7f58388f69b7db4d0780ec287e1d57f95777597f0dc621b0cc6b6f6
+  metadata.gz: 434e6312294b09fba1fea87dd7c271492d89c29e68682577ae5c4b1ae0c2b701
+  data.tar.gz: 2a1bb5d6fe59ebcddf47f53a1405166bacc290619b75ce4136b81b5038d709e6
 SHA512:
-  metadata.gz: 30b8face825e23b87c694600d70a44f92ddd03ef9d8e62935e703d2ba7f62ce328b6a61352fff94214d9abf5944c2f6d09098de0751f6f6060d2c76f2ed7f208
-  data.tar.gz: 61ca3c642f3a6eae367d72572314c99183c983dab65560ba17056f967955b56518369415fad370916391e7c29c0d879a4fb0281900ba068b94d578d604b29af8
+  metadata.gz: 1d23e06c2ff49f69808a416d3d3b44b80b717cb16d6c3895a95d46299e5eb76eadff29ba6c3e68a317e2ef6c60216f34c0880a35509340c4b8047d54264310eb
+  data.tar.gz: 64abef1eddb1550c34a37f44d6bb77c51d048d6e98e6f6ba7489e30500f464cf9f6f4bde954eabfdc484e1106df0e34a335c627b624b77b9fb42b4730384f7bb

data/lib/mcollective/agent/choria_provision.ddl

@@ -1,214 +1,283 @@
-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.23.0",
+         :url         => "https://choria.io",
+         :timeout     => 20
+
+
+action "configure", :description => "Configure the Choria Server" do
+  display :failed
+
+  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 :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.23.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,31 @@
           "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": "."
         }
+
       },
       "output": {
         "message": {
           "description": "Status message from the Provisioner",
           "display_as": "Message",
+          "type": "string",
           "default": null
         }
       },
@@ -140,11 +159,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 +213,7 @@
         "message": {
           "description": "Status message from the Provisioner",
           "display_as": "Message",
+          "type": "string",
           "default": null
         }
       },
@@ -209,11 +237,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 +267,7 @@
         "message": {
           "description": "Status message from the Provisioner",
           "display_as": "Message",
+          "type": "string",
           "default": null
         }
       },
@@ -262,6 +298,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.23.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.23.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.23.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.23.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.23.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.23.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.23.0",
          :url         => "https://choria.io",
          :provider    => "golang",
          :timeout     => 5

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.23.0",
     "url": "https://choria.io",
     "description": "Choria Scout Agent Management API",
     "provider": "golang"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: choria-mcorpc-support
 version: !ruby/object:Gem::Version
-  version: 2.25.0
+  version: 2.25.1
 platform: ruby
 authors:
 - R.I.Pienaar
@@ -65,6 +65,8 @@ files:
 - 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