RubyGems - choria-mcorpc-support - Versions diffs - 2.23.3 → 2.24.4 - Mend

choria-mcorpc-support 2.23.3 → 2.24.4

Files changed (59) hide show

checksums.yaml +5 -5
data/lib/mcollective.rb +3 -3
data/lib/mcollective/agent/choria_provision.ddl +214 -0
data/lib/mcollective/agent/choria_provision.json +272 -0
data/lib/mcollective/agent/choria_util.ddl +226 -107
data/lib/mcollective/agent/choria_util.json +125 -25
data/lib/mcollective/agent/rpcutil.ddl +242 -183
data/lib/mcollective/agent/rpcutil.json +53 -57
data/lib/mcollective/agent/scout.ddl +1 -1
data/lib/mcollective/agent/scout.json +108 -136
data/lib/mcollective/application/find.rb +1 -1
data/lib/mcollective/application/plugin.rb +8 -173
data/lib/mcollective/client.rb +1 -1
data/lib/mcollective/config.rb +145 -103
data/lib/mcollective/ddl.rb +0 -1
data/lib/mcollective/discovery.rb +11 -63
data/lib/mcollective/discovery/broadcast.ddl +11 -0
data/lib/mcollective/discovery/choria.ddl +6 -4
data/lib/mcollective/discovery/delegate.ddl +13 -0
data/lib/mcollective/discovery/delegate.rb +72 -0
data/lib/mcollective/discovery/external.ddl +13 -0
data/lib/mcollective/discovery/file.ddl +13 -0
data/lib/mcollective/discovery/flatfile.ddl +7 -5
data/lib/mcollective/discovery/inventory.ddl +13 -0
data/lib/mcollective/discovery/mc.ddl +3 -3
data/lib/mcollective/log.rb +1 -2
data/lib/mcollective/optionparser.rb +1 -1
data/lib/mcollective/pluginpackager/forge_packager.rb +1 -1
data/lib/mcollective/rpc/client.rb +4 -2
data/lib/mcollective/util.rb +2 -4
data/lib/mcollective/util/choria.rb +14 -8
data/lib/mcollective/util/tasks_support.rb +15 -2
metadata +11 -29
data/lib/mcollective/data.rb +0 -96
data/lib/mcollective/data/agent_data.ddl +0 -22
data/lib/mcollective/data/agent_data.rb +0 -17
data/lib/mcollective/data/base.rb +0 -68
data/lib/mcollective/data/bolt_task_data.ddl +0 -90
data/lib/mcollective/data/bolt_task_data.rb +0 -32
data/lib/mcollective/data/collective_data.ddl +0 -20
data/lib/mcollective/data/collective_data.rb +0 -9
data/lib/mcollective/data/fact_data.ddl +0 -28
data/lib/mcollective/data/fact_data.rb +0 -55
data/lib/mcollective/data/fstat_data.ddl +0 -89
data/lib/mcollective/data/fstat_data.rb +0 -54
data/lib/mcollective/data/result.rb +0 -50
data/lib/mcollective/ddl/dataddl.rb +0 -56
data/lib/mcollective/discovery/choria.rb +0 -223
data/lib/mcollective/discovery/flatfile.rb +0 -47
data/lib/mcollective/discovery/stdin.ddl +0 -11
data/lib/mcollective/discovery/stdin.rb +0 -67
data/lib/mcollective/generators.rb +0 -7
data/lib/mcollective/generators/agent_generator.rb +0 -50
data/lib/mcollective/generators/base.rb +0 -45
data/lib/mcollective/generators/data_generator.rb +0 -50
data/lib/mcollective/generators/templates/action_snippet.erb +0 -13
data/lib/mcollective/generators/templates/data_input_snippet.erb +0 -7
data/lib/mcollective/generators/templates/ddl.erb +0 -8
data/lib/mcollective/generators/templates/plugin.erb +0 -7

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 73c63dbc1dacba7b90acdba3141cfedd3731da11
-  data.tar.gz: 42cfc48d721f69b6ec805e71624a8b8cff0fc141
+SHA256:
+  metadata.gz: 707a3ec934abb7197a7eaaf95377c01149aa481f8320ffcfd7d07891094e6373
+  data.tar.gz: 6bdc5f52c104d5a10a3f06e5de1194c0633f20a4458d2bbf5b10064b0f153808
 SHA512:
-  metadata.gz: 2f5370f390815f5881473b6c0e482db4f821f88ecb2616e33af9aa29a91e1561f1306b24945b1df2fe9d7ad05f8f770908298cb9279ae6dedb90658906654454
-  data.tar.gz: 250ca8bb59baccda7324a4f21f7db4f938c6fc06cdfe968f46263e0fe11ba55214d237dda44a5db0243500007a8ffec856e336880334d5e0df3d2e53903499a9
+  metadata.gz: 9bc9ea26a564281863c042abc4e1e652279c62833240d7281a17cdc04a9485efd54b932d578c29415bc829432a7848acece6ef6f82e8b935e65e26e5e75fc2b0
+  data.tar.gz: 8b0b97bc19f45c868b3052c20256cff43960f4b5804ec1fda4cff2f7e65fa427dd34495727ed5adaa01c6b8bc393ef823cec3d5edd14b450938f8c73ec142f32

data/lib/mcollective.rb CHANGED Viewed

@@ -15,6 +15,7 @@ require "mcollective/monkey_patches"
 require "mcollective/cache"
 require "mcollective/exceptions"
 require "systemu"
+require "open3"
 # == The Marionette Collective
 #
@@ -34,15 +35,14 @@ module MCollective
   require "mcollective/client"
   require "mcollective/config"
   require "mcollective/connector"
-  require "mcollective/data"
   require "mcollective/ddl"
   require "mcollective/discovery"
+  require "mcollective/discovery/delegate"
   require "mcollective/facts"
   require "mcollective/logger"
   require "mcollective/log"
   require "mcollective/message"
   require "mcollective/optionparser"
-  require "mcollective/generators"
   require "mcollective/pluginmanager"
   require "mcollective/pluginpackager"
   require "mcollective/rpc"
@@ -53,7 +53,7 @@ module MCollective
   require "mcollective/util"
   require "mcollective/validator"
-  VERSION = "2.23.3".freeze
+  VERSION = "2.24.1".freeze
   def self.version
     VERSION

data/lib/mcollective/agent/choria_provision.ddl ADDED Viewed

@@ -0,0 +1,214 @@
+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
+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"
+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"
+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"
+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"
+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 => ""
+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 ADDED Viewed

@@ -0,0 +1,272 @@
+{
+  "$schema": "https://choria.io/schemas/mcorpc/ddl/v1/agent.json",
+  "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
+  },
+  "actions": [
+    {
+      "action": "configure",
+      "input": {
+        "token": {
+          "prompt": "Token",
+          "description": "Authentication token to pass to the server",
+          "type": "string",
+          "default": "",
+          "optional": true,
+          "validation": ".",
+          "maxlength": 128
+        },
+        "config": {
+          "prompt": "Configuration",
+          "description": "The configuration to apply to this node",
+          "type": "string",
+          "default": null,
+          "optional": false,
+          "validation": "^{.+}$",
+          "maxlength": 2048
+        },
+        "certificate": {
+          "prompt": "Certificate",
+          "description": "PEM text block for the certificate",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": "^-----BEGIN CERTIFICATE-----",
+          "maxlength": 10240
+        },
+        "ca": {
+          "prompt": "CA Bundle",
+          "description": "PEM text block for the CA",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": "^-----BEGIN CERTIFICATE-----",
+          "maxlength": 10240
+        },
+        "ssldir": {
+          "prompt": "SSL Dir",
+          "description": "Directory for storing the certificate in",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": ".",
+          "maxlength": 500
+        }
+      },
+      "output": {
+        "message": {
+          "description": "Status message from the Provisioner",
+          "display_as": "Message",
+          "default": null
+        }
+      },
+      "display": "failed",
+      "description": "Configure the Choria Server"
+    },
+    {
+      "action": "gencsr",
+      "input": {
+        "token": {
+          "prompt": "Token",
+          "description": "Authentication token to pass to the server",
+          "type": "string",
+          "default": "",
+          "optional": true,
+          "validation": ".",
+          "maxlength": 128
+        },
+        "cn": {
+          "prompt": "Common Name",
+          "description": "The certificate Common Name to place in the CSR",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "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
+        },
+        "C": {
+          "prompt": "Country",
+          "description": "Country Code",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": "^[A-Z]{2}$",
+          "maxlength": 2
+        },
+        "L": {
+          "prompt": "Locality",
+          "description": "Locality or municipality (such as city or town name)",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": "^[\\w\\s-]+$",
+          "maxlength": 50
+        },
+        "O": {
+          "prompt": "Organization",
+          "description": "Organization",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": "^[\\w\\s-]+$",
+          "maxlength": 50
+        },
+        "OU": {
+          "prompt": "Organizational Unit",
+          "description": "Organizational Unit",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": "^[\\w\\s-]+$",
+          "maxlength": 50
+        },
+        "ST": {
+          "prompt": "State",
+          "description": "State",
+          "type": "string",
+          "default": null,
+          "optional": true,
+          "validation": "^[\\w\\s-]+$",
+          "maxlength": 50
+        }
+      },
+      "output": {
+        "csr": {
+          "description": "PEM text block for the CSR",
+          "display_as": "CSR",
+          "default": null
+        },
+        "ssldir": {
+          "description": "SSL directory as determined by the server",
+          "display_as": "SSL Dir",
+          "default": null
+        }
+      },
+      "display": "always",
+      "description": "Request a CSR from the Choria Server"
+    },
+    {
+      "action": "release_update",
+      "input": {
+        "token": {
+          "prompt": "Token",
+          "description": "Authentication token to pass to the server",
+          "type": "string",
+          "default": "",
+          "optional": true,
+          "validation": ".",
+          "maxlength": 128
+        },
+        "repository": {
+          "prompt": "Repository URL",
+          "description": "HTTP(S) server hosting the update repository",
+          "type": "string",
+          "default": "",
+          "optional": false,
+          "validation": "^http(s*)://",
+          "maxlength": 512
+        },
+        "version": {
+          "prompt": "Version to update to",
+          "description": "Package version to update to",
+          "type": "string",
+          "default": "",
+          "optional": false,
+          "validation": ".+",
+          "maxlength": 32
+        }
+      },
+      "output": {
+        "message": {
+          "description": "Status message from the Provisioner",
+          "display_as": "Message",
+          "default": null
+        }
+      },
+      "display": "always",
+      "description": "Performs an in-place binary update and restarts Choria"
+    },
+    {
+      "action": "jwt",
+      "input": {
+        "token": {
+          "prompt": "Token",
+          "description": "Authentication token to pass to the server",
+          "type": "string",
+          "default": "",
+          "optional": true,
+          "validation": ".",
+          "maxlength": 128
+        }
+      },
+      "output": {
+        "jwt": {
+          "description": "The contents of the JWT token",
+          "display_as": "JWT Token",
+          "default": ""
+        }
+      },
+      "display": "always",
+      "description": "Reenable provision mode in a running Choria Server"
+    },
+    {
+      "action": "reprovision",
+      "input": {
+        "token": {
+          "prompt": "Token",
+          "description": "Authentication token to pass to the server",
+          "type": "string",
+          "default": "",
+          "optional": true,
+          "validation": ".",
+          "maxlength": 128
+        }
+      },
+      "output": {
+        "message": {
+          "description": "Status message from the Provisioner",
+          "display_as": "Message",
+          "default": null
+        }
+      },
+      "display": "always",
+      "description": "Reenable provision mode in a running Choria Server"
+    },
+    {
+      "action": "restart",
+      "input": {
+        "token": {
+          "prompt": "Token",
+          "description": "Authentication token to pass to the server",
+          "type": "string",
+          "default": "",
+          "optional": true,
+          "validation": ".",
+          "maxlength": 128
+        },
+        "splay": {
+          "prompt": "Splay time",
+          "description": "The configuration to apply to this node",
+          "type": "number",
+          "default": null,
+          "optional": true
+        }
+      },
+      "output": {
+        "message": {
+          "description": "Status message from the Provisioner",
+          "display_as": "Message",
+          "default": null
+        }
+      },
+      "display": "failed",
+      "description": "Restart the Choria Server"
+    }
+  ]
+}