bolt 0.5.1 → 0.6.0

data/lib/bolt/node/winrm.rb

@@ -9,15 +9,27 @@ module Bolt
 
       @shell = shell
       @endpoint = "http://#{host}:#{port}/wsman"
+    end
+
+    def connect
       @connection = ::WinRM::Connection.new(endpoint: @endpoint,
                                             user: @user,
                                             password: @password)
       @connection.logger = @transport_logger
-    end
 
-    def connect
       @session = @connection.shell(@shell)
+      @session.run('$PSVersionTable.PSVersion')
       @logger.debug { "Opened session" }
+    rescue ::WinRM::WinRMAuthorizationError
+      raise Bolt::Node::ConnectError.new(
+        "Authentication failed for #{@endpoint}",
+        'AUTH_ERROR'
+      )
+    rescue StandardError => e
+      raise Bolt::Node::ConnectError.new(
+        "Failed to connect to #{@endpoint}: #{e.message}",
+        'CONNECT_ERROR'
+      )
     end
 
     def disconnect

data/lib/bolt/node_uri.rb

@@ -1,3 +1,5 @@
+require 'addressable'
+
 module Bolt
   class NodeURI
     def initialize(string)
@@ -5,18 +7,13 @@ module Bolt
     end
 
     def parse(string)
-      case string
-      when %r{^(ssh|winrm|pcp)://.*:\d+$}
-        URI(string)
-      when %r{^pcp://}
-        URI(string)
-      when %r{^(ssh|winrm)://}
-        uri = URI(string)
-        uri.port = 5985 if uri.scheme == 'winrm'
-        uri
-      else
-        URI("ssh://#{string}")
-      end
+      uri = if string =~ %r{^(ssh|winrm|pcp)://}
+              Addressable::URI.parse(string)
+            else
+              Addressable::URI.parse("ssh://#{string}")
+            end
+      uri.port ||= 5985 if uri.scheme == 'winrm'
+      uri
     end
 
     def hostname
@@ -28,11 +25,15 @@ module Bolt
     end
 
     def user
-      @uri.user
+      Addressable::URI.unencode_component(
+        @uri.user
+      )
     end
 
     def password
-      @uri.password
+      Addressable::URI.unencode_component(
+        @uri.password
+      )
     end
 
     def scheme

data/lib/bolt/result.rb

@@ -25,6 +25,28 @@ module Bolt
     end
   end
 
+  class ErrorResult < Result
+    def initialize(message, issue_code, kind)
+      super(message)
+      @issue_code = issue_code
+      @kind = kind
+    end
+
+    def to_h
+      {
+        'error' => {
+          'issue_code' => @issue_code,
+          'kind' => @kind,
+          'msg' => @message
+        }
+      }
+    end
+
+    def success?
+      false
+    end
+  end
+
   class CommandResult < Result
     attr_reader :stdout, :stderr, :exit_code
 

data/lib/bolt/version.rb

@@ -1,3 +1,3 @@
 module Bolt
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/vendored/puppet/lib/puppet/application/script.rb

@@ -113,7 +113,13 @@ Copyright (c) 2017 Puppet Inc., LLC Licensed under the Apache 2.0 License
   end
 
   def run_command
-    main
+    if Puppet.features.bolt?
+      Puppet.override(:bolt_executor => Bolt::Executor.new) do
+        main
+      end
+    else
+      raise _("Bolt must be installed to use the script application")
+    end
   end
 
   def main

data/vendored/puppet/lib/puppet/configurer.rb

@@ -375,7 +375,7 @@ class Puppet::Configurer
               :transaction_uuid => @transaction_uuid,
               :fail_on_404 => false)
           found = true
-        rescue Exception => e
+        rescue
           # Nothing to see here
         end
       end

data/vendored/puppet/lib/puppet/defaults.rb

@@ -126,6 +126,19 @@ module Puppet
         munge(value)
         value.to_sym
       end
+    },
+    :disable_i18n => {
+      :default => false,
+      :type    => :boolean,
+      :desc    => "If true, turns off all translations of Puppet and module
+        log messages, which affects error, warning, and info log messages,
+        as well as any translations in the report and CLI.",
+      :hook    => proc do |value|
+        if value
+          require 'puppet/gettext/stubs'
+          Puppet::GettextConfig.disable_gettext
+        end
+      end
     }
   )
 
@@ -156,7 +169,9 @@ module Puppet
     :static_catalogs => {
       :default    => true,
       :type       => :boolean,
-      :desc       => "Whether to compile a static catalog."
+      :desc       => "Whether to compile a [static catalog](https://docs.puppet.com/puppet/latest/static_catalogs.html#enabling-or-disabling-static-catalogs),
+        which occurs only on a Puppet Server master when the `code-id-command` and
+        `code-content-command` settings are configured in its `puppetserver.conf` file.",
     },
     :strict_environment_mode => {
       :default    => false,
@@ -1312,6 +1327,8 @@ EOT
         :default  => "$vardir/devices",
         :type     => :directory,
         :mode     => "0750",
+        :owner    => "service",
+        :group    => "service",
         :desc     => "The root directory of devices' $vardir.",
     },
     :deviceconfig => {

data/vendored/puppet/lib/puppet/functions/run_command.rb

@@ -26,7 +26,8 @@ Puppet::Functions.create_function(:run_command) do
         {:operation => 'run_command'})
     end
 
-    unless Puppet.features.bolt?
+    executor = Puppet.lookup(:bolt_executor) { nil }
+    unless executor && Puppet.features.bolt?
       raise Puppet::ParseErrorWithIssue.from_issue_and_stack(Puppet::Pops::Issues::TASK_MISSING_BOLT, :action => _('run a command'))
     end
 
@@ -35,7 +36,9 @@ Puppet::Functions.create_function(:run_command) do
       call_function('debug', "Simulating run_command('#{command}') - no hosts given - no action taken")
       Puppet::Pops::Types::ExecutionResult::EMPTY_RESULT
     else
-      Puppet::Pops::Types::ExecutionResult.from_bolt(Bolt::Executor.from_uris(hosts).run_command(command))
+      Puppet::Pops::Types::ExecutionResult.from_bolt(
+        executor.run_command(executor.from_uris(hosts), command)
+      )
     end
   end
 end

data/vendored/puppet/lib/puppet/functions/run_script.rb

@@ -27,7 +27,8 @@ Puppet::Functions.create_function(:run_script, Puppet::Functions::InternalFuncti
         {:operation => 'run_script'})
     end
 
-    unless Puppet.features.bolt?
+    executor = Puppet.lookup(:bolt_executor) { nil }
+    unless executor && Puppet.features.bolt?
       raise Puppet::ParseErrorWithIssue.from_issue_and_stack(Puppet::Pops::Issues::TASK_MISSING_BOLT, :action => _('run a script'))
     end
 
@@ -44,7 +45,9 @@ Puppet::Functions.create_function(:run_script, Puppet::Functions::InternalFuncti
       call_function('debug', "Simulating run_script of '#{found}' - no hosts given - no action taken")
       Puppet::Pops::Types::ExecutionResult::EMPTY_RESULT
     else
-      Puppet::Pops::Types::ExecutionResult.from_bolt(Bolt::Executor.from_uris(hosts).run_script(found))
+      Puppet::Pops::Types::ExecutionResult.from_bolt(
+        executor.run_script(executor.from_uris(hosts), found)
+      )
     end
   end
 end

data/vendored/puppet/lib/puppet/functions/run_task.rb

@@ -55,7 +55,8 @@ Puppet::Functions.create_function(:run_task) do
         {:operation => 'run_task'})
     end
 
-    unless Puppet.features.bolt?
+    executor = Puppet.lookup(:bolt_executor) { nil }
+    unless executor && Puppet.features.bolt?
       raise Puppet::ParseErrorWithIssue.from_issue_and_stack(Puppet::Pops::Issues::TASK_MISSING_BOLT, :action => _('run a task'))
     end
 
@@ -67,7 +68,11 @@ Puppet::Functions.create_function(:run_task) do
       input_method = task._pcore_type['input_method'].value
 
       arguments = task.task_args
-      Puppet::Pops::Types::ExecutionResult.from_bolt(Bolt::Executor.from_uris(hosts).run_task(task.executable_path, input_method, arguments))
+      Puppet::Pops::Types::ExecutionResult.from_bolt(
+        executor.run_task(
+          executor.from_uris(hosts), task.executable_path, input_method, arguments
+        )
+      )
     end
   end
 end

data/vendored/puppet/lib/puppet/gettext/config.rb

@@ -1,18 +1,36 @@
 require 'puppet/util/platform'
+require 'puppet/file_system'
 
 module Puppet::GettextConfig
   LOCAL_PATH = File.absolute_path('../../../locales', File.dirname(__FILE__))
   POSIX_PATH = File.absolute_path('../../../../../share/locale', File.dirname(__FILE__))
   WINDOWS_PATH = File.absolute_path('../../../../../../../puppet/share/locale', File.dirname(__FILE__))
 
+  # Load gettext helpers and track whether they're available.
+  # Used instead of features because we initialize gettext before features is available.
+  # Stubbing gettext if unavailable is handled in puppet.rb.
+  begin
+    require 'gettext-setup'
+    require 'locale'
+    @gettext_loaded = true
+  rescue LoadError
+    @gettext_loaded = false
+  end
+
+  # Whether we were able to require gettext-setup and locale
+  # @return [Boolean] true if gettext-setup was successfully loaded
+  def self.gettext_loaded?
+    @gettext_loaded
+  end
+
   # Search for puppet gettext config files
   # @return [String] path to the config, or nil if not found
   def self.puppet_locale_path
-    if File.exist?(LOCAL_PATH)
+    if Puppet::FileSystem.exist?(LOCAL_PATH)
       return LOCAL_PATH
-    elsif Puppet::Util::Platform.windows? && File.exist?(WINDOWS_PATH)
+    elsif Puppet::Util::Platform.windows? && Puppet::FileSystem.exist?(WINDOWS_PATH)
       return WINDOWS_PATH
-    elsif !Puppet::Util::Platform.windows? && File.exist?(POSIX_PATH)
+    elsif !Puppet::Util::Platform.windows? && Puppet::FileSystem.exist?(POSIX_PATH)
       return POSIX_PATH
     else
       nil
@@ -30,40 +48,43 @@ module Puppet::GettextConfig
     end
   end
 
+  # Prevent future gettext initializations
+  def self.disable_gettext
+    @gettext_disabled = true
+  end
+
   # Attempt to initialize the gettext-setup gem
   # @param path [String] to gettext config file
   # @param file_format [Symbol] translation file format to use, either :po or :mo
   # @return true if initialization succeeded, false otherwise
-  def self.initialize(conf_file_location, file_format)
+  def self.initialize(conf_file_dir, file_format)
+    return false if @gettext_disabled || !@gettext_loaded
+
     unless file_format == :po || file_format == :mo
       raise Puppet::Error, "Unsupported translation file format #{file_format}; please use :po or :mo"
     end
 
-    begin
-      require 'gettext-setup'
-      require 'locale'
+    return false if conf_file_dir.nil?
 
-      if conf_file_location && File.exists?(conf_file_location)
-        if GettextSetup.method(:initialize).parameters.count == 1
-          # For use with old gettext-setup gem versions, will load PO files only
-          GettextSetup.initialize(conf_file_location)
-        else
-          GettextSetup.initialize(conf_file_location, :file_format => file_format)
-        end
-        # Only change this once.
-        # Because negotiate_locales will only return a non-default locale if
-        # the system locale matches a translation set actually available for the
-        # given gettext project, we don't want this to get set back to default if
-        # we load a module that doesn't have translations, but Puppet does have
-        # translations for the user's locale.
-        if FastGettext.locale == GettextSetup.default_locale
-          FastGettext.locale = GettextSetup.negotiate_locale(Locale.current.language)
-        end
-        true
+    conf_file = File.join(conf_file_dir, "config.yaml")
+    if Puppet::FileSystem.exist?(conf_file)
+      if GettextSetup.method(:initialize).parameters.count == 1
+        # For use with old gettext-setup gem versions, will load PO files only
+        GettextSetup.initialize(conf_file_dir)
       else
-        false
+        GettextSetup.initialize(conf_file_dir, :file_format => file_format)
       end
-    rescue LoadError
+      # Only change this once.
+      # Because negotiate_locales will only return a non-default locale if
+      # the system locale matches a translation set actually available for the
+      # given gettext project, we don't want this to get set back to default if
+      # we load a module that doesn't have translations, but Puppet does have
+      # translations for the user's locale.
+      if FastGettext.locale == GettextSetup.default_locale
+        FastGettext.locale = GettextSetup.negotiate_locale(Locale.current.language)
+      end
+      true
+    else
       false
     end
   end

data/vendored/puppet/lib/puppet/graph/relationship_graph.rb

@@ -247,6 +247,12 @@ class Puppet::Graph::RelationshipGraph < Puppet::Graph::SimpleGraph
     containers.each { |x|
       admissible[x] = whit_class.new(:name => "admissible_#{x.ref}", :catalog => catalog)
       completed[x]  = whit_class.new(:name => "completed_#{x.ref}",  :catalog => catalog)
+
+      # This copies the original container's tags over to the two anchor whits.
+      # Without this, tags are not propagated to the container's resources.
+      admissible[x].set_tags(x)
+      completed[x].set_tags(x)
+
       priority = @prioritizer.priority_of(x)
       add_vertex(admissible[x], priority)
       add_vertex(completed[x], priority)

data/vendored/puppet/lib/puppet/indirector/node/ldap.rb

@@ -5,7 +5,8 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
   desc "Search in LDAP for node configuration information.  See
   the [LDAP Nodes](https://docs.puppetlabs.com/guides/ldap_nodes.html) page for more information.  This will first
   search for whatever the certificate name is, then (if that name
-  contains a `.`) for the short name, then `default`."
+  contains a `.`) for the short name, then `default`.
+  Requires ruby-ldap with MRI ruby or jruby-ldap with puppetserver/jruby"
 
   # The attributes that Puppet class information is stored in.
   def class_attributes
@@ -93,7 +94,8 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
     result[:stacked] = get_stacked_values_from_entry(entry)
     result[:parameters] = get_parameters_from_entry(entry)
 
-    result[:environment] = result[:parameters]["environment"] if result[:parameters]["environment"]
+    # delete from parameters to prevent "Already declered variable $environment" error
+    result[:environment] = result[:parameters].delete(:environment) if result[:parameters][:environment]
 
     result[:stacked_parameters] = {}
 
@@ -222,9 +224,23 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
     result.uniq
   end
 
+  # Workaround jruby-ldap 0.0.2 missing the #to_hash method
+  #
+  # @see https://github.com/jruby/jruby-ldap/pull/5
+  #
+  # @param entry [LDAP::Entry] The LDAP::Entry object to convert to a hash
+  # @return [Hash] The hash of the provided LDAP::Entry object with keys
+  #   downcased (puppet variables need to start with lowercase char)
+  def ldap_entry_to_hash(entry)
+     h = {}
+     entry.get_attributes.each { |a| h[a.downcase.to_sym] = entry[a] }
+     h[:dn] = [entry.dn]
+     h
+  end
+
   def get_parameters_from_entry(entry)
     stacked_params = stacked_attributes
-    entry.to_hash.inject({}) do |hash, ary|
+    ldap_entry_to_hash(entry).inject({}) do |hash, ary|
       unless stacked_params.include?(ary[0]) # don't add our stacked parameters to the main param list
         if ary[1].length == 1
           hash[ary[0]] = ary[1].shift

data/vendored/puppet/lib/puppet/module.rb

@@ -98,7 +98,7 @@ class Puppet::Module
     @absolute_path_to_manifests = Puppet::FileSystem::PathPattern.absolute(manifests)
 
     # i18n initialization for modules
-    initialize_i18n
+    initialize_i18n unless Puppet[:disable_i18n]
   end
 
   # @deprecated The puppetversion module metadata field is no longer used.
@@ -428,22 +428,23 @@ class Puppet::Module
 
     locales_path = File.absolute_path('locales', path)
 
-    begin
-      Puppet::GettextConfig.initialize(locales_path, :po)
+    if Puppet::GettextConfig.initialize(locales_path, :po)
       Puppet.debug "#{module_name} initialized for i18n: #{GettextSetup.translation_repositories[module_name]}"
-    rescue
+    elsif Puppet::GettextConfig.gettext_loaded?
       config_path = File.absolute_path('config.yaml', locales_path)
       Puppet.debug "Could not find locales configuration file for #{module_name} at #{config_path}. Skipping i18n initialization."
+    else
+      Puppet.debug "No gettext library found, skipping i18n initialization."
     end
   end
 
   private
 
   def i18n_initialized?(module_name)
-    begin
+    if Puppet::GettextConfig.gettext_loaded?
       GettextSetup.translation_repositories.has_key? module_name
-    rescue NameError
-      # GettextSetup not yet initialized
+    else
+      # GettextSetup not yet initialized or not found
       false
     end
   end