choria-mcorpc-support 2.24.2 → 2.25.1

data/lib/mcollective/config.rb

@@ -137,6 +137,8 @@ module MCollective
 
         raise('Identities can only match /\w\.\-/') unless @identity =~ /^[\w.\-]+$/
 
+        check_deprecations
+
         @configured = true
 
         libdirs.each do |dir|
@@ -254,5 +256,13 @@ module MCollective
         end
       end
     end
+
+    def check_deprecations
+      if @pluginconf["choria.use_srv_records"]
+        Log.warn("Configuration set 'choria.use_srv_records' which is deprecated in favor of 'choria.use_srv'.")
+        @pluginconf["choria.use_srv"] = @pluginconf["choria.use_srv_records"]
+        @pluginconf.delete("choria.use_srv_records")
+      end
+    end
   end
 end

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,6 +56,7 @@ module MCollective
 
           begin
             Timeout.timeout(timeout + 0.5) do
+              nodes.concat(JSON.parse(stdout.read))
               status = wait_thr.value
 
               raise("Choria discovery failed: %s" % stderr.read) unless status.exitstatus == 0
@@ -62,8 +66,6 @@ module MCollective
             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/log.rb

@@ -96,9 +96,8 @@ module MCollective
         end
 
         @logger.start
-      rescue Exception => e # rubocop:disable Lint/RescueException
+      rescue Exception # rubocop:disable Lint/RescueException
         @configured = false
-        warn "Could not start logger: #{e.class} #{e}"
       end
 
       # figures out the filename that called us

data/lib/mcollective/util/choria.rb

@@ -157,19 +157,19 @@ module MCollective
 
       # Determines if SRV records should be used
       #
-      # Setting choria.use_srv_records to anything other than t, true, yes or 1 will disable
+      # Setting choria.use_srv to anything other than t, true, yes or 1 will disable
       # SRV records
       #
       # @return [Boolean]
       def should_use_srv?
-        ["t", "true", "yes", "1"].include?(get_option("choria.use_srv_records", "1").downcase)
+        ["t", "true", "yes", "1"].include?(get_option("choria.use_srv", "1").downcase)
       end
 
       # Query DNS for a series of records
       #
       # The given records will be passed through {#srv_records} to figure out the domain to query in.
       #
-      # Querying of records can be bypassed by setting choria.use_srv_records to false
+      # Querying of records can be bypassed by setting choria.use_srv to false
       #
       # @yield [Hash] each record for modification by the caller
       # @param records [Array<String>] the records to query without their domain parts
@@ -634,21 +634,27 @@ module MCollective
 
       # The PuppetDB server to connect to
       #
-      # Will consult _x-puppet-db._tcp.example.net then _x-puppet._tcp.example.net
-      # then configurable using choria.puppetdb_host and choria.puppetdb_port, defaults
-      # to puppet:8081
+      # Use choria.puppetdb_host if set, otherwise query
+      # _x-puppet-db._tcp.example.net then _x-puppet._tcp.example.net if SRV
+      # lookup is enabled, and fallback to puppet:8081 if nothing else worked.
       #
       # @return [Hash] with :target and :port
       def puppetdb_server
-        d_host = get_option("choria.puppetdb_host", "puppet")
         d_port = get_option("choria.puppetdb_port", "8081")
 
+        answer = {
+          :target => get_option("choria.puppetdb_host", nil),
+          :port => d_port
+        }
+
+        return answer if answer[:target]
+
         answer = try_srv(["_x-puppet-db._tcp"], nil, nil)
         return answer if answer[:target]
 
         # In the case where we take _x-puppet._tcp SRV records we unfortunately have
         # to force the port else it uses the one from Puppet which will 404
-        answer = try_srv(["_x-puppet._tcp"], d_host, d_port)
+        answer = try_srv(["_x-puppet._tcp"], "puppet", d_port)
         answer[:port] = d_port
 
         answer

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))
 
@@ -186,6 +195,7 @@ module MCollective
           environment["PT_%s" % k] = v.to_s
         end
 
+        environment["PT__task"] = task["task"]
         environment["PT__installdir"] = File.join(request_spooldir(task_id), "files")
 
         environment
@@ -249,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
@@ -290,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.rb

@@ -43,7 +43,6 @@ module MCollective
   require "mcollective/log"
   require "mcollective/message"
   require "mcollective/optionparser"
-  require "mcollective/generators"
   require "mcollective/pluginmanager"
   require "mcollective/pluginpackager"
   require "mcollective/rpc"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: choria-mcorpc-support
 version: !ruby/object:Gem::Version
-  version: 2.24.2
+  version: 2.25.1
 platform: ruby
 authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-08-24 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:
@@ -57,6 +63,10 @@ files:
 - 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
@@ -118,12 +128,6 @@ files:
 - lib/mcollective/facts.rb
 - lib/mcollective/facts/base.rb
 - lib/mcollective/facts/yaml_facts.rb
-- lib/mcollective/generators.rb
-- lib/mcollective/generators/agent_generator.rb
-- lib/mcollective/generators/base.rb
-- lib/mcollective/generators/templates/action_snippet.erb
-- lib/mcollective/generators/templates/ddl.erb
-- lib/mcollective/generators/templates/plugin.erb
 - lib/mcollective/log.rb
 - lib/mcollective/logger.rb
 - lib/mcollective/logger/base.rb

data/lib/mcollective/generators/agent_generator.rb

@@ -1,50 +0,0 @@
-module MCollective
-  module Generators
-    class AgentGenerator < Base
-      attr_accessor :ddl, :content
-
-      def initialize(plugin_name, actions=[], name=nil, description=nil, author=nil,
-                     license=nil, version=nil, url=nil, timeout=nil)
-
-        super(name, description, author, license, version, url, timeout)
-        @plugin_name = plugin_name
-        @actions = actions || []
-        @ddl = create_ddl
-        @mod_name = "Agent"
-        @pclass = "RPC::Agent"
-        @content = create_plugin_content
-        @plugin = create_plugin_string
-        write_plugins
-      end
-
-      def create_ddl
-        action_text = ""
-        @actions.each_with_index do |action, i|
-          action_text += "action \"#{action}\", :description => \"%ACTIONDESCRIPTION%\" do\n"
-          action_text += action_help if i == 0
-          action_text += "end\n"
-          action_text += "\n" unless @actions.size == (i + 1)
-        end
-        # Use inherited method to create metadata part of the ddl
-        create_metadata_string + action_text
-      end
-
-      def create_plugin_content
-        content_text = ""
-
-        # Add actions to agent file
-        @actions.each_with_index do |action, i|
-          content_text +=  "%6s%s" % [" ", "action \"#{action}\" do\n"]
-          content_text +=  "%6s%s" % [" ", "end\n"]
-          content_text += "\n" unless @actions.size == (i + 1)
-        end
-        content_text
-      end
-
-      def action_help
-        action_snippet = File.read(File.join(File.dirname(__FILE__), "templates", "action_snippet.erb"))
-        ERB.new(action_snippet).result
-      end
-    end
-  end
-end

data/lib/mcollective/generators/base.rb

@@ -1,45 +0,0 @@
-module MCollective
-  module Generators
-    class Base
-      attr_accessor :meta, :plugin_name, :mod_name
-
-      def initialize(name, description, author, license, version, url, timeout)
-        @meta = {:name => name,
-                 :description => description,
-                 :author => author,
-                 :license => license,
-                 :version => version,
-                 :url => url,
-                 :timeout => timeout}
-      end
-
-      def create_metadata_string
-        ddl_template = File.read(File.join(File.dirname(__FILE__), "templates", "ddl.erb"))
-        ERB.new(ddl_template, nil, "-").result(binding)
-      end
-
-      def create_plugin_string
-        plugin_template = File.read(File.join(File.dirname(__FILE__), "templates", "plugin.erb"))
-        ERB.new(plugin_template, nil, "-").result(binding)
-      end
-
-      def write_plugins
-        Dir.mkdir @plugin_name
-        dirname = File.join(@plugin_name, @mod_name.downcase)
-        Dir.mkdir dirname
-        puts "Created plugin directory : #{@plugin_name}"
-
-        File.open(File.join(dirname, "#{@plugin_name}.ddl"), "w") {|f| f.puts @ddl}
-        puts "Created DDL file : #{File.join(dirname, "#{@plugin_name}.ddl")}"
-
-        File.open(File.join(dirname, "#{@plugin_name}.rb"), "w") {|f| f.puts @plugin}
-        puts "Created #{@mod_name} file : #{File.join(dirname, "#{@plugin_name}.rb")}"
-      rescue Errno::EEXIST
-        raise "cannot generate '#{@plugin_name}' : plugin directory already exists."
-      rescue Exception => e # rubocop:disable Lint/RescueException
-        FileUtils.rm_rf(@plugin_name) if File.directory?(@plugin_name)
-        raise "cannot generate plugin - #{e}"
-      end
-    end
-  end
-end

data/lib/mcollective/generators/templates/action_snippet.erb

@@ -1,13 +0,0 @@
-     # Example Input
-     input :name,
-           :prompt => "%PROMPT%",
-           :description => "%DESCRIPTION%",
-           :type => %TYPE%,
-           :validation => '%VALIDATION%',
-           :optional => %OPTIONAL%,
-           :maxlength => %MAXLENGTH%
-
-     # Example output
-     output :name,
-            :description => "%DESCRIPTION%",
-            :display_as => "%DISPLAYAS%"

data/lib/mcollective/generators/templates/ddl.erb

@@ -1,8 +0,0 @@
-metadata :name => "<%= meta[:name] || "%FULLNANE%" -%>",
-         :description => "<%= meta[:description] || "%DESCRIPTION%" -%>",
-         :author => "<%= meta[:author] || "%AUTHOR%" -%>",
-         :license => "<%= meta[:license] || "%LICENSE%" -%>",
-         :version => "<%= meta[:version] || "%VERSION%" -%>",
-         :url => "<%= meta[:url] || "%URL%" -%>",
-         :timeout => <%= meta[:timeout] || "%TIMEOUT%" %>
-

data/lib/mcollective/generators/templates/plugin.erb

@@ -1,7 +0,0 @@
-module MCollective
-  module <%= @mod_name%>
-    class <%= @plugin_name.capitalize -%><<%= @pclass%>
-<%= @content%>
-    end
-  end
-end

data/lib/mcollective/generators.rb

@@ -1,6 +0,0 @@
-module MCollective
-  module Generators
-    require "mcollective/generators/base"
-    require "mcollective/generators/agent_generator"
-  end
-end