bolt 0.20.3 → 0.20.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 607e97f4d7609e2927f6e055baec22293cefb698
-  data.tar.gz: 7481be4e30655f46ee4908fb735dbcdc6de2383f
+  metadata.gz: be38f987a3976c357fd09e70de9ad65509014fd7
+  data.tar.gz: c92478de40249c5714dc67490b378dee76bd3f97
 SHA512:
-  metadata.gz: 82322ab31eaeddbc94d4d50ec10dd494c107de3837e3eaaee1ce727827133a921f92fe794585fc2e9f79126afc4f9a344e7eaffbd23987f55ff8b88340ddb84f
-  data.tar.gz: 1a7918248d6319a32fe7ca5daa73b6c506ea15d5cb66f733f6f562038ffeb228115f725d01e3fdce5a30a3bec20abe02e3ad0f35288d8001995fe801b62a4a8b
+  metadata.gz: e8094e1f2879c548bdd4f37af9419fbac6d6acefacfa32eead97fd020cdf301682060f6f1c482e9dd4ff4f8ddc41d7c6a0e94761099013bf006814c0a440d008
+  data.tar.gz: a76234f46802619085b65907b5f38f4c83c5865ffd91a7a45ad6472461ae78d7cc7eb7cb3b776a49263f1af72715986b972123fb1e168cdb466c1a39d1e953df

data/bolt-modules/boltlib/lib/puppet/functions/run_task.rb

@@ -76,9 +76,9 @@ Puppet::Functions.create_function(:run_task) do
     if !targets.empty? && targets.all? { |t| t.protocol == 'pcp' && t.options['local-validation'] == false }
       # create a fake task
       task = Puppet::Pops::Types::TypeFactory.task.from_hash(
-        'name'          => task_name,
-        'executable'    => '',
-        'supports_noop' => true
+        'name'            => task_name,
+        'implementations' => [{ 'name' => '', 'path' => '' }],
+        'supports_noop'   => true
       )
     else
       # TODO: use the compiler injection once PUP-8237 lands

data/bolt-modules/boltlib/lib/puppet/functions/set_feature.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'bolt/error'
+
+# Sets a particular feature to present on a target.
+
+Puppet::Functions.create_function(:set_feature) do
+  dispatch :set_feature do
+    param 'Target', :target
+    param 'String', :feature
+    optional_param 'Boolean', :value
+  end
+
+  def set_feature(target, feature, value = true)
+    unless Puppet[:tasks]
+      raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
+        Puppet::Pops::Issues::TASK_OPERATION_NOT_SUPPORTED_WHEN_COMPILING, operation: 'set_feature'
+      )
+    end
+
+    inventory = Puppet.lookup(:bolt_inventory) { nil }
+
+    unless inventory
+      raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
+        Puppet::Pops::Issues::TASK_MISSING_BOLT, action: _('set feature')
+      )
+    end
+
+    inventory.set_feature(target, feature, value)
+
+    target
+  end
+end

data/lib/bolt/inventory.rb

@@ -66,6 +66,7 @@ module Bolt
       @group_lookup = {}
       @target_vars = {}
       @target_facts = {}
+      @target_features = {}
     end
 
     def validate
@@ -105,6 +106,19 @@ module Bolt
       @target_facts[target.name] || {}
     end
 
+    def set_feature(target, feature, value = true)
+      @target_features[target.name] ||= Set.new
+      if value
+        @target_features[target.name] << feature
+      else
+        @target_features[target.name].delete(feature)
+      end
+    end
+
+    def features(target)
+      @target_features[target.name] || Set.new
+    end
+
     #### PRIVATE ####
     #
     # For debugging only now
@@ -181,7 +195,11 @@ module Bolt
         # Expand a comma-separated list
         targets.split(/[[:space:],]+/).reject(&:empty?).map do |name|
           ts = resolve_name(name)
-          ts.map { |t| Bolt::Target.new(t) }
+          ts.map do |t|
+            target = Target.new(t)
+            target.inventory = self
+            target
+          end
         end
       end
     end

data/lib/bolt/target.rb

@@ -6,6 +6,7 @@ require 'bolt/error'
 module Bolt
   class Target
     attr_reader :uri, :options
+    attr_writer :inventory
 
     # Satisfies the Puppet datatypes API
     def self.from_asserted_hash(hash)
@@ -44,6 +45,20 @@ module Bolt
     end
     private :parse
 
+    def select_impl(task, additional_features = [])
+      available_features = features + additional_features
+      suitable_impl = task.implementations.find { |impl| Set.new(impl['requirements']).subset?(available_features) }
+      return suitable_impl['path'] if suitable_impl
+    end
+
+    def features
+      if @inventory
+        @inventory.features(self)
+      else
+        Set.new
+      end
+    end
+
     def eql?(other)
       self.class.equal?(other.class) && @uri == other.uri
     end

data/lib/bolt/transport/local.rb

@@ -13,6 +13,8 @@ module Bolt
         %w[tmpdir]
       end
 
+      PROVIDED_FEATURES = ['shell'].freeze
+
       def self.validate(_options); end
 
       def initialize
@@ -78,11 +80,14 @@ module Bolt
       end
 
       def run_task(target, task, arguments, _options = {})
+        executable = target.select_impl(task, PROVIDED_FEATURES)
+        raise "No suitable implementation of #{task.name} for #{target.name}" unless executable
+
         input_method = task.input_method
         stdin = STDIN_METHODS.include?(input_method) ? JSON.dump(arguments) : nil
         env = ENVIRONMENT_METHODS.include?(input_method) ? arguments : nil
 
-        with_tmpscript(task.executable, target.options['tmpdir']) do |script|
+        with_tmpscript(executable, target.options['tmpdir']) do |script|
           logger.debug("Running '#{script}' with #{arguments}")
 
           output = @conn.execute(script, stdin: stdin, env: env)

data/lib/bolt/transport/orch.rb

@@ -22,6 +22,8 @@ module Bolt
         %w[service-url cacert token-file task-environment local-validation]
       end
 
+      PROVIDED_FEATURES = ['puppet-agent'].freeze
+
       def self.validate(options)
         validation_flag = options['local-validation']
         unless !!validation_flag == validation_flag

data/lib/bolt/transport/ssh.rb

@@ -9,9 +9,11 @@ module Bolt
   module Transport
     class SSH < Base
       def self.options
-        %w[port user password sudo-password private-key host-key-check connect-timeout tmpdir run-as]
+        %w[port user password sudo-password private-key host-key-check connect-timeout tmpdir run-as tty]
       end
 
+      PROVIDED_FEATURES = ['shell'].freeze
+
       def self.validate(options)
         logger = Logging.logger[self]
 
@@ -108,6 +110,9 @@ module Bolt
       end
 
       def run_task(target, task, arguments, options = {})
+        executable = target.select_impl(task, PROVIDED_FEATURES)
+        raise "No suitable implementation of #{task.name} for #{target.name}" unless executable
+
         input_method = task.input_method
         with_connection(target) do |conn|
           conn.running_as(options['_run_as']) do
@@ -128,7 +133,7 @@ module Bolt
             end
 
             conn.with_remote_tempdir do |dir|
-              remote_task_path = conn.write_remote_executable(dir, task.executable)
+              remote_task_path = conn.write_remote_executable(dir, executable)
               if conn.run_as && stdin
                 wrapper = make_wrapper_stringio(remote_task_path, stdin)
                 remote_wrapper_path = conn.write_remote_executable(dir, wrapper, 'wrapper.sh')

data/lib/bolt/transport/winrm.rb

@@ -13,6 +13,8 @@ module Bolt
         %w[port user password connect-timeout ssl ssl-verify tmpdir cacert extensions]
       end
 
+      PROVIDED_FEATURES = ['powershell'].freeze
+
       def self.validate(options)
         ssl_flag = options['ssl']
         unless !!ssl_flag == ssl_flag
@@ -98,6 +100,9 @@ catch
       end
 
       def run_task(target, task, arguments, _options = {})
+        executable = target.select_impl(task, PROVIDED_FEATURES)
+        raise "No suitable implementation of #{task.name} for #{target.name}" unless executable
+
         input_method = task.input_method
         with_connection(target) do |conn|
           if STDIN_METHODS.include?(input_method)
@@ -114,7 +119,7 @@ catch
             end
           end
 
-          conn.with_remote_file(task.executable) do |remote_path|
+          conn.with_remote_file(executable) do |remote_path|
             output =
               if powershell_file?(remote_path) && stdin.nil?
                 # NOTE: cannot redirect STDIN to a .ps1 script inside of PowerShell

data/lib/bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bolt
-  VERSION = '0.20.3'
+  VERSION = '0.20.5'
 end

data/modules/facts/plans/retrieve.pp

@@ -1,32 +1,8 @@
 # A plan that retrieves facts from the specified nodes by running
-# an appropriate facts::* task on each. Care is taken to run a
-# facts::* task corresponding to the node's platfrom on each
-# node.
+# the 'facts' task on each.
 #
 # The $nodes parameter is a list of the nodes to retrieve the facts
 # from.
 plan facts::retrieve(TargetSpec $nodes) {
-  $targets = get_targets($nodes)
-
-  # Build a mapping from the names of the tasks to run to the lists of
-  # targets to run the tasks on
-  $task_targets = $targets.facts::group_by |$target| {
-    $target.protocol ? {
-      'ssh'   => 'facts::bash',
-      'winrm' => 'facts::powershell',
-      'pcp'   => 'facts::ruby',
-      'local' => 'facts::bash',
-    }
-  }
-
-  # Return a single result set composed of results from the result sets
-  # returned by the individual task runs.
-  return ResultSet(
-    $task_targets.map |$task, $targets| {
-      run_task($task, $targets, '_catch_errors' => true)
-    }.reduce([]) |$results, $result_set| {
-      # Collect the results from the individual result sets
-      $results + $result_set.results
-    }
-  )
+  return run_task('facts', $nodes, '_catch_errors' => true)
 }

data/modules/facts/tasks/init.json

@@ -0,0 +1,9 @@
+{
+  "description": "Gather system facts",
+  "parameters": {},
+  "implementations": [
+    {"name": "ruby.rb", "requirements": ["puppet-agent"]},
+    {"name": "powershell.ps1", "requirements": ["powershell"]},
+    {"name": "bash.sh", "requirements": ["shell"]}
+  ]
+}

data/vendored/puppet/lib/hiera/puppet_function.rb

@@ -62,7 +62,7 @@ class Hiera::PuppetFunction < Puppet::Functions::InternalFunction
     unless Puppet[:strict] == :off
       #TRANSLATORS 'lookup' is a puppet function and should not be translated
       message = _("The function '%{class_name}' is deprecated in favor of using 'lookup'.") % { class_name: self.class.name }
-      message += ' '+ _("See https://docs.puppet.com/puppet/%{minor_version}/reference/deprecated_language.html") %
+      message += ' '+ _("See https://puppet.com/docs/puppet/%{minor_version}/deprecated_language.html") %
           { minor_version: Puppet.minor_version }
       Puppet.warn_once('deprecations', self.class.name, message)
     end

data/vendored/puppet/lib/hiera/scope.rb

@@ -20,13 +20,35 @@ class Hiera
       elsif key == CALLING_CLASS_PATH
         ans = find_hostclass(@real).gsub(/::/, '/')
       elsif key == CALLING_MODULE
-        ans = @real.lookupvar(MODULE_NAME)
+        ans = safe_lookupvar(MODULE_NAME)
       else
-        ans = @real.lookupvar(key)
+        ans = safe_lookupvar(key)
       end
       ans == EMPTY_STRING ? nil : ans
     end
 
+    # This method is used to handle the throw of :undefined_variable since when
+    # strict variables is not in effect, missing handling of the throw leads to
+    # a more expensive code path.
+    #
+    def safe_lookupvar(key)
+      reason = catch :undefined_variable do
+        return @real.lookupvar(key)
+      end
+
+      case Puppet[:strict]
+      when :off
+        # do nothing
+      when :warning
+        Puppet.warn_once(Puppet::Parser::Scope::UNDEFINED_VARIABLES_KIND, _("Variable: %{name}") % { name: key },
+        _("Undefined variable '%{name}'; %{reason}") % { name: key, reason: reason } )
+      when :error
+        raise ArgumentError, _("Undefined variable '%{name}'; %{reason}") % { name: key, reason: reason }
+      end
+      nil
+    end
+    private :safe_lookupvar
+
     def exist?(key)
       CALLING_KEYS.include?(key) || @real.exist?(key)
     end

data/vendored/puppet/lib/puppet.rb

@@ -1,10 +1,10 @@
 require 'puppet/version'
 
-if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new("1.9.3")
-  raise LoadError, _("Puppet %{version} requires ruby 1.9.3 or greater.") % { version: Puppet.version }
+if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new("2.3.0")
+  raise LoadError, _("Puppet %{version} requires ruby 2.3.0 or greater.") % { version: Puppet.version }
 end
 
-Puppet::OLDEST_RECOMMENDED_RUBY_VERSION = '2.1.0'
+Puppet::OLDEST_RECOMMENDED_RUBY_VERSION = '2.3.0'
 
 # see the bottom of the file for further inclusions
 # Also see the new Vendor support - towards the end
@@ -127,7 +127,7 @@ module Puppet
   # Now that settings are loaded we have the code loaded to be able to issue
   # deprecation warnings. Warn if we're on a deprecated ruby version.
   if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new(Puppet::OLDEST_RECOMMENDED_RUBY_VERSION)
-    Puppet.deprecation_warning(_("Support for ruby version %{version} is deprecated and will be removed in a future release. See https://docs.puppet.com/puppet/latest/system_requirements.html#ruby for a list of supported ruby versions.") % { version: RUBY_VERSION })
+    Puppet.deprecation_warning(_("Support for ruby version %{version} is deprecated and will be removed in a future release. See https://puppet.com/docs/puppet/latest/system_requirements.html for a list of supported ruby versions.") % { version: RUBY_VERSION })
   end
 
   # Initialize puppet's settings. This is intended only for use by external tools that are not
@@ -170,14 +170,6 @@ module Puppet
     end
   end
 
-  # Create a new type.  Just proxy to the Type class.  The mirroring query
-  # code was deprecated in 2008, but this is still in heavy use.  I suppose
-  # this can count as a soft deprecation for the next dev. --daniel 2011-04-12
-  def self.newtype(name, options = {}, &block)
-    Puppet.deprecation_warning(_("Creating %{name} via Puppet.newtype is deprecated and will be removed in a future release. Use Puppet::Type.newtype instead.") % { name: name })
-    Puppet::Type.newtype(name, options, &block)
-  end
-
   # Load vendored (setup paths, and load what is needed upfront).
   # See the Vendor class for how to add additional vendored gems/code
   require "puppet/vendor"
@@ -216,7 +208,6 @@ module Puppet
         Puppet::Network::HTTP::NoCachePool.new
       },
       :ssl_host => proc { Puppet::SSL::Host.localhost },
-      :certificate_revocation => proc { Puppet[:certificate_revocation] },
       :plugins => proc { Puppet::Plugins::Configuration.load_plugins }
     }
   end

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

@@ -311,13 +311,13 @@ class Application
   # handling of this.
   option("--version", "-V") do |arg|
     puts "#{Puppet.version}"
-    exit
+    exit(0)
   end
 
   # Every app responds to --help
   option("--help", "-h") do |v|
     puts help
-    exit
+    exit(0)
   end
 
   def app_defaults()

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

@@ -166,7 +166,7 @@ specify '--server <servername>' as an argument. Boolean settings translate into
 '--setting' and '--no-setting' pairs.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
+https://puppet.com/docs/puppet/latest/configuration.html for the
 full list of acceptable settings. A commented list of all settings can also be
 generated by running puppet agent with '--genconfig'.
 

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

@@ -78,7 +78,7 @@ valid setting, so you can specify '--tags <class>,<tag>'
 as an argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
+https://puppet.com/docs/puppet/latest/configuration.html for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 '--genconfig'.

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

@@ -194,7 +194,7 @@ setting, so you can specify '--ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
+https://puppet.com/docs/puppet/latest/configuration.html for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet cert with
 '--genconfig'.

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

@@ -83,7 +83,7 @@ puppet-device(8) -- #{summary}
 
 SYNOPSIS
 --------
-Retrieves catalogs from the Puppet master and applies them to remote devices. 
+Retrieves catalogs from the Puppet master and applies them to remote devices.
 
 This subcommand can be run manually; or periodically using cron,
 a scheduled task, or a similar tool.
@@ -106,9 +106,9 @@ retrieve and apply catalogs, and store reports.
 
 USAGE NOTES
 -----------
-Devices managed by the puppet-device subcommand on a Puppet agent are 
-configured in device.conf, which is located at $confdir/device.conf by default, 
-and is configurable with the $deviceconfig setting. 
+Devices managed by the puppet-device subcommand on a Puppet agent are
+configured in device.conf, which is located at $confdir/device.conf by default,
+and is configurable with the $deviceconfig setting.
 
 The device.conf file is an INI-like file, with one section per device:
 
@@ -117,20 +117,20 @@ type <TYPE>
 url <URL>
 debug
 
-The section name specifies the certname of the device. 
+The section name specifies the certname of the device.
 
 The values for the type and url properties are specific to each type of device.
 
 The optional debug property specifies transport-level debugging,
 and is limited to telnet and ssh transports.
 
-See https://docs.puppet.com/puppet/latest/config_file_device.html for details.
+See https://puppet.com/docs/puppet/latest/config_file_device.html for details.
 
 
 OPTIONS
 -------
-Note that any setting that's valid in the configuration file is also a valid 
-long argument. For example, 'server' is a valid configuration parameter, so 
+Note that any setting that's valid in the configuration file is also a valid
+long argument. For example, 'server' is a valid configuration parameter, so
 you can specify '--server <servername>' as an argument.
 
 * --debug: