bolt 0.15.0 → 0.16.0

data/lib/bolt/version.rb

@@ -1,3 +1,3 @@
 module Bolt
-  VERSION = '0.15.0'.freeze
+  VERSION = '0.16.0'.freeze
 end

data/modules/boltlib/lib/puppet/functions/run_command.rb

@@ -42,7 +42,7 @@ Puppet::Functions.create_function(:run_command) do
       call_function('debug', "Simulating run_command('#{command}') - no targets given - no action taken")
       r = Bolt::ResultSet.new([])
     else
-      r = executor.run_command(targets, command)
+      r = executor.run_command(targets, command, options.select { |k, _| k == '_run_as' })
     end
 
     if !r.ok && !options['_catch_errors']

data/modules/boltlib/lib/puppet/functions/run_plan.rb

@@ -22,13 +22,30 @@ Puppet::Functions.create_function(:run_plan, Puppet::Functions::InternalFunction
       )
     end
 
+    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 plan')
+      )
+    end
+
+    use_args = named_args.reject { |k, _| k.start_with?('_') }
+
     loaders = closure_scope.compiler.loaders
     # The perspective of the environment is wanted here (for now) to not have to
     # require modules to have dependencies defined in meta data.
     loader = loaders.private_environment_loader
     if loader && (func = loader.load(:plan, plan_name))
       # TODO: Add profiling around this
-      return func.class.dispatcher.dispatchers[0].call_by_name_with_scope(scope, named_args, true)
+      if (run_as = named_args['_run_as'])
+        old_run_as = executor.run_as
+        executor.run_as = run_as
+      end
+      result = func.class.dispatcher.dispatchers[0].call_by_name_with_scope(scope, use_args, true)
+      if run_as
+        executor.run_as = old_run_as
+      end
+      return result
     end
     # Could not find plan
     raise ArgumentError, "Function #{self.class.name}(): Unknown plan: '#{plan_name}'"

data/modules/boltlib/lib/puppet/functions/run_script.rb

@@ -50,7 +50,7 @@ Puppet::Functions.create_function(:run_script, Puppet::Functions::InternalFuncti
     r = if targets.empty?
           Bolt::ResultSet.new([])
         else
-          executor.run_script(targets, found, options['arguments'] || [])
+          executor.run_script(targets, found, options['arguments'] || [], options.select { |k, _| k == '_run_as' })
         end
 
     if !r.ok && !options['_catch_errors']

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

@@ -87,7 +87,8 @@ Puppet::Functions.create_function(:run_task) do
       Bolt::ResultSet.new([])
     else
       # TODO: pass entire task to executor
-      executor.run_task(targets, task.executable, task.input_method, use_args, &block)
+      options = task_args.select { |k, _| k == '_run_as' }
+      executor.run_task(targets, task.executable, task.input_method, use_args, options, &block)
     end
   end
 end

data/vendored/facter/lib/facter/virtual.rb

@@ -217,6 +217,8 @@ Facter.add("virtual") do
           result = "bochs"
         when /OpenStack/
           result = "openstack"
+        when /Google Compute Engine/
+          result = "gce"
         end
 
         if result.nil? and computersystem.manufacturer =~ /Xen/

data/vendored/hiera/lib/hiera/config.rb

@@ -29,7 +29,7 @@ class Hiera::Config
           if config
             version = config['version'] || config[:version] || 3
             if version >= 4
-              raise "v4 hiera.yaml is only to be used inside an environment or a module and cannot be given to the global hiera"
+              raise "v#{version} hiera.yaml is only to be used inside an environment or a module and cannot be given to the global hiera"
             end
             @config.merge! config
           end
@@ -48,7 +48,7 @@ class Hiera::Config
         @config[:logger] = "console"
         Hiera.logger = "console"
       end
-    
+
       self.validate!
 
       @config

data/vendored/hiera/lib/hiera/version.rb

@@ -7,7 +7,7 @@
 
 
 class Hiera
-  VERSION = "3.4.1"
+  VERSION = "3.4.2"
 
   ##
   # version is a public API method intended to always provide a fast and

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

@@ -60,8 +60,11 @@ class Hiera::PuppetFunction < Puppet::Functions::InternalFunction
 
   def lookup(scope, key, default, has_default, override, &default_block)
     unless Puppet[:strict] == :off
-      Puppet.warn_once('deprecations', self.class.name,
-        "The function '#{self.class.name}' is deprecated in favor of using 'lookup'. See https://docs.puppet.com/puppet/#{Puppet.minor_version}/reference/deprecated_language.html")
+      #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") %
+          { minor_version: Puppet.minor_version }
+      Puppet.warn_once('deprecations', self.class.name, message)
     end
     lookup_invocation = Puppet::Pops::Lookup::Invocation.new(scope, {}, {})
     adapter = lookup_invocation.lookup_adapter

data/vendored/puppet/lib/hiera_puppet.rb

@@ -11,7 +11,7 @@ module HieraPuppet
     answer = hiera.lookup(key, default, scope, override, resolution_type)
 
     if answer.nil?
-      raise(Puppet::ParseError, "Could not find data item #{key} in any Hiera data file and no default supplied")
+      raise Puppet::ParseError, _("Could not find data item %{key} in any Hiera data file and no default supplied") % { key: key }
     end
 
     answer
@@ -38,7 +38,7 @@ module HieraPuppet
     end
 
     if args.empty?
-      raise(Puppet::ParseError, "Please supply a parameter to perform a Hiera lookup")
+      raise Puppet::ParseError, _("Please supply a parameter to perform a Hiera lookup")
     end
 
     key      = args[0]
@@ -71,7 +71,7 @@ module HieraPuppet
     if Puppet::FileSystem.exist?(hiera_config)
       hiera_config
     else
-      Puppet.warning "Config file #{hiera_config} not found, using Hiera defaults"
+      Puppet.warning _("Config file %{hiera_config} not found, using Hiera defaults") % { hiera_config: hiera_config }
       nil
     end
   end

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

@@ -29,11 +29,12 @@ module Puppet::Agent::Locker
 
   # @deprecated
   def running?
-    Puppet.deprecation_warning _(<<-ENDHEREDOC)
-Puppet::Agent::Locker.running? is deprecated as it is inherently unsafe.
-The only safe way to know if the lock is locked is to try lock and perform some
-action and then handle the LockError that may result.
-ENDHEREDOC
+    #TRANSLATORS 'Puppet::Agent::Locker.running?' is a method name and should not be translated
+    message = _('Puppet::Agent::Locker.running? is deprecated as it is inherently unsafe.')
+    #TRANSLATORS 'LockError' should not be translated
+    message += ' ' + _('The only safe way to know if the lock is locked is to try lock and perform some '\
+                       'action and then handle the LockError that may result.')
+    Puppet.deprecation_warning(message)
     lockfile.locked?
   end
 

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

@@ -84,8 +84,8 @@ configuration options can also be generated by running puppet with
 '--genconfig'.
 
 * --bucket:
-  Specify a filebucket path. If '--local' is also set, this path
-  overrides the default '--local' path set in '$clientbucketdir'.
+  Specify a local filebucket path. This overrides the default path
+  set in '$clientbucketdir'.
 
 * --debug:
   Enable full debugging.
@@ -119,35 +119,47 @@ configuration options can also be generated by running puppet with
 * --version:
   Print version information.
 
-
-EXAMPLE
--------
+EXAMPLES
+--------
+    ## Backup a file to the filebucket, then restore it to a temporary directory
     $ puppet filebucket backup /etc/passwd
     /etc/passwd: 429b225650b912a2ee067b0a4cf1e949
     $ puppet filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949
+
     ## Diff between two files in the filebucket
     $ puppet filebucket -l diff d43a6ecaa892a1962398ac9170ea9bf2 7ae322f5791217e031dc60188f4521ef
     1a2
     > again
-    ## Diff between the file in the filebucket and the current one
+
+    ## Diff between the file in the filebucket and a local file
     $ puppet filebucket -l diff d43a6ecaa892a1962398ac9170ea9bf2 /tmp/testFile
     1a2
     > again
+
+    ## Backup a file to the filebucket and observe that it keeps each backup separate
     $ puppet filebucket -l list
     d43a6ecaa892a1962398ac9170ea9bf2 2015-05-11 09:27:56 /tmp/TestFile
+
     $ echo again >> /tmp/TestFile
+
     $ puppet filebucket -l backup /tmp/TestFile
     /tmp/TestFile: 7ae322f5791217e031dc60188f4521ef
+
     $ puppet filebucket -l list
     d43a6ecaa892a1962398ac9170ea9bf2 2015-05-11 09:27:56 /tmp/TestFile
     7ae322f5791217e031dc60188f4521ef 2015-05-11 09:52:15 /tmp/TestFile
+
+    ## List files in a filebucket within date ranges
     $ puppet filebucket -l -f 2015-01-01 -t 2015-01-11 list
     <Empty Output>
+
     $ puppet filebucket -l -f 2015-05-10 list
     d43a6ecaa892a1962398ac9170ea9bf2 2015-05-11 09:27:56 /tmp/TestFile
     7ae322f5791217e031dc60188f4521ef 2015-05-11 09:52:15 /tmp/TestFile
+
     $ puppet filebucket -l -f "2015-05-11 09:30:00" list
     7ae322f5791217e031dc60188f4521ef 2015-05-11 09:52:15 /tmp/TestFile
+
     $ puppet filebucket -l -t "2015-05-11 09:30:00" list
     d43a6ecaa892a1962398ac9170ea9bf2 2015-05-11 09:27:56 /tmp/TestFile
     ## Manage files in a specific local filebucket
@@ -156,6 +168,11 @@ EXAMPLE
     $ puppet filebucket -b /tmp/TestBucket list
     d41d8cd98f00b204e9800998ecf8427e 2015-05-11 09:33:22 /tmp/TestFile2
 
+    ## From a Puppet master, list files in the master bucketdir
+    $ puppet filebucket -b $(puppet config print bucketdir --section master) list
+    d43a6ecaa892a1962398ac9170ea9bf2 2015-05-11 09:27:56 /tmp/TestFile
+    7ae322f5791217e031dc60188f4521ef 2015-05-11 09:52:15 /tmp/TestFile
+
 AUTHOR
 ------
 Luke Kanies

data/vendored/puppet/lib/puppet/daemon.rb

@@ -79,7 +79,7 @@ class Puppet::Daemon
   end
 
   def reexec
-    raise Puppet::DevError, "Cannot reexec unless ARGV arguments are set" unless argv
+    raise Puppet::DevError, _("Cannot reexec unless ARGV arguments are set") unless argv
     command = $0 + " " + argv.join(" ")
     Puppet.notice "Restarting with '#{command}'"
     stop(:exit => false)
@@ -140,7 +140,7 @@ class Puppet::Daemon
   def start
     create_pidfile
 
-    raise Puppet::DevError, "Daemons must have an agent, server, or both" unless agent or server
+    raise Puppet::DevError, _("Daemons must have an agent, server, or both") unless agent or server
 
     # Start the listening server, if required.
     server.start if server

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

@@ -1,3 +1,5 @@
+require 'puppet/util/platform'
+
 module Puppet
 
   def self.default_diffargs
@@ -8,6 +10,22 @@ module Puppet
     end
   end
 
+  def self.default_digest_alg
+    if Puppet::Util::Platform.fips_enabled?
+      "sha256"
+    else
+      "md5"
+    end
+  end
+
+  def self.default_checksum_types 
+    if Puppet::Util::Platform.fips_enabled?
+      ['sha256', 'sha384', 'sha512', 'sha224']
+    else
+      ['md5', 'sha256', 'sha384', 'sha512', 'sha224']
+    end
+  end
+
   ############################################################################################
   # NOTE: For information about the available values for the ":type" property of settings,
   #   see the docs for Settings.define_settings
@@ -99,7 +117,8 @@ module Puppet
         valid   = %w[deprecations undefined_variables undefined_resources]
         invalid = values - (values & valid)
         if not invalid.empty?
-          raise ArgumentError, "Cannot disable unrecognized warning types #{invalid.inspect}. Valid values are #{valid.inspect}."
+          raise ArgumentError, _("Cannot disable unrecognized warning types %{invalid}.") % { invalid: invalid.inspect } +
+              ' ' + _("Valid values are %{values}.") % { values: valid.inspect}
         end
       end
     },
@@ -443,7 +462,11 @@ module Puppet
         if Puppet[:strict] != :off
           s_val = value.to_s # because sometimes the value is a symbol
           unless s_val == 'hiera' || s_val == 'none' || value == '' || value.nil?
-            Puppet.deprecation_warning "Setting 'data_binding_terminus' is deprecated. Convert custom terminus to hiera 5 API."
+            #TRANSLATORS 'data_binding_terminus' is a setting and should not be translated
+            message = _("Setting 'data_binding_terminus' is deprecated.")
+            #TRANSLATORS 'hiera' should not be translated
+            message += ' ' + _("Convert custom terminus to hiera 5 API.")
+            Puppet.deprecation_warning(message)
           end
         end
       end
@@ -595,7 +618,8 @@ module Puppet
       custom data providers see the respective module documentation. This setting is deprecated.",
       :hook => proc { |value|
         unless value.nil? || Puppet[:strict] == :off
-          Puppet.deprecation_warning "Setting 'environment_data_provider' is deprecated."
+          #TRANSLATORS 'environment_data_provider' is a setting and should not be translated
+          Puppet.deprecation_warning(_("Setting 'environment_data_provider' is deprecated."))
         end
       }
     },
@@ -697,7 +721,7 @@ module Puppet
           for a normal node.
 
         Defaults to the node's fully qualified domain name.",
-      :hook => proc { |value| raise(ArgumentError, "Certificate names must be lower case") unless value == value.downcase }},
+      :hook => proc { |value| raise(ArgumentError, _("Certificate names must be lower case")) unless value == value.downcase }},
     :dns_alt_names => {
       :default => '',
       :desc    => <<EOT,
@@ -915,14 +939,14 @@ attempt to download the CRL.
 EOT
     },
     :digest_algorithm => {
-        :default  => 'md5',
+        :default  => lambda { default_digest_alg },
         :type     => :enum,
         :values => ["md5", "sha256", "sha384", "sha512", "sha224"],
         :desc     => 'Which digest algorithm to use for file resources and the filebucket.
                       Valid values are md5, sha256, sha384, sha512, sha224. Default is md5.',
     },
     :supported_checksum_types => {
-      :default => ['md5', 'sha256', 'sha384', 'sha512', 'sha224'],
+      :default => lambda { default_checksum_types },
       :type    => :array,
       :desc    => 'Checksum types supported by this agent for use in file resources of a
                    static catalog. Values must be comma-separated. Valid types are md5,
@@ -933,7 +957,8 @@ EOT
         valid   = ['md5', 'md5lite', 'sha256', 'sha256lite', 'sha384', 'sha512', 'sha224', 'sha1', 'sha1lite', 'mtime', 'ctime']
         invalid = values.reject {|alg| valid.include?(alg)}
         if not invalid.empty?
-          raise ArgumentError, "Unrecognized checksum types #{invalid} are not supported. Valid values are #{valid}."
+          raise ArgumentError, _("Unrecognized checksum types %{invalid} are not supported.") % { invalid: invalid } +
+              ' ' + _("Valid values are %{values}.") % { values: valid }
         end
       end
     }
@@ -1456,7 +1481,10 @@ EOT
       :call_hook => :on_initialize_and_write,
       :hook => proc { |value|
         if Puppet.settings.set_by_config?(:server) && Puppet.settings.set_by_config?(:server_list)
-          Puppet.deprecation_warning('Attempted to set both server and server_list. Server setting will not be used.', :SERVER_DUPLICATION)
+          #TRANSLATOR 'server' and 'server_list' are setting names and should not be translated
+          message = _('Attempted to set both server and server_list.')
+          message += ' ' + _('Server setting will not be used.')
+          Puppet.deprecation_warning(message, :SERVER_DUPLICATION)
         end
       }
     },
@@ -1468,7 +1496,10 @@ EOT
       :call_hook => :on_initialize_and_write,
       :hook => proc { |value|
         if Puppet.settings.set_by_config?(:server) && Puppet.settings.set_by_config?(:server_list)
-          Puppet.deprecation_warning('Attempted to set both server and server_list. Server setting will not be used.', :SERVER_DUPLICATION)
+          #TRANSLATOR 'server' and 'server_list' are setting names and should not be translated
+          message = _('Attempted to set both server and server_list.')
+          message += ' ' + _('Server setting will not be used.')
+          Puppet.deprecation_warning(message, :SERVER_DUPLICATION)
         end
       }
     },
@@ -1776,7 +1807,8 @@ EOT
       :desc       => "Whether plugins should be synced with the central server. This setting is
         deprecated.",
       :hook => proc { |value|
-        Puppet.deprecation_warning "Setting 'pluginsync' is deprecated."
+        #TRANSLATORS 'pluginsync' is a setting and should not be translated
+        Puppet.deprecation_warning(_("Setting 'pluginsync' is deprecated."))
       }
     },
     :pluginsignore => {

data/vendored/puppet/lib/puppet/error.rb

@@ -27,22 +27,12 @@ module Puppet
       @line = line
       @pos = pos
     end
+
     def to_s
       msg = super
       @file = nil if (@file.is_a?(String) && @file.empty?)
-      if @file and @line and @pos
-        "#{msg} at #{@file}:#{@line}:#{@pos}"
-      elsif @file and @line
-        "#{msg} at #{@file}:#{@line}"
-      elsif @line and @pos
-          "#{msg} at line #{@line}:#{@pos}"
-      elsif @line
-        "#{msg} at line #{@line}"
-      elsif @file
-        "#{msg} in #{@file}"
-      else
-        msg
-      end
+      msg += Puppet::Util::Errors.error_location_with_space(@file, @line, @pos)
+      msg
     end
   end
 
@@ -74,8 +64,8 @@ module Puppet
 
     def to_s
       msg = super
-      msg = "Could not parse for environment #{environment}: #{msg}" if environment
-      msg = "#{msg} on node #{node}" if node
+      msg = _("Could not parse for environment %{environment}: %{message}") % { environment: environment, message: msg } if environment
+      msg = _("%{message} on node %{node}") % { message: msg, node: node } if node
       msg
     end
 

data/vendored/puppet/lib/puppet/external/pson/common.rb

@@ -43,7 +43,7 @@ module PSON
         case
         when c.empty?             then p
         when p.const_defined?(c)  then p.const_get(c)
-        else                      raise ArgumentError, "can't find const for unregistered document type #{path}"
+        else                      raise ArgumentError, _("can't find const for unregistered document type %{path}") % { path: path}
         end
       end
     end
@@ -308,7 +308,7 @@ module PSON
       result
     end
   rescue PSON::NestingError
-    raise ArgumentError, "exceed depth limit", $!.backtrace
+    raise ArgumentError, _("exceed depth limit"), $!.backtrace
   end