choria-mcorpc-support 2.24.3 → 2.25.2

data/lib/mcollective/agent/rpcutil.json

@@ -2,10 +2,10 @@
   "$schema": "https://choria.io/schemas/mcorpc/ddl/v1/agent.json",
   "metadata": {
     "name": "rpcutil",
-    "description": "General helpful actions that expose stats and internals to SimpleRPC clients",
+    "description": "Utility actions that expose information about the state of the running Server",
     "author": "R.I.Pienaar <rip@devco.net>",
-    "license": "Apache License, Version 2.0",
-    "version": "0.19.0",
+    "license": "Apache-2.0",
+    "version": "0.24.0",
     "url": "https://choria.io/",
     "timeout": 2
   },
@@ -18,11 +18,11 @@
         "agents": {
           "description": "List of agents on the server",
           "display_as": "Agents",
-          "default": null
+          "type": "array"
         }
       },
       "display": "always",
-      "description": "Inventory of all agents on the server"
+      "description": "Inventory of all agents on the server including versions, licenses and more"
     },
     {
       "action": "collective_info",
@@ -32,16 +32,16 @@
         "main_collective": {
           "description": "The main Collective",
           "display_as": "Main Collective",
-          "default": null
+          "type": "string"
         },
         "collectives": {
           "description": "All Collectives",
           "display_as": "All Collectives",
-          "default": null
+          "type": "array"
         }
       },
       "display": "always",
-      "description": "Info about the main and sub collectives",
+      "description": "Info about the main and sub collectives that the server belongs to",
       "aggregate": [
         {
           "function": "summary",
@@ -57,74 +57,74 @@
       },
       "output": {
         "threads": {
-          "description": "List of threads active in the daemon",
+          "description": "List of threads active in the Choria Server",
           "display_as": "Threads",
-          "default": null
+          "type": "array"
         },
         "agents": {
           "description": "List of agents loaded",
           "display_as": "Agents",
-          "default": null
+          "type": "array"
         },
         "pid": {
-          "description": "Process ID of the daemon",
+          "description": "Process ID of the Choria Server",
           "display_as": "PID",
-          "default": null
+          "type": "integer"
         },
         "times": {
-          "description": "Processor time consumed by the daemon",
+          "description": "Processor time consumed by the Choria Server",
           "display_as": "Times",
-          "default": null
+          "type": "hash"
         },
         "validated": {
-          "description": "Messages that passed security validation",
+          "description": "Count of messages that passed security validation",
           "display_as": "Security Validated",
-          "default": null
+          "type": "integer"
         },
         "unvalidated": {
-          "description": "Messages that failed security validation",
+          "description": "Count of messages that failed security validation",
           "display_as": "Failed Security",
-          "default": null
+          "type": "integer"
         },
         "passed": {
-          "description": "Passed filter checks",
+          "description": "Count of messages that passed filter checks",
           "display_as": "Passed Filter",
-          "default": null
+          "type": "integer"
         },
         "filtered": {
-          "description": "Didn't pass filter checks",
+          "description": "Count of message that didn't pass filter checks",
           "display_as": "Failed Filter",
-          "default": null
+          "type": "integer"
         },
         "starttime": {
-          "description": "Time the server started",
+          "description": "Time the Choria Server started in unix seconds",
           "display_as": "Start Time",
-          "default": null
+          "type": "integer"
         },
         "total": {
-          "description": "Total messages received",
+          "description": "Count of messages received by the Choria Server",
           "display_as": "Total Messages",
-          "default": null
+          "type": "integer"
         },
         "replies": {
-          "description": "Replies sent back to clients",
+          "description": "Count of replies sent back to clients",
           "display_as": "Replies",
-          "default": null
+          "type": "integer"
         },
         "configfile": {
           "description": "Config file used to start the daemon",
           "display_as": "Config File",
-          "default": null
+          "type": "string"
         },
         "version": {
-          "description": "MCollective Version",
+          "description": "Choria Server Version",
           "display_as": "Version",
-          "default": null
+          "type": "string"
         },
         "ttlexpired": {
-          "description": "Messages that did pass TTL checks",
+          "description": "Count of messages that did pass TTL checks",
           "display_as": "TTL Expired",
-          "default": null
+          "type": "integer"
         }
       },
       "display": "always",
@@ -151,22 +151,20 @@
           "prompt": "Configuration Item",
           "description": "The item to retrieve from the server",
           "type": "string",
-          "default": null,
           "optional": false,
           "validation": "^.+$",
-          "maxlength": 50
+          "maxlength": 120
         }
       },
       "output": {
         "item": {
           "description": "The config property being retrieved",
           "display_as": "Property",
-          "default": null
+          "type": "string"
         },
         "value": {
           "description": "The value that is in use",
-          "display_as": "Value",
-          "default": null
+          "display_as": "Value"
         }
       },
       "display": "always",
@@ -187,7 +185,6 @@
           "prompt": "Data Source",
           "description": "The data plugin to retrieve information from",
           "type": "string",
-          "default": null,
           "optional": false,
           "validation": "^\\w+$",
           "maxlength": 50
@@ -202,8 +199,7 @@
           "maxlength": 200
         }
       },
-      "output": {
-      },
+      "output": {},
       "display": "always",
       "description": "Get data from a data plugin"
     },
@@ -224,7 +220,7 @@
         "fact": {
           "description": "The name of the fact being returned",
           "display_as": "Fact",
-          "default": null
+          "type": "string"
         },
         "value": {
           "description": "The value of the fact",
@@ -247,7 +243,7 @@
       "action": "get_facts",
       "input": {
         "facts": {
-          "prompt": "Comma-separated list of facts",
+          "prompt": "Comma-separated list of facts to retrieve",
           "description": "Facts to retrieve",
           "type": "string",
           "default": null,
@@ -260,7 +256,7 @@
         "values": {
           "description": "List of values of the facts",
           "display_as": "Values",
-          "default": null
+          "type": "hash"
         }
       },
       "display": "always",
@@ -274,41 +270,42 @@
         "agents": {
           "description": "List of agent names",
           "display_as": "Agents",
-          "default": null
+          "type": "array"
         },
         "facts": {
           "description": "List of facts and values",
           "display_as": "Facts",
-          "default": null
+          "type": "hash"
         },
         "classes": {
           "description": "List of classes on the system",
           "display_as": "Classes",
-          "default": null
+          "type": "array"
         },
         "version": {
-          "description": "MCollective Version",
+          "description": "Choria Server Version",
           "display_as": "Version",
-          "default": null
+          "type": "string"
         },
         "main_collective": {
           "description": "The main Collective",
           "display_as": "Main Collective",
-          "default": null
+          "type": "string"
         },
         "collectives": {
           "description": "All Collectives",
           "display_as": "All Collectives",
-          "default": null
+          "type": "array"
         },
         "data_plugins": {
           "description": "List of data plugin names",
           "display_as": "Data Plugins",
-          "default": null
+          "type": "array"
         },
         "machines": {
           "description": "Autonomous Agents",
-          "display_as": "Machines"
+          "display_as": "Machines",
+          "type": "hash"
         }
       },
       "display": "always",
@@ -320,9 +317,9 @@
       },
       "output": {
         "pong": {
-          "description": "The local timestamp",
+          "description": "The local Unix timestamp",
           "display_as": "Timestamp",
-          "default": null
+          "type": "string"
         }
       },
       "display": "always",

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.0.1",
+         :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.0.1",
+    "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,17 +56,18 @@ module MCollective
 
           begin
             Timeout.timeout(timeout + 0.5) do
+              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")
             Process.kill("KILL", wait_thr[:pid])
             raise("Choria failed to complete discovery within %d timeout" % timeout)
           end
-
-          nodes.concat(JSON.parse(stdout.read))
         end
 
         nodes

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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: choria-mcorpc-support
 version: !ruby/object:Gem::Version
-  version: 2.24.3
+  version: 2.25.2
 platform: ruby
 authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-09-20 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,9 +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